29 files changed, 620 insertions, 292 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_774.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_774.enc
deleted file mode 100644
index d163c4f19ca..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_774.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_774cbp6dtpfhjjvh4rbnfjz76eX
-% Encoding created by otftotfm on Sun Oct 27 15:21:02 2013
-% Command line follows encoding
-/AutoEnc_774cbp6dtpfhjjvh4rbnfjz76eX [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
-  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.oldstyle /oneAlt.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
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
-  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
-%A0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
-  /.notdef /.notdef /scaron.sc /.notdef /.notdef /.notdef /.notdef /.notdef
-  /ydieresis.sc /.notdef /zcaron.sc /.notdef /.notdef /exclamdown.sc /questiondown.sc /sterling
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring /ae.sc /ccedilla.sc
-  /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/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 XCharter-Roman-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_nhq.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_nhq.enc
deleted file mode 100644
index 52e59ea2473..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_nhq.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_nhqiuun3uzujlzih2vbqcnuk7aX
-% Encoding created by otftotfm on Sun Oct 27 15:21:01 2013
-% Command line follows encoding
-/AutoEnc_nhqiuun3uzujlzih2vbqcnuk7aX [
-%00
-  /.notdef /.notdef /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
-  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
-%20
-  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.oldstyle /oneAlt.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 /circumflex /underscore
-%60
-  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
-  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
-%70
-  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
-  /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
-%80
-  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
-  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-  /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
-%A0
-  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
-%B0
-  /degree /plusminus /two.oldstyle /three.oldstyle /acute /mu /paragraph /periodcentered
-  /cedilla /one.oldstyle /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
-%C0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
-  /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring /ae.sc /ccedilla.sc
-  /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave /iacute /icircumflex /idieresis
-%F0
-  /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex /otilde.sc /odieresis.sc /divide
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/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_2bziiw.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2bziiw.enc
index 9d4e5e70981..35120c933c8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_2bziiw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_2bziiw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd
-% Encoding created by otftotfm on Sun Oct 27 15:20:11 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:53 2013
 % Command line follows encoding
 /AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd [
 %00
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_57c3kj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_57c3kj.enc
index f02d620dc53..183d410b3e8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_57c3kj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_57c3kj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_57c3kjpgjfgm77mkj7rccpop3b
-% Encoding created by otftotfm on Sun Oct 27 15:20:13 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:55 2013
 % Command line follows encoding
 /AutoEnc_57c3kjpgjfgm77mkj7rccpop3b [
 %00
@@ -54,11 +54,11 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_774cbp.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_774cbp.enc
index d9fb29362a6..5a047c57229 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_774cbp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_774cbp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_774cbp6dtpfhjjvh4rbnfjz76e
-% Encoding created by otftotfm on Sun Oct 27 15:21:02 2013
+% Encoding created by otftotfm on Sat Nov 30 17:11:23 2013
 % Command line follows encoding
 /AutoEnc_774cbp6dtpfhjjvh4rbnfjz76e [
 %00
@@ -54,12 +54,12 @@
   /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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 XCharter-Roman-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_7xsilo.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7xsilo.enc
index 6195e8b56c8..e800e83ebe9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_7xsilo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7xsilo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7xsilovt7bdwbwvxblu7xil3ac
-% Encoding created by otftotfm on Sun Oct 27 15:20:08 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:52 2013
 % Command line follows encoding
 /AutoEnc_7xsilovt7bdwbwvxblu7xil3ac [
 %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=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_7yasjx.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7yasjx.enc
index 5fab8267409..798c398e744 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_7yasjx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_7yasjx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7yasjxah7llw4rtugy54bqnqof
-% Encoding created by otftotfm on Sun Oct 27 15:20:14 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:56 2013
 % Command line follows encoding
 /AutoEnc_7yasjxah7llw4rtugy54bqnqof [
 %00
@@ -54,12 +54,12 @@
   /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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 XCharter-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_gev.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c7a5t5.enc
index a6dae74a858..6b3df71c876 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_gev.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_c7a5t5.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gev73zslq7un6el5psm4425p2eX
-% Encoding created by otftotfm on Sun Oct 27 15:20:13 2013
+%%AutoEnc_c7a5t5urqwnxoogu3ab7a44a2d
+% Encoding created by otftotfm on Sat Nov 30 17:11:51 2013
 % Command line follows encoding
-/AutoEnc_gev73zslq7un6el5psm4425p2eX [
+/AutoEnc_c7a5t5urqwnxoogu3ab7a44a2d [
 %00
   /.notdef /.notdef /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,7 +14,7 @@
   /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
-  /zero.oldstyle /oneAlt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /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
@@ -36,7 +36,7 @@
   /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
 %A0
   /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
 %B0
   /degree /plusminus /two.oldstyle /three.oldstyle /acute /mu /paragraph /periodcentered
   /cedilla /one.oldstyle /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
@@ -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=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.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'
+% SSsmall XCharter1-Italic.otf XCharter1-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_gev73z.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gev73z.enc
index 59c750d8ba9..882ce6319c9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_gev73z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gev73z.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gev73zslq7un6el5psm4425p2e
-% Encoding created by otftotfm on Sun Oct 27 15:20:13 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:57 2013
 % Command line follows encoding
 /AutoEnc_gev73zslq7un6el5psm4425p2e [
 %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=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_ghsr6w.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ghsr6w.enc
new file mode 100644
index 00000000000..c39bee553e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ghsr6w.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ghsr6w7mpszbcaadf3uudfnuve
+% Encoding created by otftotfm on Sat Nov 30 17:11:46 2013
+% Command line follows encoding
+/AutoEnc_ghsr6w7mpszbcaadf3uudfnuve [
+%00
+  /.notdef /.notdef /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /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 /circumflex /underscore
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown.sc /cent.sc /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+  /degree /plusminus /two /three /acute /mu /paragraph /periodcentered
+  /cedilla /one /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring /ae.sc /ccedilla.sc
+  /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex /otilde.sc /odieresis.sc /divide
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --unicoding=germandbls =:
+% SSsmall XCharter1-Italic.otf XCharter1-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gjy6pd.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gjy6pd.enc
new file mode 100644
index 00000000000..367ce6e61f5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gjy6pd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gjy6pdlqejfehvzrztpiskrtth
+% Encoding created by otftotfm on Sat Nov 30 17:11:43 2013
+% Command line follows encoding
+/AutoEnc_gjy6pdlqejfehvzrztpiskrtth [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /fi /fl /.notdef /.notdef /.notdef
+%20
+  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /Racute
+%90
+  /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /ydieresis /.notdef /zcaron /.notdef /.notdef /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum XCharter1-Italic.otf
+% XCharter1-Italic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gvpfwf.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gvpfwf.enc
new file mode 100644
index 00000000000..e746bedd485
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_gvpfwf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gvpfwfgbg6erx5zgf6as57dwsb
+% Encoding created by otftotfm on Sat Nov 30 17:11:45 2013
+% Command line follows encoding
+/AutoEnc_gvpfwfgbg6erx5zgf6as57dwsb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /.notdef /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
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /Racute
+%90
+  /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /scaron.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /ydieresis.sc /.notdef /zcaron.sc /.notdef /.notdef /exclamdown.sc /questiondown.sc /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring /ae.sc /ccedilla.sc
+  /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex /otilde.sc /odieresis.sc /oe.sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --unicoding=germandbls =:
+% SSsmall XCharter1-Italic.otf XCharter1-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hrugnt.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hrugnt.enc
new file mode 100644
index 00000000000..305fe6f0484
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_hrugnt.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hrugntz6325rqergxrc6epa25e
+% Encoding created by otftotfm on Sat Nov 30 17:11:46 2013
+% Command line follows encoding
+/AutoEnc_hrugntz6325rqergxrc6epa25e [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+%10
+  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
+%20
+  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
+%30
+  /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+%40
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%50
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%60
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%70
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%80
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
+  /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+  /degree /plusminus /two.oldstyle /three.oldstyle /.notdef /mu /paragraph /periodcentered
+  /.notdef /one.oldstyle /ordmasculine /.notdef /onequarter /onehalf /threequarters /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+  /f_f_l /f_f_i /f_f /fl /l /fi /i /f
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.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 XCharter1-Italic.otf
+% XCharter1-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ic35ro.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ic35ro.enc
new file mode 100644
index 00000000000..b48f56ddc24
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ic35ro.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ic35ro4hcgj7kkn7bgvvr4tera
+% Encoding created by otftotfm on Sat Nov 30 17:11:44 2013
+% Command line follows encoding
+/AutoEnc_ic35ro4hcgj7kkn7bgvvr4tera [
+%00
+  /fi /.notdef /fl /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /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 /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+  /degree /plusminus /two /three /acute /mu /paragraph /periodcentered
+  /cedilla /one /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum XCharter1-Italic.otf
+% XCharter1-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_kaakcj.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kaakcj.enc
index e2d7dfebbc1..981bf4a8594 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_kaakcj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kaakcj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kaakcjyb4jlgitatdq753repib
-% Encoding created by otftotfm on Sun Oct 27 15:20:10 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:54 2013
 % Command line follows encoding
 /AutoEnc_kaakcjyb4jlgitatdq753repib [
 %00
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_kn5oqz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kn5oqz.enc
new file mode 100644
index 00000000000..0623249bc3c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_kn5oqz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kn5oqzhqo5rii3e67dchvycwya
+% Encoding created by otftotfm on Sat Nov 30 17:11:47 2013
+% Command line follows encoding
+/AutoEnc_kn5oqzhqo5rii3e67dchvycwya [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior
+  /eightsuperior /ninesuperior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /Racute
+%90
+  /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /ydieresis /.notdef /zcaron /.notdef /.notdef /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * XCharter1-Italic.otf
+% XCharter1-Italic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_mbz2ag.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mbz2ag.enc
index d1813e60eaf..ce1b31d2aca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_mbz2ag.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mbz2ag.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mbz2ag7dzq6cnzvufdp3mnjjkg
-% Encoding created by otftotfm on Sun Oct 27 15:20:46 2013
+% Encoding created by otftotfm on Sat Nov 30 17:11:18 2013
 % Command line follows encoding
 /AutoEnc_mbz2ag7dzq6cnzvufdp3mnjjkg [
 %00
@@ -54,12 +54,12 @@
   /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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 XCharter-Roman-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_o3e.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgl6fo.enc
index a3c06f9f756..7a6d8903196 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_o3e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_mgl6fo.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX
-% Encoding created by otftotfm on Sun Oct 27 15:20:12 2013
+%%AutoEnc_mgl6fo3pkowiwkzk5cc57oqane
+% Encoding created by otftotfm on Sat Nov 30 17:11:49 2013
 % Command line follows encoding
-/AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX [
+/AutoEnc_mgl6fo3pkowiwkzk5cc57oqane [
 %00
   /fi /.notdef /fl /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -14,7 +14,7 @@
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
-  /zero.oldstyle /oneAlt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /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
@@ -36,7 +36,7 @@
   /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
 %A0
   /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
-  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
 %B0
   /degree /plusminus /two.oldstyle /three.oldstyle /acute /mu /paragraph /periodcentered
   /cedilla /one.oldstyle /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
@@ -54,11 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-ly1'
+% --feature=liga --feature=onum XCharter1-Italic.otf
+% XCharter1-Italic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_nhqiuu.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhqiuu.enc
index b62bc862849..5f35670dc30 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_nhqiuu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_nhqiuu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nhqiuun3uzujlzih2vbqcnuk7a
-% Encoding created by otftotfm on Sun Oct 27 15:21:01 2013
+% Encoding created by otftotfm on Sat Nov 30 17:11:24 2013
 % Command line follows encoding
 /AutoEnc_nhqiuun3uzujlzih2vbqcnuk7a [
 %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=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_o3eiyz.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o3eiyz.enc
index 26f28047430..a73cc753e6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_o3eiyz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_o3eiyz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_o3eiyzejerk3kg6suhmkr63b3h
-% Encoding created by otftotfm on Sun Oct 27 15:20:12 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:55 2013
 % Command line follows encoding
 /AutoEnc_o3eiyzejerk3kg6suhmkr63b3h [
 %00
@@ -54,11 +54,11 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_57c.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ptibkq.enc
index 028b8f1e557..6882dcdcbd1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_57c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ptibkq.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX
-% Encoding created by otftotfm on Sun Oct 27 15:20:13 2013
+%%AutoEnc_ptibkqp547zw5iym7kq36jvzab
+% Encoding created by otftotfm on Sat Nov 30 17:11:48 2013
 % Command line follows encoding
-/AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX [
+/AutoEnc_ptibkqp547zw5iym7kq36jvzab [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,7 +14,7 @@
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
-  /zero.oldstyle /oneAlt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /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
@@ -30,9 +30,9 @@
   /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
 %80
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /Racute
 %90
-  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
   /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,11 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum XCharter-Bold.otf XCharter-Bold-tosf-t1'
+% --feature=liga --feature=onum XCharter1-Italic.otf
+% XCharter1-Italic-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_rqpru4.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rqpru4.enc
index 6422dd2a062..26272f2f2e4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_rqpru4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rqpru4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rqpru4nwt3wdlmctj3bjbnxvbb
-% Encoding created by otftotfm on Sun Oct 27 15:20:09 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:51 2013
 % Command line follows encoding
 /AutoEnc_rqpru4nwt3wdlmctj3bjbnxvbb [
 %00
@@ -54,12 +54,12 @@
   /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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 XCharter-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_rvnb4v.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvnb4v.enc
index afc990e3ee6..b60aa12f4c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_rvnb4v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_rvnb4v.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rvnb4vwnh67sodmukenhr2ljra
-% Encoding created by otftotfm on Sun Oct 27 15:20:10 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:53 2013
 % Command line follows encoding
 /AutoEnc_rvnb4vwnh67sodmukenhr2ljra [
 %00
@@ -54,12 +54,12 @@
   /f_f_l /f_f_i /ff /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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 XCharter-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_tsbasn.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tsbasn.enc
index ec9dfe4a2a4..96e06104e27 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_tsbasn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_tsbasn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tsbasnwupqq7mugdupbyhyep6c
-% Encoding created by otftotfm on Sun Oct 27 15:20:45 2013
+% Encoding created by otftotfm on Sat Nov 30 17:11:19 2013
 % Command line follows encoding
 /AutoEnc_tsbasnwupqq7mugdupbyhyep6c [
 %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=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_ttrny6.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ttrny6.enc
index 33e1b5b17f7..f50628875cc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_ttrny6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_ttrny6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug
-% Encoding created by otftotfm on Sun Oct 27 15:20:07 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:49 2013
 % Command line follows encoding
 /AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug [
 %00
@@ -54,11 +54,11 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_uggo2i.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uggo2i.enc
new file mode 100644
index 00000000000..4a41ef8021c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_uggo2i.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uggo2i6o4sr4vnni7t2aikd5ca
+% Encoding created by otftotfm on Sat Nov 30 17:11:48 2013
+% Command line follows encoding
+/AutoEnc_uggo2i6o4sr4vnni7t2aikd5ca [
+%00
+  /.notdef /.notdef /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior
+  /eightsuperior /ninesuperior /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=sups --ligkern=* {KL} * XCharter1-Italic.otf
+% XCharter1-Italic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_x4fzx5.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x4fzx5.enc
index 0dda5be36eb..75dd5d7d3da 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_x4fzx5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_x4fzx5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_x4fzx5xyhchposxsrhan4pg3wg
-% Encoding created by otftotfm on Sun Oct 27 15:20:07 2013
+% Encoding created by otftotfm on Sat Nov 30 17:10:50 2013
 % Command line follows encoding
 /AutoEnc_x4fzx5xyhchposxsrhan4pg3wg [
 %00
@@ -54,11 +54,11 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_xeu7sg.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xeu7sg.enc
index ea082c25112..97f233b6964 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_xeu7sg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_xeu7sg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya
-% Encoding created by otftotfm on Sun Oct 27 15:20:22 2013
+% Encoding created by otftotfm on Sat Nov 30 17:11:02 2013
 % Command line follows encoding
 /AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya [
 %00
@@ -54,12 +54,12 @@
   /f_f_l /f_f_i /ff /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/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_7ya.enc b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z56e5d.enc
index 5b6200e6600..4280ff26fa1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/xcharter/XCh_7ya.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/xcharter/xch_z56e5d.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7yasjxah7llw4rtugy54bqnqofX
-% Encoding created by otftotfm on Sun Oct 27 15:20:14 2013
+%%AutoEnc_z56e5dblkv74lkfzvwdpmpzrsb
+% Encoding created by otftotfm on Sat Nov 30 17:11:50 2013
 % Command line follows encoding
-/AutoEnc_7yasjxah7llw4rtugy54bqnqofX [
+/AutoEnc_z56e5dblkv74lkfzvwdpmpzrsb [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,7 +14,7 @@
   /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
 %30
-  /zero.oldstyle /oneAlt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+  /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
@@ -30,9 +30,9 @@
   /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
 %80
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /Racute
 %90
-  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
   /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/xcharter
-% --vf-directory=texmf/fonts/vf/public/xcharter
-% --type1-directory=texmf/fonts/type1/public/xcharter
-% --truetype-directory=texmf/fonts/truetype/public/xcharter
-% --encoding-directory=texmf/fonts/enc/dvips/xcharter
-% --map-file=texmf/fonts/map/dvips/xcharter/XCharter.map --no-updmap
+% --tfm-directory=texmf/fonts/tfm/public/xcharter1
+% --vf-directory=texmf/fonts/vf/public/xcharter1
+% --type1-directory=texmf/fonts/type1/public/xcharter1
+% --truetype-directory=texmf/fonts/truetype/public/xcharter1
+% --encoding-directory=texmf/fonts/enc/dvips/xcharter1
+% --map-file=texmf/fonts/map/dvips/xcharter1/XCharterOne.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --unicoding=germandbls =:
-% SSsmall XCharter-Bold.otf XCharter-Bold-tosf-sc-t1'
+% SSsmall XCharter1-Italic.otf XCharter1-Italic-tosf-sc-t1'