summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-06-03 21:16:16 +0000
committerKarl Berry <karl@freefriends.org>2018-06-03 21:16:16 +0000
commit5c227fc8809abf53bc5c149d0cf083f8025d08d9 (patch)
tree58177496975c3f8f349a0a19d2b9671812230788 /Master/texmf-dist/fonts/enc
parentb601736d4ed0e5b7f56490fff8ce7c705a8db832 (diff)
xcharter (3jun18)
git-svn-id: svn://tug.org/texlive/trunk@47910 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3v4tq3.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_62ztbr.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bcg6lk.enc71
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bpv7ty.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bwwzc2.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_e3nxtd.enc71
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_esnimw.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_evj3rb.enc71
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_gb4haz.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_l6an6k.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lfljed.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lve4jz.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mtaw4d.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mz2wxn.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nzcsoe.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7u3cc.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wi6ykn.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xj54uk.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xmfb6b.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_26pbhy.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2o3aaj.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3v4tq3.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4siibn.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5klbw4.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62z5ot.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62ztbr.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7cmdv6.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ba4bq2.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bcg6lk.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bk4eiy.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bpv7ty.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bwwzc2.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ch4v2b.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ct4qni.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dwd75d.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_e3nxtd.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_esnimw.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_evj3rb.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_g4jsot.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gb4haz.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ggr2qz.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h2xo5a.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hftfu7.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hk5uz5.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iasu4e.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kkifs2.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l6an6k.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lfljed.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lmi455.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lve4jz.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mtaw4d.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mz2wxn.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nzcsoe.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_otbpkf.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ouuvex.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pmmkri.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7u3cc.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qlavc3.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rwgtvm.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tuu2ww.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uxsipk.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_v6llfb.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wi6ykn.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wredey.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xj54uk.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xmfb6b.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ykltyo.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yrgi2d.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zojt4g.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zufbxc.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zvionm.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/xcharter/xcharter-ot2.enc259
82 files changed, 1215 insertions, 763 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3v4tq3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3v4tq3.enc
index 8e879c337e0..b3ad7d9f54c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3v4tq3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_3v4tq3.enc
@@ -1,7 +1,13 @@
+% 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_3v4tq3a7c5xv2s24iawolkvvof
-% Encoding created by otftotfm on Thu Nov 2 10:54:34 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:28 2018
% Command line follows encoding
/AutoEnc1_3v4tq3a7c5xv2s24iawolkvvof [
%00
@@ -54,12 +60,12 @@
/ffl /ffi /ff /fl /l /fi /i /f
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
% --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_62ztbr.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_62ztbr.enc
index face27e098c..18b25b17aed 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_62ztbr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_62ztbr.enc
@@ -1,7 +1,13 @@
+% 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_62ztbr6nk2ftffcgxkbyqc63rc
-% Encoding created by otftotfm on Thu Nov 2 10:55:04 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:08 2018
% Command line follows encoding
/AutoEnc1_62ztbr6nk2ftffcgxkbyqc63rc [
%00
@@ -54,11 +60,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum
% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc
index 17e830257c6..7740ad06005 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_7p4e2o.enc
@@ -1,7 +1,13 @@
+% 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_7p4e2okxw4m5ierz3rzoubdpud
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc1_7p4e2okxw4m5ierz3rzoubdpud [
%00
@@ -54,11 +60,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bcg6lk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bcg6lk.enc
new file mode 100644
index 00000000000..b0d9139ebc8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bcg6lk.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_bcg6lktn6xbfjt5m2alhs5j7rc
+% Encoding created by otftotfm on Sat Jun 2 11:51:07 2018
+% Command line follows encoding
+/AutoEnc1_bcg6lktn6xbfjt5m2alhs5j7rc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bpv7ty.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bpv7ty.enc
index f0a97ee5a3b..d253100a746 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bpv7ty.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bpv7ty.enc
@@ -1,7 +1,13 @@
+% 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_bpv7tyhroppqwztnxg3uk5mhnf
-% Encoding created by otftotfm on Thu Nov 2 10:55:03 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:06 2018
% Command line follows encoding
/AutoEnc1_bpv7tyhroppqwztnxg3uk5mhnf [
%00
@@ -54,11 +60,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bwwzc2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bwwzc2.enc
index 89d2872d76a..625fd8a9c52 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bwwzc2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_bwwzc2.enc
@@ -1,7 +1,13 @@
+% 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_bwwzc2j2ime3rd3zxpbhfqjypf
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc1_bwwzc2j2ime3rd3zxpbhfqjypf [
%00
@@ -54,12 +60,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_e3nxtd.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_e3nxtd.enc
new file mode 100644
index 00000000000..7109159fba8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_e3nxtd.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_e3nxtdby7saxg6wiummzc35egf
+% Encoding created by otftotfm on Sat Jun 2 11:51:11 2018
+% Command line follows encoding
+/AutoEnc1_e3nxtdby7saxg6wiummzc35egf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_esnimw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_esnimw.enc
index 349dc618c2b..5f846289817 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_esnimw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_esnimw.enc
@@ -1,7 +1,13 @@
+% 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_esnimwuxw4lzkw5yn52vzfg6sf
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc1_esnimwuxw4lzkw5yn52vzfg6sf [
%00
@@ -54,12 +60,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_evj3rb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_evj3rb.enc
new file mode 100644
index 00000000000..accbbb9a651
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_evj3rb.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_evj3rbxl3z6gpxzz5cspncj5vd
+% Encoding created by otftotfm on Sat Jun 2 11:51:08 2018
+% Command line follows encoding
+/AutoEnc1_evj3rbxl3z6gpxzz5cspncj5vd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /fi /fl /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10098 /SSsmall /afii10099 /afii10108 /uni04BB /SSsmall /SSsmall /afii10106
+ /afii10104 /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10102
+%B0
+ /SSsmall /uni04AB /afii10110 /SSsmall /SSsmall /SSsmall /afii10193 /SSsmall
+ /SSsmall /afii10101 /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_gb4haz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_gb4haz.enc
index 8bd95fb7e74..8891093b9a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_gb4haz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_gb4haz.enc
@@ -1,7 +1,13 @@
+% 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_gb4hazflrmw4ypysjleckozq4b
-% Encoding created by otftotfm on Thu Nov 2 10:55:02 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:04 2018
% Command line follows encoding
/AutoEnc1_gb4hazflrmw4ypysjleckozq4b [
%00
@@ -54,12 +60,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
% XCharter-Roman-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_l6an6k.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_l6an6k.enc
index d067bf42506..88adbb67bb5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_l6an6k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_l6an6k.enc
@@ -1,7 +1,13 @@
+% 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_l6an6kxdiedrbf2cyc5zyit2hf
-% Encoding created by otftotfm on Thu Nov 2 10:54:59 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:59 2018
% Command line follows encoding
/AutoEnc1_l6an6kxdiedrbf2cyc5zyit2hf [
%00
@@ -54,12 +60,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
% XCharter-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lfljed.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lfljed.enc
index b527f869573..98a39235b9a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lfljed.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lfljed.enc
@@ -1,7 +1,13 @@
+% 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_lfljedwtt777c23ukiuhpngcqd
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc1_lfljedwtt777c23ukiuhpngcqd [
%00
@@ -54,12 +60,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Roman.otf XCharter-Roman-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lve4jz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lve4jz.enc
index 9264189f39f..b5f0443e374 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lve4jz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_lve4jz.enc
@@ -1,7 +1,13 @@
+% 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_lve4jz3nn3ftlgj5hxhwfitned
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:24 2018
% Command line follows encoding
/AutoEnc1_lve4jz3nn3ftlgj5hxhwfitned [
%00
@@ -54,12 +60,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Bold.otf XCharter-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc
index d5c66c3ac0a..e7501c45419 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_m7ekhw.enc
@@ -1,7 +1,13 @@
+% 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_m7ekhwlp323btq5a5hhwjpjzqd
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc1_m7ekhwlp323btq5a5hhwjpjzqd [
%00
@@ -54,12 +60,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Bold.otf XCharter-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mtaw4d.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mtaw4d.enc
index e0a3fc1266a..7507893b0ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mtaw4d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mtaw4d.enc
@@ -1,7 +1,13 @@
+% 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_mtaw4dvhmwuesq6desscz6ua6g
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc1_mtaw4dvhmwuesq6desscz6ua6g [
%00
@@ -54,11 +60,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mz2wxn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mz2wxn.enc
index 6a1b7f54b0d..996ed19c242 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mz2wxn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_mz2wxn.enc
@@ -1,7 +1,13 @@
+% 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_mz2wxnocgzvqz373les4k2dmvc
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc1_mz2wxnocgzvqz373les4k2dmvc [
%00
@@ -54,12 +60,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Roman.otf XCharter-Roman-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nzcsoe.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nzcsoe.enc
index cd750a22ad8..c88ed5f1af3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nzcsoe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_nzcsoe.enc
@@ -1,7 +1,13 @@
+% 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_nzcsoeacflqqlnzfz562dawzae
-% Encoding created by otftotfm on Thu Nov 2 10:54:37 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:30 2018
% Command line follows encoding
/AutoEnc1_nzcsoeacflqqlnzfz562dawzae [
%00
@@ -54,12 +60,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7u3cc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7u3cc.enc
index c9330e44dea..1f7ea2d7a25 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7u3cc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_q7u3cc.enc
@@ -1,7 +1,13 @@
+% 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_q7u3ccpo4s6jcmlz6whk3kk5qb
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc1_q7u3ccpo4s6jcmlz6whk3kk5qb [
%00
@@ -54,12 +60,12 @@
/ffl /ffi /ff /fl /l /fi /i /f
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
% --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wi6ykn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wi6ykn.enc
index 3a73fb0b783..f2e5c7cfaa5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wi6ykn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_wi6ykn.enc
@@ -1,7 +1,13 @@
+% 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_wi6yknl3kt4py2tsiqef6clbfd
-% Encoding created by otftotfm on Thu Nov 2 10:54:59 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:00 2018
% Command line follows encoding
/AutoEnc1_wi6yknl3kt4py2tsiqef6clbfd [
%00
@@ -54,12 +60,12 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
% XCharter-BoldItalic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xj54uk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xj54uk.enc
index 13aedf1ee17..8c42f9f6e07 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xj54uk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xj54uk.enc
@@ -1,7 +1,13 @@
+% 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_xj54ukkqh5dkanxnllyngohkba
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:24 2018
% Command line follows encoding
/AutoEnc1_xj54ukkqh5dkanxnllyngohkba [
%00
@@ -54,12 +60,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xmfb6b.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xmfb6b.enc
index 188bc03421d..94bd1705167 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xmfb6b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch1_xmfb6b.enc
@@ -1,7 +1,13 @@
+% 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_xmfb6bhkkyqaejxdoyqfvnjqad
-% Encoding created by otftotfm on Thu Nov 2 10:54:58 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:59 2018
% Command line follows encoding
/AutoEnc1_xmfb6bhkkyqaejxdoyqfvnjqad [
%00
@@ -54,11 +60,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-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 2a6a4c34beb..66e97f5b220 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 Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:25 2018
% Command line follows encoding
/AutoEnc_26pbhyeyswcx6l35vecjqtozga [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=subs --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2o3aaj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2o3aaj.enc
index ec754ada515..1805e5cbe0b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2o3aaj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2o3aaj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2o3aajru4ekyxia5orx46ahmyg
-% Encoding created by otftotfm on Thu Nov 2 10:54:48 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:46 2018
% Command line follows encoding
/AutoEnc_2o3aajru4ekyxia5orx46ahmyg [
%00
@@ -54,12 +54,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=lnum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Roman.otf XCharter-Roman-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3v4tq3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3v4tq3.enc
index 762ea79aaf2..3c034594156 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3v4tq3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_3v4tq3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3v4tq3a7c5xv2s24iawolkvvof
-% Encoding created by otftotfm on Thu Nov 2 10:54:34 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:28 2018
% Command line follows encoding
/AutoEnc_3v4tq3a7c5xv2s24iawolkvvof [
%00
@@ -54,12 +54,12 @@
/ffl /ffi /ff /fl /l /fi /i /f
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
% --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4siibn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4siibn.enc
new file mode 100644
index 00000000000..30ea7e49dd2
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_4siibn.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4siibncubheqpamzb7gyl4v6db
+% Encoding created by otftotfm on Sat Jun 2 11:51:06 2018
+% Command line follows encoding
+/AutoEnc_4siibncubheqpamzb7gyl4v6db [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
+% XCharter-Bold-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5klbw4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5klbw4.enc
index 49cf7524272..092e297ce3e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5klbw4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_5klbw4.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5klbw4qsdei625xf6arb5wssab
-% Encoding created by otftotfm on Thu Nov 2 10:55:02 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:03 2018
% Command line follows encoding
/AutoEnc_5klbw4qsdei625xf6arb5wssab [
%00
@@ -54,12 +54,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
% XCharter-Roman-tlf-sc-t2a'
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 27732f57617..382020ed262 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 Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:25 2018
% Command line follows encoding
/AutoEnc_62z5otp5uxbu4kardxkb52z6sa [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=numr --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62ztbr.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62ztbr.enc
index dfea856ae61..9d3fe3233e3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62ztbr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_62ztbr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_62ztbr6nk2ftffcgxkbyqc63rc
-% Encoding created by otftotfm on Thu Nov 2 10:55:04 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:08 2018
% Command line follows encoding
/AutoEnc_62ztbr6nk2ftffcgxkbyqc63rc [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum
% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-t2asrb'
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 e99f095d974..390990fa066 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 Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:20 2018
% Command line follows encoding
/AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=sups --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc
index 6a1317866c6..68e9f8e38ca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7p4e2o.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7p4e2okxw4m5ierz3rzoubdpud
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc_7p4e2okxw4m5ierz3rzoubdpud [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc
index f3f4da57a3d..171a18f5f31 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ao7ayk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ao7aykitowiy6mof7pomrdbq3f
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:24 2018
% Command line follows encoding
/AutoEnc_ao7aykitowiy6mof7pomrdbq3f [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=numr --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-numr-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ba4bq2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ba4bq2.enc
index fdcc266e22b..e555670089a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ba4bq2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ba4bq2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ba4bq2nb6jjzhaljxjur5oiaac
-% Encoding created by otftotfm on Thu Nov 2 10:54:33 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:28 2018
% Command line follows encoding
/AutoEnc_ba4bq2nb6jjzhaljxjur5oiaac [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bcg6lk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bcg6lk.enc
new file mode 100644
index 00000000000..842c6b8649a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bcg6lk.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bcg6lktn6xbfjt5m2alhs5j7rc
+% Encoding created by otftotfm on Sat Jun 2 11:51:07 2018
+% Command line follows encoding
+/AutoEnc_bcg6lktn6xbfjt5m2alhs5j7rc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
+% XCharter-Bold-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bk4eiy.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bk4eiy.enc
index ba72ba6deb1..2c0c90753e3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bk4eiy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bk4eiy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bk4eiyxgpeuzzl5dgdyaqvulyg
-% Encoding created by otftotfm on Thu Nov 2 10:55:04 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:07 2018
% Command line follows encoding
/AutoEnc_bk4eiyxgpeuzzl5dgdyaqvulyg [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
% * XCharter-BoldItalic.otf XCharter-BoldItalic-sup-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bpv7ty.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bpv7ty.enc
index c92010740f6..6fd7b326bc3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bpv7ty.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bpv7ty.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bpv7tyhroppqwztnxg3uk5mhnf
-% Encoding created by otftotfm on Thu Nov 2 10:55:03 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:06 2018
% Command line follows encoding
/AutoEnc_bpv7tyhroppqwztnxg3uk5mhnf [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bwwzc2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bwwzc2.enc
index 858757090db..44c6194088a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bwwzc2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_bwwzc2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bwwzc2j2ime3rd3zxpbhfqjypf
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc_bwwzc2j2ime3rd3zxpbhfqjypf [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ch4v2b.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ch4v2b.enc
new file mode 100644
index 00000000000..20db071e2be
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ch4v2b.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ch4v2btqux72zuhgwahqqkxceh
+% Encoding created by otftotfm on Sat Jun 2 11:51:07 2018
+% Command line follows encoding
+/AutoEnc_ch4v2btqux72zuhgwahqqkxceh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /fi /fl /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10098 /SSsmall /afii10099 /afii10108 /uni04BB /SSsmall /SSsmall /afii10106
+ /afii10104 /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10102
+%B0
+ /SSsmall /uni04AB /afii10110 /SSsmall /SSsmall /SSsmall /afii10193 /SSsmall
+ /SSsmall /afii10101 /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ct4qni.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ct4qni.enc
index 6d9a3b2d9a6..94fa1f278f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ct4qni.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ct4qni.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ct4qniax6sbw4j4frehenox2rd
-% Encoding created by otftotfm on Thu Nov 2 10:54:59 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:00 2018
% Command line follows encoding
/AutoEnc_ct4qniax6sbw4j4frehenox2rd [
%00
@@ -54,12 +54,12 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
% XCharter-BoldItalic-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dwd75d.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dwd75d.enc
index 238496e46aa..915afc94aca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dwd75d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_dwd75d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dwd75dyhlcch47jxer45hq6d2g
-% Encoding created by otftotfm on Thu Nov 2 10:54:58 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:58 2018
% Command line follows encoding
/AutoEnc_dwd75dyhlcch47jxer45hq6d2g [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
% * XCharter-Bold.otf XCharter-Bold-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_e3nxtd.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_e3nxtd.enc
new file mode 100644
index 00000000000..683d5956eb9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_e3nxtd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e3nxtdby7saxg6wiummzc35egf
+% Encoding created by otftotfm on Sat Jun 2 11:51:11 2018
+% Command line follows encoding
+/AutoEnc_e3nxtdby7saxg6wiummzc35egf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
+% XCharter-Roman-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_esnimw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_esnimw.enc
index d6be295a95b..0a25ba16a47 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_esnimw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_esnimw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_esnimwuxw4lzkw5yn52vzfg6sf
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc_esnimwuxw4lzkw5yn52vzfg6sf [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_evj3rb.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_evj3rb.enc
new file mode 100644
index 00000000000..4180c5a296a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_evj3rb.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_evj3rbxl3z6gpxzz5cspncj5vd
+% Encoding created by otftotfm on Sat Jun 2 11:51:08 2018
+% Command line follows encoding
+/AutoEnc_evj3rbxl3z6gpxzz5cspncj5vd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /fi /fl /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /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
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10098 /SSsmall /afii10099 /afii10108 /uni04BB /SSsmall /SSsmall /afii10106
+ /afii10104 /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10102
+%B0
+ /SSsmall /uni04AB /afii10110 /SSsmall /SSsmall /SSsmall /afii10193 /SSsmall
+ /SSsmall /afii10101 /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
+% XCharter-BoldItalic-tosf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_g4jsot.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_g4jsot.enc
index 572dcce81eb..bf2d56328fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_g4jsot.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_g4jsot.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_g4jsotzod2w2pk3wx6ltel7yjc
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:25 2018
% Command line follows encoding
/AutoEnc_g4jsotzod2w2pk3wx6ltel7yjc [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=numr --ligkern=* {KL} *
% XCharter-Bold.otf XCharter-Bold-numr-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gb4haz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gb4haz.enc
index faf75134dfb..9b0b94ce07a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gb4haz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gb4haz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_gb4hazflrmw4ypysjleckozq4b
-% Encoding created by otftotfm on Thu Nov 2 10:55:02 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:04 2018
% Command line follows encoding
/AutoEnc_gb4hazflrmw4ypysjleckozq4b [
%00
@@ -54,12 +54,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
% XCharter-Roman-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ggr2qz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ggr2qz.enc
index 4929bde80d8..4d27f4dffb1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ggr2qz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ggr2qz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ggr2qzs5cyholuealrn5ymxarf
-% Encoding created by otftotfm on Thu Nov 2 10:54:28 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:21 2018
% Command line follows encoding
/AutoEnc_ggr2qzs5cyholuealrn5ymxarf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=lnum XCharter-Bold.otf XCharter-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h2xo5a.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h2xo5a.enc
index 86370bf6c71..a53b88be7e8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h2xo5a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h2xo5a.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_h2xo5amb5x2vxzsnowtxc2m4jf
-% Encoding created by otftotfm on Thu Nov 2 10:55:04 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:07 2018
% Command line follows encoding
/AutoEnc_h2xo5amb5x2vxzsnowtxc2m4jf [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum
% XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc
index 144e06acec4..ab5970a7024 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_h4dyum.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_h4dyumvfz6ek2rcxjxry72wymd
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=dnom --feature=kern
% --feature=liga --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hftfu7.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hftfu7.enc
index 26f3e8a68b8..be17011ccd4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hftfu7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hftfu7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_hftfu7n5hnfh7fq76qthw5rroh
-% Encoding created by otftotfm on Thu Nov 2 10:54:45 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:38 2018
% Command line follows encoding
/AutoEnc_hftfu7n5hnfh7fq76qthw5rroh [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=sups --ligkern=* {KL} * XCharter-Italic.otf
% XCharter-Italic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hk5uz5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hk5uz5.enc
index 4c68f5f72ff..c1893211a73 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hk5uz5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hk5uz5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_hk5uz5as5p5eyx5dr4lhl5fpkd
-% Encoding created by otftotfm on Thu Nov 2 10:55:04 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:06 2018
% Command line follows encoding
/AutoEnc_hk5uz5as5p5eyx5dr4lhl5fpkd [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
% * XCharter-Bold.otf XCharter-Bold-sup-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc
index 8748aee1d1e..96f06b57a60 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hnm3ex.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_hnm3exhjnhih7v5eit3ir6bkod
-% Encoding created by otftotfm on Thu Nov 2 10:54:27 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:20 2018
% Command line follows encoding
/AutoEnc_hnm3exhjnhih7v5eit3ir6bkod [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum XCharter-Bold.otf XCharter-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iasu4e.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iasu4e.enc
index 7ed61d5b480..d99259ad442 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iasu4e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_iasu4e.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_iasu4e565ashmuis43adhdeteg
-% Encoding created by otftotfm on Thu Nov 2 10:54:48 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:46 2018
% Command line follows encoding
/AutoEnc_iasu4e565ashmuis43adhdeteg [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Roman.otf XCharter-Roman-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc
index 27c60d4cded..deaef1385e0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_jqdzb6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_jqdzb6humj6vo27ahaxkz4oyog
-% Encoding created by otftotfm on Thu Nov 2 10:54:28 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:21 2018
% Command line follows encoding
/AutoEnc_jqdzb6humj6vo27ahaxkz4oyog [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Bold.otf XCharter-Bold-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kkifs2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kkifs2.enc
index a9d9c870149..1e3a30145f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kkifs2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kkifs2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kkifs23kqxvoo6oqghiakxijzb
-% Encoding created by otftotfm on Thu Nov 2 10:54:58 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:58 2018
% Command line follows encoding
/AutoEnc_kkifs23kqxvoo6oqghiakxijzb [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum XCharter-Bold.otf
% XCharter-Bold-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l6an6k.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l6an6k.enc
index 00662000951..b9652f7453c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l6an6k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l6an6k.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_l6an6kxdiedrbf2cyc5zyit2hf
-% Encoding created by otftotfm on Thu Nov 2 10:54:59 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:59 2018
% Command line follows encoding
/AutoEnc_l6an6kxdiedrbf2cyc5zyit2hf [
%00
@@ -54,12 +54,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
% XCharter-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc
index 48edfa62462..bc52077fcfe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_l7jokp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_l7jokpfcz44zpao2do3sbtw4rb
-% Encoding created by otftotfm on Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:25 2018
% Command line follows encoding
/AutoEnc_l7jokpfcz44zpao2do3sbtw4rb [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=subs --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lfljed.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lfljed.enc
index 77aba6b21e3..dc056f10531 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lfljed.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lfljed.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lfljedwtt777c23ukiuhpngcqd
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc_lfljedwtt777c23ukiuhpngcqd [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Roman.otf XCharter-Roman-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lmi455.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lmi455.enc
index 4878b21d989..b717d857e19 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lmi455.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lmi455.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lmi455rwcsd34hy42jyxoakb3f
-% Encoding created by otftotfm on Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:20 2018
% Command line follows encoding
/AutoEnc_lmi455rwcsd34hy42jyxoakb3f [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
% XCharter-Bold.otf XCharter-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lve4jz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lve4jz.enc
index 016fb0af5ed..541507df7cf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lve4jz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_lve4jz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lve4jz3nn3ftlgj5hxhwfitned
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:24 2018
% Command line follows encoding
/AutoEnc_lve4jz3nn3ftlgj5hxhwfitned [
%00
@@ -54,12 +54,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Bold.otf XCharter-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc
index 8491fb76b53..792fe9e02da 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_m7ekhw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_m7ekhwlp323btq5a5hhwjpjzqd
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc_m7ekhwlp323btq5a5hhwjpjzqd [
%00
@@ -54,12 +54,12 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --unicoding=germandbls =: SSsmall
% XCharter-Bold.otf XCharter-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mtaw4d.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mtaw4d.enc
index c85b372c562..624984d3cc8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mtaw4d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mtaw4d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mtaw4dvhmwuesq6desscz6ua6g
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:23 2018
% Command line follows encoding
/AutoEnc_mtaw4dvhmwuesq6desscz6ua6g [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mz2wxn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mz2wxn.enc
index 0390a1d4f2f..3dc0e35f293 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mz2wxn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mz2wxn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mz2wxnocgzvqz373les4k2dmvc
-% Encoding created by otftotfm on Thu Nov 2 10:54:52 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:49 2018
% Command line follows encoding
/AutoEnc_mz2wxnocgzvqz373les4k2dmvc [
%00
@@ -54,12 +54,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=onum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Roman.otf XCharter-Roman-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nzcsoe.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nzcsoe.enc
index e95501b5341..53ba30e9010 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nzcsoe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nzcsoe.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nzcsoeacflqqlnzfz562dawzae
-% Encoding created by otftotfm on Thu Nov 2 10:54:37 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:30 2018
% Command line follows encoding
/AutoEnc_nzcsoeacflqqlnzfz562dawzae [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_otbpkf.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_otbpkf.enc
index 43dbd73d2a7..450cedab3e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_otbpkf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_otbpkf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_otbpkfdmzkwmwrhepovreniseb
-% Encoding created by otftotfm on Thu Nov 2 10:54:49 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:47 2018
% Command line follows encoding
/AutoEnc_otbpkfdmzkwmwrhepovreniseb [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ouuvex.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ouuvex.enc
new file mode 100644
index 00000000000..498874eb872
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ouuvex.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ouuvexj34zgqmguu33ic4ftelf
+% Encoding created by otftotfm on Sat Jun 2 11:51:11 2018
+% Command line follows encoding
+/AutoEnc_ouuvexj34zgqmguu33ic4ftelf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /SSsmall /SSsmall
+%10
+ /quotedblleft /quotedblright /SSsmall /SSsmall /cyrbreve /endash /emdash /SSsmall
+ /SSsmall /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl
+%20
+ /SSsmall /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at.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 /SSsmall /afii10051 /afii10060 /SSsmall /SSsmall /SSsmall /afii10058
+ /afii10056 /SSsmall /SSsmall /SSsmall /uni04D4 /SSsmall /SSsmall /afii10054
+%90
+ /SSsmall /uni04AA /afii10062 /uni04AE /SSsmall /SSsmall /afii10145 /SSsmall
+ /SSsmall /afii10053 /SSsmall /afii10059 /afii10023 /uni2116 /currency /section
+%A0
+ /afii10050.sc /SSsmall /afii10051.sc /afii10060.sc /uni04BB /SSsmall /SSsmall /afii10058.sc
+ /afii10056.sc /SSsmall /SSsmall /SSsmall /uni04D5 /SSsmall /SSsmall /afii10054.sc
+%B0
+ /SSsmall /uni04AB /afii10062.sc /SSsmall /SSsmall /SSsmall /afii10145.sc /SSsmall
+ /SSsmall /afii10053.sc /SSsmall /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
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
+% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
+% --unicoding=germandbls =: SSsmall XCharter-Roman.otf
+% XCharter-Roman-tlf-sc-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pmmkri.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pmmkri.enc
index cdce776d986..899d59fcaed 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pmmkri.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_pmmkri.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pmmkrizm4ggcamqvuui4riwvoc
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc_pmmkrizm4ggcamqvuui4riwvoc [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7u3cc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7u3cc.enc
index 3bd2e0c31a0..15fd1a3966f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7u3cc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_q7u3cc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_q7u3ccpo4s6jcmlz6whk3kk5qb
-% Encoding created by otftotfm on Thu Nov 2 10:54:29 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc_q7u3ccpo4s6jcmlz6whk3kk5qb [
%00
@@ -54,12 +54,12 @@
/ffl /ffi /ff /fl /l /fi /i /f
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
% --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qlavc3.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qlavc3.enc
index 69914a8887b..7530e00446d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qlavc3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_qlavc3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qlavc3u3qydxq5kr2hgtye3zxb
-% Encoding created by otftotfm on Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc_qlavc3u3qydxq5kr2hgtye3zxb [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
% XCharter-Bold.otf XCharter-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rwgtvm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rwgtvm.enc
index dc3cb1aca3a..4b85b111a97 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rwgtvm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rwgtvm.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rwgtvm2cwxyjxd5exeu4e6ceja
-% Encoding created by otftotfm on Thu Nov 2 10:55:05 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:09 2018
% Command line follows encoding
/AutoEnc_rwgtvm2cwxyjxd5exeu4e6ceja [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
% * XCharter-Italic.otf XCharter-Italic-sup-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tuu2ww.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tuu2ww.enc
index 64b0dc90547..ebd2bbb7813 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tuu2ww.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tuu2ww.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tuu2wwxco5uzy4cpz5cin57wvf
-% Encoding created by otftotfm on Thu Nov 2 10:54:28 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:21 2018
% Command line follows encoding
/AutoEnc_tuu2wwxco5uzy4cpz5cin57wvf [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum XCharter-Bold.otf
% XCharter-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uxsipk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uxsipk.enc
index 47f4de02c80..3908c93eb7b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uxsipk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uxsipk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uxsipkxucgapqattecwa77jxye
-% Encoding created by otftotfm on Thu Nov 2 10:55:00 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:02 2018
% Command line follows encoding
/AutoEnc_uxsipkxucgapqattecwa77jxye [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
% * XCharter-Italic.otf XCharter-Italic-sup-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 8c2ab7528db..9e070a7f782 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 Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:22 2018
% Command line follows encoding
/AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
% --feature=kern --feature=liga --ligkern=* {KL} * XCharter-Bold.otf
% XCharter-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc
index ff6c980c612..98d38ca8864 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_vtvjjk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vtvjjktdgjkkmdvqy3brwughzb
-% Encoding created by otftotfm on Thu Nov 2 10:54:30 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:20 2018
% Command line follows encoding
/AutoEnc_vtvjjktdgjkkmdvqy3brwughzb [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=sups --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wi6ykn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wi6ykn.enc
index 9fa71ba76f1..c42331ffe94 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wi6ykn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wi6ykn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wi6yknl3kt4py2tsiqef6clbfd
-% Encoding created by otftotfm on Thu Nov 2 10:54:59 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:00 2018
% Command line follows encoding
/AutoEnc_wi6yknl3kt4py2tsiqef6clbfd [
%00
@@ -54,12 +54,12 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-BoldItalic.otf
% XCharter-BoldItalic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wredey.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wredey.enc
index 2152dee2540..e7f03cc5223 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wredey.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_wredey.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wredeypkxyfgwzoo77ittpwpgd
-% Encoding created by otftotfm on Thu Nov 2 10:54:28 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:21 2018
% Command line follows encoding
/AutoEnc_wredeypkxyfgwzoo77ittpwpgd [
%00
@@ -54,12 +54,12 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=lnum --feature=smcp --unicoding=germandbls =:
% SSsmall XCharter-Bold.otf XCharter-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xj54uk.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xj54uk.enc
index 07f482c2679..934139270c8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xj54uk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xj54uk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xj54ukkqh5dkanxnllyngohkba
-% Encoding created by otftotfm on Thu Nov 2 10:54:32 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:24 2018
% Command line follows encoding
/AutoEnc_xj54ukkqh5dkanxnllyngohkba [
%00
@@ -54,12 +54,12 @@
/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/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xmfb6b.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xmfb6b.enc
index dcfb8e3fc64..6331ecde8f3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xmfb6b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xmfb6b.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xmfb6bhkkyqaejxdoyqfvnjqad
-% Encoding created by otftotfm on Thu Nov 2 10:54:58 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:59 2018
% Command line follows encoding
/AutoEnc_xmfb6bhkkyqaejxdoyqfvnjqad [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=onum XCharter-Bold.otf
% XCharter-Bold-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ykltyo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ykltyo.enc
index 66bc1b1d1ed..9ee22418d78 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ykltyo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ykltyo.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ykltyoqxg3qar3htqai7tovnxh
-% Encoding created by otftotfm on Thu Nov 2 10:54:58 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:58 2018
% Command line follows encoding
/AutoEnc_ykltyoqxg3qar3htqai7tovnxh [
%00
@@ -54,12 +54,12 @@
/afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
] def
% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=smcp
% --unicoding=germandbls =: SSsmall XCharter-Bold.otf
% XCharter-Bold-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yrgi2d.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yrgi2d.enc
index 7e7436b0ac6..f9ae2013fc8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yrgi2d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_yrgi2d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yrgi2dpbqrwqwzkn3nxmqozxeh
-% Encoding created by otftotfm on Thu Nov 2 10:55:03 2017
+% Encoding created by otftotfm on Sat Jun 2 11:51:06 2018
% Command line follows encoding
/AutoEnc_yrgi2dpbqrwqwzkn3nxmqozxeh [
%00
@@ -54,11 +54,11 @@
/afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
] def
% Command line: 'otftotfm --automatic --encoding=t2asrb
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --feature=kern --feature=liga --feature=lnum XCharter-Bold.otf
% XCharter-Bold-tlf-t2asrb'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zojt4g.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zojt4g.enc
index d610c79dc03..f2dc23379cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zojt4g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zojt4g.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zojt4glnbz2hxf5d3khhowjcwe
-% Encoding created by otftotfm on Thu Nov 2 10:54:31 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:26 2018
% Command line follows encoding
/AutoEnc_zojt4glnbz2hxf5d3khhowjcwe [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=subs --ligkern=* {KL} *
% XCharter-Bold.otf XCharter-Bold-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zufbxc.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zufbxc.enc
index d061b3958e3..9198b41904b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zufbxc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zufbxc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zufbxcvt7j5sw3orjpgzbp4iba
-% Encoding created by otftotfm on Thu Nov 2 10:54:45 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:38 2018
% Command line follows encoding
/AutoEnc_zufbxcvt7j5sw3orjpgzbp4iba [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
% --feature=liga --feature=sups --ligkern=* {KL} * XCharter-Italic.otf
% XCharter-Italic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zvionm.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zvionm.enc
index 2828ac0f25e..26f3a8e2d32 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zvionm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_zvionm.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zvionmf2lcojpmzynj6nbpyoxa
-% Encoding created by otftotfm on Thu Nov 2 10:54:45 2017
+% Encoding created by otftotfm on Sat Jun 2 11:50:39 2018
% Command line follows encoding
/AutoEnc_zvionmf2lcojpmzynj6nbpyoxa [
%00
@@ -54,12 +54,12 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/tfm/public/xcharter
-% --vf-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/vf/public/xcharter
-% --type1-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/type1/public/xcharter
-% --truetype-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/truetype/public/xcharter
-% --encoding-directory=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/enc/dvips/xcharter
-% --map-file=/Users/msharpe/Library/texlive/2017/texmf-config/fonts/map/dvips/xcharter/XCharter.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/tfm/public/xcharter
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/vf/public/xcharter
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/type1/public/xcharter
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/truetype/public/xcharter
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/enc/dvips/xcharter
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-var/fonts/map/dvips/xcharter/XCharter.map
% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
% XCharter-Italic.otf XCharter-Italic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xcharter-ot2.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xcharter-ot2.enc
deleted file mode 100644
index 4787e52c046..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/xcharter-ot2.enc
+++ /dev/null
@@ -1,259 +0,0 @@
-/xcharterOT2enc[%
-/afii10059 % 0x0 (D 0)
-/afii10058 % 0x1 (D 1)
-/afii10145 % 0x2 (D 2)
-/afii10047 % 0x3 (D 3)
-/afii10055 % 0x4 (D 4)
-/afii10053 % 0x5 (D 5)
-/afii10051 % 0x6 (D 6)
-/afii10060 % 0x7 (D 7)
-/afii10107 % 0x8 (D 8)
-/afii10106 % 0x9 (D 9)
-/afii10193 % 0xa (D 10)
-/afii10095 % 0xb (D 11)
-/afii10103 % 0xc (D 12)
-/afii10101 % 0xd (D 13)
-/afii10099 % 0xe (D 14)
-/afii10108 % 0xf (D 15)
-/afii10048 % 0x10 (D 16)
-/afii10024 % 0x11 (D 17)
-/afii10027 % 0x12 (D 18)
-/afii10023 % 0x13 (D 19)
-/afii10148 % 0x14 (D 20)
-/afii10147 % 0x15 (D 21)
-/afii10054 % 0x16 (D 22)
-/afii10049 % 0x17 (D 23)
-/afii10096 % 0x18 (D 24)
-/afii10072 % 0x19 (D 25)
-/afii10075 % 0x1a (D 26)
-/afii10071 % 0x1b (D 27)
-/afii10196 % 0x1c (D 28)
-/afii10195 % 0x1d (D 29)
-/afii10102 % 0x1e (D 30)
-/afii10097 % 0x1f (D 31)
-/dieresis % 0x20 (D 32)
-/exclam % 0x21 (D 33)
-/quotedblright % 0x22 (D 34)
-/afii10146 % 0x23 (D 35)
-/cyrbreve % 0x24 (D 36)
-/percent % 0x25 (D 37)
-/acute % 0x26 (D 38)
-/quoteright % 0x27 (D 39)
-/parenleft % 0x28 (D 40)
-/parenright % 0x29 (D 41)
-/asterisk % 0x2a (D 42)
-/afii10194 % 0x2b (D 43)
-/comma % 0x2c (D 44)
-/hyphen % 0x2d (D 45)
-/period % 0x2e (D 46)
-/slash % 0x2f (D 47)
-/zero % 0x30 (D 48)
-/one % 0x31 (D 49)
-/two % 0x32 (D 50)
-/three % 0x33 (D 51)
-/four % 0x34 (D 52)
-/five % 0x35 (D 53)
-/six % 0x36 (D 54)
-/seven % 0x37 (D 55)
-/eight % 0x38 (D 56)
-/nine % 0x39 (D 57)
-/colon % 0x3a (D 58)
-/semicolon % 0x3b (D 59)
-/guillemotleft % 0x3c (D 60)
-/dotlessi % 0x3d (D 61)
-/guillemotright % 0x3e (D 62)
-/question % 0x3f (D 63)
-/breve % 0x40 (D 64)
-/afii10017 % 0x41 (D 65)
-/afii10018 % 0x42 (D 66)
-/afii10040 % 0x43 (D 67)
-/afii10021 % 0x44 (D 68)
-/afii10022 % 0x45 (D 69)
-/afii10038 % 0x46 (D 70)
-/afii10020 % 0x47 (D 71)
-/afii10039 % 0x48 (D 72)
-/afii10026 % 0x49 (D 73)
-/afii10057 % 0x4a (D 74)
-/afii10028 % 0x4b (D 75)
-/afii10029 % 0x4c (D 76)
-/afii10030 % 0x4d (D 77)
-/afii10031 % 0x4e (D 78)
-/afii10032 % 0x4f (D 79)
-/afii10033 % 0x50 (D 80)
-/afii10041 % 0x51 (D 81)
-/afii10034 % 0x52 (D 82)
-/afii10035 % 0x53 (D 83)
-/afii10036 % 0x54 (D 84)
-/afii10037 % 0x55 (D 85)
-/afii10019 % 0x56 (D 86)
-/afii10043 % 0x57 (D 87)
-/afii10042 % 0x58 (D 88)
-/afii10045 % 0x59 (D 89)
-/afii10025 % 0x5a (D 90)
-/bracketleft % 0x5b (D 91)
-/quotedblleft % 0x5c (D 92)
-/bracketright % 0x5d (D 93)
-/afii10046 % 0x5e (D 94)
-/afii10044 % 0x5f (D 95)
-/quoteleft % 0x60 (D 96)
-/afii10065 % 0x61 (D 97)
-/afii10066 % 0x62 (D 98)
-/afii10088 % 0x63 (D 99)
-/afii10069 % 0x64 (D 100)
-/afii10070 % 0x65 (D 101)
-/afii10086 % 0x66 (D 102)
-/afii10068 % 0x67 (D 103)
-/afii10087 % 0x68 (D 104)
-/afii10074 % 0x69 (D 105)
-/afii10105 % 0x6a (D 106)
-/afii10076 % 0x6b (D 107)
-/afii10077 % 0x6c (D 108)
-/afii10078 % 0x6d (D 109)
-/afii10079 % 0x6e (D 110)
-/afii10080 % 0x6f (D 111)
-/afii10081 % 0x70 (D 112)
-/afii10089 % 0x71 (D 113)
-/afii10082 % 0x72 (D 114)
-/afii10083 % 0x73 (D 115)
-/afii10084 % 0x74 (D 116)
-/afii10085 % 0x75 (D 117)
-/afii10067 % 0x76 (D 118)
-/afii10091 % 0x77 (D 119)
-/afii10090 % 0x78 (D 120)
-/afii10093 % 0x79 (D 121)
-/afii10073 % 0x7a (D 122)
-/endash % 0x7b (D 123)
-/emdash % 0x7c (D 124)
-/uni2116 % 0x7d (D 125)
-/afii10094 % 0x7e (D 126)
-/afii10092 % 0x7f (D 127)
-/.notdef % 0x80 (D 128)
-/.notdef % 0x81 (D 129)
-/.notdef % 0x82 (D 130)
-/.notdef % 0x83 (D 131)
-/.notdef % 0x84 (D 132)
-/.notdef % 0x85 (D 133)
-/.notdef % 0x86 (D 134)
-/.notdef % 0x87 (D 135)
-/.notdef % 0x88 (D 136)
-/.notdef % 0x89 (D 137)
-/.notdef % 0x8a (D 138)
-/.notdef % 0x8b (D 139)
-/.notdef % 0x8c (D 140)
-/.notdef % 0x8d (D 141)
-/.notdef % 0x8e (D 142)
-/.notdef % 0x8f (D 143)
-/.notdef % 0x90 (D 144)
-/.notdef % 0x91 (D 145)
-/.notdef % 0x92 (D 146)
-/.notdef % 0x93 (D 147)
-/.notdef % 0x94 (D 148)
-/.notdef % 0x95 (D 149)
-/.notdef % 0x96 (D 150)
-/.notdef % 0x97 (D 151)
-/.notdef % 0x98 (D 152)
-/.notdef % 0x99 (D 153)
-/.notdef % 0x9a (D 154)
-/.notdef % 0x9b (D 155)
-/.notdef % 0x9c (D 156)
-/.notdef % 0x9d (D 157)
-/.notdef % 0x9e (D 158)
-/.notdef % 0x9f (D 159)
-/.notdef % 0xa0 (D 160)
-/.notdef % 0xa1 (D 161)
-/.notdef % 0xa2 (D 162)
-/.notdef % 0xa3 (D 163)
-/.notdef % 0xa4 (D 164)
-/.notdef % 0xa5 (D 165)
-/.notdef % 0xa6 (D 166)
-/.notdef % 0xa7 (D 167)
-/.notdef % 0xa8 (D 168)
-/.notdef % 0xa9 (D 169)
-/.notdef % 0xaa (D 170)
-/.notdef % 0xab (D 171)
-/.notdef % 0xac (D 172)
-/.notdef % 0xad (D 173)
-/.notdef % 0xae (D 174)
-/.notdef % 0xaf (D 175)
-/.notdef % 0xb0 (D 176)
-/.notdef % 0xb1 (D 177)
-/.notdef % 0xb2 (D 178)
-/.notdef % 0xb3 (D 179)
-/.notdef % 0xb4 (D 180)
-/.notdef % 0xb5 (D 181)
-/.notdef % 0xb6 (D 182)
-/.notdef % 0xb7 (D 183)
-/.notdef % 0xb8 (D 184)
-/.notdef % 0xb9 (D 185)
-/.notdef % 0xba (D 186)
-/.notdef % 0xbb (D 187)
-/.notdef % 0xbc (D 188)
-/.notdef % 0xbd (D 189)
-/.notdef % 0xbe (D 190)
-/.notdef % 0xbf (D 191)
-/.notdef % 0xc0 (D 192)
-/.notdef % 0xc1 (D 193)
-/.notdef % 0xc2 (D 194)
-/.notdef % 0xc3 (D 195)
-/.notdef % 0xc4 (D 196)
-/.notdef % 0xc5 (D 197)
-/.notdef % 0xc6 (D 198)
-/.notdef % 0xc7 (D 199)
-/.notdef % 0xc8 (D 200)
-/.notdef % 0xc9 (D 201)
-/.notdef % 0xca (D 202)
-/.notdef % 0xcb (D 203)
-/.notdef % 0xcc (D 204)
-/.notdef % 0xcd (D 205)
-/.notdef % 0xce (D 206)
-/.notdef % 0xcf (D 207)
-/.notdef % 0xd0 (D 208)
-/.notdef % 0xd1 (D 209)
-/.notdef % 0xd2 (D 210)
-/.notdef % 0xd3 (D 211)
-/.notdef % 0xd4 (D 212)
-/.notdef % 0xd5 (D 213)
-/.notdef % 0xd6 (D 214)
-/.notdef % 0xd7 (D 215)
-/.notdef % 0xd8 (D 216)
-/.notdef % 0xd9 (D 217)
-/.notdef % 0xda (D 218)
-/.notdef % 0xdb (D 219)
-/.notdef % 0xdc (D 220)
-/.notdef % 0xdd (D 221)
-/.notdef % 0xde (D 222)
-/.notdef % 0xdf (D 223)
-/.notdef % 0xe0 (D 224)
-/.notdef % 0xe1 (D 225)
-/.notdef % 0xe2 (D 226)
-/.notdef % 0xe3 (D 227)
-/.notdef % 0xe4 (D 228)
-/.notdef % 0xe5 (D 229)
-/.notdef % 0xe6 (D 230)
-/.notdef % 0xe7 (D 231)
-/.notdef % 0xe8 (D 232)
-/.notdef % 0xe9 (D 233)
-/.notdef % 0xea (D 234)
-/.notdef % 0xeb (D 235)
-/.notdef % 0xec (D 236)
-/.notdef % 0xed (D 237)
-/.notdef % 0xee (D 238)
-/.notdef % 0xef (D 239)
-/.notdef % 0xf0 (D 240)
-/.notdef % 0xf1 (D 241)
-/.notdef % 0xf2 (D 242)
-/.notdef % 0xf3 (D 243)
-/.notdef % 0xf4 (D 244)
-/.notdef % 0xf5 (D 245)
-/.notdef % 0xf6 (D 246)
-/.notdef % 0xf7 (D 247)
-/.notdef % 0xf8 (D 248)
-/.notdef % 0xf9 (D 249)
-/.notdef % 0xfa (D 250)
-/.notdef % 0xfb (D 251)
-/.notdef % 0xfc (D 252)
-/.notdef % 0xfd (D 253)
-/.notdef % 0xfe (D 254)
-/.notdef % 0xff (D 255)
-] def
-