xcharter (26feb22)

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

184 files changed, 5693 insertions, 527 deletions

diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2itbay.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2itbay.enc
index b6b0ae32062..fead1801cb9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2itbay.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2itbay.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_2itbaymenzrb5xthj47dlmqvzc
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:09 2022
 % Command line follows encoding
 /AutoEnc1_2itbaymenzrb5xthj47dlmqvzc [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
-% XCharter-Roman-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
+% XCharter-Roman-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2jcsfa.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2jcsfa.enc
index 6243d043509..9efa5879a90 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2jcsfa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_2jcsfa.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:59 2022
 % Command line follows encoding
 /AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb [
 %00
@@ -66,8 +66,8 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-t2asrb'
+% --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 XCharter-Bold.otf XCharter-Bold-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3qy4ma.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3qy4ma.enc
index 799cafb6f74..3933d32a57b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3qy4ma.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3qy4ma.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg
-% Encoding created by otftotfm on Sat Apr  3 15:03:53 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:43 2022
 % Command line follows encoding
 /AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-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 XCharter-Bold.otf XCharter-Bold-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4sqimf.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4sqimf.enc
new file mode 100644
index 00000000000..31005ad4072
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4sqimf.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_4sqimfdumbp34jdzocpuw555xe
+% Encoding created by otftotfm on Wed Feb 23 17:59:37 2022
+% Command line follows encoding
+/AutoEnc1_4sqimfdumbp34jdzocpuw555xe [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /uni1E9E.ss01
+%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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4zysyq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4zysyq.enc
index eb8a8cdb0c5..f039d80d3b7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4zysyq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_4zysyq.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_4zysyqekhrh377ld64a5gt3bcc
-% Encoding created by otftotfm on Sat Apr  3 15:03:45 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
 /AutoEnc1_4zysyqekhrh377ld64a5gt3bcc [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %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
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-ly1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_5x23ii.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_5x23ii.enc
new file mode 100644
index 00000000000..afdf03f1813
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_5x23ii.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_5x23iijnyd3bukkzcghkx6k47h
+% Encoding created by otftotfm on Wed Feb 23 18:00:21 2022
+% Command line follows encoding
+/AutoEnc1_5x23iijnyd3bukkzcghkx6k47h [
+%00
+  /f_j /Euro /f_b /f_h /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_64qgug.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_64qgug.enc
index 8eb91c3ed69..18c0363ade0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_64qgug.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_64qgug.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_64qgugv7glijhxes55r42djrte
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
 /AutoEnc1_64qgugv7glijhxes55r42djrte [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1'
+% --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 XCharter-Bold.otf XCharter-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_65qaqc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_65qaqc.enc
new file mode 100644
index 00000000000..914be00d532
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_65qaqc.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_65qaqc2gtff7bw6zj6q4gehfpc
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc1_65qaqc2gtff7bw6zj6q4gehfpc [
+%00
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ivnpe7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6ir2ua.enc
index bdb1cf5912f..a44a6069ca3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ivnpe7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6ir2ua.enc
@@ -6,10 +6,10 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_ivnpe75mj322okzj6wfooqsf5h
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+%%AutoEnc1_6ir2ua64b5sfibyjqihzrj2csd
+% Encoding created by otftotfm on Wed Feb 23 18:00:27 2022
 % Command line follows encoding
-/AutoEnc1_ivnpe75mj322okzj6wfooqsf5h [
+/AutoEnc1_6ir2ua64b5sfibyjqihzrj2csd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -17,7 +17,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
-% XCharter-Roman-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zhjmar.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6ramfp.enc
index ac27458fd3c..a9c80869690 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zhjmar.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6ramfp.enc
@@ -6,18 +6,18 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_zhjmarbateoccr2llfvgvl5sya
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+%%AutoEnc1_6ramfpqc7c7xjz2jbkz2ys4g3d
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
-/AutoEnc1_zhjmarbateoccr2llfvgvl5sya [
+/AutoEnc1_6ramfpqc7c7xjz2jbkz2ys4g3d [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,8 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-ot1'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6xwfqv.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6xwfqv.enc
index 8a697c0a0d3..56385570f02 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6xwfqv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_6xwfqv.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe
-% Encoding created by otftotfm on Sat Apr  3 15:03:45 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
 /AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %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
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-t1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7aohvb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7aohvb.enc
index 5f349db1a19..f0c86a7f7a2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7aohvb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7aohvb.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_7aohvb3j4cllo2ny34ugeabofe
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
 /AutoEnc1_7aohvb3j4cllo2ny34ugeabofe [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %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
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-ly1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_acpec5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_acpec5.enc
new file mode 100644
index 00000000000..1cf3c3bda3b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_acpec5.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_acpec5jlnur2n7nbmxku2s3k6h
+% Encoding created by otftotfm on Wed Feb 23 18:00:21 2022
+% Command line follows encoding
+/AutoEnc1_acpec5jlnur2n7nbmxku2s3k6h [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_an6s6r.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_an6s6r.enc
new file mode 100644
index 00000000000..44f8a27ff12
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_an6s6r.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_an6s6r7vvyiaiocljopu5j6ikc
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc1_an6s6r7vvyiaiocljopu5j6ikc [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c3yyfo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c3yyfo.enc
new file mode 100644
index 00000000000..6824bac62cd
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c3yyfo.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d
+% Encoding created by otftotfm on Wed Feb 23 18:00:42 2022
+% Command line follows encoding
+/AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c54uym.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c54uym.enc
new file mode 100644
index 00000000000..bca8826206f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_c54uym.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_c54uymh6bm5yms366xu5llwvve
+% Encoding created by otftotfm on Wed Feb 23 17:59:46 2022
+% Command line follows encoding
+/AutoEnc1_c54uymh6bm5yms366xu5llwvve [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ccfumi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ccfumi.enc
new file mode 100644
index 00000000000..5cd6d726a74
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ccfumi.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_ccfumixdc336kzewpgzadb4gra
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
+% Command line follows encoding
+/AutoEnc1_ccfumixdc336kzewpgzadb4gra [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cilcsm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cilcsm.enc
new file mode 100644
index 00000000000..55bf34b5ed0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cilcsm.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_cilcsmy3jvivb56pc5mgy4v4eh
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc1_cilcsmy3jvivb56pc5mgy4v4eh [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cjimfy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cjimfy.enc
index 07f55f4d448..d623273f5e9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cjimfy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_cjimfy.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a
-% Encoding created by otftotfm on Sat Apr  3 15:03:58 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:54 2022
 % Command line follows encoding
 /AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-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 XCharter-Roman.otf XCharter-Roman-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_co4ru4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_co4ru4.enc
index 85f711b21a4..312b89cb527 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_co4ru4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_co4ru4.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_co4ru464vsgph3ezqa72efxcnh
-% Encoding created by otftotfm on Sat Apr  3 15:04:08 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:13 2022
 % Command line follows encoding
 /AutoEnc1_co4ru464vsgph3ezqa72efxcnh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dp2hrq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dp2hrq.enc
new file mode 100644
index 00000000000..2d439f163ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dp2hrq.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /dotlessi /dotlessj /ffl /ffi /ff /fl /fi
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dynzsr.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dynzsr.enc
new file mode 100644
index 00000000000..65260032bd6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_dynzsr.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
+% Command line follows encoding
+/AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_eldrzl.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_eldrzl.enc
new file mode 100644
index 00000000000..4f0331ca209
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_eldrzl.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_eldrzlqarw4p4ckswo2y34m4la
+% Encoding created by otftotfm on Wed Feb 23 17:59:47 2022
+% Command line follows encoding
+/AutoEnc1_eldrzlqarw4p4ckswo2y34m4la [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_geqmur.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_geqmur.enc
index 70fe964f112..1a00a9ee5fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_geqmur.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_geqmur.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf
-% Encoding created by otftotfm on Sat Apr  3 15:03:58 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:54 2022
 % Command line follows encoding
 /AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf [
 %00
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_hgvfee.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_hgvfee.enc
new file mode 100644
index 00000000000..49862f7d2dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_hgvfee.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
+% Command line follows encoding
+/AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf
+% XCharter-Bold-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_i2cund.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_i2cund.enc
new file mode 100644
index 00000000000..71d4afa096a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_i2cund.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_i2cundlmhxhdttwik6tmbaoeta
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
+% Command line follows encoding
+/AutoEnc1_i2cundlmhxhdttwik6tmbaoeta [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_afo4o4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_i2fqhk.enc
index b5aebe54e54..58af506ee5f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_afo4o4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_i2fqhk.enc
@@ -6,18 +6,18 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_afo4o42f6y4dlfgulys2itsagb
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+%%AutoEnc1_i2fqhkoxi7tdwc72ombhuexvte
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
-/AutoEnc1_afo4o42f6y4dlfgulys2itsagb [
+/AutoEnc1_i2fqhkoxi7tdwc72ombhuexvte [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,8 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-ot1'
+% --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 XCharter-Bold.otf
+% XCharter-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_icytdu.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_icytdu.enc
index 8805b103bf8..74230085a2a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_icytdu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_icytdu.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_icytdughipwu4ylecsn2jfsdbc
-% Encoding created by otftotfm on Sat Apr  3 15:03:53 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:44 2022
 % Command line follows encoding
 /AutoEnc1_icytdughipwu4ylecsn2jfsdbc [
 %00
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_iit6m7.enc
index 2da8f828f9a..3bd3ed23f24 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_iit6m7.enc
@@ -6,18 +6,18 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_m7ekhwlp323btq5a5hhwjpjzqd
-% Encoding created by otftotfm on Sat Apr  3 15:03:26 2021
+%%AutoEnc1_iit6m7aygjojwhzgc3qxbp4mcd
+% Encoding created by otftotfm on Wed Feb 23 17:59:54 2022
 % Command line follows encoding
-/AutoEnc1_m7ekhwlp323btq5a5hhwjpjzqd [
+/AutoEnc1_iit6m7aygjojwhzgc3qxbp4mcd [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+  /cedilla /uni1E9E.ss01 /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-sc-ot1'
+% --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ksktz7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ksktz7.enc
new file mode 100644
index 00000000000..a7605aba879
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ksktz7.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd
+% Encoding created by otftotfm on Wed Feb 23 18:00:22 2022
+% Command line follows encoding
+/AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /uni1E9E.ss01
+%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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_laqzs3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_laqzs3.enc
new file mode 100644
index 00000000000..960b6200607
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_laqzs3.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_laqzs3jbi2yov36wtv6ud2km3h
+% Encoding created by otftotfm on Wed Feb 23 18:00:20 2022
+% Command line follows encoding
+/AutoEnc1_laqzs3jbi2yov36wtv6ud2km3h [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_j /f_b /f_h /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m6qb7y.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m6qb7y.enc
new file mode 100644
index 00000000000..a5ac0e9a57d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m6qb7y.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd
+% Encoding created by otftotfm on Wed Feb 23 18:00:52 2022
+% Command line follows encoding
+/AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mpbiom.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mpbiom.enc
new file mode 100644
index 00000000000..14bcedc3b34
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mpbiom.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_mpbiommipfp7afy3jn6kkjs23g
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
+% Command line follows encoding
+/AutoEnc1_mpbiommipfp7afy3jn6kkjs23g [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ng7me5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ng7me5.enc
new file mode 100644
index 00000000000..ac896f13491
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ng7me5.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_ng7me5mjnlk3d4x26fckblue2f
+% Encoding created by otftotfm on Wed Feb 23 17:59:37 2022
+% Command line follows encoding
+/AutoEnc1_ng7me5mjnlk3d4x26fckblue2f [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
+%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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nhow2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nhow2o.enc
index b373351f48b..8175aff9f8c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nhow2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nhow2o.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_nhow2oriavhyxfh6euosdomsje
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
 % Command line follows encoding
 /AutoEnc1_nhow2oriavhyxfh6euosdomsje [
 %00
@@ -66,8 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ph46id.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ph46id.enc
index e64b53060cb..d8e88d0b70e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ph46id.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_ph46id.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_ph46idfft7to53v2kspy6xejya
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc1_ph46idfft7to53v2kspy6xejya [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pikjb7.enc
index b5f46cbf6ad..54ff3967d4a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pikjb7.enc
@@ -6,10 +6,10 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_7p4e2okxw4m5ierz3rzoubdpud
-% Encoding created by otftotfm on Sat Apr  3 15:03:25 2021
+%%AutoEnc1_pikjb7kncjlrolhowkef2umc3a
+% Encoding created by otftotfm on Wed Feb 23 17:59:53 2022
 % Command line follows encoding
-/AutoEnc1_7p4e2okxw4m5ierz3rzoubdpud [
+/AutoEnc1_pikjb7kncjlrolhowkef2umc3a [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
@@ -17,7 +17,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_plaupi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_plaupi.enc
new file mode 100644
index 00000000000..dad3ba35903
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_plaupi.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_plaupi652dl6la5yzojc7c7tma
+% Encoding created by otftotfm on Wed Feb 23 18:00:42 2022
+% Command line follows encoding
+/AutoEnc1_plaupi652dl6la5yzojc7c7tma [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Bold.otf XCharter-Bold-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pqp4df.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pqp4df.enc
index 05e69f8477a..1f6d4da54bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pqp4df.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_pqp4df.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f
-% Encoding created by otftotfm on Sat Apr  3 15:04:08 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7fabp.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7fabp.enc
index 8517325fe38..02ccb7d9632 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7fabp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7fabp.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_q7fabpknswrkabbcspsxnge7se
-% Encoding created by otftotfm on Sat Apr  3 15:03:21 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
 /AutoEnc1_q7fabpknswrkabbcspsxnge7se [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %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
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-t1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q2nwaj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_qfy5bi.enc
index e911c813d32..bc8f2c15378 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q2nwaj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_qfy5bi.enc
@@ -6,10 +6,10 @@
 % LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_q2nwaj3r2ed2ei2xtolszzvvpd
-% Encoding created by otftotfm on Sat Apr  3 15:03:19 2021
+%%AutoEnc1_qfy5biuowgnr3eyr56ntx5cmha
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
-/AutoEnc1_q2nwaj3r2ed2ei2xtolszzvvpd [
+/AutoEnc1_qfy5biuowgnr3eyr56ntx5cmha [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -17,7 +17,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
-% XCharter-Bold-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_s4eoyd.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_s4eoyd.enc
index d996409a4b0..15cd6dea4bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_s4eoyd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_s4eoyd.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug
-% Encoding created by otftotfm on Sat Apr  3 15:04:02 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
 % Command line follows encoding
 /AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_sczepj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_sczepj.enc
index 616e938d42d..db34a44e7ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_sczepj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_sczepj.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg
-% Encoding created by otftotfm on Sat Apr  3 15:04:03 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
 % Command line follows encoding
 /AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg [
 %00
@@ -66,8 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb'
+% --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tipddl.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tipddl.enc
new file mode 100644
index 00000000000..d64390be802
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tipddl.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_tipddl6hla4uyfdfli25e6uedb
+% Encoding created by otftotfm on Wed Feb 23 17:59:48 2022
+% Command line follows encoding
+/AutoEnc1_tipddl6hla4uyfdfli25e6uedb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
+%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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tohekq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tohekq.enc
new file mode 100644
index 00000000000..53f2c09bf29
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_tohekq.enc
@@ -0,0 +1,71 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_tohekqb7m7y2fvorjyknq54efb
+% Encoding created by otftotfm on Wed Feb 23 18:00:52 2022
+% Command line follows encoding
+/AutoEnc1_tohekqb7m7y2fvorjyknq54efb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Roman.otf XCharter-Roman-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wd2dbe.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wd2dbe.enc
index 5e8d7b6dbb5..8e5ce0ddc0c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wd2dbe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wd2dbe.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c
-% Encoding created by otftotfm on Sat Apr  3 15:03:27 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:54 2022
 % Command line follows encoding
 /AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %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
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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
-% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t1'
+% --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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wf67wi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wf67wi.enc
new file mode 100644
index 00000000000..388dbec8304
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wf67wi.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_wf67wi5apar2djse5bcegu5l5a
+% Encoding created by otftotfm on Wed Feb 23 18:00:45 2022
+% Command line follows encoding
+/AutoEnc1_wf67wi5apar2djse5bcegu5l5a [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqeam3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqeam3.enc
index bc8e610d79e..7624a790621 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqeam3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqeam3.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_wqeam3xphw5mmouhxu2uypuhte
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:27 2022
 % Command line follows encoding
 /AutoEnc1_wqeam3xphw5mmouhxu2uypuhte [
 %00
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1'
+% --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 XCharter-Roman.otf XCharter-Roman-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqjgnt.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqjgnt.enc
new file mode 100644
index 00000000000..b8b412bee72
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wqjgnt.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
+% Command line follows encoding
+/AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wuciy4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wuciy4.enc
index 8d07dea11fc..aa4f74ed100 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wuciy4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wuciy4.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:59 2022
 % Command line follows encoding
 /AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe [
 %00
@@ -66,5 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
+% XCharter-Bold-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_x6jczy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_x6jczy.enc
index f7c70f735ba..d769d7c92bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_x6jczy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_x6jczy.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_x6jczyaykpt55mhfvxdxwokyih
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
 /AutoEnc1_x6jczyaykpt55mhfvxdxwokyih [
 %00
@@ -51,7 +51,7 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
 %E0
   /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
   /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
@@ -66,6 +66,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xqcxen.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xqcxen.enc
index d2b940c2702..d1e855021e0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xqcxen.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xqcxen.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_xqcxendti4xfjtesusecvwojab
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc1_xqcxendti4xfjtesusecvwojab [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_yr3lcc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_yr3lcc.enc
new file mode 100644
index 00000000000..54b1cbc4363
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_yr3lcc.enc
@@ -0,0 +1,74 @@
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_yr3lccoclcllj4jacxiujymtwh
+% Encoding created by otftotfm on Wed Feb 23 18:00:22 2022
+% Command line follows encoding
+/AutoEnc1_yr3lccoclcllj4jacxiujymtwh [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss01
+%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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_z3wvjz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_z3wvjz.enc
index 85e7201075a..95de88551df 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_z3wvjz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_z3wvjz.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_z3wvjzrihuxhpixor2gglzqccg
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:15 2022
 % Command line follows encoding
 /AutoEnc1_z3wvjzrihuxhpixor2gglzqccg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zqx27h.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zqx27h.enc
index 89a5ddf3c0a..aee6783beca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zqx27h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_zqx27h.enc
@@ -7,7 +7,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_zqx27h6iquwnh4mli45z2uykrb
-% Encoding created by otftotfm on Sat Apr  3 15:03:54 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:46 2022
 % Command line follows encoding
 /AutoEnc1_zqx27h6iquwnh4mli45z2uykrb [
 %00
@@ -66,9 +66,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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
-% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_26pbhy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_26pbhy.enc
index 96be7bcf6f8..9a522afabbd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_26pbhy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_26pbhy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_26pbhyeyswcx6l35vecjqtozga
-% Encoding created by otftotfm on Sat Apr  3 15:03:16 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:41 2022
 % Command line follows encoding
 /AutoEnc_26pbhyeyswcx6l35vecjqtozga [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2itbay.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2itbay.enc
index f8b27d51668..1d937e2fbcb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2itbay.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2itbay.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2itbaymenzrb5xthj47dlmqvzc
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:09 2022
 % Command line follows encoding
 /AutoEnc_2itbaymenzrb5xthj47dlmqvzc [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
-% XCharter-Roman-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
+% XCharter-Roman-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2jcsfa.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2jcsfa.enc
index cb9012136d5..aabc6985a9b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2jcsfa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2jcsfa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:59 2022
 % Command line follows encoding
 /AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb [
 %00
@@ -60,8 +60,8 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-t2asrb'
+% --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 XCharter-Bold.otf XCharter-Bold-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2ne5ra.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2ne5ra.enc
new file mode 100644
index 00000000000..8193b5f6a32
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2ne5ra.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2ne5ras2ihnhgxt43rxslgjvce
+% Encoding created by otftotfm on Wed Feb 23 18:01:08 2022
+% Command line follows encoding
+/AutoEnc_2ne5ras2ihnhgxt43rxslgjvce [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-lf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2v3pxw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2v3pxw.enc
new file mode 100644
index 00000000000..922c02eac7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2v3pxw.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2v3pxwpwzyh7ol42swht4e2qif
+% Encoding created by otftotfm on Wed Feb 23 17:59:50 2022
+% Command line follows encoding
+/AutoEnc_2v3pxwpwzyh7ol42swht4e2qif [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_34ooqo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_34ooqo.enc
index e981c8a2883..1d757bcb165 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_34ooqo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_34ooqo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_34ooqoxesskwfyq5lkgbtvjjpg
-% Encoding created by otftotfm on Sat Apr  3 15:03:17 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:38 2022
 % Command line follows encoding
 /AutoEnc_34ooqoxesskwfyq5lkgbtvjjpg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3qy4ma.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3qy4ma.enc
index b2650777f94..c8eaddd659c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3qy4ma.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3qy4ma.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3qy4mai7utp4xgoxpc25ikvocg
-% Encoding created by otftotfm on Sat Apr  3 15:03:53 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:43 2022
 % Command line follows encoding
 /AutoEnc_3qy4mai7utp4xgoxpc25ikvocg [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-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 XCharter-Bold.otf XCharter-Bold-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4ba22z.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4ba22z.enc
new file mode 100644
index 00000000000..1825b69cb00
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4ba22z.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4ba22zhyriefdyz5zlws5ycgcf
+% Encoding created by otftotfm on Wed Feb 23 18:00:23 2022
+% Command line follows encoding
+/AutoEnc_4ba22zhyriefdyz5zlws5ycgcf [
+%00
+  /f_j /Euro /f_b /f_h /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4j4sw5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4j4sw5.enc
index 59e145c1996..3c314030d88 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4j4sw5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4j4sw5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga
-% Encoding created by otftotfm on Sat Apr  3 15:03:19 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:35 2022
 % Command line follows encoding
 /AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf
-% XCharter-Bold-tlf-sc-t1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4nycuc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4nycuc.enc
new file mode 100644
index 00000000000..4bdfa76f70e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4nycuc.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4nycucgn33u6rajgwlou4lz6vf
+% Encoding created by otftotfm on Wed Feb 23 18:01:01 2022
+% Command line follows encoding
+/AutoEnc_4nycucgn33u6rajgwlou4lz6vf [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-lf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4sqimf.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4sqimf.enc
new file mode 100644
index 00000000000..6f29e52178b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4sqimf.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4sqimfdumbp34jdzocpuw555xe
+% Encoding created by otftotfm on Wed Feb 23 17:59:37 2022
+% Command line follows encoding
+/AutoEnc_4sqimfdumbp34jdzocpuw555xe [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4zysyq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4zysyq.enc
index f510fc1c8b6..4f698cb3887 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4zysyq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4zysyq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4zysyqekhrh377ld64a5gt3bcc
-% Encoding created by otftotfm on Sat Apr  3 15:03:45 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
 /AutoEnc_4zysyqekhrh377ld64a5gt3bcc [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-ly1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5wo36q.enc
index 9d28bc66f03..090df4afc2e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5wo36q.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ao7aykitowiy6mof7pomrdbq3f
-% Encoding created by otftotfm on Sat Apr  3 15:03:27 2021
+%%AutoEnc_5wo36q4t5p2lppbir4ecpopyfc
+% Encoding created by otftotfm on Wed Feb 23 17:59:51 2022
 % Command line follows encoding
-/AutoEnc_ao7aykitowiy6mof7pomrdbq3f [
+/AutoEnc_5wo36q4t5p2lppbir4ecpopyfc [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5x23ii.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5x23ii.enc
new file mode 100644
index 00000000000..de9196e1db5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5x23ii.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5x23iijnyd3bukkzcghkx6k47h
+% Encoding created by otftotfm on Wed Feb 23 18:00:21 2022
+% Command line follows encoding
+/AutoEnc_5x23iijnyd3bukkzcghkx6k47h [
+%00
+  /f_j /Euro /f_b /f_h /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62bu45.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62bu45.enc
new file mode 100644
index 00000000000..eb52b4cea22
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62bu45.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_62bu45iinhmai2wncojqwud3he
+% Encoding created by otftotfm on Wed Feb 23 18:00:58 2022
+% Command line follows encoding
+/AutoEnc_62bu45iinhmai2wncojqwud3he [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf
+% XCharter-Bold-lf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62z5ot.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62z5ot.enc
index 095c81874a1..8077d5dfc18 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62z5ot.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62z5ot.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_62z5otp5uxbu4kardxkb52z6sa
-% Encoding created by otftotfm on Sat Apr  3 15:03:21 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:40 2022
 % Command line follows encoding
 /AutoEnc_62z5otp5uxbu4kardxkb52z6sa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6335sg.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6335sg.enc
index f85645c3909..b47cdad3b5a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6335sg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6335sg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:08 2022
 % Command line follows encoding
 /AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb [
 %00
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --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 XCharter-Roman.otf XCharter-Roman-tlf-sc-t2asrb'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_64qgug.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_64qgug.enc
index d5dfd774abe..eb1d1807ce0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_64qgug.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_64qgug.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_64qgugv7glijhxes55r42djrte
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
 /AutoEnc_64qgugv7glijhxes55r42djrte [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1'
+% --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 XCharter-Bold.otf XCharter-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_65qaqc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_65qaqc.enc
new file mode 100644
index 00000000000..28472a6de5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_65qaqc.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_65qaqc2gtff7bw6zj6q4gehfpc
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc_65qaqc2gtff7bw6zj6q4gehfpc [
+%00
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ckksa.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ckksa.enc
new file mode 100644
index 00000000000..dc3c561ee2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ckksa.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6ckksab4xgup3cfdzppakccfch
+% Encoding created by otftotfm on Wed Feb 23 18:00:53 2022
+% Command line follows encoding
+/AutoEnc_6ckksab4xgup3cfdzppakccfch [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Roman.otf XCharter-Roman-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6hzluo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6hzluo.enc
index 909d5627e1f..345462d061e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6hzluo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6hzluo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6hzluovfqgqjqwjosfm7uze3oh
-% Encoding created by otftotfm on Sat Apr  3 15:03:42 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:29 2022
 % Command line follows encoding
 /AutoEnc_6hzluovfqgqjqwjosfm7uze3oh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ivnpe7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ir2ua.enc
index 6e1eb187eee..9f50009f2ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ivnpe7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ir2ua.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ivnpe75mj322okzj6wfooqsf5h
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+%%AutoEnc_6ir2ua64b5sfibyjqihzrj2csd
+% Encoding created by otftotfm on Wed Feb 23 18:00:27 2022
 % Command line follows encoding
-/AutoEnc_ivnpe75mj322okzj6wfooqsf5h [
+/AutoEnc_6ir2ua64b5sfibyjqihzrj2csd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /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
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
-% XCharter-Roman-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6mgzuz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6mgzuz.enc
new file mode 100644
index 00000000000..f2f3ad6b1f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6mgzuz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb
+% Encoding created by otftotfm on Wed Feb 23 18:01:01 2022
+% Command line follows encoding
+/AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-lf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zhjmar.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ramfp.enc
index 7e614184586..eaec05c083d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zhjmar.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6ramfp.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zhjmarbateoccr2llfvgvl5sya
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+%%AutoEnc_6ramfpqc7c7xjz2jbkz2ys4g3d
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
-/AutoEnc_zhjmarbateoccr2llfvgvl5sya [
+/AutoEnc_6ramfpqc7c7xjz2jbkz2ys4g3d [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /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
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-ot1'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6w7aji.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6w7aji.enc
index 7d92437f6bf..4e0ba6024a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6w7aji.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6w7aji.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd
-% Encoding created by otftotfm on Sat Apr  3 15:03:18 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:44 2022
 % Command line follows encoding
 /AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6xwfqv.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6xwfqv.enc
index 5b41de85014..d9943e7e2b6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6xwfqv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_6xwfqv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe
-% Encoding created by otftotfm on Sat Apr  3 15:03:45 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:28 2022
 % Command line follows encoding
 /AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-t1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7aohvb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7aohvb.enc
index 439e6967d6f..38723d7f5be 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7aohvb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7aohvb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7aohvb3j4cllo2ny34ugeabofe
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
 /AutoEnc_7aohvb3j4cllo2ny34ugeabofe [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-ly1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7cmdv6.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7cmdv6.enc
index 9864dab3239..68ad321a767 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7cmdv6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7cmdv6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf
-% Encoding created by otftotfm on Sat Apr  3 15:03:17 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:44 2022
 % Command line follows encoding
 /AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_a6eos7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_a6eos7.enc
new file mode 100644
index 00000000000..65f16246fa6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_a6eos7.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_a6eos74zdc3rz44li6qottufnc
+% Encoding created by otftotfm on Wed Feb 23 18:01:09 2022
+% Command line follows encoding
+/AutoEnc_a6eos74zdc3rz44li6qottufnc [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-lf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_acpec5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_acpec5.enc
new file mode 100644
index 00000000000..b39e20fc61e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_acpec5.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_acpec5jlnur2n7nbmxku2s3k6h
+% Encoding created by otftotfm on Wed Feb 23 18:00:21 2022
+% Command line follows encoding
+/AutoEnc_acpec5jlnur2n7nbmxku2s3k6h [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_akeqbh.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_akeqbh.enc
new file mode 100644
index 00000000000..7b2fe288ae3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_akeqbh.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_akeqbhudkf7g3q53cagwosdclb
+% Encoding created by otftotfm on Wed Feb 23 18:00:23 2022
+% Command line follows encoding
+/AutoEnc_akeqbhudkf7g3q53cagwosdclb [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_j /f_b /f_h /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_an6s6r.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_an6s6r.enc
new file mode 100644
index 00000000000..023aad09957
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_an6s6r.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_an6s6r7vvyiaiocljopu5j6ikc
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc_an6s6r7vvyiaiocljopu5j6ikc [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_aw3wom.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_aw3wom.enc
index c49313c93fa..55a64855af6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_aw3wom.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_aw3wom.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_aw3womsecdumtuxvl6hik6fs3a
-% Encoding created by otftotfm on Sat Apr  3 15:03:21 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:41 2022
 % Command line follows encoding
 /AutoEnc_aw3womsecdumtuxvl6hik6fs3a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bjnaxa.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bjnaxa.enc
index f412b975370..92f5615f555 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bjnaxa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bjnaxa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa
-% Encoding created by otftotfm on Sat Apr  3 15:04:02 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
 % Command line follows encoding
 /AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa [
 %00
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-t2asrb'
+% --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_blmpt7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_blmpt7.enc
index 7f1e422193f..a213846991b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_blmpt7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_blmpt7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_blmpt7r443ymavkauxboyp4quh
-% Encoding created by otftotfm on Sat Apr  3 15:03:55 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:45 2022
 % Command line follows encoding
 /AutoEnc_blmpt7r443ymavkauxboyp4quh [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --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
+% --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
 % XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c3yyfo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c3yyfo.enc
new file mode 100644
index 00000000000..20c62d463a8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c3yyfo.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_c3yyfog2eypvvushmfwwi6yc5d
+% Encoding created by otftotfm on Wed Feb 23 18:00:42 2022
+% Command line follows encoding
+/AutoEnc_c3yyfog2eypvvushmfwwi6yc5d [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c54uym.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c54uym.enc
new file mode 100644
index 00000000000..00e453cb92c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c54uym.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_c54uymh6bm5yms366xu5llwvve
+% Encoding created by otftotfm on Wed Feb 23 17:59:46 2022
+% Command line follows encoding
+/AutoEnc_c54uymh6bm5yms366xu5llwvve [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ccfumi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ccfumi.enc
new file mode 100644
index 00000000000..a372635ae6b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ccfumi.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ccfumixdc336kzewpgzadb4gra
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
+% Command line follows encoding
+/AutoEnc_ccfumixdc336kzewpgzadb4gra [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cilcsm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cilcsm.enc
new file mode 100644
index 00000000000..e80d376c929
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cilcsm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cilcsmy3jvivb56pc5mgy4v4eh
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc_cilcsmy3jvivb56pc5mgy4v4eh [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cjimfy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cjimfy.enc
index 6b687906285..89623bf22e2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cjimfy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cjimfy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cjimfyni74ccxjsnsycgpfdr7a
-% Encoding created by otftotfm on Sat Apr  3 15:03:58 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:54 2022
 % Command line follows encoding
 /AutoEnc_cjimfyni74ccxjsnsycgpfdr7a [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-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 XCharter-Roman.otf XCharter-Roman-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ckugtc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ckugtc.enc
index c11bc9639a6..e15d833d9a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ckugtc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ckugtc.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ckugtclujsguxmcovvf3bkqf2b
-% Encoding created by otftotfm on Sat Apr  3 15:03:42 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:18 2022
 % Command line follows encoding
 /AutoEnc_ckugtclujsguxmcovvf3bkqf2b [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-ly1'
+% --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 XCharter-Roman.otf XCharter-Roman-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_co4ru4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_co4ru4.enc
index 1fd4a9e72f2..4ffd0ad7c25 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_co4ru4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_co4ru4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_co4ru464vsgph3ezqa72efxcnh
-% Encoding created by otftotfm on Sat Apr  3 15:04:08 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:13 2022
 % Command line follows encoding
 /AutoEnc_co4ru464vsgph3ezqa72efxcnh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cos7tu.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cos7tu.enc
new file mode 100644
index 00000000000..c273c8a2923
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cos7tu.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg
+% Encoding created by otftotfm on Wed Feb 23 17:59:39 2022
+% Command line follows encoding
+/AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cy5fc2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cy5fc2.enc
new file mode 100644
index 00000000000..b3f549a8c2c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_cy5fc2.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg
+% Encoding created by otftotfm on Wed Feb 23 17:59:51 2022
+% Command line follows encoding
+/AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-BoldItalic.otf XCharter-BoldItalic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dp2hrq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dp2hrq.enc
new file mode 100644
index 00000000000..01b6dcb39b4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dp2hrq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid
+% Encoding created by otftotfm on Wed Feb 23 17:59:36 2022
+% Command line follows encoding
+/AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /dotlessi /dotlessj /ffl /ffi /ff /fl /fi
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dqjass.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dqjass.enc
new file mode 100644
index 00000000000..5bd37bef1f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dqjass.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dqjasssuetpohv5a3ljixdqrrg
+% Encoding created by otftotfm on Wed Feb 23 18:00:43 2022
+% Command line follows encoding
+/AutoEnc_dqjasssuetpohv5a3ljixdqrrg [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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
+% XCharter-Bold.otf XCharter-Bold-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dynzsr.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dynzsr.enc
new file mode 100644
index 00000000000..02f0971de83
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dynzsr.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
+% Command line follows encoding
+/AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ei7atk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ei7atk.enc
new file mode 100644
index 00000000000..3b595febfed
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ei7atk.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ei7atkg5jugifyavjb2rplvirf
+% Encoding created by otftotfm on Wed Feb 23 17:59:49 2022
+% Command line follows encoding
+/AutoEnc_ei7atkg5jugifyavjb2rplvirf [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l5j7vv.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_el7fqi.enc
index bfff468e078..f5a1ce66b3b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l5j7vv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_el7fqi.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l5j7vvl2r3qghndrxfqhbggoph
-% Encoding created by otftotfm on Sat Apr  3 15:03:19 2021
+%%AutoEnc_el7fqisktu3hwhtaharptxk7za
+% Encoding created by otftotfm on Wed Feb 23 17:59:35 2022
 % Command line follows encoding
-/AutoEnc_l5j7vvl2r3qghndrxfqhbggoph [
+/AutoEnc_el7fqisktu3hwhtaharptxk7za [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --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 XCharter-Bold.otf XCharter-Bold-tlf-sc-ot1'
+% --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 XCharter-Bold.otf
+% XCharter-Bold-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_eldrzl.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_eldrzl.enc
new file mode 100644
index 00000000000..74893e02ca1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_eldrzl.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_eldrzlqarw4p4ckswo2y34m4la
+% Encoding created by otftotfm on Wed Feb 23 17:59:47 2022
+% Command line follows encoding
+/AutoEnc_eldrzlqarw4p4ckswo2y34m4la [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_en7yt2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_en7yt2.enc
index ecd83762d1b..26d046478c9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_en7yt2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_en7yt2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_en7yt2uld2mo3sfpmbkuptjxub
-% Encoding created by otftotfm on Sat Apr  3 15:04:03 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:01 2022
 % Command line follows encoding
 /AutoEnc_en7yt2uld2mo3sfpmbkuptjxub [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_phn3tc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_f5e46c.enc
index 81c2d40867a..120fb3611d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_phn3tc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_f5e46c.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_phn3tcvsl2ylgqm4z2komwpoza
-% Encoding created by otftotfm on Sat Apr  3 15:03:43 2021
+%%AutoEnc_f5e46ca3jarka5qvgilkcnddgf
+% Encoding created by otftotfm on Wed Feb 23 18:00:19 2022
 % Command line follows encoding
-/AutoEnc_phn3tcvsl2ylgqm4z2komwpoza [
+/AutoEnc_f5e46ca3jarka5qvgilkcnddgf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --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 XCharter-Roman.otf XCharter-Roman-tlf-sc-ot1'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_fiqldz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_fiqldz.enc
index 1c1a51c878f..bbff1b8d899 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_fiqldz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_fiqldz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fiqldzomfw67cfhl2p3wqrxjna
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:08 2022
 % Command line follows encoding
 /AutoEnc_fiqldzomfw67cfhl2p3wqrxjna [
 %00
@@ -60,5 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2asrb'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
+% XCharter-Roman-tlf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_geqmur.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_geqmur.enc
index 83ed16b98b8..fd1947966ea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_geqmur.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_geqmur.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf
-% Encoding created by otftotfm on Sat Apr  3 15:03:58 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:54 2022
 % Command line follows encoding
 /AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf
-% XCharter-Roman-tosf-sc-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
+% XCharter-Roman.otf XCharter-Roman-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_glnwao.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_glnwao.enc
index 4b5b8e0b534..2c1464c7c67 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_glnwao.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_glnwao.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_glnwaoq2otchakcfayz2fzbx3a
-% Encoding created by otftotfm on Sat Apr  3 15:03:54 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:41 2022
 % Command line follows encoding
 /AutoEnc_glnwaoq2otchakcfayz2fzbx3a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gspcih.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gspcih.enc
new file mode 100644
index 00000000000..55baac7e99a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gspcih.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gspcih7x43orr6eyenwuehn75d
+% Encoding created by otftotfm on Wed Feb 23 18:00:24 2022
+% Command line follows encoding
+/AutoEnc_gspcih7x43orr6eyenwuehn75d [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Roman.otf
+% XCharter-Roman-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x25wg5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_guhmqj.enc
index 1e40ea1c935..42bf085d5b9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x25wg5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_guhmqj.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_x25wg5wzbfblxt2tm7d7pkp5mc
-% Encoding created by otftotfm on Sat Apr  3 15:03:16 2021
+%%AutoEnc_guhmqjapplr7kfh3nofuxthtlf
+% Encoding created by otftotfm on Wed Feb 23 17:59:37 2022
 % Command line follows encoding
-/AutoEnc_x25wg5wzbfblxt2tm7d7pkp5mc [
+/AutoEnc_guhmqjapplr7kfh3nofuxthtlf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hgvfee.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hgvfee.enc
new file mode 100644
index 00000000000..8936c079f81
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hgvfee.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
+% Command line follows encoding
+/AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf
+% XCharter-Bold-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hiviyg.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hiviyg.enc
new file mode 100644
index 00000000000..7198c9c3fc7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hiviyg.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hiviygp7byoou5mxdiefpzfebe
+% Encoding created by otftotfm on Wed Feb 23 18:00:25 2022
+% Command line follows encoding
+/AutoEnc_hiviygp7byoou5mxdiefpzfebe [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm6t3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm6t3.enc
index 505222f366b..c77ae9818c6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm6t3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm6t3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:57 2022
 % Command line follows encoding
 /AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch [
 %00
@@ -60,5 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t2asrb'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
+% XCharter-Bold-tlf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_i2cund.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_i2cund.enc
new file mode 100644
index 00000000000..9460bc8af74
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_i2cund.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_i2cundlmhxhdttwik6tmbaoeta
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
+% Command line follows encoding
+/AutoEnc_i2cundlmhxhdttwik6tmbaoeta [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_afo4o4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_i2fqhk.enc
index d84a237935d..d0b8caf015d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_afo4o4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_i2fqhk.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_afo4o42f6y4dlfgulys2itsagb
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+%%AutoEnc_i2fqhkoxi7tdwc72ombhuexvte
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
-/AutoEnc_afo4o42f6y4dlfgulys2itsagb [
+/AutoEnc_i2fqhkoxi7tdwc72ombhuexvte [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /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
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-ot1'
+% --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 XCharter-Bold.otf
+% XCharter-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_icytdu.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_icytdu.enc
index 79dd74be417..f93e9b6b51f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_icytdu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_icytdu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_icytdughipwu4ylecsn2jfsdbc
-% Encoding created by otftotfm on Sat Apr  3 15:03:53 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:44 2022
 % Command line follows encoding
 /AutoEnc_icytdughipwu4ylecsn2jfsdbc [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iit6m7.enc
index 072220ac157..407d97cdbf0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iit6m7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_m7ekhwlp323btq5a5hhwjpjzqd
-% Encoding created by otftotfm on Sat Apr  3 15:03:26 2021
+%%AutoEnc_iit6m7aygjojwhzgc3qxbp4mcd
+% Encoding created by otftotfm on Wed Feb 23 17:59:54 2022
 % Command line follows encoding
-/AutoEnc_m7ekhwlp323btq5a5hhwjpjzqd [
+/AutoEnc_iit6m7aygjojwhzgc3qxbp4mcd [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /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
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --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 XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-sc-ot1'
+% --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ijhcpw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ijhcpw.enc
new file mode 100644
index 00000000000..7da1772e73b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ijhcpw.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ijhcpwmyoxml75krl4rjpeewld
+% Encoding created by otftotfm on Wed Feb 23 18:00:58 2022
+% Command line follows encoding
+/AutoEnc_ijhcpwmyoxml75krl4rjpeewld [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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 /afii10066.srb /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=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-Bold.otf XCharter-Bold-lf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_irqw25.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_irqw25.enc
new file mode 100644
index 00000000000..f67c9428968
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_irqw25.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_irqw25oqekzdjghvtrl34ij3ch
+% Encoding created by otftotfm on Wed Feb 23 17:59:39 2022
+% Command line follows encoding
+/AutoEnc_irqw25oqekzdjghvtrl34ij3ch [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall XCharter-Bold.otf
+% XCharter-Bold-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_og2pus.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kly36k.enc
index 190d9a383f9..89675c9c22f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_og2pus.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kly36k.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_og2pussftqyl45scunlcyi2pzh
-% Encoding created by otftotfm on Sat Apr  3 15:03:17 2021
+%%AutoEnc_kly36ked4rvlzszxdj3molsgpb
+% Encoding created by otftotfm on Wed Feb 23 17:59:44 2022
 % Command line follows encoding
-/AutoEnc_og2pussftqyl45scunlcyi2pzh [
+/AutoEnc_kly36ked4rvlzszxdj3molsgpb [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /uni207D /uni207E /asterisk /uni207A /comma /uni207B /period /slash
 %30
   /uni2070 /one.superior /two.superior /three.superior /uni2074 /uni2075 /uni2076 /uni2077
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ksktz7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ksktz7.enc
new file mode 100644
index 00000000000..84553f2448c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ksktz7.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ksktz7tjppfhb42xvb6yxczkqd
+% Encoding created by otftotfm on Wed Feb 23 18:00:22 2022
+% Command line follows encoding
+/AutoEnc_ksktz7tjppfhb42xvb6yxczkqd [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_laqzs3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_laqzs3.enc
new file mode 100644
index 00000000000..414499438d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_laqzs3.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_laqzs3jbi2yov36wtv6ud2km3h
+% Encoding created by otftotfm on Wed Feb 23 18:00:20 2022
+% Command line follows encoding
+/AutoEnc_laqzs3jbi2yov36wtv6ud2km3h [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_j /f_b /f_h /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m2vrds.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m2vrds.enc
index 6b009149124..8e07ef11695 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m2vrds.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m2vrds.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_m2vrds6ohoduinigqjp2pulx6b
-% Encoding created by otftotfm on Sat Apr  3 15:03:58 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:53 2022
 % Command line follows encoding
 /AutoEnc_m2vrds6ohoduinigqjp2pulx6b [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2a'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m4ry62.enc
index 84c141d5ea1..0e046509e6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m4ry62.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hnm3exhjnhih7v5eit3ir6bkod
-% Encoding created by otftotfm on Sat Apr  3 15:03:24 2021
+%%AutoEnc_m4ry62oqiramkzd522imp6knhd
+% Encoding created by otftotfm on Wed Feb 23 17:59:44 2022
 % Command line follows encoding
-/AutoEnc_hnm3exhjnhih7v5eit3ir6bkod [
+/AutoEnc_m4ry62oqiramkzd522imp6knhd [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tlf-ot1'
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m6qb7y.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m6qb7y.enc
new file mode 100644
index 00000000000..18feda56a05
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m6qb7y.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd
+% Encoding created by otftotfm on Wed Feb 23 18:00:52 2022
+% Command line follows encoding
+/AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mcqmfh.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mcqmfh.enc
new file mode 100644
index 00000000000..fd04aa7c56a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mcqmfh.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mcqmfhpufqjoiajjiul4b2kg2e
+% Encoding created by otftotfm on Wed Feb 23 17:59:39 2022
+% Command line follows encoding
+/AutoEnc_mcqmfhpufqjoiajjiul4b2kg2e [
+%00
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgb5xg.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgb5xg.enc
index d7784e1f96c..547e530180c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgb5xg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgb5xg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog
-% Encoding created by otftotfm on Sat Apr  3 15:03:53 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:42 2022
 % Command line follows encoding
 /AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t2a'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mpbiom.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mpbiom.enc
new file mode 100644
index 00000000000..bda06bcc39d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mpbiom.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mpbiommipfp7afy3jn6kkjs23g
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
+% Command line follows encoding
+/AutoEnc_mpbiommipfp7afy3jn6kkjs23g [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_naadkf.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_naadkf.enc
new file mode 100644
index 00000000000..ff709005dfb
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_naadkf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_naadkf5e4gajnnpolvyey6a5yf
+% Encoding created by otftotfm on Wed Feb 23 17:59:38 2022
+% Command line follows encoding
+/AutoEnc_naadkf5e4gajnnpolvyey6a5yf [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /f_b /f_h /f_j /f_k /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ng7me5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ng7me5.enc
new file mode 100644
index 00000000000..4ecd4a47fce
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ng7me5.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ng7me5mjnlk3d4x26fckblue2f
+% Encoding created by otftotfm on Wed Feb 23 17:59:37 2022
+% Command line follows encoding
+/AutoEnc_ng7me5mjnlk3d4x26fckblue2f [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhow2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhow2o.enc
index 308efaddd81..1655ad8186a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhow2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhow2o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nhow2oriavhyxfh6euosdomsje
-% Encoding created by otftotfm on Sat Apr  3 15:04:06 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:10 2022
 % Command line follows encoding
 /AutoEnc_nhow2oriavhyxfh6euosdomsje [
 %00
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb'
+% --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 XCharter-Roman.otf
+% XCharter-Roman-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nii5is.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nii5is.enc
new file mode 100644
index 00000000000..8d5555c6138
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nii5is.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nii5islrejiuxdowrmow774atg
+% Encoding created by otftotfm on Wed Feb 23 18:00:43 2022
+% Command line follows encoding
+/AutoEnc_nii5islrejiuxdowrmow774atg [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Bold.otf XCharter-Bold-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o2mz2z.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o2mz2z.enc
index 90899f02927..469b33a5aec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o2mz2z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o2mz2z.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb
-% Encoding created by otftotfm on Sat Apr  3 15:04:02 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:59 2022
 % Command line follows encoding
 /AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ocop3w.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ocop3w.enc
index 098010ecdc7..256c913adc3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ocop3w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ocop3w.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd
-% Encoding created by otftotfm on Sat Apr  3 15:03:43 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:20 2022
 % Command line follows encoding
 /AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf
-% XCharter-Roman-tlf-sc-ly1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bxmb3o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_oeyavg.enc
index 249ca8d571f..a0b37cd788c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bxmb3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_oeyavg.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bxmb3o6ttiywvevh4ccqmv6rph
-% Encoding created by otftotfm on Sat Apr  3 15:03:18 2021
+%%AutoEnc_oeyavgihy5irfru7kh6qigtiad
+% Encoding created by otftotfm on Wed Feb 23 17:59:34 2022
 % Command line follows encoding
-/AutoEnc_bxmb3o6ttiywvevh4ccqmv6rph [
+/AutoEnc_oeyavgihy5irfru7kh6qigtiad [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
-% XCharter-Bold-tlf-ot1'
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ph46id.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ph46id.enc
index 288a666f837..57ef2e6b099 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ph46id.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ph46id.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ph46idfft7to53v2kspy6xejya
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc_ph46idfft7to53v2kspy6xejya [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pikjb7.enc
index 848e5a8cf35..2491de50952 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pikjb7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7p4e2okxw4m5ierz3rzoubdpud
-% Encoding created by otftotfm on Sat Apr  3 15:03:25 2021
+%%AutoEnc_pikjb7kncjlrolhowkef2umc3a
+% Encoding created by otftotfm on Wed Feb 23 17:59:53 2022
 % Command line follows encoding
-/AutoEnc_7p4e2okxw4m5ierz3rzoubdpud [
+/AutoEnc_pikjb7kncjlrolhowkef2umc3a [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /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
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_plaupi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_plaupi.enc
new file mode 100644
index 00000000000..429dfe82501
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_plaupi.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_plaupi652dl6la5yzojc7c7tma
+% Encoding created by otftotfm on Wed Feb 23 18:00:42 2022
+% Command line follows encoding
+/AutoEnc_plaupi652dl6la5yzojc7c7tma [
+%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 /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Bold.otf XCharter-Bold-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pqp4df.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pqp4df.enc
index db569b7ece7..f9c4ff56e08 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pqp4df.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pqp4df.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f
-% Encoding created by otftotfm on Sat Apr  3 15:04:08 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pz3lxg.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pz3lxg.enc
index 317e75c491e..14b9f88001b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pz3lxg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pz3lxg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pz3lxgt2tnxz7p6istzozn734g
-% Encoding created by otftotfm on Sat Apr  3 15:03:59 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:52 2022
 % Command line follows encoding
 /AutoEnc_pz3lxgt2tnxz7p6istzozn734g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7fabp.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7fabp.enc
index 8379ea82b02..7c39bcdeed5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7fabp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7fabp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_q7fabpknswrkabbcspsxnge7se
-% Encoding created by otftotfm on Sat Apr  3 15:03:21 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:43 2022
 % Command line follows encoding
 /AutoEnc_q7fabpknswrkabbcspsxnge7se [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf
-% XCharter-Bold-tosf-sc-t1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qdw4m6.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qdw4m6.enc
index 62c34545dcd..9909b03d98b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qdw4m6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qdw4m6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qdw4m6pd2ohzfiltqvezylzubb
-% Encoding created by otftotfm on Sat Apr  3 15:03:19 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:35 2022
 % Command line follows encoding
 /AutoEnc_qdw4m6pd2ohzfiltqvezylzubb [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf
-% XCharter-Bold-tlf-sc-ly1'
+% --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
+% XCharter-Bold.otf XCharter-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q2nwaj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qfy5bi.enc
index 248556866ed..a195777a658 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q2nwaj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qfy5bi.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q2nwaj3r2ed2ei2xtolszzvvpd
-% Encoding created by otftotfm on Sat Apr  3 15:03:19 2021
+%%AutoEnc_qfy5biuowgnr3eyr56ntx5cmha
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
-/AutoEnc_q2nwaj3r2ed2ei2xtolszzvvpd [
+/AutoEnc_qfy5biuowgnr3eyr56ntx5cmha [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /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
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
-% XCharter-Bold-tosf-ot1'
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Bold.otf XCharter-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qibaxb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qibaxb.enc
index 6c45fc00122..cae500fc618 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qibaxb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qibaxb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qibaxbcjnlrejjdickc5oq67xa
-% Encoding created by otftotfm on Sat Apr  3 15:04:02 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:00 2022
 % Command line follows encoding
 /AutoEnc_qibaxbcjnlrejjdickc5oq67xa [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
 % XCharter-BoldItalic-tlf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_imj3v4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qt227l.enc
index 73f515d3861..4745ebd298f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_imj3v4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qt227l.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_imj3v4gund2byhyqg54gxv3wvh
-% Encoding created by otftotfm on Sat Apr  3 15:03:41 2021
+%%AutoEnc_qt227l3joc2ge63rf27t2sr7pg
+% Encoding created by otftotfm on Wed Feb 23 18:00:29 2022
 % Command line follows encoding
-/AutoEnc_imj3v4gund2byhyqg54gxv3wvh [
+/AutoEnc_qt227l3joc2ge63rf27t2sr7pg [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam.superior /quotedblright /numbersign.superior /dollar.superior /percent.superior /ampersand.superior /quoteright
+  /uni2423 /exclam.superior /quotedblright /numbersign.superior /dollar.superior /percent.superior /ampersand.superior /quoteright
   /uni207D /uni207E /asterisk.superior /uni207A /comma.superior /hyphen.superior /period.superior /slash.superior
 %30
   /uni2070 /one.superior /two.superior /three.superior /uni2074 /uni2075 /uni2076 /uni2077
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qxwrge.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qxwrge.enc
index b92b8da29e8..543a0510710 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qxwrge.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qxwrge.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qxwrgebgo6njjcjcdhmfgeuxea
-% Encoding created by otftotfm on Sat Apr  3 15:03:16 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:41 2022
 % Command line follows encoding
 /AutoEnc_qxwrgebgo6njjcjcdhmfgeuxea [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ruokxy.enc
index 01af9454ae7..0912ee18e5c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ruokxy.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jqdzb6humj6vo27ahaxkz4oyog
-% Encoding created by otftotfm on Sat Apr  3 15:03:24 2021
+%%AutoEnc_ruokxyc3527cmo7vpqnxzx27id
+% Encoding created by otftotfm on Wed Feb 23 17:59:45 2022
 % Command line follows encoding
-/AutoEnc_jqdzb6humj6vo27ahaxkz4oyog [
+/AutoEnc_ruokxyc3527cmo7vpqnxzx27id [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --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 XCharter-BoldItalic.otf
+% --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 XCharter-BoldItalic.otf
 % XCharter-BoldItalic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvzpfm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvzpfm.enc
index d1e0d94e016..1526d0b5c97 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvzpfm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvzpfm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd
-% Encoding created by otftotfm on Sat Apr  3 15:03:54 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:43 2022
 % Command line follows encoding
 /AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf
-% XCharter-Bold-tlf-sc-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
+% XCharter-Bold.otf XCharter-Bold-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rydp4l.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rydp4l.enc
index 24563662928..a8bf4c71526 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rydp4l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rydp4l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rydp4lirfokm2yleqgpye6uk6c
-% Encoding created by otftotfm on Sat Apr  3 15:03:18 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:34 2022
 % Command line follows encoding
 /AutoEnc_rydp4lirfokm2yleqgpye6uk6c [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t1'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s4eoyd.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s4eoyd.enc
index bbc4beadb7f..0d4e505cf0e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s4eoyd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s4eoyd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_s4eoyduxwz7j6pqfbocqab7gug
-% Encoding created by otftotfm on Sat Apr  3 15:04:02 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
 % Command line follows encoding
 /AutoEnc_s4eoyduxwz7j6pqfbocqab7gug [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
-% XCharter-BoldItalic-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_sczepj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_sczepj.enc
index 149aecfab79..f2fe80ea377 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_sczepj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_sczepj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sczepjndlpzhjzrv7huzzcgcmg
-% Encoding created by otftotfm on Sat Apr  3 15:04:03 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
 % Command line follows encoding
 /AutoEnc_sczepjndlpzhjzrv7huzzcgcmg [
 %00
@@ -60,8 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb'
+% --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-osf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hrleas.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_swys7y.enc
index 6fbe41b414e..ea027b41157 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hrleas.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_swys7y.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hrleasgmzc6qxql6x4t4lllivd
-% Encoding created by otftotfm on Sat Apr  3 15:03:21 2021
+%%AutoEnc_swys7yb23ohzrx7bjg2xtipl6h
+% Encoding created by otftotfm on Wed Feb 23 17:59:40 2022
 % Command line follows encoding
-/AutoEnc_hrleasgmzc6qxql6x4t4lllivd [
+/AutoEnc_swys7yb23ohzrx7bjg2xtipl6h [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.numerator /one.numerator /two.numerator /three.numerator /four.numerator /five.numerator /six.numerator /seven.numerator
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_t5vgvk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_t5vgvk.enc
index 35b125f9aa0..a93366361aa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_t5vgvk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_t5vgvk.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc
-% Encoding created by otftotfm on Sat Apr  3 15:03:25 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:46 2022
 % Command line follows encoding
 /AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --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
+% --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
 % XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tcksd3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tcksd3.enc
index 37078ff9585..49240089979 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tcksd3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tcksd3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:58 2022
 % Command line follows encoding
 /AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g [
 %00
@@ -60,8 +60,8 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=lnum
-% --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 XCharter-Bold.otf XCharter-Bold-tlf-sc-t2asrb'
+% --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 XCharter-Bold.otf XCharter-Bold-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tdjqi5.enc
index 471f9cc2f51..565d758888e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tdjqi5.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_h4dyumvfz6ek2rcxjxry72wymd
-% Encoding created by otftotfm on Sat Apr  3 15:03:22 2021
+%%AutoEnc_tdjqi5dhjmy2v5xnygisfxvs3h
+% Encoding created by otftotfm on Wed Feb 23 17:59:48 2022
 % Command line follows encoding
-/AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [
+/AutoEnc_tdjqi5dhjmy2v5xnygisfxvs3h [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tipddl.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tipddl.enc
new file mode 100644
index 00000000000..cadf52eff37
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tipddl.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tipddl6hla4uyfdfli25e6uedb
+% Encoding created by otftotfm on Wed Feb 23 17:59:48 2022
+% Command line follows encoding
+/AutoEnc_tipddl6hla4uyfdfli25e6uedb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tohekq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tohekq.enc
new file mode 100644
index 00000000000..5e70bdddbba
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tohekq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tohekqb7m7y2fvorjyknq54efb
+% Encoding created by otftotfm on Wed Feb 23 18:00:52 2022
+% Command line follows encoding
+/AutoEnc_tohekqb7m7y2fvorjyknq54efb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_b
+%10
+  /quotedblleft /quotedblright /f_h /f_k /cyrbreve /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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 XCharter-Roman.otf XCharter-Roman-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_abgjzu.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ttjfqt.enc
index 3ed0f673ca0..495412bf197 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_abgjzu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ttjfqt.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_abgjzucpfylen2zent2njgtuwf
-% Encoding created by otftotfm on Sat Apr  3 15:03:42 2021
+%%AutoEnc_ttjfqtxtro2mgkkz6v73wpkcpb
+% Encoding created by otftotfm on Wed Feb 23 18:00:18 2022
 % Command line follows encoding
-/AutoEnc_abgjzucpfylen2zent2njgtuwf [
+/AutoEnc_ttjfqtxtro2mgkkz6v73wpkcpb [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /ff /fi /fl /ffi /ffl
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
   /zero /one /two /three /four /five /six /seven
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf
-% XCharter-Roman-tlf-ot1'
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% XCharter-Roman.otf XCharter-Roman-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s3y5jv.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_txakzr.enc
index 4224f9d41ca..87c918655c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_s3y5jv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_txakzr.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_s3y5jvk4hx5jxjonvlutht5zbb
-% Encoding created by otftotfm on Sat Apr  3 15:03:15 2021
+%%AutoEnc_txakzrvw5m5p553346rtmlakbd
+% Encoding created by otftotfm on Wed Feb 23 17:59:41 2022
 % Command line follows encoding
-/AutoEnc_s3y5jvk4hx5jxjonvlutht5zbb [
+/AutoEnc_txakzrvw5m5p553346rtmlakbd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
   /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /uni208D /uni208E /asterisk /uni208A /comma /uni208B /period /slash
 %30
   /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u5ytlb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u5ytlb.enc
new file mode 100644
index 00000000000..fe620038bd9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u5ytlb.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh
+% Encoding created by otftotfm on Wed Feb 23 18:00:24 2022
+% Command line follows encoding
+/AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /SSsmall /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a.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 /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
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /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 /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/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u7hnxs.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u7hnxs.enc
index 0b285f5641b..fe30e50dbdc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u7hnxs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_u7hnxs.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf
-% Encoding created by otftotfm on Sat Apr  3 15:03:59 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:53 2022
 % Command line follows encoding
 /AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf
-% XCharter-Roman-tlf-sc-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
+% XCharter-Roman.otf XCharter-Roman-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ufo3av.enc
index 3a9cf696371..c3d17ece440 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ufo3av.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l7jokpfcz44zpao2do3sbtw4rb
-% Encoding created by otftotfm on Sat Apr  3 15:03:22 2021
+%%AutoEnc_ufo3avdj5poqfp2wiub6tseofg
+% Encoding created by otftotfm on Wed Feb 23 17:59:52 2022
 % Command line follows encoding
-/AutoEnc_l7jokpfcz44zpao2do3sbtw4rb [
+/AutoEnc_ufo3avdj5poqfp2wiub6tseofg [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /uni208D /uni208E /asterisk /uni208A /comma /uni208B /period /slash
 %30
   /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ukw3hq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ukw3hq.enc
index f36ed7f80a9..aee39d2a4fc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ukw3hq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ukw3hq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ukw3hq7h3prn34ryh2qktyrkse
-% Encoding created by otftotfm on Sat Apr  3 15:03:41 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:29 2022
 % Command line follows encoding
 /AutoEnc_ukw3hq7h3prn34ryh2qktyrkse [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_usfr4u.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_usfr4u.enc
new file mode 100644
index 00000000000..8b4e163def3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_usfr4u.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_usfr4utzybskw556u2nlvg4jqd
+% Encoding created by otftotfm on Wed Feb 23 18:00:54 2022
+% Command line follows encoding
+/AutoEnc_usfr4utzybskw556u2nlvg4jqd [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc
+  /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc
+%B0
+  /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef
+  /.notdef /afii10053.sc /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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
+% XCharter-Roman.otf XCharter-Roman-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_v6llfb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_v6llfb.enc
index 0f5b400e3d9..7b6a2d3c094 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_v6llfb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_v6llfb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza
-% Encoding created by otftotfm on Sat Apr  3 15:03:17 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:38 2022
 % Command line follows encoding
 /AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vyhv3k.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vyhv3k.enc
index 0bc6eb017a5..c06bb9e1697 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vyhv3k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vyhv3k.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf
-% Encoding created by otftotfm on Sat Apr  3 15:04:07 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:09 2022
 % Command line follows encoding
 /AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wbcur7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wbcur7.enc
new file mode 100644
index 00000000000..83c021ba6fa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wbcur7.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wbcur76q4dbzd4ywyghgzedq6b
+% Encoding created by otftotfm on Wed Feb 23 17:59:39 2022
+% Command line follows encoding
+/AutoEnc_wbcur76q4dbzd4ywyghgzedq6b [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /dotlessi /dotlessj /ffl /ffi /ff /fl /fi
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wd2dbe.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wd2dbe.enc
index 2b29aa225d7..63097f587a9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wd2dbe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wd2dbe.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wd2dbe34sf7rkkaeon64og5a3c
-% Encoding created by otftotfm on Sat Apr  3 15:03:27 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:54 2022
 % Command line follows encoding
 /AutoEnc_wd2dbe34sf7rkkaeon64og5a3c [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --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
-% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t1'
+% --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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wf67wi.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wf67wi.enc
new file mode 100644
index 00000000000..bef164c50e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wf67wi.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wf67wi5apar2djse5bcegu5l5a
+% Encoding created by otftotfm on Wed Feb 23 18:00:45 2022
+% Command line follows encoding
+/AutoEnc_wf67wi5apar2djse5bcegu5l5a [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wizqmm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wizqmm.enc
index 42e0adec9c3..84228cb3a96 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wizqmm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wizqmm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wizqmmzl3mhmm6sbwmu3i6uufe
-% Encoding created by otftotfm on Sat Apr  3 15:03:18 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:34 2022
 % Command line follows encoding
 /AutoEnc_wizqmmzl3mhmm6sbwmu3i6uufe [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-ly1'
+% --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 XCharter-Bold.otf XCharter-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqeam3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqeam3.enc
index 2f88a4766a0..e5a176cac0f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqeam3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqeam3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wqeam3xphw5mmouhxu2uypuhte
-% Encoding created by otftotfm on Sat Apr  3 15:03:44 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:27 2022
 % Command line follows encoding
 /AutoEnc_wqeam3xphw5mmouhxu2uypuhte [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1'
+% --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 XCharter-Roman.otf XCharter-Roman-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqjgnt.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqjgnt.enc
new file mode 100644
index 00000000000..9f708d5d658
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wqjgnt.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wqjgntyg3synkg5qzgjlx6cclh
+% Encoding created by otftotfm on Wed Feb 23 18:01:02 2022
+% Command line follows encoding
+/AutoEnc_wqjgntyg3synkg5qzgjlx6cclh [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073
+  /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb
+%F0
+  /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089
+  /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
+] def
+% Command line: 'otftotfm --automatic --encoding=T2Asrb.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --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 XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wuciy4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wuciy4.enc
index c08516cd057..c364416a354 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wuciy4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wuciy4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wuciy4n2roolzf5f34qqbzzhxe
-% Encoding created by otftotfm on Sat Apr  3 15:04:01 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:59 2022
 % Command line follows encoding
 /AutoEnc_wuciy4n2roolzf5f34qqbzzhxe [
 %00
@@ -60,5 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --feature=kern --feature=liga --feature=onum
-% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2asrb'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf
+% XCharter-Bold-osf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wz23kl.enc
index dbd35d5899e..43002a0aab8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wz23kl.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vtvjjktdgjkkmdvqy3brwughzb
-% Encoding created by otftotfm on Sat Apr  3 15:03:23 2021
+%%AutoEnc_wz23kll56hpfzpoyls37dgzq4f
+% Encoding created by otftotfm on Wed Feb 23 17:59:55 2022
 % Command line follows encoding
-/AutoEnc_vtvjjktdgjkkmdvqy3brwughzb [
+/AutoEnc_wz23kll56hpfzpoyls37dgzq4f [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -11,7 +11,7 @@
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
 %20
-  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /uni2423 /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /uni207D /uni207E /asterisk /uni207A /comma /uni207B /period /slash
 %30
   /uni2070 /one.superior /two.superior /three.superior /uni2074 /uni2075 /uni2076 /uni2077
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x36pxl.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x36pxl.enc
new file mode 100644
index 00000000000..4d32f32ecb2
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x36pxl.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_x36pxls7tusl4n2jk2ctibxz5h
+% Encoding created by otftotfm on Wed Feb 23 17:59:40 2022
+% Command line follows encoding
+/AutoEnc_x36pxls7tusl4n2jk2ctibxz5h [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Bold.otf XCharter-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x6jczy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x6jczy.enc
index a00d6c17128..5c9b076e42a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x6jczy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x6jczy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_x6jczyaykpt55mhfvxdxwokyih
-% Encoding created by otftotfm on Sat Apr  3 15:03:20 2021
+% Encoding created by otftotfm on Wed Feb 23 17:59:42 2022
 % Command line follows encoding
 /AutoEnc_x6jczyaykpt55mhfvxdxwokyih [
 %00
@@ -60,6 +60,6 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi
-% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xqcxen.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xqcxen.enc
index 844ff024553..f6fb240d6ce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xqcxen.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xqcxen.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xqcxendti4xfjtesusecvwojab
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:14 2022
 % Command line follows encoding
 /AutoEnc_xqcxendti4xfjtesusecvwojab [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_y642va.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_y642va.enc
new file mode 100644
index 00000000000..c23ae7a2e7a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_y642va.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_y642vacq5wk2t7fdon4fcauezg
+% Encoding created by otftotfm on Wed Feb 23 18:00:46 2022
+% Command line follows encoding
+/AutoEnc_y642vacq5wk2t7fdon4fcauezg [
+%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 /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+  /eight.lf /nine.lf /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.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
+%80
+  /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058
+  /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054
+%90
+  /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef
+  /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+  /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106
+  /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102
+%B0
+  /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef
+  /.notdef /afii10101 /.notdef /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=T2A.enc
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yelf2i.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yelf2i.enc
index 0d6ba26cf8b..3ac4db3354e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yelf2i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yelf2i.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc
-% Encoding created by otftotfm on Sat Apr  3 15:03:43 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:20 2022
 % Command line follows encoding
 /AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf
-% XCharter-Roman-tlf-sc-t1'
+% --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
+% XCharter-Roman.otf XCharter-Roman-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yr3lcc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yr3lcc.enc
new file mode 100644
index 00000000000..12507b21e76
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yr3lcc.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yr3lccoclcllj4jacxiujymtwh
+% Encoding created by otftotfm on Wed Feb 23 18:00:22 2022
+% Command line follows encoding
+/AutoEnc_yr3lccoclcllj4jacxiujymtwh [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /perthousandzero /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /uni2423 /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+  /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+  /at.sc /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
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /eth.sc /section
+%A0
+  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+  /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.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 /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /SSsmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/type1/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% XCharter-Roman.otf XCharter-Roman-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z3wvjz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z3wvjz.enc
index 332d70f79e9..ee47f93e555 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z3wvjz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z3wvjz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_z3wvjzrihuxhpixor2gglzqccg
-% Encoding created by otftotfm on Sat Apr  3 15:04:09 2021
+% Encoding created by otftotfm on Wed Feb 23 18:01:15 2022
 % Command line follows encoding
 /AutoEnc_z3wvjzrihuxhpixor2gglzqccg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zqx27h.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zqx27h.enc
index 3028b8988f7..6b4609047a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zqx27h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zqx27h.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zqx27h6iquwnh4mli45z2uykrb
-% Encoding created by otftotfm on Sat Apr  3 15:03:54 2021
+% Encoding created by otftotfm on Wed Feb 23 18:00:46 2022
 % Command line follows encoding
 /AutoEnc_zqx27h6iquwnh4mli45z2uykrb [
 %00
@@ -60,9 +60,9 @@
 % --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/enc/dvips/xcharter
 % --map-file=/Users/msharpe/Library/texlive/2021/texmf-var/fonts/map/dvips/xcharter/XCharter.map
 % --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --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
-% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-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
+% XCharter-BoldItalic.otf XCharter-BoldItalic-osf-sc-t2a'