erewhon (13jan21)

git-svn-id: svn://tug.org/texlive/trunk@57410 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2021-01-13 22:10:02 +0000
committer: Karl Berry <karl@freefriends.org> 2021-01-13 22:10:02 +0000
commit: 4065c882e0f8f03db7efccc7374a81450ce7b0e5 (patch)
tree: 648132b72560ed71486bda1ab3eb3f06c1344282 /Master/texmf-dist/fonts/enc/dvips/erewhon
parent: cb5a8155268b6fcc187641648ef87612168200f6 (diff)
200 files changed, 3562 insertions, 4077 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mwaz7t.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_25oktk.enc
index 898fd309f19..6a2e901ad44 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mwaz7t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_25oktk.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mwaz7tlf7o3j4lmiev67gogm6h
-% Encoding created by otftotfm on Mon May 11 15:11:25 2020
+%%AutoEnc_25oktkxhemlejmtsnxbbe3ybmf
+% Encoding created by otftotfm on Tue Jan 12 13:16:18 2021
 % Command line follows encoding
-/AutoEnc_mwaz7tlf7o3j4lmiev67gogm6h [
+/AutoEnc_25oktkxhemlejmtsnxbbe3ybmf [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vkdxbd.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2jsbza.enc
index 059e798c98c..a07697f4152 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vkdxbd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2jsbza.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vkdxbdi4zqpx2bjfcxqvetlqdb
-% Encoding created by otftotfm on Mon May 11 15:10:44 2020
+%%AutoEnc_2jsbzahpjk2d7arg3zsprv2kmc
+% Encoding created by otftotfm on Tue Jan 12 13:15:30 2021
 % Command line follows encoding
-/AutoEnc_vkdxbdi4zqpx2bjfcxqvetlqdb [
+/AutoEnc_2jsbzahpjk2d7arg3zsprv2kmc [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,6 @@
 % --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=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-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=pnum Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2lssnc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2lssnc.enc
new file mode 100644
index 00000000000..41ed2f0198c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2lssnc.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2lssnckyf3ci7delpjhg65wfpg
+% Encoding created by otftotfm on Tue Jan 12 13:17:11 2021
+% Command line follows encoding
+/AutoEnc_2lssnckyf3ci7delpjhg65wfpg [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni0493 /ffl /uni0495 /uni04BB /uni0497 /ffi /uni04E1
+  /uni0459 /uni049B /fl /uni04C4 /L.sc /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /fi /uni045E /uni04AF /I.sc /uni04B3 /ff /F.sc
+  /uni04B7 /uni045A /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2b.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --feature=smcp
+% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% Erewhon-Bold-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2objs7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2objs7.enc
new file mode 100644
index 00000000000..ce6bbe6747a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2objs7.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2objs7rif6zqpcrlugxyki4bsc
+% Encoding created by otftotfm on Tue Jan 12 13:16:09 2021
+% Command line follows encoding
+/AutoEnc_2objs7rif6zqpcrlugxyki4bsc [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2qulls.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2qulls.enc
new file mode 100644
index 00000000000..4f2640ee13d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2qulls.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2qullsqw7j565gwlypfir6yyae
+% Encoding created by otftotfm on Tue Jan 12 13:16:30 2021
+% Command line follows encoding
+/AutoEnc_2qullsqw7j565gwlypfir6yyae [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_siihhb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2sunpf.enc
index c33956552aa..aa16c1554fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_siihhb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2sunpf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_siihhbrexvbbfofdsq3mfvvyeh
-% Encoding created by otftotfm on Mon May 11 15:10:36 2020
+%%AutoEnc_2sunpfjrvuutujfde77cbk7psc
+% Encoding created by otftotfm on Tue Jan 12 13:15:24 2021
 % Command line follows encoding
-/AutoEnc_siihhbrexvbbfofdsq3mfvvyeh [
+/AutoEnc_2sunpfjrvuutujfde77cbk7psc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2zzglv.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2zzglv.enc
deleted file mode 100644
index 3c167b59de6..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2zzglv.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_2zzglv6ljfkikhjchsv5ljubrg
-% Encoding created by otftotfm on Mon May 11 15:11:16 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_zhuxl5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_36pkgq.enc
index 817ccf7b5ec..fd9b1ba886a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zhuxl5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_36pkgq.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zhuxl5pbjfxufpyyt7xbeea5cc
-% Encoding created by otftotfm on Mon May 11 15:11:16 2020
+%%AutoEnc_36pkgqryfvkoxaac4epnkknwte
+% Encoding created by otftotfm on Tue Jan 12 13:16:19 2021
 % Command line follows encoding
-/AutoEnc_zhuxl5pbjfxufpyyt7xbeea5cc [
+/AutoEnc_36pkgqryfvkoxaac4epnkknwte [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3b4drr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3b4drr.enc
deleted file mode 100644
index 1eaceff9d8c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3b4drr.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_3b4drrm56eb45lwxbwibobpckc
-% Encoding created by otftotfm on Mon May 11 15:11:22 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_iioipf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3cc3dt.enc
index 26d6f997675..ebd82349203 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iioipf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3cc3dt.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_iioipfjae7ff2h3mjvaneskpdh
-% Encoding created by otftotfm on Mon May 11 15:11:02 2020
+%%AutoEnc_3cc3dt4qow5uduzosxrkx3dlhd
+% Encoding created by otftotfm on Tue Jan 12 13:15:47 2021
 % Command line follows encoding
-/AutoEnc_iioipfjae7ff2h3mjvaneskpdh [
+/AutoEnc_3cc3dt4qow5uduzosxrkx3dlhd [
 %00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
+  /F.sc /Euro.sc /I.sc /L.sc /fraction /dotaccent /hungarumlaut /ogonek
+  /S.sc /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %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
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwkviq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3ss64c.enc
index be5c44db4f3..ad23996d0a0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwkviq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3ss64c.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xwkviq3nqzsjwrqqg7j7n462ig
-% Encoding created by otftotfm on Mon May 11 15:11:05 2020
+%%AutoEnc_3ss64cy7shbh2bxecfgkq3yuig
+% Encoding created by otftotfm on Tue Jan 12 13:15:51 2021
 % Command line follows encoding
-/AutoEnc_xwkviq3nqzsjwrqqg7j7n462ig [
+/AutoEnc_3ss64cy7shbh2bxecfgkq3yuig [
 %00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
+  /F.sc /Euro.sc /I.sc /L.sc /fraction /dotaccent /hungarumlaut /ogonek
+  /S.sc /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %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
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3xl2sl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3xl2sl.enc
new file mode 100644
index 00000000000..8f1686498ca
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3xl2sl.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_3xl2slchqqthmfx7ni2lwrwgnf
+% Encoding created by otftotfm on Tue Jan 12 13:16:10 2021
+% Command line follows encoding
+/AutoEnc_3xl2slchqqthmfx7ni2lwrwgnf [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4j4ux5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4j4ux5.enc
new file mode 100644
index 00000000000..eadd778f42e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4j4ux5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4j4ux5su3mc4x6v67x5nbfknve
+% Encoding created by otftotfm on Tue Jan 12 13:16:50 2021
+% Command line follows encoding
+/AutoEnc_4j4ux5su3mc4x6v67x5nbfknve [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_upydia.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4qs3ad.enc
index be94da5d3be..0c7ca638472 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_upydia.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4qs3ad.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_upydia7fwx4oywv2b4w7c37cxf
-% Encoding created by otftotfm on Mon May 11 15:11:39 2020
+%%AutoEnc_4qs3adwpfmbnbow2y4agdolvid
+% Encoding created by otftotfm on Tue Jan 12 13:16:41 2021
 % Command line follows encoding
-/AutoEnc_upydia7fwx4oywv2b4w7c37cxf [
+/AutoEnc_4qs3adwpfmbnbow2y4agdolvid [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2b'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eu4f6g.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_53w3xs.enc
index 797a6de9397..14e3e4c69ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eu4f6g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_53w3xs.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_eu4f6guvlotd5agjis4dkqch2f
-% Encoding created by otftotfm on Mon May 11 15:11:26 2020
+%%AutoEnc_53w3xsadtnxatmcgyoznsd6qja
+% Encoding created by otftotfm on Tue Jan 12 13:16:19 2021
 % Command line follows encoding
-/AutoEnc_eu4f6guvlotd5agjis4dkqch2f [
+/AutoEnc_53w3xsadtnxatmcgyoznsd6qja [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2a'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3elzbu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_546xgo.enc
index debc2555db0..ec339396936 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3elzbu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_546xgo.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3elzbu2a5lcim3sxbvyymxfude
-% Encoding created by otftotfm on Mon May 11 15:11:29 2020
+%%AutoEnc_546xgoxfguwlojzsegeoozfg4b
+% Encoding created by otftotfm on Tue Jan 12 13:16:40 2021
 % Command line follows encoding
-/AutoEnc_3elzbu2a5lcim3sxbvyymxfude [
+/AutoEnc_546xgoxfguwlojzsegeoozfg4b [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
 %30
   /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=dnom --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-dnom-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mza5ex.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5eo37n.enc
index 4c8fff79e2c..a37ff6fb034 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mza5ex.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5eo37n.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mza5exifoibje4usgvxnokuccg
-% Encoding created by otftotfm on Mon May 11 15:10:42 2020
+%%AutoEnc_5eo37nbwtzz6kmqtvlyhznnvdb
+% Encoding created by otftotfm on Tue Jan 12 13:15:25 2021
 % Command line follows encoding
-/AutoEnc_mza5exifoibje4usgvxnokuccg [
+/AutoEnc_5eo37nbwtzz6kmqtvlyhznnvdb [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5iiyxb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5iiyxb.enc
new file mode 100644
index 00000000000..e201bfed9e4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5iiyxb.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5iiyxbae53xshwdjj5gr2dzrqd
+% Encoding created by otftotfm on Tue Jan 12 13:16:49 2021
+% Command line follows encoding
+/AutoEnc_5iiyxbae53xshwdjj5gr2dzrqd [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_auximm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5kulil.enc
index ef1e29174e1..0a13cc7e654 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_auximm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5kulil.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_auximm4wrfjtxg3m2vbwwlyb7b
-% Encoding created by otftotfm on Mon May 11 15:11:41 2020
+%%AutoEnc_5kuliluodmkka3ds5xy6nxfleg
+% Encoding created by otftotfm on Tue Jan 12 13:16:47 2021
 % Command line follows encoding
-/AutoEnc_auximm4wrfjtxg3m2vbwwlyb7b [
+/AutoEnc_5kuliluodmkka3ds5xy6nxfleg [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,14 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-RegularSlanted.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-RegularSlanted.otf
 % Erewhon-RegularSlanted-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_44vtia.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6etwti.enc
index 5ac74287321..4fd4ecde104 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_44vtia.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6etwti.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_44vtiarfy3umi7th6ikkcdnyla
-% Encoding created by otftotfm on Mon May 11 15:11:06 2020
+%%AutoEnc_6etwtibpauqnqqxbcasutxongg
+% Encoding created by otftotfm on Tue Jan 12 13:15:50 2021
 % Command line follows encoding
-/AutoEnc_44vtiarfy3umi7th6ikkcdnyla [
+/AutoEnc_6etwtibpauqnqqxbcasutxongg [
 %00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
+  /F.sc /Euro.sc /I.sc /L.sc /fraction /dotaccent /hungarumlaut /ogonek
+  /S.sc /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %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
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bnrjsn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6kzn42.enc
index bf461496dc0..1bc651005ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bnrjsn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6kzn42.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bnrjsnql5bewgjzkcn57lozgqh
-% Encoding created by otftotfm on Mon May 11 15:10:53 2020
+%%AutoEnc_6kzn4223orbc6tbrqyxbiswmva
+% Encoding created by otftotfm on Tue Jan 12 13:15:43 2021
 % Command line follows encoding
-/AutoEnc_bnrjsnql5bewgjzkcn57lozgqh [
+/AutoEnc_6kzn4223orbc6tbrqyxbiswmva [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,6 @@
 % --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-BoldSlanted.otf Erewhon-BoldSlanted-tlf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum Erewhon-BoldSlanted.otf
+% Erewhon-BoldSlanted-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6uafpb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6uafpb.enc
deleted file mode 100644
index d966a2f9e09..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6uafpb.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_6uafpbuulz26flcptjqtjocp6h
-% Encoding created by otftotfm on Mon May 11 15:11:58 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E8.sc /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10145.sc /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_q6m374.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_74cce3.enc
index 0d3b02897d4..63dcfa1dac6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6m374.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_74cce3.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q6m374jrghb5g7urdd37cvyzgd
-% Encoding created by otftotfm on Mon May 11 15:11:39 2020
+%%AutoEnc_74cce3c6wh72l5qxywosp5hwkb
+% Encoding created by otftotfm on Tue Jan 12 13:16:40 2021
 % Command line follows encoding
-/AutoEnc_q6m374jrghb5g7urdd37cvyzgd [
+/AutoEnc_74cce3c6wh72l5qxywosp5hwkb [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vwspja.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_74ksak.enc
index e4b30e91cf1..9d667c0315f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vwspja.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_74ksak.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vwspjaw5an66qamjzq6n3zybhe
-% Encoding created by otftotfm on Mon May 11 15:11:05 2020
+%%AutoEnc_74ksakihhn2syfvy7k33ftm5zb
+% Encoding created by otftotfm on Tue Jan 12 13:15:52 2021
 % Command line follows encoding
-/AutoEnc_vwspjaw5an66qamjzq6n3zybhe [
+/AutoEnc_74ksakihhn2syfvy7k33ftm5zb [
 %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 /ff /FI.sc /FL.sc /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /F.sc /I.sc /L.sc /S.sc /.notdef
 %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 /S.sc /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /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
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t1'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kyhdzd.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7ajsnx.enc
index 4841ebe0603..734eaa7ed1b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kyhdzd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7ajsnx.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kyhdzdis6w7h6uctzywbsadndg
-% Encoding created by otftotfm on Mon May 11 15:11:58 2020
+%%AutoEnc_7ajsnxpxxueque2mq37nym7rwb
+% Encoding created by otftotfm on Tue Jan 12 13:17:08 2021
 % Command line follows encoding
-/AutoEnc_kyhdzdis6w7h6uctzywbsadndg [
+/AutoEnc_7ajsnxpxxueque2mq37nym7rwb [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,14 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-RegularSlanted.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-RegularSlanted.otf
 % Erewhon-RegularSlanted-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kaj6yp.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7lebnu.enc
index 0d3929cbf8d..c92d3a42c3f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kaj6yp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7lebnu.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kaj6ypdqrlvh526atrbsdd3nsc
-% Encoding created by otftotfm on Mon May 11 15:11:40 2020
+%%AutoEnc_7lebnuz2qpdulamyr45j7kil4a
+% Encoding created by otftotfm on Tue Jan 12 13:16:39 2021
 % Command line follows encoding
-/AutoEnc_kaj6ypdqrlvh526atrbsdd3nsc [
+/AutoEnc_7lebnuz2qpdulamyr45j7kil4a [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2b'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7qbp4f.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7qbp4f.enc
deleted file mode 100644
index a404c4440d7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7qbp4f.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7qbp4fql4ip3ypmabozm3qr3nh
-% Encoding created by otftotfm on Mon May 11 15:11:42 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10058.sc /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A4.sc /uni04C8
-%B0
-  /uni04E8.sc /.notdef /afii10062.sc /uni04AE.sc /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10059.sc /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_y46t2n.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7xxsa3.enc
index 690780c8b40..a9d0ba78366 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_y46t2n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7xxsa3.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_y46t2njdm3uvtk5ns42dvxrgag
-% Encoding created by otftotfm on Mon May 11 15:10:38 2020
+%%AutoEnc_7xxsa3al42d3onvivrhepproba
+% Encoding created by otftotfm on Tue Jan 12 13:15:20 2021
 % Command line follows encoding
-/AutoEnc_y46t2njdm3uvtk5ns42dvxrgag [
+/AutoEnc_7xxsa3al42d3onvivrhepproba [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=dnom --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zfl2i.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zfl2i.enc
new file mode 100644
index 00000000000..0d044f97b1b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zfl2i.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7zfl2igm2qdmq2pyfnkvsfyjnf
+% Encoding created by otftotfm on Tue Jan 12 13:16:11 2021
+% Command line follows encoding
+/AutoEnc_7zfl2igm2qdmq2pyfnkvsfyjnf [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
+%30
+  /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+  /eight.denominator /nine.denominator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=dnom --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zlfno.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zlfno.enc
new file mode 100644
index 00000000000..5f9da5bc2d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7zlfno.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7zlfnozrsowdumyxowft3fl3va
+% Encoding created by otftotfm on Tue Jan 12 13:16:48 2021
+% Command line follows encoding
+/AutoEnc_7zlfnozrsowdumyxowft3fl3va [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
+  /eight.inferior /nine.inferior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o6jmxn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a27mgr.enc
index 343c46e9903..771c03f60ce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o6jmxn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a27mgr.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_o6jmxnaukpk4q5qrziiitmyi6g
-% Encoding created by otftotfm on Mon May 11 15:11:14 2020
+%%AutoEnc_a27mgrtzpba7fos22r6ujpvz4c
+% Encoding created by otftotfm on Tue Jan 12 13:16:19 2021
 % Command line follows encoding
-/AutoEnc_o6jmxnaukpk4q5qrziiitmyi6g [
+/AutoEnc_a27mgrtzpba7fos22r6ujpvz4c [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_arprdz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a7a6j7.enc
index d003aaaa14b..42063f25124 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_arprdz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a7a6j7.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_arprdz74ocb4enwmna2noek6ig
-% Encoding created by otftotfm on Mon May 11 15:11:15 2020
+%%AutoEnc_a7a6j7hqmjwzog5uxfmp3i3asd
+% Encoding created by otftotfm on Tue Jan 12 13:16:20 2021
 % Command line follows encoding
-/AutoEnc_arprdz74ocb4enwmna2noek6ig [
+/AutoEnc_a7a6j7hqmjwzog5uxfmp3i3asd [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
 %30
   /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=numr --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-numr-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawuiy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_acvwor.enc
index ee400b892b6..eed9c93670f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawuiy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_acvwor.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sawuiyrsdjgryspywwbyrfx2xd
-% Encoding created by otftotfm on Mon May 11 15:11:54 2020
+%%AutoEnc_acvworc4kv45ogghu32w7s65se
+% Encoding created by otftotfm on Tue Jan 12 13:17:01 2021
 % Command line follows encoding
-/AutoEnc_sawuiyrsdjgryspywwbyrfx2xd [
+/AutoEnc_acvworc4kv45ogghu32w7s65se [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2c'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_adckrx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_adckrx.enc
new file mode 100644
index 00000000000..5bfee763ad7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_adckrx.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_adckrxbhezx3hxkmjmbc5iybxb
+% Encoding created by otftotfm on Tue Jan 12 13:16:51 2021
+% Command line follows encoding
+/AutoEnc_adckrxbhezx3hxkmjmbc5iybxb [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
+%30
+  /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
+  /eight.numerator /nine.numerator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ahzhtu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ahzhtu.enc
new file mode 100644
index 00000000000..561988e60a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ahzhtu.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ahzhtuvjxqbwbeulfoumazrnof
+% Encoding created by otftotfm on Tue Jan 12 13:16:52 2021
+% Command line follows encoding
+/AutoEnc_ahzhtuvjxqbwbeulfoumazrnof [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+  /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+  /eight.superior /nine.superior /colon.superior /semicolon.superior /less.superior /equal.superior /greater.superior /question.superior
+%40
+  /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+  /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash /bracketright.superior /asciicircum /underscore
+%60
+  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+  /x.superior /y.superior /z.superior /braceleft.superior /bar /braceright.superior /asciitilde /hyphen.superior
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n6sb7c.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_aluvmp.enc
index f2c7adfa012..e911822c2f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n6sb7c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_aluvmp.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_n6sb7ccqce626igrc36zip6bxe
-% Encoding created by otftotfm on Mon May 11 15:11:29 2020
+%%AutoEnc_aluvmpl4ufeonmid44giwn4ybe
+% Encoding created by otftotfm on Tue Jan 12 13:16:31 2021
 % Command line follows encoding
-/AutoEnc_n6sb7ccqce626igrc36zip6bxe [
+/AutoEnc_aluvmpl4ufeonmid44giwn4ybe [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -30,37 +30,39 @@
   /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_45ihyl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amccbu.enc
index 8cf0324719e..0bae5edf5c8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_45ihyl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amccbu.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_45ihylf6whilgncrrghkssclph
-% Encoding created by otftotfm on Mon May 11 15:11:05 2020
+%%AutoEnc_amccbu3eic3wlznmlqqnmmm4ag
+% Encoding created by otftotfm on Tue Jan 12 13:15:59 2021
 % Command line follows encoding
-/AutoEnc_45ihylf6whilgncrrghkssclph [
+/AutoEnc_amccbu3eic3wlznmlqqnmmm4ag [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /.notdef /.notdef
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,6 @@
 % --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-tlf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum Erewhon-Regular.otf
+% Erewhon-Regular-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2kgcbe.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amjics.enc
index 6912215be1e..27ef480e5d9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2kgcbe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amjics.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2kgcbefbp3mclphoys5pqwrs5g
-% Encoding created by otftotfm on Mon May 11 15:10:43 2020
+%%AutoEnc_amjicsj3u4bgao6esbrhmeruyb
+% Encoding created by otftotfm on Tue Jan 12 13:15:31 2021
 % Command line follows encoding
-/AutoEnc_2kgcbefbp3mclphoys5pqwrs5g [
+/AutoEnc_amjicsj3u4bgao6esbrhmeruyb [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --ligkern=f i
-% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-BoldItalic.otf Erewhon-BoldItalic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ap3btm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ap3btm.enc
deleted file mode 100644
index 1d0fef07691..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ap3btm.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ap3btmoep2ikhrm3mibvmrwdmh
-% Encoding created by otftotfm on Mon May 11 15:11:27 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10051.sc /afii10060.sc /uni04BB /uni0497 /.notdef /afii10058.sc
-  /afii10056.sc /uni049B /.notdef /.notdef /uni04D4.sc /uni04A3 /uni04A4.sc /afii10054.sc
-%B0
-  /uni04E8.sc /uni04AA.sc /afii10062.sc /uni04AE.sc /uni04B0.sc /uni04B3 /afii10145.sc /.notdef
-  /uni04B7 /afii10053.sc /afii10846 /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_avxsqu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_avxsqu.enc
deleted file mode 100644
index 2096479f1a7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_avxsqu.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_avxsquxo374zeij2m4rrrgmmsd
-% Encoding created by otftotfm on Mon May 11 15:11:14 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_krmfb2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_awhpzb.enc
index 4bf4787d409..ac8d12ff945 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_krmfb2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_awhpzb.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_krmfb2ivmui25lyedcanjmhhpe
-% Encoding created by otftotfm on Mon May 11 15:10:40 2020
+%%AutoEnc_awhpzbceqjumysoeqntn3pheye
+% Encoding created by otftotfm on Tue Jan 12 13:15:26 2021
 % Command line follows encoding
-/AutoEnc_krmfb2ivmui25lyedcanjmhhpe [
+/AutoEnc_awhpzbceqjumysoeqntn3pheye [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /question
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,5 @@
 % --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-tlf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum Erewhon-Bold.otf Erewhon-Bold-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_stg3em.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azbcfh.enc
index 9f7c30a07f8..2e01b3bff92 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_stg3em.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azbcfh.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_stg3emqawv4rqfwrsxkucvctoh
-% Encoding created by otftotfm on Mon May 11 15:11:45 2020
+%%AutoEnc_azbcfhc7hkufziiwwfs7k3xftg
+% Encoding created by otftotfm on Tue Jan 12 13:16:59 2021
 % Command line follows encoding
-/AutoEnc_stg3emqawv4rqfwrsxkucvctoh [
+/AutoEnc_azbcfhc7hkufziiwwfs7k3xftg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-lf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bgu3lr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azqpxw.enc
index b7a670e889f..c8c55253326 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bgu3lr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azqpxw.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bgu3lr5cgpgu5tvhtlmg25wz5b
-% Encoding created by otftotfm on Mon May 11 15:11:13 2020
+%%AutoEnc_azqpxwwsy6pa4cpvo43aa63rmh
+% Encoding created by otftotfm on Tue Jan 12 13:16:05 2021
 % Command line follows encoding
-/AutoEnc_bgu3lr5cgpgu5tvhtlmg25wz5b [
+/AutoEnc_azqpxwwsy6pa4cpvo43aa63rmh [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -59,8 +59,6 @@
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-RegularSlanted.otf
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-RegularSlanted.otf
 % Erewhon-RegularSlanted-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lknn34.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_c73i2u.enc
index bbb4a06946d..9e57f3ac4f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lknn34.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_c73i2u.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lknn34yo2kjegzl5o6ia2oxzkf
-% Encoding created by otftotfm on Mon May 11 15:10:56 2020
+%%AutoEnc_c73i2ukgtfjc2vuhpn4ycqb5ca
+% Encoding created by otftotfm on Tue Jan 12 13:15:46 2021
 % Command line follows encoding
-/AutoEnc_lknn34yo2kjegzl5o6ia2oxzkf [
+/AutoEnc_c73i2ukgtfjc2vuhpn4ycqb5ca [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /question
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,5 @@
 % --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=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Erewhon-Italic.otf Erewhon-Italic-osf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=pnum Erewhon-Italic.otf Erewhon-Italic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rrs35b.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cmujr7.enc
index 24fbbb94399..3e7efa38a0a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rrs35b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cmujr7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rrs35b2rkcvcsdbh2bpmr3gulh
-% Encoding created by otftotfm on Mon May 11 15:10:48 2020
+%%AutoEnc_cmujr77uyzm43dk2wm4yrf3ide
+% Encoding created by otftotfm on Tue Jan 12 13:15:33 2021
 % Command line follows encoding
-/AutoEnc_rrs35b2rkcvcsdbh2bpmr3gulh [
+/AutoEnc_cmujr77uyzm43dk2wm4yrf3ide [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqdyjt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqdyjt.enc
new file mode 100644
index 00000000000..2a497f126b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqdyjt.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cqdyjtnshnwsoasionuqm42osg
+% Encoding created by otftotfm on Tue Jan 12 13:16:09 2021
+% Command line follows encoding
+/AutoEnc_cqdyjtnshnwsoasionuqm42osg [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+  /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+  /eight.superior /nine.superior /colon.superior /semicolon.superior /less.superior /equal.superior /greater.superior /question.superior
+%40
+  /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+  /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash /bracketright.superior /asciicircum /underscore
+%60
+  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+  /x.superior /y.superior /z.superior /braceleft.superior /bar /braceright.superior /asciitilde /hyphen.superior
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwbecz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwbecz.enc
deleted file mode 100644
index 6e5e670254a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwbecz.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_cwbecztg4ljvntrtfc3d6popvd
-% Encoding created by otftotfm on Mon May 11 15:11:38 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
-%B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --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
-% --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_3om7o5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cxj5nb.enc
index dfea9014db1..2814c9a46d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3om7o5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cxj5nb.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3om7o5bsc7kes7csipbdbvovyh
-% Encoding created by otftotfm on Mon May 11 15:11:24 2020
+%%AutoEnc_cxj5nbsmat2o5rrw3rihpccu7c
+% Encoding created by otftotfm on Tue Jan 12 13:16:22 2021
 % Command line follows encoding
-/AutoEnc_3om7o5bsc7kes7csipbdbvovyh [
+/AutoEnc_cxj5nbsmat2o5rrw3rihpccu7c [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2a'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2h4ezz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cyj7pa.enc
index 812f950e393..53cdd11fc4c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2h4ezz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cyj7pa.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2h4ezzalccduudak3ke2exlawb
-% Encoding created by otftotfm on Mon May 11 15:11:41 2020
+%%AutoEnc_cyj7paegg5dbidxe2suse6imee
+% Encoding created by otftotfm on Tue Jan 12 13:16:39 2021
 % Command line follows encoding
-/AutoEnc_2h4ezzalccduudak3ke2exlawb [
+/AutoEnc_cyj7paegg5dbidxe2suse6imee [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2b'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6afaq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6afaq.enc
new file mode 100644
index 00000000000..8acdf35b3d0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6afaq.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_d6afaqfbmpd5whbgmsuwzioe4c
+% Encoding created by otftotfm on Tue Jan 12 13:16:10 2021
+% Command line follows encoding
+/AutoEnc_d6afaqfbmpd5whbgmsuwzioe4c [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
+  /eight.inferior /nine.inferior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_difcna.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_difcna.enc
deleted file mode 100644
index 6f6514f2c5a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_difcna.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_difcnamdlb3hsgevr4rs3f33mh
-% Encoding created by otftotfm on Mon May 11 15:11:22 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_twhqtf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dkbnkq.enc
index eb2c0cca55e..4479b96ac4e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_twhqtf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dkbnkq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_twhqtfj6gdmztcbz3kvmaifwug
-% Encoding created by otftotfm on Mon May 11 15:10:42 2020
+%%AutoEnc_dkbnkqacchqxsfpbz476kotysa
+% Encoding created by otftotfm on Tue Jan 12 13:15:25 2021
 % Command line follows encoding
-/AutoEnc_twhqtfj6gdmztcbz3kvmaifwug [
+/AutoEnc_dkbnkqacchqxsfpbz476kotysa [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc
index d7b8d9627fc..a1ca823f4b8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dnhvn3eke7zu5sjjabbi6bzhoa
-% Encoding created by otftotfm on Mon May 11 15:10:44 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:29 2021
 % Command line follows encoding
 /AutoEnc_dnhvn3eke7zu5sjjabbi6bzhoa [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dpee64.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dpee64.enc
new file mode 100644
index 00000000000..a7ae4187a05
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dpee64.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dpee64l3jiqxr2764clnomeqpg
+% Encoding created by otftotfm on Tue Jan 12 13:16:49 2021
+% Command line follows encoding
+/AutoEnc_dpee64l3jiqxr2764clnomeqpg [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_45lvyq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dq4c7f.enc
index 5f1e946a13a..5cb69c92712 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_45lvyq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dq4c7f.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_45lvyqiuboididyyy3t3ek5eyf
-% Encoding created by otftotfm on Mon May 11 15:10:55 2020
+%%AutoEnc_dq4c7fmfe7jtll7q2mn43racdh
+% Encoding created by otftotfm on Tue Jan 12 13:15:41 2021
 % Command line follows encoding
-/AutoEnc_45lvyqiuboididyyy3t3ek5eyf [
+/AutoEnc_dq4c7fmfe7jtll7q2mn43racdh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --ligkern=* {KL} * Erewhon-BoldSlanted.otf Erewhon-BoldSlanted-sup-ly1'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldSlanted.otf
+% Erewhon-BoldSlanted-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k5naq7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dru2ao.enc
index 07c45b3a7cf..a231eb66e02 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k5naq7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dru2ao.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k5naq7aeqe7voqd6zlw2adigib
-% Encoding created by otftotfm on Mon May 11 15:11:31 2020
+%%AutoEnc_dru2aopc24mh4e3yzsjq64uoke
+% Encoding created by otftotfm on Tue Jan 12 13:16:41 2021
 % Command line follows encoding
-/AutoEnc_k5naq7aeqe7voqd6zlw2adigib [
+/AutoEnc_dru2aopc24mh4e3yzsjq64uoke [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sinf --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-inf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_evduy3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dwvmxx.enc
index d4135917929..47f5f6b2358 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_evduy3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dwvmxx.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_evduy3bji32ktsgaf7r2vhxkkb
-% Encoding created by otftotfm on Mon May 11 15:11:31 2020
+%%AutoEnc_dwvmxxf36pw6oubqzidh7nsl7f
+% Encoding created by otftotfm on Tue Jan 12 13:16:34 2021
 % Command line follows encoding
-/AutoEnc_evduy3bji32ktsgaf7r2vhxkkb [
+/AutoEnc_dwvmxxf36pw6oubqzidh7nsl7f [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -30,37 +30,35 @@
   /x.superior /y.superior /z.superior /braceleft.superior /bar /braceright.superior /asciitilde /hyphen.superior
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
 % Erewhon-BoldItalic-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntfore.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4qrg7.enc
index 69642128992..3c577229c62 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntfore.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4qrg7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ntforeruoum3fsn3uud5i4wx2d
-% Encoding created by otftotfm on Mon May 11 15:10:46 2020
+%%AutoEnc_e4qrg7oegtryokp323stfqd43h
+% Encoding created by otftotfm on Tue Jan 12 13:15:35 2021
 % Command line follows encoding
-/AutoEnc_ntforeruoum3fsn3uud5i4wx2d [
+/AutoEnc_e4qrg7oegtryokp323stfqd43h [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --ligkern=f i
-% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-BoldItalic.otf Erewhon-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7j7rwe.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eajfvl.enc
index 05d091f65c5..a5001fd9178 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7j7rwe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eajfvl.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7j7rwey4sdimtdz2iy2o4z66th
-% Encoding created by otftotfm on Mon May 11 15:11:07 2020
+%%AutoEnc_eajfvlrxjrk47foeaie527sxzf
+% Encoding created by otftotfm on Tue Jan 12 13:15:57 2021
 % Command line follows encoding
-/AutoEnc_7j7rwey4sdimtdz2iy2o4z66th [
+/AutoEnc_eajfvlrxjrk47foeaie527sxzf [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
+% Erewhon-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_itswie.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eazsup.enc
index a31d3425f31..c0816352b50 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_itswie.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eazsup.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_itswier3puh2dnggnzzmhe2szd
-% Encoding created by otftotfm on Mon May 11 15:11:07 2020
+%%AutoEnc_eazsupxj2nvgra3k3nw7tyzt4h
+% Encoding created by otftotfm on Tue Jan 12 13:15:57 2021
 % Command line follows encoding
-/AutoEnc_itswier3puh2dnggnzzmhe2szd [
+/AutoEnc_eazsupxj2nvgra3k3nw7tyzt4h [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
+% Erewhon-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ecrwth.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ecrwth.enc
new file mode 100644
index 00000000000..c0093ded732
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ecrwth.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ecrwths5he7xmigefdz7ssiabf
+% Encoding created by otftotfm on Tue Jan 12 13:17:11 2021
+% Command line follows encoding
+/AutoEnc_ecrwths5he7xmigefdz7ssiabf [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni0493 /ffl /uni0495 /uni04BB /uni0497 /ffi /uni04E1
+  /uni0459 /uni049B /fl /uni04C4 /L.sc /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /fi /uni045E /uni04AF /I.sc /uni04B3 /ff /F.sc
+  /uni04B7 /uni045A /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2b.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ejltpg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ejltpg.enc
deleted file mode 100644
index e9ff764a6fd..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ejltpg.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ejltpgr2e2ye6frntnbdidv56h
-% Encoding created by otftotfm on Mon May 11 15:11:11 2020
-% Command line follows encoding
-/AutoEnc_ejltpgr2e2ye6frntnbdidv56h [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /Lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /OE.sc /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_ekq2fx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ekq2fx.enc
deleted file mode 100644
index 7805ea0ecf4..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ekq2fx.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ekq2fxftfud4bp4jpk273yp35b
-% Encoding created by otftotfm on Mon May 11 15:11:43 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10058.sc /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A4.sc /uni04C8
-%B0
-  /uni04E8.sc /.notdef /afii10062.sc /uni04AE.sc /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10059.sc /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_q6o7po.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_erihhu.enc
index 6b30aa1342c..d1dd5742520 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6o7po.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_erihhu.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q6o7poza2jprqhmfvsu2r56nrf
-% Encoding created by otftotfm on Mon May 11 15:11:04 2020
+%%AutoEnc_erihhu7xpgnqoftxmaqnljetsd
+% Encoding created by otftotfm on Tue Jan 12 13:15:46 2021
 % Command line follows encoding
-/AutoEnc_q6o7poza2jprqhmfvsu2r56nrf [
+/AutoEnc_erihhu7xpgnqoftxmaqnljetsd [
 %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 /ff /FI.sc /FL.sc /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /F.sc /I.sc /L.sc /S.sc /.notdef
 %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 /S.sc /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /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
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t1'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q3ctgn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_etc5hm.enc
index a89ebc85b9f..17998172ad1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q3ctgn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_etc5hm.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q3ctgnbplpzanleyjeq2qhenwg
-% Encoding created by otftotfm on Mon May 11 15:11:28 2020
+%%AutoEnc_etc5hmyttl7g6x6vw5wjdp2epd
+% Encoding created by otftotfm on Tue Jan 12 13:16:25 2021
 % Command line follows encoding
-/AutoEnc_q3ctgnbplpzanleyjeq2qhenwg [
+/AutoEnc_etc5hmyttl7g6x6vw5wjdp2epd [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,14 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-RegularSlanted.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-RegularSlanted.otf
 % Erewhon-RegularSlanted-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eulyhg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eulyhg.enc
deleted file mode 100644
index 42636737090..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eulyhg.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_eulyhgf37rnvapvnym2werh5da
-% Encoding created by otftotfm on Mon May 11 15:11:43 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10058.sc /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A4.sc /uni04C8
-%B0
-  /uni04E8.sc /.notdef /afii10062.sc /uni04AE.sc /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10059.sc /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_flawok.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_flawok.enc
deleted file mode 100644
index ae7cce99a43..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_flawok.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_flawokpqzvakggamqlszrohzge
-% Encoding created by otftotfm on Mon May 11 15:11:37 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
-%B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --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
-% --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_fmm3ij.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fmm3ij.enc
deleted file mode 100644
index 2adb65e8a62..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fmm3ij.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_fmm3ijj6eijjcrt3hjjzmfrg6g
-% Encoding created by otftotfm on Mon May 11 15:11:56 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E8.sc /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10145.sc /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_fojqdn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fojqdn.enc
new file mode 100644
index 00000000000..0f84baeb55c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fojqdn.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fojqdns5npjp4l5jwfiw3hyjcb
+% Encoding created by otftotfm on Tue Jan 12 13:16:32 2021
+% Command line follows encoding
+/AutoEnc_fojqdns5npjp4l5jwfiw3hyjcb [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
+  /eight.inferior /nine.inferior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a2ijma.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fomwqp.enc
index 2498c07cf43..57320ed568f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a2ijma.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fomwqp.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_a2ijmaxiqjzpfnjf3oy4pq773a
-% Encoding created by otftotfm on Mon May 11 15:11:30 2020
+%%AutoEnc_fomwqpzuuwpoonismyvwtavjdc
+% Encoding created by otftotfm on Tue Jan 12 13:16:41 2021
 % Command line follows encoding
-/AutoEnc_a2ijmaxiqjzpfnjf3oy4pq773a [
+/AutoEnc_fomwqpzuuwpoonismyvwtavjdc [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
 %30
   /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=numr --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-numr-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fp3vw2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fp3vw2.enc
new file mode 100644
index 00000000000..2212bd00a0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fp3vw2.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fp3vw27onmfyvlqoxajuyp4s6a
+% Encoding created by otftotfm on Tue Jan 12 13:16:30 2021
+% Command line follows encoding
+/AutoEnc_fp3vw27onmfyvlqoxajuyp4s6a [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
+%30
+  /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+  /eight.superior /nine.superior /colon.superior /semicolon.superior /less.superior /equal.superior /greater.superior /question.superior
+%40
+  /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+  /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash /bracketright.superior /asciicircum /underscore
+%60
+  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+  /x.superior /y.superior /z.superior /braceleft.superior /bar /braceright.superior /asciitilde /hyphen.superior
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yllr7z.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fqlf3s.enc
index 0045e0c6e8d..775eee1579b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yllr7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fqlf3s.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yllr7zdoqzyeim2u24cw2cv7qf
-% Encoding created by otftotfm on Mon May 11 15:10:40 2020
+%%AutoEnc_fqlf3sn2uge7xkjecfsghu6jje
+% Encoding created by otftotfm on Tue Jan 12 13:15:27 2021
 % Command line follows encoding
-/AutoEnc_yllr7zdoqzyeim2u24cw2cv7qf [
+/AutoEnc_fqlf3sn2uge7xkjecfsghu6jje [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g7cqph.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g7cqph.enc
deleted file mode 100644
index e471b4763c1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g7cqph.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_g7cqphvdzab2tpapakrbyzvf3d
-% Encoding created by otftotfm on Mon May 11 15:11:52 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --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
-% --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_aswkga.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gagfjo.enc
index 7e87894a4ac..159e7f0c03d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_aswkga.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gagfjo.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_aswkgaedktd6ydww24av6r7cze
-% Encoding created by otftotfm on Mon May 11 15:10:50 2020
+%%AutoEnc_gagfjo3w2mbpucu75xxp5527yb
+% Encoding created by otftotfm on Tue Jan 12 13:15:38 2021
 % Command line follows encoding
-/AutoEnc_aswkgaedktd6ydww24av6r7cze [
+/AutoEnc_gagfjo3w2mbpucu75xxp5527yb [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,6 @@
 % --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=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Erewhon-BoldSlanted.otf Erewhon-BoldSlanted-osf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=pnum Erewhon-BoldSlanted.otf
+% Erewhon-BoldSlanted-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gsknjr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gbmzbk.enc
index b463403c207..7ce19944871 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gsknjr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gbmzbk.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gsknjrrvuc4ih37w37ozycg2cg
-% Encoding created by otftotfm on Mon May 11 15:10:42 2020
+%%AutoEnc_gbmzbkb423ptardxwohoh6wryd
+% Encoding created by otftotfm on Tue Jan 12 13:15:24 2021
 % Command line follows encoding
-/AutoEnc_gsknjrrvuc4ih37w37ozycg2cg [
+/AutoEnc_gbmzbkb423ptardxwohoh6wryd [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gc72xz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gc72xz.enc
deleted file mode 100644
index ca38423df0a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gc72xz.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gc72xzdhe2duith3ljywljeafd
-% Encoding created by otftotfm on Mon May 11 15:10:56 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /tcommaaccent /uhungarumlaut /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /oe
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_ke4hra.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gm2ao2.enc
index bb36f73e95f..c043db10076 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ke4hra.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gm2ao2.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ke4hrauons4dmxmtexpedalrud
-% Encoding created by otftotfm on Mon May 11 15:11:18 2020
+%%AutoEnc_gm2ao2in6ub5aoymgwyb2yed7e
+% Encoding created by otftotfm on Tue Jan 12 13:16:12 2021
 % Command line follows encoding
-/AutoEnc_ke4hrauons4dmxmtexpedalrud [
+/AutoEnc_gm2ao2in6ub5aoymgwyb2yed7e [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -29,38 +29,36 @@
   /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
   /x.superior /y.superior /z.superior /braceleft.superior /bar /braceright.superior /asciitilde /hyphen.superior
 %80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
 %90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency /section
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
 %A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
 %B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
 % Erewhon-BoldItalic-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gohf2a.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gohf2a.enc
deleted file mode 100644
index a36889f375d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gohf2a.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gohf2aa4eszacdcvgcxy3hc4he
-% Encoding created by otftotfm on Mon May 11 15:11:08 2020
-% Command line follows encoding
-/AutoEnc_gohf2aa4eszacdcvgcxy3hc4he [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /Lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /OE.sc /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_gqji7z.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gqji7z.enc
index b830ee74c73..5425c9898f0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gqji7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gqji7z.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gqji7zklr4wvmpgemzivkzh4ta
-% Encoding created by otftotfm on Mon May 11 15:10:41 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:26 2021
 % Command line follows encoding
 /AutoEnc_gqji7zklr4wvmpgemzivkzh4ta [
 %00
@@ -59,7 +59,7 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
 % --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guyry6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guyry6.enc
deleted file mode 100644
index 4048833b4b8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guyry6.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_guyry6nvwmo6dliton2abuyukd
-% Encoding created by otftotfm on Mon May 11 15:11:57 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E8.sc /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10145.sc /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_gxqdb2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gxqdb2.enc
new file mode 100644
index 00000000000..b2a568fb797
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gxqdb2.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gxqdb2wzzeoymcx4p4l2ntw2hf
+% Encoding created by otftotfm on Tue Jan 12 13:16:10 2021
+% Command line follows encoding
+/AutoEnc_gxqdb2wzzeoymcx4p4l2ntw2hf [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
+%30
+  /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
+  /eight.numerator /nine.numerator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gzlvot.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gzlvot.enc
new file mode 100644
index 00000000000..810a4ce86b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gzlvot.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gzlvotry5dlomrxjrpqterxjvb
+% Encoding created by otftotfm on Tue Jan 12 13:17:13 2021
+% Command line follows encoding
+/AutoEnc_gzlvotry5dlomrxjrpqterxjvb [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /ffl
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /ffi /uni0409
+  /uni0407 /uni049A /fl /L.sc /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /fi
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /I.sc /uni0459
+  /uni0457 /uni049B /ff /F.sc /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /hyphen.sc
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2a.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hbj2kj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hbj2kj.enc
deleted file mode 100644
index 8be8b30384e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hbj2kj.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_hbj2kjra6gxdz7to7epcapdxua
-% Encoding created by otftotfm on Mon May 11 15:11:51 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --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
-% --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_hhrib2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hhrib2.enc
new file mode 100644
index 00000000000..04cb10fe22b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hhrib2.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hhrib227jpelszalbzlpy6ttde
+% Encoding created by otftotfm on Tue Jan 12 13:17:09 2021
+% Command line follows encoding
+/AutoEnc_hhrib227jpelszalbzlpy6ttde [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /ffl /uni04E1
+  /ffi /uni049B /fl /uni049F /L.sc /uni04A3 /fi /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /I.sc /ff /uni04B3 /uni045F /uni04A9
+  /uni04B7 /F.sc /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2c.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --feature=smcp
+% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% Erewhon-Bold-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_diyaes.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hl634h.enc
index 4009bb21159..d2150e1b3e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_diyaes.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hl634h.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_diyaesm2dtjpnnttcmzquopwqb
-% Encoding created by otftotfm on Mon May 11 15:11:13 2020
+%%AutoEnc_hl634hz77uxvfzzkfj7zczaeug
+% Encoding created by otftotfm on Tue Jan 12 13:16:05 2021
 % Command line follows encoding
-/AutoEnc_diyaesm2dtjpnnttcmzquopwqb [
+/AutoEnc_hl634hz77uxvfzzkfj7zczaeug [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,8 +59,6 @@
 % --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=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --ligkern=* {KL} * Erewhon-RegularSlanted.otf
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-RegularSlanted.otf
 % Erewhon-RegularSlanted-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hljml5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hljml5.enc
deleted file mode 100644
index c528e9f94bc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hljml5.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_hljml5d7bx7xiynopqospzwhtg
-% Encoding created by otftotfm on Mon May 11 15:11:12 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /Tcommaaccent.sc /Uhungarumlaut.sc /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /OE.sc
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_mhy7h5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i3xnrn.enc
index 2175ccce802..02c69871793 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mhy7h5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i3xnrn.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mhy7h55xehbaflqvked7eh4dja
-% Encoding created by otftotfm on Mon May 11 15:11:44 2020
+%%AutoEnc_i3xnrn6x44lfrielwaffcprjpa
+% Encoding created by otftotfm on Tue Jan 12 13:16:59 2021
 % Command line follows encoding
-/AutoEnc_mhy7h55xehbaflqvked7eh4dja [
+/AutoEnc_i3xnrn6x44lfrielwaffcprjpa [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sinf --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-inf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i4xinu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i4xinu.enc
deleted file mode 100644
index 19b2302bac6..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i4xinu.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_i4xinub27rl3ybo2mrh5us26ea
-% Encoding created by otftotfm on Mon May 11 15:11:26 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10051.sc /afii10060.sc /uni04BB /uni0497 /.notdef /afii10058.sc
-  /afii10056.sc /uni049B /.notdef /.notdef /uni04D4.sc /uni04A3 /uni04A4.sc /afii10054.sc
-%B0
-  /uni04E8.sc /uni04AA.sc /afii10062.sc /uni04AE.sc /uni04B0.sc /uni04B3 /afii10145.sc /.notdef
-  /uni04B7 /afii10053.sc /afii10846 /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_i6k2d2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i6k2d2.enc
new file mode 100644
index 00000000000..e7ea9fa0909
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i6k2d2.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_i6k2d2byofcnq3xo7sykxa7tqf
+% Encoding created by otftotfm on Tue Jan 12 13:16:09 2021
+% Command line follows encoding
+/AutoEnc_i6k2d2byofcnq3xo7sykxa7tqf [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_igmc4g.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_igmc4g.enc
new file mode 100644
index 00000000000..5917b909bc8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_igmc4g.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_igmc4g7iq6y47jlg5qcbdvuatf
+% Encoding created by otftotfm on Tue Jan 12 13:17:08 2021
+% Command line follows encoding
+/AutoEnc_igmc4g7iq6y47jlg5qcbdvuatf [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /ffl /uni04E1
+  /ffi /uni049B /fl /uni049F /L.sc /uni04A3 /fi /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /I.sc /ff /uni04B3 /uni045F /uni04A9
+  /uni04B7 /F.sc /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2c.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iih2z6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iih2z6.enc
deleted file mode 100644
index f4d382fb16c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iih2z6.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_iih2z6jpjr3iwjfli7wau7i7bf
-% Encoding created by otftotfm on Mon May 11 15:11:10 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /Tcommaaccent.sc /Uhungarumlaut.sc /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /OE.sc
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_wznnjs.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ijhs6t.enc
index a5050416655..912c9efc425 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wznnjs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ijhs6t.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wznnjsmzev744tmsm4e5jwp6ah
-% Encoding created by otftotfm on Mon May 11 15:11:06 2020
+%%AutoEnc_ijhs6tozcgzgurnqlgrduuicse
+% Encoding created by otftotfm on Tue Jan 12 13:15:50 2021
 % Command line follows encoding
-/AutoEnc_wznnjsmzev744tmsm4e5jwp6ah [
+/AutoEnc_ijhs6tozcgzgurnqlgrduuicse [
 %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 /ff /FI.sc /FL.sc /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /F.sc /I.sc /L.sc /S.sc /.notdef
 %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 /S.sc /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /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
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t1'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_alti6e.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_irfza6.enc
index 5e680bcaf08..0ed9a54bc67 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_alti6e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_irfza6.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_alti6exx7n3perfea4ocq6prmf
-% Encoding created by otftotfm on Mon May 11 15:11:15 2020
+%%AutoEnc_irfza62pbokwivccnmgdsquidh
+% Encoding created by otftotfm on Tue Jan 12 13:16:20 2021
 % Command line follows encoding
-/AutoEnc_alti6exx7n3perfea4ocq6prmf [
+/AutoEnc_irfza62pbokwivccnmgdsquidh [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sinf --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-inf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wapm72.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_isszvh.enc
index 2ae058a9108..3f3d1eb3820 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wapm72.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_isszvh.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wapm722w76gldj56rdzrbyeiqf
-% Encoding created by otftotfm on Mon May 11 15:11:30 2020
+%%AutoEnc_isszvhjt7axabaa7mfd3vvvvee
+% Encoding created by otftotfm on Tue Jan 12 13:16:39 2021
 % Command line follows encoding
-/AutoEnc_wapm722w76gldj56rdzrbyeiqf [
+/AutoEnc_isszvhjt7axabaa7mfd3vvvvee [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tosf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wjwjxt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iszlz3.enc
index 9da16594080..8a4b0a57247 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wjwjxt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iszlz3.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wjwjxtguevnfdb3dvtly6wsszg
-% Encoding created by otftotfm on Mon May 11 15:11:56 2020
+%%AutoEnc_iszlz3benzuytrscwa3c2f4vyg
+% Encoding created by otftotfm on Tue Jan 12 13:16:59 2021
 % Command line follows encoding
-/AutoEnc_wjwjxtguevnfdb3dvtly6wsszg [
+/AutoEnc_iszlz3benzuytrscwa3c2f4vyg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2c'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwyvmt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ivciyi.enc
index 6407f36056b..cbb0a49a545 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwyvmt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ivciyi.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cwyvmtet3dtwiqkzfxopce6mrf
-% Encoding created by otftotfm on Mon May 11 15:11:46 2020
+%%AutoEnc_ivciyiowpkgpsyy2gqe4pth27d
+% Encoding created by otftotfm on Tue Jan 12 13:17:01 2021
 % Command line follows encoding
-/AutoEnc_cwyvmtet3dtwiqkzfxopce6mrf [
+/AutoEnc_ivciyiowpkgpsyy2gqe4pth27d [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
 %30
   /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=numr --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-numr-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ixswvx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ixswvx.enc
deleted file mode 100644
index 31ca80081ba..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ixswvx.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ixswvxsfv6hj7pnejtey343wwa
-% Encoding created by otftotfm on Mon May 11 15:11:00 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /tcommaaccent /uhungarumlaut /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /oe
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_m3nnvz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_izu75o.enc
index faa29b681f9..8262dd0fb5b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m3nnvz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_izu75o.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_m3nnvzgdnbax66fltlw33garyb
-% Encoding created by otftotfm on Mon May 11 15:11:01 2020
+%%AutoEnc_izu75oryiiirwhylxqtgr26gdb
+% Encoding created by otftotfm on Tue Jan 12 13:15:49 2021
 % Command line follows encoding
-/AutoEnc_m3nnvzgdnbax66fltlw33garyb [
+/AutoEnc_izu75oryiiirwhylxqtgr26gdb [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
@@ -59,7 +59,6 @@
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-Italic.otf Erewhon-Italic-sup-t1'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z3cf52.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6ua73.enc
index 03d75127211..3ad8fc21dbe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z3cf52.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6ua73.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_z3cf52npu6vvz7i4zqa2o77zad
-% Encoding created by otftotfm on Mon May 11 15:11:31 2020
+%%AutoEnc_j6ua73cstblr5j364xqwoextue
+% Encoding created by otftotfm on Tue Jan 12 13:16:38 2021
 % Command line follows encoding
-/AutoEnc_z3cf52npu6vvz7i4zqa2o77zad [
+/AutoEnc_j6ua73cstblr5j364xqwoextue [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tlf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jdnyy6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jdnyy6.enc
new file mode 100644
index 00000000000..48582b6d6d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jdnyy6.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_jdnyy6stgd4w4gc4dxh2oqyqla
+% Encoding created by otftotfm on Tue Jan 12 13:16:11 2021
+% Command line follows encoding
+/AutoEnc_jdnyy6stgd4w4gc4dxh2oqyqla [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_jjyu3n.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jjyu3n.enc
deleted file mode 100644
index b815cd8bb62..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jjyu3n.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_jjyu3nmo4pmudb6mdopbzrq6ke
-% Encoding created by otftotfm on Mon May 11 15:10:59 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /tcommaaccent /uhungarumlaut /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /oe
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_7pzgim.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jmwubr.enc
index 2bf10fbb4ba..5f4438eb899 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7pzgim.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jmwubr.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7pzgimbtw7o3dyk6o2wcfm662c
-% Encoding created by otftotfm on Mon May 11 15:11:55 2020
+%%AutoEnc_jmwubrggdna5iaadab32rilied
+% Encoding created by otftotfm on Tue Jan 12 13:17:05 2021
 % Command line follows encoding
-/AutoEnc_7pzgimbtw7o3dyk6o2wcfm662c [
+/AutoEnc_jmwubrggdna5iaadab32rilied [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
+% Erewhon-Regular-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zxumb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jofyrj.enc
index 56bd134ca11..89b8d75edef 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zxumb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jofyrj.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5zxumbnvlcfirmjgrrhpo4qgmd
-% Encoding created by otftotfm on Mon May 11 15:11:55 2020
+%%AutoEnc_jofyrjnu5r6th2ih5hydjmw3yh
+% Encoding created by otftotfm on Tue Jan 12 13:17:00 2021
 % Command line follows encoding
-/AutoEnc_5zxumbnvlcfirmjgrrhpo4qgmd [
+/AutoEnc_jofyrjnu5r6th2ih5hydjmw3yh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2c'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc
index 0a72b3be514..d3e44abeb0d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jsdebf3asiai42yux4rwsffwga
-% Encoding created by otftotfm on Mon May 11 15:10:43 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:30 2021
 % Command line follows encoding
 /AutoEnc_jsdebf3asiai42yux4rwsffwga [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvhtbp.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jyfbou.enc
index a0e9ac847f6..2340479a553 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvhtbp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jyfbou.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qvhtbpqajgj4rodxnjbihk4ieg
-% Encoding created by otftotfm on Mon May 11 15:10:37 2020
+%%AutoEnc_jyfbouxteazafggc7prf5yh5pb
+% Encoding created by otftotfm on Tue Jan 12 13:15:23 2021
 % Command line follows encoding
-/AutoEnc_qvhtbpqajgj4rodxnjbihk4ieg [
+/AutoEnc_jyfbouxteazafggc7prf5yh5pb [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3uyvf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3uyvf.enc
new file mode 100644
index 00000000000..c1921a20c95
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3uyvf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_k3uyvfrvd57ihdq53udqkonmyc
+% Encoding created by otftotfm on Tue Jan 12 13:17:14 2021
+% Command line follows encoding
+/AutoEnc_k3uyvfrvd57ihdq53udqkonmyc [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /ffl
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /ffi /uni0409
+  /uni0407 /uni049A /fl /L.sc /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /fi
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /I.sc /uni0459
+  /uni0457 /uni049B /ff /F.sc /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /hyphen.sc
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2a.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --feature=smcp
+% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% Erewhon-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kusb63.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kdakg5.enc
index 0871977d8c2..93672f48ba1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kusb63.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kdakg5.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kusb634srdkflviy3rzsv6pqeb
-% Encoding created by otftotfm on Mon May 11 15:11:24 2020
+%%AutoEnc_kdakg5gc6pm4d7fyipgxyttbla
+% Encoding created by otftotfm on Tue Jan 12 13:16:20 2021
 % Command line follows encoding
-/AutoEnc_kusb634srdkflviy3rzsv6pqeb [
+/AutoEnc_kdakg5gc6pm4d7fyipgxyttbla [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2a'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kfacq2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kfacq2.enc
deleted file mode 100644
index 167b8567ce5..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kfacq2.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kfacq2es3ekovcdvyzwtrimb4g
-% Encoding created by otftotfm on Mon May 11 15:11:10 2020
-% Command line follows encoding
-/AutoEnc_kfacq2es3ekovcdvyzwtrimb4g [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /Lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /OE.sc /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_kgxk7e.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kgxk7e.enc
deleted file mode 100644
index a581fae8dc7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kgxk7e.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kgxk7euoy3xmmvfnkleasvmhbc
-% Encoding created by otftotfm on Mon May 11 15:11:27 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10051.sc /afii10060.sc /uni04BB /uni0497 /.notdef /afii10058.sc
-  /afii10056.sc /uni049B /.notdef /.notdef /uni04D4.sc /uni04A3 /uni04A4.sc /afii10054.sc
-%B0
-  /uni04E8.sc /uni04AA.sc /afii10062.sc /uni04AE.sc /uni04B0.sc /uni04B3 /afii10145.sc /.notdef
-  /uni04B7 /afii10053.sc /afii10846 /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_su4wdy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_knq7bi.enc
index 544731397dd..c010e369de1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_su4wdy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_knq7bi.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_su4wdyudgqaudqmzs76ycvrhkc
-% Encoding created by otftotfm on Mon May 11 15:10:48 2020
+%%AutoEnc_knq7bi2mhkvxwrmtvayeums7ee
+% Encoding created by otftotfm on Tue Jan 12 13:15:32 2021
 % Command line follows encoding
-/AutoEnc_su4wdyudgqaudqmzs76ycvrhkc [
+/AutoEnc_knq7bi2mhkvxwrmtvayeums7ee [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sinf --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc
index d4581b8c94c..21e541c0dce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kpjvx5hiwdtye2rbz7rdizlc5g
-% Encoding created by otftotfm on Mon May 11 15:10:46 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:35 2021
 % Command line follows encoding
 /AutoEnc_kpjvx5hiwdtye2rbz7rdizlc5g [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kqpq7i.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kqpq7i.enc
deleted file mode 100644
index 132dbc5951c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kqpq7i.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kqpq7ibhetpu2u3qviztp4s4lh
-% Encoding created by otftotfm on Mon May 11 15:11:14 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_kwgi2r.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kwgi2r.enc
new file mode 100644
index 00000000000..7487ea82df3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kwgi2r.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kwgi2r4pah3ahn4nizvq5ckpee
+% Encoding created by otftotfm on Tue Jan 12 13:16:31 2021
+% Command line follows encoding
+/AutoEnc_kwgi2r4pah3ahn4nizvq5ckpee [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
+%30
+  /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
+  /eight.numerator /nine.numerator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ldfvvz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ldfvvz.enc
deleted file mode 100644
index 007788c330a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ldfvvz.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ldfvvzpdz5ktxj4xzvhzi7v4qa
-% Encoding created by otftotfm on Mon May 11 15:10:58 2020
-% Command line follows encoding
-/AutoEnc_ldfvvzpdz5ktxj4xzvhzi7v4qa [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /oe /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_lefook.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lefook.enc
new file mode 100644
index 00000000000..4d5a204e84a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lefook.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lefookgvensoo26mu525zvrz2c
+% Encoding created by otftotfm on Tue Jan 12 13:16:12 2021
+% Command line follows encoding
+/AutoEnc_lefookgvensoo26mu525zvrz2c [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a4kjr4.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ljsdwq.enc
index 57d873637ec..65b0b38da0d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a4kjr4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ljsdwq.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_a4kjr4eyepci3z5yuo66ukvm4f
-% Encoding created by otftotfm on Mon May 11 15:11:45 2020
+%%AutoEnc_ljsdwquqsrfy5jrsgszlwmvmwf
+% Encoding created by otftotfm on Tue Jan 12 13:17:02 2021
 % Command line follows encoding
-/AutoEnc_a4kjr4eyepci3z5yuo66ukvm4f [
+/AutoEnc_ljsdwquqsrfy5jrsgszlwmvmwf [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5rdrfx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lkesvg.enc
index 3fff82c981b..468bdce193a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5rdrfx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lkesvg.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5rdrfxlrvtaao34imywuja2skb
-% Encoding created by otftotfm on Mon May 11 15:10:55 2020
+%%AutoEnc_lkesvgfxnbxapxbzo62pgbjkte
+% Encoding created by otftotfm on Tue Jan 12 13:15:41 2021
 % Command line follows encoding
-/AutoEnc_5rdrfxlrvtaao34imywuja2skb [
+/AutoEnc_lkesvgfxnbxapxbzo62pgbjkte [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -59,8 +59,6 @@
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldSlanted.otf
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldSlanted.otf
 % Erewhon-BoldSlanted-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lku3zs.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lku3zs.enc
deleted file mode 100644
index 792191800a7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lku3zs.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_lku3zs7uaiqxz662bkfwiocslb
-% Encoding created by otftotfm on Mon May 11 15:11:23 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_k3wfh7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lql6bl.enc
index e005598b0b5..07560a2ade2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3wfh7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lql6bl.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k3wfh7hpgk5dgchbdceflzjwtf
-% Encoding created by otftotfm on Mon May 11 15:10:47 2020
+%%AutoEnc_lql6blcqbncxoymkhhwmwgtz4a
+% Encoding created by otftotfm on Tue Jan 12 13:15:34 2021
 % Command line follows encoding
-/AutoEnc_k3wfh7hpgk5dgchbdceflzjwtf [
+/AutoEnc_lql6blcqbncxoymkhhwmwgtz4a [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --ligkern=f i
-% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-BoldItalic.otf Erewhon-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2px4pm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lxr6iw.enc
index 7db38909a8b..28749350983 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2px4pm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lxr6iw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2px4pm5fx5xqd6bs64zvpitmqa
-% Encoding created by otftotfm on Mon May 11 15:10:42 2020
+%%AutoEnc_lxr6iwqh4znsuzauzbqumyaoxb
+% Encoding created by otftotfm on Tue Jan 12 13:15:32 2021
 % Command line follows encoding
-/AutoEnc_2px4pm5fx5xqd6bs64zvpitmqa [
+/AutoEnc_lxr6iwqh4znsuzauzbqumyaoxb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=numr --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzgimh.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzgimh.enc
deleted file mode 100644
index 19b905856b1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzgimh.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_lzgimh5gh7ty7agdice5waya5f
-% Encoding created by otftotfm on Mon May 11 15:11:12 2020
-% Command line follows encoding
-/AutoEnc_lzgimh5gh7ty7agdice5waya5f [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /Lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /OE.sc /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_m37h6o.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m37h6o.enc
deleted file mode 100644
index 31e7c35ebdf..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m37h6o.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_m37h6oflr6uu3tk3mcx7jit4pa
-% Encoding created by otftotfm on Mon May 11 15:11:00 2020
-% Command line follows encoding
-/AutoEnc_m37h6oflr6uu3tk3mcx7jit4pa [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /oe /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_sawcbj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m62wbz.enc
index 71fb524ed43..7ff9b4b300b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawcbj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m62wbz.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sawcbjtwgcwmecttj7gfrpdcda
-% Encoding created by otftotfm on Mon May 11 15:11:45 2020
+%%AutoEnc_m62wbzjocrq2gt2fxcigu7bmof
+% Encoding created by otftotfm on Tue Jan 12 13:16:50 2021
 % Command line follows encoding
-/AutoEnc_sawcbjtwgcwmecttj7gfrpdcda [
+/AutoEnc_m62wbzjocrq2gt2fxcigu7bmof [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -32,35 +32,37 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u22hib.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mieo7u.enc
index db583d8a23b..90e2d57b4be 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u22hib.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mieo7u.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_u22hibunhycltgwfoykmcmd4ca
-% Encoding created by otftotfm on Mon May 11 15:10:44 2020
+%%AutoEnc_mieo7ugaj7dqshi2pcglhzik7c
+% Encoding created by otftotfm on Tue Jan 12 13:15:28 2021
 % Command line follows encoding
-/AutoEnc_u22hibunhycltgwfoykmcmd4ca [
+/AutoEnc_mieo7ugaj7dqshi2pcglhzik7c [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=dnom --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc
index 45e9d307521..6fa1f794589 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mkqhoamwqzt3pogdzsqovdmide
-% Encoding created by otftotfm on Mon May 11 15:10:37 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:22 2021
 % Command line follows encoding
 /AutoEnc_mkqhoamwqzt3pogdzsqovdmide [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mmwqox.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mmwqox.enc
new file mode 100644
index 00000000000..eb2477decce
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mmwqox.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mmwqoxds3ynnzkxm65nhlzoqoa
+% Encoding created by otftotfm on Tue Jan 12 13:16:29 2021
+% Command line follows encoding
+/AutoEnc_mmwqoxds3ynnzkxm65nhlzoqoa [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_3nkbzs.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mno2dl.enc
index 5c64093af18..74ba7e8cdcb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3nkbzs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mno2dl.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3nkbzstn2a4eo7l6cbm7rtiseg
-% Encoding created by otftotfm on Mon May 11 15:11:15 2020
+%%AutoEnc_mno2dl2we2jommfxnbmxeaqoac
+% Encoding created by otftotfm on Tue Jan 12 13:16:11 2021
 % Command line follows encoding
-/AutoEnc_3nkbzstn2a4eo7l6cbm7rtiseg [
+/AutoEnc_mno2dl2we2jommfxnbmxeaqoac [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -29,38 +29,40 @@
   /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
   /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
 %80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
 %90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
 %A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
 %B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6faof.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mqoft7.enc
index c8867313ece..38ee11541e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6faof.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mqoft7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_d6faofbzq5wua3q6f5ctw2jwsb
-% Encoding created by otftotfm on Mon May 11 15:11:04 2020
+%%AutoEnc_mqoft7x7k2ek6qkqpe5adzrpmg
+% Encoding created by otftotfm on Tue Jan 12 13:15:46 2021
 % Command line follows encoding
-/AutoEnc_d6faofbzq5wua3q6f5ctw2jwsb [
+/AutoEnc_mqoft7x7k2ek6qkqpe5adzrpmg [
 %00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
+  /F.sc /Euro.sc /I.sc /L.sc /fraction /dotaccent /hungarumlaut /ogonek
+  /S.sc /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %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
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4s5f2s.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mxehrm.enc
index c70d0d8ced7..a167e5dc81f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_4s5f2s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mxehrm.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4s5f2s57pmlwj53eoftugnmffe
-% Encoding created by otftotfm on Mon May 11 15:10:38 2020
+%%AutoEnc_mxehrmtqiwpy6uuaelclocgm4d
+% Encoding created by otftotfm on Tue Jan 12 13:15:22 2021
 % Command line follows encoding
-/AutoEnc_4s5f2s57pmlwj53eoftugnmffe [
+/AutoEnc_mxehrmtqiwpy6uuaelclocgm4d [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /question
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,5 @@
 % --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=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-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=pnum Erewhon-Bold.otf Erewhon-Bold-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xfwnyy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ncwigg.enc
index dc4e2147f82..d97792fc8f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xfwnyy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ncwigg.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xfwnyyjqlirj2esp5o5kskzl5d
-% Encoding created by otftotfm on Mon May 11 15:11:50 2020
+%%AutoEnc_ncwigglgd2tns3agfyd7h32c5h
+% Encoding created by otftotfm on Tue Jan 12 13:16:58 2021
 % Command line follows encoding
-/AutoEnc_xfwnyyjqlirj2esp5o5kskzl5d [
+/AutoEnc_ncwigglgd2tns3agfyd7h32c5h [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -32,35 +32,33 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldSlanted.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldSlanted.otf
 % Erewhon-BoldSlanted-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ncyh3k.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ncyh3k.enc
new file mode 100644
index 00000000000..e5e589db780
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ncyh3k.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ncyh3kr6gcilape3foy6kba4zg
+% Encoding created by otftotfm on Tue Jan 12 13:16:51 2021
+% Command line follows encoding
+/AutoEnc_ncyh3kr6gcilape3foy6kba4zg [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_cqlwfi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ndxvka.enc
index 1874f4fedd0..cd805a103f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqlwfi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ndxvka.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cqlwfiursfrjui3lckxr7jiwze
-% Encoding created by otftotfm on Mon May 11 15:11:46 2020
+%%AutoEnc_ndxvkazva3rkdwbv6x6fr6sxsh
+% Encoding created by otftotfm on Tue Jan 12 13:16:49 2021
 % Command line follows encoding
-/AutoEnc_cqlwfiursfrjui3lckxr7jiwze [
+/AutoEnc_ndxvkazva3rkdwbv6x6fr6sxsh [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -32,35 +32,37 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nhu5qm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nhu5qm.enc
new file mode 100644
index 00000000000..e7ccc56d14a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nhu5qm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nhu5qmjqvbtisqonximf4xivuh
+% Encoding created by otftotfm on Tue Jan 12 13:16:11 2021
+% Command line follows encoding
+/AutoEnc_nhu5qmjqvbtisqonximf4xivuh [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_aapc7z.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nlk3tk.enc
index 65e0a6acb20..810a49cb201 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_aapc7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nlk3tk.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_aapc7zmpvchgqrq5fpqbyrpk4f
-% Encoding created by otftotfm on Mon May 11 15:11:15 2020
+%%AutoEnc_nlk3tksjqxtpqyuwmr6rjlcqyb
+% Encoding created by otftotfm on Tue Jan 12 13:16:22 2021
 % Command line follows encoding
-/AutoEnc_aapc7zmpvchgqrq5fpqbyrpk4f [
+/AutoEnc_nlk3tksjqxtpqyuwmr6rjlcqyb [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
+% Erewhon-Regular-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dv3mk6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nmevy6.enc
index 84e0b444380..7e554cd7661 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dv3mk6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nmevy6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dv3mk6qutbgevbxeknyhnmetyg
-% Encoding created by otftotfm on Mon May 11 15:10:41 2020
+%%AutoEnc_nmevy6itjhbxdhu2afvetdjene
+% Encoding created by otftotfm on Tue Jan 12 13:15:24 2021
 % Command line follows encoding
-/AutoEnc_dv3mk6qutbgevbxeknyhnmetyg [
+/AutoEnc_nmevy6itjhbxdhu2afvetdjene [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nosd3d.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nosd3d.enc
deleted file mode 100644
index a0e2a563843..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nosd3d.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_nosd3drhwdvciwa56e7aeipkdc
-% Encoding created by otftotfm on Mon May 11 15:11:28 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10051.sc /afii10060.sc /uni04BB /uni0497 /.notdef /afii10058.sc
-  /afii10056.sc /uni049B /.notdef /.notdef /uni04D4.sc /uni04A3 /uni04A4.sc /afii10054.sc
-%B0
-  /uni04E8.sc /uni04AA.sc /afii10062.sc /uni04AE.sc /uni04B0.sc /uni04B3 /afii10145.sc /.notdef
-  /uni04B7 /afii10053.sc /afii10846 /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_nrup2h.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nrup2h.enc
new file mode 100644
index 00000000000..9c56e745403
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nrup2h.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nrup2hlrew4kvgow6duu7kz4dc
+% Encoding created by otftotfm on Tue Jan 12 13:16:31 2021
+% Command line follows encoding
+/AutoEnc_nrup2hlrew4kvgow6duu7kz4dc [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
+%30
+  /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+  /eight.denominator /nine.denominator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=dnom --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guxxsa.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntuunb.enc
index 97325595286..827ca22cf35 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guxxsa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntuunb.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_guxxsahksyrbpke6ua73hftwlf
-% Encoding created by otftotfm on Mon May 11 15:11:03 2020
+%%AutoEnc_ntuunbl2uhudfoikyrd4anfuqe
+% Encoding created by otftotfm on Tue Jan 12 13:15:54 2021
 % Command line follows encoding
-/AutoEnc_guxxsahksyrbpke6ua73hftwlf [
+/AutoEnc_ntuunbl2uhudfoikyrd4anfuqe [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /.notdef /.notdef
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,5 @@
 % --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=pnum --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-osf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=pnum Erewhon-Regular.otf Erewhon-Regular-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dn3zcw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nwll5a.enc
index ab92212d8f1..4ce71f851ae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dn3zcw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nwll5a.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dn3zcwkgft5natye6xae5zaije
-% Encoding created by otftotfm on Mon May 11 15:10:37 2020
+%%AutoEnc_nwll5a43vvjxwec4h3etohsp6a
+% Encoding created by otftotfm on Tue Jan 12 13:15:23 2021
 % Command line follows encoding
-/AutoEnc_dn3zcwkgft5natye6xae5zaije [
+/AutoEnc_nwll5a43vvjxwec4h3etohsp6a [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2vfnrz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o4jtlp.enc
index ea1e6bb2e10..17adafe19d2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2vfnrz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o4jtlp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2vfnrzlifcliddaunxrrwl5gba
-% Encoding created by otftotfm on Mon May 11 15:10:36 2020
+%%AutoEnc_o4jtlpdoieczf5g4yrkdrvcveg
+% Encoding created by otftotfm on Tue Jan 12 13:15:24 2021
 % Command line follows encoding
-/AutoEnc_2vfnrzlifcliddaunxrrwl5gba [
+/AutoEnc_o4jtlpdoieczf5g4yrkdrvcveg [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i7vlzw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_odgoid.enc
index 0e23631d2e4..93fa9c75fdb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i7vlzw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_odgoid.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_i7vlzwsv42ov7ufgam54wyrr4e
-% Encoding created by otftotfm on Mon May 11 15:11:48 2020
+%%AutoEnc_odgoidhqekw4dt2ezr4oz5tulf
+% Encoding created by otftotfm on Tue Jan 12 13:16:55 2021
 % Command line follows encoding
-/AutoEnc_i7vlzwsv42ov7ufgam54wyrr4e [
+/AutoEnc_odgoidhqekw4dt2ezr4oz5tulf [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -32,35 +32,33 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
 % Erewhon-BoldItalic-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_okacrk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_okacrk.enc
new file mode 100644
index 00000000000..f33c3e0d81a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_okacrk.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_okacrkxtt237yuj7jwrogkujxg
+% Encoding created by otftotfm on Tue Jan 12 13:17:11 2021
+% Command line follows encoding
+/AutoEnc_okacrkxtt237yuj7jwrogkujxg [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni0493 /ffl /uni0495 /uni04BB /uni0497 /ffi /uni04E1
+  /uni0459 /uni049B /fl /uni04C4 /L.sc /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /fi /uni045E /uni04AF /I.sc /uni04B3 /ff /F.sc
+  /uni04B7 /uni045A /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2b.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lbxa52.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_orscbj.enc
index 8cb92b4cfc9..fb6af959c6e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lbxa52.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_orscbj.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lbxa522qhe2c6vwmjjqz3lxsib
-% Encoding created by otftotfm on Mon May 11 15:10:47 2020
+%%AutoEnc_orscbjizq2he6ts6l7wuprj6sc
+% Encoding created by otftotfm on Tue Jan 12 13:15:34 2021
 % Command line follows encoding
-/AutoEnc_lbxa522qhe2c6vwmjjqz3lxsib [
+/AutoEnc_orscbjizq2he6ts6l7wuprj6sc [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,6 @@
 % --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-tlf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_p5bs7v.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_p5bs7v.enc
deleted file mode 100644
index c87355526dd..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_p5bs7v.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_p5bs7v6wtyt5axz54jlkmrlxrh
-% Encoding created by otftotfm on Mon May 11 15:11:21 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency.sc /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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
-% --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_papffl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_papffl.enc
new file mode 100644
index 00000000000..6d068d0e463
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_papffl.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_papffl2wxzu6bgnvkqvabkiymb
+% Encoding created by otftotfm on Tue Jan 12 13:17:09 2021
+% Command line follows encoding
+/AutoEnc_papffl2wxzu6bgnvkqvabkiymb [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /ffl /uni04E1
+  /ffi /uni049B /fl /uni049F /L.sc /uni04A3 /fi /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /I.sc /ff /uni04B3 /uni045F /uni04A9
+  /uni04B7 /F.sc /uni04D9 /hyphen.sc /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2c.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_peef5q.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_peef5q.enc
new file mode 100644
index 00000000000..23075ee46ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_peef5q.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_peef5qadbzvkerxlxx5ew3y2ac
+% Encoding created by otftotfm on Tue Jan 12 13:16:15 2021
+% Command line follows encoding
+/AutoEnc_peef5qadbzvkerxlxx5ew3y2ac [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
+%30
+  /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+  /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft.superior /backslash /bracketright.superior /asciicircum /underscore
+%60
+  /quoteleft /uniF6E9 /uniF6EA /uniE049 /uniF6EB /uniF6EC /uniE04E /uniE04C
+  /uniE048 /uniF6ED /uniE04A /uniE04B /uniF6EE /uniF6EF /uni207F /uniF6F0
+%70
+  /uniE052 /uniE053 /uniF6F1 /uniF6F2 /uniF6F3 /uniE050 /uniE054 /uniE055
+  /uniE056 /uniE057 /uniE058 /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldSlanted.otf
+% Erewhon-BoldSlanted-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zt7jvb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pj2kv6.enc
index f1e89875f8d..611de691fcc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zt7jvb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pj2kv6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zt7jvbvq5xhs6jht5eh44awopb
-% Encoding created by otftotfm on Mon May 11 15:10:45 2020
+%%AutoEnc_pj2kv6lbw2ld26yjxg3rz3woud
+% Encoding created by otftotfm on Tue Jan 12 13:15:29 2021
 % Command line follows encoding
-/AutoEnc_zt7jvbvq5xhs6jht5eh44awopb [
+/AutoEnc_pj2kv6lbw2ld26yjxg3rz3woud [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --ligkern=f i
-% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-BoldItalic.otf Erewhon-BoldItalic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_prrnsj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_prrnsj.enc
deleted file mode 100644
index 19d56e043f3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_prrnsj.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_prrnsj4klzb5v4a7htehdcw77e
-% Encoding created by otftotfm on Mon May 11 15:11:37 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
-%B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --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
-% --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_acdonb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ps4rne.enc
index 57bdbe091ca..473836f8cc1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_acdonb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ps4rne.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_acdonb7cij4u6jgcpofvq7kfkg
-% Encoding created by otftotfm on Mon May 11 15:10:49 2020
+%%AutoEnc_ps4rnegpnajbcduy4j3av57zac
+% Encoding created by otftotfm on Tue Jan 12 13:15:33 2021
 % Command line follows encoding
-/AutoEnc_acdonb7cij4u6jgcpofvq7kfkg [
+/AutoEnc_ps4rnegpnajbcduy4j3av57zac [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash
@@ -59,8 +59,6 @@
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
 % Erewhon-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gom6la.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_psdthf.enc
index 6424234ce17..a0fa5206755 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gom6la.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_psdthf.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gom6lauq7timnqkv5frvr2vwug
-% Encoding created by otftotfm on Mon May 11 15:10:41 2020
+%%AutoEnc_psdthftm3up3an2b27mgkryaeh
+% Encoding created by otftotfm on Tue Jan 12 13:15:26 2021
 % Command line follows encoding
-/AutoEnc_gom6lauq7timnqkv5frvr2vwug [
+/AutoEnc_psdthftm3up3an2b27mgkryaeh [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6pqeu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pux3en.enc
index 02bc01e66b3..664e0fc550b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6pqeu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pux3en.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_j6pqeu7752kbwdqdrqvpnkaijb
-% Encoding created by otftotfm on Mon May 11 15:10:38 2020
+%%AutoEnc_pux3enil4qwqeoxornk7ygxcme
+% Encoding created by otftotfm on Tue Jan 12 13:15:20 2021
 % Command line follows encoding
-/AutoEnc_j6pqeu7752kbwdqdrqvpnkaijb [
+/AutoEnc_pux3enil4qwqeoxornk7ygxcme [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,5 @@
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=dnom --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qduv2i.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qduv2i.enc
deleted file mode 100644
index 0a394d6f0bf..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qduv2i.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_qduv2imv4effqtded2yxsnxffa
-% Encoding created by otftotfm on Mon May 11 15:11:53 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --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
-% --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_lfc333.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qltwwe.enc
index 94919ebe855..c9e3e354166 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lfc333.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qltwwe.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lfc333speqqmibdwtxmsrrltia
-% Encoding created by otftotfm on Mon May 11 15:11:44 2020
+%%AutoEnc_qltwwelfraiwaliq42ib2shqdc
+% Encoding created by otftotfm on Tue Jan 12 13:16:51 2021
 % Command line follows encoding
-/AutoEnc_lfc333speqqmibdwtxmsrrltia [
+/AutoEnc_qltwwelfraiwaliq42ib2shqdc [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -32,35 +32,37 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qptrxz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qptrxz.enc
new file mode 100644
index 00000000000..f4acb55b9d6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qptrxz.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qptrxzlovohrjey3ufn36fjatg
+% Encoding created by otftotfm on Tue Jan 12 13:17:13 2021
+% Command line follows encoding
+/AutoEnc_qptrxzlovohrjey3ufn36fjatg [
+%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
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /ffl
+%20
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
+  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
+%70
+  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
+  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /ffi /uni0409
+  /uni0407 /uni049A /fl /L.sc /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /fi
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency.sc /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /I.sc /uni0459
+  /uni0457 /uni049B /ff /F.sc /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /hyphen.sc
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430.sc /uni0431.sc /uni0432.sc /uni0433.sc /uni0434.sc /uni0435.sc /uni0436.sc /uni0437.sc
+  /uni0438.sc /uni0439.sc /uni043A.sc /uni043B.sc /uni043C.sc /uni043D.sc /uni043E.sc /uni043F.sc
+%F0
+  /uni0440.sc /uni0441.sc /uni0442.sc /uni0443.sc /uni0444.sc /uni0445.sc /uni0446.sc /uni0447.sc
+  /uni0448.sc /uni0449.sc /uni044A.sc /uni044B.sc /uni044C.sc /uni044D.sc /uni044E.sc /uni044F.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=zut1_sc_t2a.enc
+% --tfm-directory=./texmf/fonts/tfm/public/erewhon
+% --vf-directory=./texmf/fonts/vf/public/erewhon
+% --type1-directory=./texmf/fonts/type1/public/erewhon
+% --encoding-directory=./texmf/fonts/enc/dvips/erewhon
+% --map-file=./texmf/fonts/map/dvips/erewhon/erewhon.map --no-updmap --force
+% --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'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qr6pdo.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qr6pdo.enc
deleted file mode 100644
index c12fdd08f4c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qr6pdo.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_qr6pdouwhppexjaxt3hkbrptef
-% Encoding created by otftotfm on Mon May 11 15:11:57 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E8.sc /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10145.sc /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_tjqwnw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvbgtd.enc
index 22f9d4eb36f..12543ad6b2c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tjqwnw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvbgtd.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tjqwnwknmph5mu6f4i4h7q6omd
-% Encoding created by otftotfm on Mon May 11 15:11:14 2020
+%%AutoEnc_qvbgtdyeaxu44be4guo4btkcud
+% Encoding created by otftotfm on Tue Jan 12 13:16:21 2021
 % Command line follows encoding
-/AutoEnc_tjqwnwknmph5mu6f4i4h7q6omd [
+/AutoEnc_qvbgtdyeaxu44be4guo4btkcud [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r35fsd.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r35fsd.enc
deleted file mode 100644
index 72800452c92..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r35fsd.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_r35fsd3773ph6ckj5ltyfc562b
-% Encoding created by otftotfm on Mon May 11 15:10:56 2020
-% Command line follows encoding
-/AutoEnc_r35fsd3773ph6ckj5ltyfc562b [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /oe /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_wyd53g.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r3uc5w.enc
index 77be1ad3305..e0d761b4d65 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wyd53g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r3uc5w.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wyd53grb7xa4a5j6nmccqesozh
-% Encoding created by otftotfm on Mon May 11 15:10:41 2020
+%%AutoEnc_r3uc5w7zbbqgqc3wqsitfmq2ub
+% Encoding created by otftotfm on Tue Jan 12 13:15:26 2021
 % Command line follows encoding
-/AutoEnc_wyd53grb7xa4a5j6nmccqesozh [
+/AutoEnc_r3uc5w7zbbqgqc3wqsitfmq2ub [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nzqzmy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r74hdq.enc
index 58d39985074..e1c92b93ec8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nzqzmy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r74hdq.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nzqzmyipmihjkliby7tbb5wm6f
-% Encoding created by otftotfm on Mon May 11 15:11:44 2020
+%%AutoEnc_r74hdqj63twuo4u2y4by4ryb3g
+% Encoding created by otftotfm on Tue Jan 12 13:16:50 2021
 % Command line follows encoding
-/AutoEnc_nzqzmyipmihjkliby7tbb5wm6f [
+/AutoEnc_r74hdqj63twuo4u2y4by4ryb3g [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -32,35 +32,37 @@
   /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
   /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
 %90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
   /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
 %B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rf456a.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rf456a.enc
deleted file mode 100644
index 58626d81839..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rf456a.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_rf456axpgtu6ipqxkca2fcbwbc
-% Encoding created by otftotfm on Mon May 11 15:11:38 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
-%B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --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
-% --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_rlrhvn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rlrhvn.enc
deleted file mode 100644
index d1656b6ee6d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rlrhvn.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_rlrhvn52u4ukljtjpfounvpdtg
-% Encoding created by otftotfm on Mon May 11 15:11:42 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
-%90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10058.sc /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A4.sc /uni04C8
-%B0
-  /uni04E8.sc /.notdef /afii10062.sc /uni04AE.sc /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10059.sc /afii10846 /.notdef /afii10023.sc /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc
-  /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc
-%F0
-  /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
-  /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/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
-% --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_kr7owi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rp5jpf.enc
index 05d1732e8e9..8993a8a60c6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kr7owi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rp5jpf.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kr7owilafqhmccsbc2hql6jr5g
-% Encoding created by otftotfm on Mon May 11 15:11:30 2020
+%%AutoEnc_rp5jpfvbjbbygqwokqskoy2jua
+% Encoding created by otftotfm on Tue Jan 12 13:16:29 2021
 % Command line follows encoding
-/AutoEnc_kr7owilafqhmccsbc2hql6jr5g [
+/AutoEnc_rp5jpfvbjbbygqwokqskoy2jua [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -30,37 +30,39 @@
   /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q5l3se.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_s5ndkw.enc
index 1dbacd55d2c..82665bcb743 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q5l3se.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_s5ndkw.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q5l3set7ebqfuxqwgyja47cdpg
-% Encoding created by otftotfm on Mon May 11 15:11:45 2020
+%%AutoEnc_s5ndkw6ry3576imixxjs5esuoc
+% Encoding created by otftotfm on Tue Jan 12 13:17:00 2021
 % Command line follows encoding
-/AutoEnc_q5l3set7ebqfuxqwgyja47cdpg [
+/AutoEnc_s5ndkw6ry3576imixxjs5esuoc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tlf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc
index b897137752d..f83a324dfcc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sim7pz7qkzoxw2u7iew664kxdb
-% Encoding created by otftotfm on Mon May 11 15:10:39 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:27 2021
 % Command line follows encoding
 /AutoEnc_sim7pz7qkzoxw2u7iew664kxdb [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rorgcs.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t32gte.enc
index 09274a8b76c..efb24e367a1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rorgcs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t32gte.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rorgcsorvtcm7ahzweh64ce6xg
-% Encoding created by otftotfm on Mon May 11 15:11:54 2020
+%%AutoEnc_t32gteusegktlil4rc2vdfdove
+% Encoding created by otftotfm on Tue Jan 12 13:17:00 2021
 % Command line follows encoding
-/AutoEnc_rorgcsorvtcm7ahzweh64ce6xg [
+/AutoEnc_t32gteusegktlil4rc2vdfdove [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2c'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oxlhzq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tmatie.enc
index f431040a316..edd82e2f9d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oxlhzq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tmatie.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_oxlhzqzukjqatlaon6ypt3xv7c
-% Encoding created by otftotfm on Mon May 11 15:11:44 2020
+%%AutoEnc_tmatievywiovhepbajxlagtkua
+% Encoding created by otftotfm on Tue Jan 12 13:16:59 2021
 % Command line follows encoding
-/AutoEnc_oxlhzqzukjqatlaon6ypt3xv7c [
+/AutoEnc_tmatievywiovhepbajxlagtkua [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-osf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc
index deedaaf5666..5b3cead4c49 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_totpyloaf2wbjqqcgoudrzdz6a
-% Encoding created by otftotfm on Mon May 11 15:10:38 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:21 2021
 % Command line follows encoding
 /AutoEnc_totpyloaf2wbjqqcgoudrzdz6a [
 %00
@@ -59,7 +59,7 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
 % --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l2txil.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tzgz6e.enc
index bb25da0bfaf..256cc35d718 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l2txil.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tzgz6e.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l2txil633hishz7h5sd4mc5cme
-% Encoding created by otftotfm on Mon May 11 15:10:40 2020
+%%AutoEnc_tzgz6edygcbbaua5eontwwbuwd
+% Encoding created by otftotfm on Tue Jan 12 13:15:28 2021
 % Command line follows encoding
-/AutoEnc_l2txil633hishz7h5sd4mc5cme [
+/AutoEnc_tzgz6edygcbbaua5eontwwbuwd [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ubwvkh.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ubwvkh.enc
deleted file mode 100644
index 2b341674634..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ubwvkh.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ubwvkhyjxb2fhdzriy6igvhlsg
-% Encoding created by otftotfm on Mon May 11 15:10:59 2020
-% Command line follows encoding
-/AutoEnc_ubwvkhyjxb2fhdzriy6igvhlsg [
-%00
-  /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.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
-%20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /Scaron.sc /guilsinglright /oe /Zcaron.sc /asciitilde /Ydieresis
-%A0
-  /afii61664 /exclamdown.sc /cent.sc /sterling.sc /currency.sc /yen.sc /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
-%B0
-  /degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
-  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /divide
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /Ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/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 --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_ibngfe.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ufk2cy.enc
index 8a9cf3a6f6a..6811b4f2894 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ibngfe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ufk2cy.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ibngfejtkzmp3s2nmusssxzjdc
-% Encoding created by otftotfm on Mon May 11 15:11:31 2020
+%%AutoEnc_ufk2cy42ye5jw7ryvbvbcs4wmg
+% Encoding created by otftotfm on Tue Jan 12 13:16:29 2021
 % Command line follows encoding
-/AutoEnc_ibngfejtkzmp3s2nmusssxzjdc [
+/AutoEnc_ufk2cy42ye5jw7ryvbvbcs4wmg [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -30,37 +30,39 @@
   /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77qtc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uft3lp.enc
index f3b7015d6c0..ba0cb45bd8f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77qtc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uft3lp.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e77qtcktnd7r5sqzih4pxwsksg
-% Encoding created by otftotfm on Mon May 11 15:11:40 2020
+%%AutoEnc_uft3lppygcqkzq2j2gcw3syetd
+% Encoding created by otftotfm on Tue Jan 12 13:16:40 2021
 % Command line follows encoding
-/AutoEnc_e77qtcktnd7r5sqzih4pxwsksg [
+/AutoEnc_uft3lppygcqkzq2j2gcw3syetd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2b'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xdsmvt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uhamxn.enc
index a573715aacf..2a70c19c2b3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xdsmvt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uhamxn.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xdsmvtptl77l3aeuq3zclxjv3b
-% Encoding created by otftotfm on Mon May 11 15:11:14 2020
+%%AutoEnc_uhamxnt2ejnpgrpu6s64rtsesg
+% Encoding created by otftotfm on Tue Jan 12 13:16:20 2021
 % Command line follows encoding
-/AutoEnc_xdsmvtptl77l3aeuq3zclxjv3b [
+/AutoEnc_uhamxnt2ejnpgrpu6s64rtsesg [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
 %30
   /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
+% --feature=dnom --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-dnom-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cimwg7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ui2iqu.enc
index 99e7268bc2e..3bd8b52525a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cimwg7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ui2iqu.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cimwg7mapzzkh4cjceq4gp25rd
-% Encoding created by otftotfm on Mon May 11 15:10:59 2020
+%%AutoEnc_ui2iqukhuoqckycm6zkfxvlp7g
+% Encoding created by otftotfm on Tue Jan 12 13:15:51 2021
 % Command line follows encoding
-/AutoEnc_cimwg7mapzzkh4cjceq4gp25rd [
+/AutoEnc_ui2iqukhuoqckycm6zkfxvlp7g [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /question
@@ -51,7 +51,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %F0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /ffl /ffi /ff /fl /l /fi /i /f
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
@@ -59,7 +59,5 @@
 % --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-Italic.otf Erewhon-Italic-tlf-ts1'
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum Erewhon-Italic.otf Erewhon-Italic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uimsyn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uimsyn.enc
deleted file mode 100644
index 0bcd3717c47..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uimsyn.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_uimsynkwud3ro2ca46ibeh6rwa
-% Encoding created by otftotfm on Mon May 11 15:11:52 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
-  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
-%90
-  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /afii10145 /uni04A8
-  /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
-%A0
-  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
-  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
-%B0
-  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /afii10193 /uni04A9
-  /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --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
-% --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_rvwfgp.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uk5nxi.enc
index 1ab5abb2a65..891561ea11b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rvwfgp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uk5nxi.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rvwfgpxo352f536z6hvjjtw57a
-% Encoding created by otftotfm on Mon May 11 15:10:39 2020
+%%AutoEnc_uk5nxigzparxur3a7ux7wxmvtb
+% Encoding created by otftotfm on Tue Jan 12 13:15:21 2021
 % Command line follows encoding
-/AutoEnc_rvwfgpxo352f536z6hvjjtw57a [
+/AutoEnc_uk5nxigzparxur3a7ux7wxmvtb [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -59,8 +59,10 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nyil2z.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ul5nhk.enc
index 21ac610b522..d17baa5afd0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nyil2z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ul5nhk.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nyil2zlprdnfize7jgweukgzyc
-% Encoding created by otftotfm on Mon May 11 15:10:39 2020
+%%AutoEnc_ul5nhkafzs7oitxiydo7pedlug
+% Encoding created by otftotfm on Tue Jan 12 13:15:22 2021
 % Command line follows encoding
-/AutoEnc_nyil2zlprdnfize7jgweukgzyc [
+/AutoEnc_ul5nhkafzs7oitxiydo7pedlug [
 %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 /ff /fi /fl /ffi /ffl
+  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_umzzxg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_umzzxg.enc
new file mode 100644
index 00000000000..46bea6bbbb9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_umzzxg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_umzzxgc5hpf6rrcdalhusqmu4b
+% Encoding created by otftotfm on Tue Jan 12 13:16:29 2021
+% Command line follows encoding
+/AutoEnc_umzzxgc5hpf6rrcdalhusqmu4b [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_qyrste.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uuvzxd.enc
index 81aeb715af3..ea2b3cb1c4e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qyrste.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uuvzxd.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qyrsteolcwl5ngxvnbdi74lb3d
-% Encoding created by otftotfm on Mon May 11 15:11:25 2020
+%%AutoEnc_uuvzxdwqi6tc5eezkwlju6emrd
+% Encoding created by otftotfm on Tue Jan 12 13:16:21 2021
 % Command line follows encoding
-/AutoEnc_qyrsteolcwl5ngxvnbdi74lb3d [
+/AutoEnc_uuvzxdwqi6tc5eezkwlju6emrd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
-  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
+  /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /F.sc /I.sc
 %10
-  /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
+  /quotedblleft /quotedblright /L.sc /.notdef /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,14 +53,16 @@
   /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2a'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc
index 537be2b69c7..a51d5d3b27c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v2pu2lsfusvhedmkn7jrhjmcpg
-% Encoding created by otftotfm on Mon May 11 15:10:47 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:33 2021
 % Command line follows encoding
 /AutoEnc_v2pu2lsfusvhedmkn7jrhjmcpg [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc
index a0788d5f0ba..fa483305b65 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vcw2hi6zo6akmvjgiqiqhhqrwc
-% Encoding created by otftotfm on Mon May 11 15:10:40 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:27 2021
 % Command line follows encoding
 /AutoEnc_vcw2hi6zo6akmvjgiqiqhhqrwc [
 %00
@@ -59,7 +59,7 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
 % --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vj42om.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vj42om.enc
new file mode 100644
index 00000000000..a580067b32e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vj42om.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vj42omczd676gmcxyiwuzm77de
+% Encoding created by otftotfm on Tue Jan 12 13:16:51 2021
+% Command line follows encoding
+/AutoEnc_vj42omczd676gmcxyiwuzm77de [
+%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
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
+%30
+  /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+  /eight.denominator /nine.denominator /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni04B4 /uni04AC /uni0494 /uni04BA /.notdef /.notdef /uni04E0
+  /.notdef /uni049A /.notdef /uni049E /.notdef /uni04A2 /.notdef /uni04C7
+%90
+  /uni04E8 /uni04BC /uni04BE /.notdef /.notdef /uni04B2 /uni040F /uni04A8
+  /uni04B6 /.notdef /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni04B5 /uni04AD /uni0495 /uni04BB /.notdef /.notdef /uni04E1
+  /.notdef /uni049B /.notdef /uni049F /.notdef /uni04A3 /.notdef /uni04C8
+%B0
+  /uni04E9 /uni04BD /uni04BF /.notdef /.notdef /uni04B3 /uni045F /uni04A9
+  /uni04B7 /.notdef /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=dnom --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc
index d4794058867..1404cb7d121 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vlikpxnr3fj2cw2epxr4g7pjxc
-% Encoding created by otftotfm on Mon May 11 15:10:37 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:23 2021
 % Command line follows encoding
 /AutoEnc_vlikpxnr3fj2cw2epxr4g7pjxc [
 %00
@@ -59,7 +59,7 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
 % --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3qrga.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vtfujz.enc
index 4e8e086e281..1d3952e823a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3qrga.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vtfujz.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_f3qrga4ngejd5faaxcrao6e2ph
-% Encoding created by otftotfm on Mon May 11 15:11:44 2020
+%%AutoEnc_vtfujz4jne422t4szuhk6gliud
+% Encoding created by otftotfm on Tue Jan 12 13:17:01 2021
 % Command line follows encoding
-/AutoEnc_f3qrga4ngejd5faaxcrao6e2ph [
+/AutoEnc_vtfujz4jne422t4szuhk6gliud [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tosf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zk3pqy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wg4pgf.enc
index be354af72ae..5f555362081 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zk3pqy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wg4pgf.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zk3pqy5fmfklmn4pk4jbbo3crc
-% Encoding created by otftotfm on Mon May 11 15:11:34 2020
+%%AutoEnc_wg4pgfmvxchok5qzx65c25rtff
+% Encoding created by otftotfm on Tue Jan 12 13:16:37 2021
 % Command line follows encoding
-/AutoEnc_zk3pqy5fmfklmn4pk4jbbo3crc [
+/AutoEnc_wg4pgfmvxchok5qzx65c25rtff [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -30,37 +30,35 @@
   /uniE056 /uniE057 /uniE058 /braceleft /bar /braceright /asciitilde /hyphen
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldSlanted.otf
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-BoldSlanted.otf
 % Erewhon-BoldSlanted-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc
index 1ee6b73bca5..c22513e8d84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wrgbkswccz6m4mr7voizaxhylg
-% Encoding created by otftotfm on Mon May 11 15:10:40 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:25 2021
 % Command line follows encoding
 /AutoEnc_wrgbkswccz6m4mr7voizaxhylg [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g5zjdm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_x3bhkk.enc
index 22ae4860830..d632eabb654 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g5zjdm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_x3bhkk.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_g5zjdmvl5cr6rdh64ea6adsllh
-% Encoding created by otftotfm on Mon May 11 15:11:45 2020
+%%AutoEnc_x3bhkkhv4ebiuznq3fimo6rs4d
+% Encoding created by otftotfm on Tue Jan 12 13:17:01 2021
 % Command line follows encoding
-/AutoEnc_g5zjdmvl5cr6rdh64ea6adsllh [
+/AutoEnc_x3bhkkhv4ebiuznq3fimo6rs4d [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
 %30
   /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2c
+% Command line: 'otftotfm --automatic --encoding=T2C.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
+% --feature=dnom --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-dnom-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xarqe6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xarqe6.enc
deleted file mode 100644
index ba7a746931d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xarqe6.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xarqe6i5ddfkq3fwr2df3fpisg
-% Encoding created by otftotfm on Mon May 11 15:11:09 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
-  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /Tcommaaccent.sc /Uhungarumlaut.sc /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /OE.sc
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_xbmmsr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xbmmsr.enc
deleted file mode 100644
index 0c023be5d08..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xbmmsr.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xbmmsrlfkg7t4pxev73nnk2gvc
-% Encoding created by otftotfm on Mon May 11 15:11:20 2020
-% Command line follows encoding
-/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 /ff /fi /fl /ffi /ffl
-%20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
-%30
-  /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
-  /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft.superior /backslash /bracketright.superior /asciicircum /underscore
-%60
-  /quoteleft /uniF6E9 /uniF6EA /uniE049 /uniF6EB /uniF6EC /uniE04E /uniE04C
-  /uniE048 /uniF6ED /uniE04A /uniE04B /uniF6EE /uniF6EF /uni207F /uniF6F0
-%70
-  /uniE052 /uniE053 /uniF6F1 /uniF6F2 /uniF6F3 /uniE050 /uniE054 /uniE055
-  /uniE056 /uniE057 /uniE058 /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /.notdef /afii10058
-  /afii10056 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /afii10054
-%90
-  /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /.notdef
-  /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency /section
-%A0
-  /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /.notdef /afii10106
-  /afii10104 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /afii10102
-%B0
-  /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /.notdef
-  /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
-%D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
-%E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
-%F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --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=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --ligkern=* {KL} * Erewhon-BoldSlanted.otf
-% Erewhon-BoldSlanted-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_43wmo6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xd5tcn.enc
index 265546b9ad5..1e482867744 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_43wmo6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xd5tcn.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_43wmo6zbx547ihcyyk236b6g6b
-% Encoding created by otftotfm on Mon May 11 15:11:15 2020
+%%AutoEnc_xd5tcnuaucojxm3b2okqvunngc
+% Encoding created by otftotfm on Tue Jan 12 13:16:21 2021
 % Command line follows encoding
-/AutoEnc_43wmo6zbx547ihcyyk236b6g6b [
+/AutoEnc_xd5tcnuaucojxm3b2okqvunngc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2a
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xhc3k4.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xhc3k4.enc
new file mode 100644
index 00000000000..43fd1a81afe
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xhc3k4.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xhc3k4mui2tmn6pty4gkwf7kvh
+% Encoding created by otftotfm on Tue Jan 12 13:16:09 2021
+% Command line follows encoding
+/AutoEnc_xhc3k4mui2tmn6pty4gkwf7kvh [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /uni0490 /uni0492 /uni0402 /uni040B /uni04BA /uni0496 /.notdef /uni0409
+  /uni0407 /uni049A /.notdef /.notdef /uni04D4 /uni04A2 /uni04A4 /uni0405
+%90
+  /uni04E8 /uni04AA /uni040E /uni04AE /uni04B0 /uni04B2 /uni040F /.notdef
+  /uni04B6 /uni0404 /uni04D8 /uni040A /uni0401 /uni2116 /currency /section
+%A0
+  /uni0491 /uni0493 /uni0452 /uni045B /uni04BB /uni0497 /.notdef /uni0459
+  /uni0457 /uni049B /.notdef /.notdef /uni04D5 /uni04A3 /uni04A5 /uni0455
+%B0
+  /uni04E9 /uni04AB /uni045E /uni04AF /uni04B1 /uni04B3 /uni045F /.notdef
+  /uni04B7 /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2A.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_xlud6l.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xlud6l.enc
index 836c3eecbcc..f98bd606b52 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xlud6l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xlud6l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xlud6l36grnnehisddby2u7hue
-% Encoding created by otftotfm on Mon May 11 15:10:38 2020
+% Encoding created by otftotfm on Tue Jan 12 13:15:21 2021
 % Command line follows encoding
 /AutoEnc_xlud6l36grnnehisddby2u7hue [
 %00
@@ -59,7 +59,7 @@
 % --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 --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'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uofugq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xsflzz.enc
index 4db2dad4a19..19f0367ff30 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uofugq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xsflzz.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uofugqx3rtk534nq264dlwp5be
-% Encoding created by otftotfm on Mon May 11 15:11:29 2020
+%%AutoEnc_xsflzzxzwhsujmxyfes4c5qida
+% Encoding created by otftotfm on Tue Jan 12 13:16:41 2021
 % Command line follows encoding
-/AutoEnc_uofugqx3rtk534nq264dlwp5be [
+/AutoEnc_xsflzzxzwhsujmxyfes4c5qida [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-lf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yicjml.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yicjml.enc
deleted file mode 100644
index eb4009ffd22..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yicjml.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_yicjmlovwuvujqgkmjw77kadeg
-% Encoding created by otftotfm on Mon May 11 15:10:58 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /tcommaaccent /uhungarumlaut /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /oe
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_yjdtdu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yjdtdu.enc
new file mode 100644
index 00000000000..d1847c89efe
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yjdtdu.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yjdtdu6drcmhqj6wnflp7tmqrh
+% Encoding created by otftotfm on Tue Jan 12 13:16:31 2021
+% Command line follows encoding
+/AutoEnc_yjdtdu6drcmhqj6wnflp7tmqrh [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+%10
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+%90
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency /section
+%A0
+  /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+%B0
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
+%C0
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
+%D0
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
+%E0
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
+%F0
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
+] def
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
+% --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 --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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_owr4hx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ytd5fv.enc
index 9f2444d60b7..795c2540d00 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_owr4hx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ytd5fv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_owr4hxf6wu7xywiw6p4knw257h
-% Encoding created by otftotfm on Mon May 11 15:11:01 2020
+%%AutoEnc_ytd5fvum5s56nbsvrcxeox42lh
+% Encoding created by otftotfm on Tue Jan 12 13:15:49 2021
 % Command line follows encoding
-/AutoEnc_owr4hxf6wu7xywiw6p4knw257h [
+/AutoEnc_ytd5fvum5s56nbsvrcxeox42lh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -59,7 +59,6 @@
 % --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=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --ligkern=* {KL} * Erewhon-Italic.otf Erewhon-Italic-sup-ly1'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * Erewhon-Italic.otf
+% Erewhon-Italic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rru6gy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yx3dqr.enc
index c92104de863..f1656fd9aec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rru6gy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yx3dqr.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rru6gyevkz2yeevhcwshztm3nh
-% Encoding created by otftotfm on Mon May 11 15:11:30 2020
+%%AutoEnc_yx3dqrffquyoueof2nr546vhdb
+% Encoding created by otftotfm on Tue Jan 12 13:16:39 2021
 % Command line follows encoding
-/AutoEnc_rru6gyevkz2yeevhcwshztm3nh [
+/AutoEnc_yx3dqrffquyoueof2nr546vhdb [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
 %10
-  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
-  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
+  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /T_h
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -53,13 +53,13 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - 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'
+% --ligkern=ff l =: ffl Erewhon-Italic.otf Erewhon-Italic-osf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdof4l.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdof4l.enc
deleted file mode 100644
index dd7f8ce9f41..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdof4l.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_zdof4luj5lc5ukaa5udq2km3dc
-% Encoding created by otftotfm on Mon May 11 15:11:11 2020
-% Command line follows encoding
-/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 /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
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question.sc
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /A.sc /B.sc /C.sc /D.sc /E.sc /F.sc /G.sc
-  /H.sc /I.sc /J.sc /K.sc /L.sc /M.sc /N.sc /O.sc
-%70
-  /P.sc /Q.sc /R.sc /S.sc /T.sc /U.sc /V.sc /W.sc
-  /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
-%80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
-%90
-  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /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
-%B0
-  /Rcaron.sc /Sacute.sc /Scaron.sc /scedilla /Tcaron.sc /Tcommaaccent.sc /Uhungarumlaut.sc /Uring.sc
-  /Ydieresis.sc /Zacute.sc /Zcaron.sc /Zdotaccent.sc /.notdef /exclamdown.sc /questiondown.sc /sterling.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /Agrave.sc /Aacute.sc /Acircumflex.sc /Atilde.sc /Adieresis.sc /Aring.sc /AE.sc /Ccedilla.sc
-  /Egrave.sc /Eacute.sc /Ecircumflex.sc /Edieresis.sc /Igrave.sc /Iacute.sc /Icircumflex.sc /Idieresis.sc
-%F0
-  /Eth.sc /Ntilde.sc /Ograve.sc /Oacute.sc /Ocircumflex.sc /Otilde.sc /Odieresis.sc /OE.sc
-  /Oslash.sc /Ugrave.sc /Uacute.sc /Ucircumflex.sc /Udieresis.sc /Yacute.sc /Thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/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
-% --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_lzr7pz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdrb2k.enc
index ddd706cb06d..bf3380ef8a1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzr7pz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdrb2k.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lzr7pznksf6jm262thopm2goma
-% Encoding created by otftotfm on Mon May 11 15:11:02 2020
+%%AutoEnc_zdrb2kvbs4juks4ig24mpbcfyf
+% Encoding created by otftotfm on Tue Jan 12 13:15:47 2021
 % Command line follows encoding
-/AutoEnc_lzr7pznksf6jm262thopm2goma [
+/AutoEnc_zdrb2kvbs4juks4ig24mpbcfyf [
 %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 /ff /FI.sc /FL.sc /ffi /ffl
+  /perthousandzero /dotlessi /uni0237 /F.sc /I.sc /L.sc /S.sc /.notdef
 %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 /S.sc /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /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
@@ -59,8 +59,10 @@
 % --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
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t1'
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fhck2l.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zhgadb.enc
index 602773c01f2..2f6597d822d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fhck2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zhgadb.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fhck2lwwjcefeyghoqi53ch4ih
-% Encoding created by otftotfm on Mon May 11 15:11:30 2020
+%%AutoEnc_zhgadbkbt4h3ecgw6o6j6zpgkd
+% Encoding created by otftotfm on Tue Jan 12 13:16:30 2021
 % Command line follows encoding
-/AutoEnc_fhck2lwwjcefeyghoqi53ch4ih [
+/AutoEnc_zhgadbkbt4h3ecgw6o6j6zpgkd [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
-  /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+  /uni2423 /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -30,37 +30,39 @@
   /X.sc /Y.sc /Z.sc /braceleft /bar /braceright /asciitilde /hyphen.sc
 %80
   /.notdef /uni0492 /.notdef /uni0494 /uni04BA /uni0496 /.notdef /uni04E0
-  /afii10058 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
+  /uni0409 /uni049A /.notdef /uni04C3 /.notdef /uni04A2 /uni04A4 /uni04C7
 %90
-  /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /.notdef
-  /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency.sc /section
+  /uni04E8 /.notdef /uni040E /uni04AE /.notdef /uni04B2 /.notdef /.notdef
+  /uni04B6 /uni040A /uni04D8 /.notdef /uni0401 /uni2116 /currency.sc /section
 %A0
   /.notdef /uni0493 /.notdef /uni0495 /uni04BB /uni0497 /.notdef /uni04E1
-  /afii10106 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
+  /uni0459 /uni049B /.notdef /uni04C4 /.notdef /uni04A3 /uni04A5 /uni04C8
 %B0
-  /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /.notdef
-  /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright
+  /uni04E9 /.notdef /uni045E /uni04AF /.notdef /uni04B3 /.notdef /.notdef
+  /uni04B7 /uni045A /uni04D9 /.notdef /uni0451 /quotedblbase /guillemotleft /guillemotright
 %C0
-  /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025
-  /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033
+  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
+  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
 %D0
-  /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041
-  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049
+  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
+  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
 %E0
-  /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073
-  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081
+  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
+  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
 %F0
-  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
-  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
+  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
 % =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
 % Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2ttnbr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zx32l7.enc
index dbf8a991c2f..7aa9537ec29 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2ttnbr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zx32l7.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2ttnbr6u7k3rnuinti6acphurb
-% Encoding created by otftotfm on Mon May 11 15:11:29 2020
+%%AutoEnc_zx32l7mf6dhab22v6jupqpk5rh
+% Encoding created by otftotfm on Tue Jan 12 13:16:43 2021
 % Command line follows encoding
-/AutoEnc_2ttnbr6u7k3rnuinti6acphurb [
+/AutoEnc_zx32l7mf6dhab22v6jupqpk5rh [
 %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 /ff /fi /fl /ffi /ffl
+  /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
-  /space /exclam.superior /quotedbl /numbersign /dollar /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedbl /numbersign /dollar /percent /ampersand.superior /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -53,13 +53,12 @@
   /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t2b
+% Command line: 'otftotfm --automatic --encoding=T2B.enc
 % --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=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'
+% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
+% --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
+% Erewhon-Regular-sup-t2b'
author	Karl Berry <karl@freefriends.org>	2021-01-13 22:10:02 +0000
committer	Karl Berry <karl@freefriends.org>	2021-01-13 22:10:02 +0000
commit	4065c882e0f8f03db7efccc7374a81450ce7b0e5 (patch)
tree	648132b72560ed71486bda1ab3eb3f06c1344282 /Master/texmf-dist/fonts/enc/dvips/erewhon
parent	cb5a8155268b6fcc187641648ef87612168200f6 (diff)