xcharter (2dec13)

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

170 files changed, 931 insertions, 653 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index b6eaceaddb9..9bf7f163922 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/README
+++ b/Master/texmf-dist/doc/fonts/xcharter/README
@@ -1,6 +1,6 @@
 				XCharter Fonts
 				Michael Sharpe
-				2013-10-28
+				2013-12-01
 
 This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are  in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html 
 for the details of that license. 
@@ -21,80 +21,28 @@ Original Bitstream Free font license:
 The font modifications are Copyright (c) 2013, Michael Sharpe.
 
 
-Current version: 1.00
+Current version: 1.01
 
-The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the basic LaTeX support files may be re-created using the command
+Changes in version 1.01
+The method of generating the support files has changed from version 1.00, and is outlined below. The result is that the problem is version 1.00, where under the option oldstyle (or the macro \useosf) the resulting oldstyle 1 (like a short 1) failed to behave as a the character 1 when copied from a pdf file, is now rectified.
+
+The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the following outlie of the method should be followed.
+
+Make four copies of of the otf files and rename them internally and externally to XCharter1... Place the 8 otf files in a new folder along with a subfolder named texmf. Then run the command
 
 /usr/texbin/autoinst  --noupdmap  --noswash --notitling --noornaments --target=./texmf --encoding=TS1,T1,LY1 --vendor=public --typeface=xcharter *.otf
 
-after cding to the folder containing just the modified otf fonts and a subfolder named texmf. You should replace the newly generated XCharter.sty with the one from the distribution in order to preserve its functionality. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder:
+after cding to the new folder. You should replace the newly generated XCharter.sty and .fd files the with the ones from the distribution in order to preserve the functionality of the package. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder:
 
 #!/bin/bash
 pushd texmf/fonts/map/dvips/xcharter
 sed -i '' 's/<\[a_/<\[XCh_/g' XCharter.map
 popd
 pushd texmf/fonts/enc/dvips/xcharter
-for f in *.enc; do mv ${f} XCh${f:1}; done
+for f in *.enc; do mv ${f} xch${f:1}; done
 popd
 
-Creating the parallel version of the osf fonts (labelled osfx) with a small 1 rather than a short I for oldstyle one was somewhat laborious:
-1. Copy the relevant .enc files, providing them new names, and replace one.oldstyle to oneAlt.oldstyle in each. Change the internal encoding name as well.
-2. Use afm2tfm to create a new raw tfm file for each, with names like XCharter-Roman-osfx-t1--base.tfm. The commands were
-
-  afm2tfm XCharter-Bold -T XCh_o3e.enc XCharter-Bold-osfx-ly1--base 
-  afm2tfm XCharter-Bold -T XCh_57c.enc XCharter-Bold-osfx-t1--base 
-  afm2tfm XCharter-Bold -T XCh_gev.enc XCharter-Bold-osfx-sc-ly1--base
-  afm2tfm XCharter-Bold -T XCh_7ya.enc XCharter-Bold-osfx-sc-t1--base 
-  afm2tfm XCharter-BoldItalic -T XCh_o3e.enc XCharter-BoldItalic-osfx-ly1--base
-  afm2tfm XCharter-BoldItalic -T XCh_57c.enc XCharter-BoldItalic-osfx-t1--base
-  afm2tfm XCharter-BoldItalic -T XCh_gev.enc XCharter-BoldItalic-osfx-sc-ly1--base
-  afm2tfm XCharter-BoldItalic -T XCh_7ya.enc XCharter-BoldItalic-osfx-sc-t1--base
-  afm2tfm XCharter-Italic -T XCh_o3e.enc XCharter-Italic-osfx-ly1--base
-  afm2tfm XCharter-Italic -T XCh_57c.enc XCharter-Italic-osfx-t1--base
-  afm2tfm XCharter-Italic -T XCh_gev.enc XCharter-Italic-osfx-sc-ly1--base
-  afm2tfm XCharter-Italic -T XCh_7ya.enc XCharter-Italic-osfx-sc-t1--base
-  afm2tfm XCharter-Roman -T XCh_o3e.enc XCharter-Roman-osfx-ly1--base
-  afm2tfm XCharter-Roman -T XCh_57c.enc XCharter-Roman-osfx-t1--base
-  afm2tfm XCharter-Roman -T XCh_nhq.enc XCharter-Roman-osfx-sc-ly1--base
-  afm2tfm XCharter-Roman -T XCh_774.enc XCharter-Roman-osfx-sc-t1--base
-
-Copy the resulting tfm files to the tfm folder and assemble the output with appropriate pfb files appended to XCharter.map.
-
-3. Create virtual vpl files for each osf tfm/vf pair, using
-
-vftovp XCharter-Roman-osf-t1 XCharter-Roman-osf-t1 XCharter-Roman-osf-t1
-vftovp XCharter-Roman-osf-ly1 XCharter-Roman-osf-ly1 XCharter-Roman-osf-ly1
-vftovp XCharter-Roman-osf-sc-t1 XCharter-Roman-osf-sc-t1 XCharter-Roman-osf-sc-t1
-#tftopl XCharter-Roman-osf-sc-ot1 XCharter-Roman-osf-sc-ot1
-vftovp XCharter-Roman-osf-sc-ly1 XCharter-Roman-osf-sc-ly1 XCharter-Roman-osf-sc-ly1
-vftovp XCharter-Bold-osf-t1 XCharter-Bold-osf-t1 XCharter-Bold-osf-t1
-vftovp XCharter-Bold-osf-ly1 XCharter-Bold-osf-ly1 XCharter-Bold-osf-ly1
-vftovp XCharter-Bold-osf-sc-t1 XCharter-Bold-osf-sc-t1 XCharter-Bold-osf-sc-t1
-vftovp XCharter-Bold-osf-sc-ly1 XCharter-Bold-osf-sc-ly1 XCharter-Bold-osf-sc-ly1
-vftovp XCharter-BoldItalic-osf-t1 XCharter-BoldItalic-osf-t1 XCharter-BoldItalic-osf-t1
-vftovp XCharter-BoldItalic-osf-ly1 XCharter-BoldItalic-osf-ly1 XCharter-BoldItalic-osf-ly1
-vftovp XCharter-BoldItalic-osf-sc-t1 XCharter-BoldItalic-osf-sc-t1 XCharter-BoldItalic-osf-sc-t1
-vftovp XCharter-BoldItalic-osf-sc-ly1 XCharter-BoldItalic-osf-sc-ly1 XCharter-BoldItalic-osf-sc-ly1
-vftovp XCharter-Italic-osf-t1 XCharter-Italic-osf-t1 XCharter-Italic-osf-t1
-vftovp XCharter-Italic-osf-ly1 XCharter-Italic-osf-ly1 XCharter-Italic-osf-ly1
-vftovp XCharter-Italic-osf-sc-t1 XCharter-Italic-osf-sc-t1 XCharter-Italic-osf-sc-t1
-vftovp XCharter-Italic-osf-sc-ly1 XCharter-Italic-osf-sc-ly1 XCharter-Italic-osf-sc-ly1
-
-4 For each resulting vpl, change the name fragment -osf- to -osfx- and within the file, remove the two checksum lines and change the source file name similarly. That is, in the section
-
-MAPFONT D 0
-
-change
-
-(FONTNAME XCharter-Bold-osf-t1--base) to (FONTNAME XCharter-Bold-osfx-t1--base)
-
-5. Copy the resulting vpl files to a new empty folder, cd to that folder and run
-
-apply vptovf *.vpl
-
-to produce the required tfm/vf alternate pairs, and move them to appropriate locations.
-
-(It would have been much easier to write a simple fontinst driver script for this, but the current version of otftotfm does not place all f-ligatures in the correct slots as specified by the T1 and LY1 encodings.)
+Discard all newly generated XCharter1*.tfm EXCEPT for the 32 files containing -tosf and not -ts1. Do the same for XCharter1*.vf. These are referenced by the fd files in the package.
 
 Please send comments and bug reports or suggestions for improvement to
 
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index 9dbc8527106..e472738b894 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
index 58a1c9dfc69..e8ab5b6218d 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -4,15 +4,14 @@
 
 \usepackage[scaled=1.03,varqu,varl]{zi4}
 \usepackage[type1]{cabin}
-\pdfmapfile{+XCharter.map}
 \usepackage[scaled=.98]{XCharter}
 \usepackage[T1]{fontenc}
 \linespread{1.04}
 \usepackage[libertine,scaled=1.07]{newtxmath}
 \usepackage[cal=boondoxo,bb=boondox,frak=boondox]{mathalfa}
 \useosf
-\font\osfIfnt=XCharter-Roman-osf-t1 at 11pt
-\font\osffnt=XCharter-Roman-osfx-t1 at 11pt
+\font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt
+\font\osffnt=XCharter1-Roman-tosf-t1 at 11pt
 
 %\usepackage[cal=rsfso]{mathalfa}
 %\usepackage{bm}% load after all math to give access to bold math
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'
diff --git a/Master/texmf-dist/fonts/map/dvips/xcharter/XCharter.map b/Master/texmf-dist/fonts/map/dvips/xcharter/XCharter.map
index ab9046ac8a0..02c19828e9b 100644
--- a/Master/texmf-dist/fonts/map/dvips/xcharter/XCharter.map
+++ b/Master/texmf-dist/fonts/map/dvips/xcharter/XCharter.map
@@ -1,66 +1,66 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
-XCharter-Bold-tlf-ly1--base XCharter-Bold "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Bold.pfb
 XCharter-Bold-tlf-t1--base XCharter-Bold "AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug ReEncodeFont" <[XCh_ttrny6.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-ly1--base XCharter-Bold "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-ly1--base XCharter-Bold "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Bold.pfb
 XCharter-Bold-tlf-sc-t1--base XCharter-Bold "AutoEnc_rqpru4nwt3wdlmctj3bjbnxvbb ReEncodeFont" <[XCh_rqpru4.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-ly1--base XCharter-Bold "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-Bold.pfb
 XCharter-Bold-tlf-ts1--base XCharter-Bold "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-ly1--base XCharter-Bold "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Bold.pfb
 XCharter-Bold-sup-t1--base XCharter-Bold "AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd ReEncodeFont" <[XCh_2bziiw.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-ly1--base XCharter-Bold "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t1--base XCharter-Bold "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-ly1--base XCharter-Bold "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t1--base XCharter-Bold "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-ts1--base XCharter-Bold "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Bold.pfb
-XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-BoldItalic.pfb
+XCharter-Bold-sup-ly1--base XCharter-Bold "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t1--base XCharter-Bold "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-ly1--base XCharter-Bold "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t1--base XCharter-Bold "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-ly1--base XCharter-Bold "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-ts1--base XCharter-Bold "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Bold.pfb
 XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic "AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug ReEncodeFont" <[XCh_ttrny6.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-BoldItalic.pfb
 XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic "AutoEnc_rqpru4nwt3wdlmctj3bjbnxvbb ReEncodeFont" <[XCh_rqpru4.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-BoldItalic.pfb
 XCharter-BoldItalic-tlf-ts1--base XCharter-BoldItalic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-BoldItalic.pfb
 XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic "AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd ReEncodeFont" <[XCh_2bziiw.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-ly1--base XCharter-BoldItalic "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-ts1--base XCharter-BoldItalic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-BoldItalic.pfb
-XCharter-Italic-tlf-ly1--base XCharter-Italic "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Italic.pfb
+XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-ts1--base XCharter-BoldItalic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-BoldItalic.pfb
 XCharter-Italic-tlf-t1--base XCharter-Italic "AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug ReEncodeFont" <[XCh_ttrny6.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-ly1--base XCharter-Italic "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-ly1--base XCharter-Italic "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Italic.pfb
 XCharter-Italic-tlf-sc-t1--base XCharter-Italic "AutoEnc_rqpru4nwt3wdlmctj3bjbnxvbb ReEncodeFont" <[XCh_rqpru4.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-ly1--base XCharter-Italic "AutoEnc_7xsilovt7bdwbwvxblu7xil3ac ReEncodeFont" <[XCh_7xsilo.enc <XCharter-Italic.pfb
 XCharter-Italic-tlf-ts1--base XCharter-Italic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-ly1--base XCharter-Italic "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Italic.pfb
 XCharter-Italic-sup-t1--base XCharter-Italic "AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd ReEncodeFont" <[XCh_2bziiw.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-ly1--base XCharter-Italic "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t1--base XCharter-Italic "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-ly1--base XCharter-Italic "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t1--base XCharter-Italic "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-ts1--base XCharter-Italic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-Italic.pfb
-XCharter-Roman-tlf-ly1--base XCharter-Roman "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Roman.pfb
+XCharter-Italic-sup-ly1--base XCharter-Italic "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t1--base XCharter-Italic "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-ly1--base XCharter-Italic "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t1--base XCharter-Italic "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-ly1--base XCharter-Italic "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-ts1--base XCharter-Italic "AutoEnc_xeu7sgpkkatwmf7mtl7d4lyhya ReEncodeFont" <[XCh_xeu7sg.enc <XCharter-Italic.pfb
 XCharter-Roman-tlf-t1--base XCharter-Roman "AutoEnc_ttrny6gcwrot42gjvhf5fyk5ug ReEncodeFont" <[XCh_ttrny6.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-ly1--base XCharter-Roman "AutoEnc_tsbasnwupqq7mugdupbyhyep6c ReEncodeFont" <[XCh_tsbasn.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-ly1--base XCharter-Roman "AutoEnc_x4fzx5xyhchposxsrhan4pg3wg ReEncodeFont" <[XCh_x4fzx5.enc <XCharter-Roman.pfb
 XCharter-Roman-tlf-sc-t1--base XCharter-Roman "AutoEnc_mbz2ag7dzq6cnzvufdp3mnjjkg ReEncodeFont" <[XCh_mbz2ag.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-ly1--base XCharter-Roman "AutoEnc_tsbasnwupqq7mugdupbyhyep6c ReEncodeFont" <[XCh_tsbasn.enc <XCharter-Roman.pfb
 XCharter-Roman-tlf-ts1--base XCharter-Roman "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-ly1--base XCharter-Roman "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Roman.pfb
 XCharter-Roman-sup-t1--base XCharter-Roman "AutoEnc_2bziiwlsccqh4lfqa5z3xb56pd ReEncodeFont" <[XCh_2bziiw.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-ly1--base XCharter-Roman "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t1--base XCharter-Roman "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-ly1--base XCharter-Roman "AutoEnc_nhqiuun3uzujlzih2vbqcnuk7a ReEncodeFont" <[XCh_nhqiuu.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t1--base XCharter-Roman "AutoEnc_774cbp6dtpfhjjvh4rbnfjz76e ReEncodeFont" <[XCh_774cbp.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-ts1--base XCharter-Roman "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Roman.pfb
-XCharter-Bold-osfx-ly1--base XCharter-Bold " AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX ReEncodeFont " <[XCh_o3e.enc <XCharter-Bold.pfb
-XCharter-Bold-osfx-t1--base XCharter-Bold " AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX ReEncodeFont " <[XCh_57c.enc <XCharter-Bold.pfb
-XCharter-Bold-osfx-sc-ly1--base XCharter-Bold " AutoEnc_gev73zslq7un6el5psm4425p2eX ReEncodeFont " <[XCh_gev.enc <XCharter-Bold.pfb
-XCharter-Bold-osfx-sc-t1--base XCharter-Bold " AutoEnc_7yasjxah7llw4rtugy54bqnqofX ReEncodeFont " <[XCh_7ya.enc <XCharter-Bold.pfb
-XCharter-BoldItalic-osfx-ly1--base XCharter-BoldItalic " AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX ReEncodeFont " <[XCh_o3e.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osfx-t1--base XCharter-BoldItalic " AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX ReEncodeFont " <[XCh_57c.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osfx-sc-ly1--base XCharter-BoldItalic " AutoEnc_gev73zslq7un6el5psm4425p2eX ReEncodeFont " <[XCh_gev.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osfx-sc-t1--base XCharter-BoldItalic " AutoEnc_7yasjxah7llw4rtugy54bqnqofX ReEncodeFont " <[XCh_7ya.enc <XCharter-BoldItalic.pfb
-XCharter-Italic-osfx-ly1--base XCharter-Italic " AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX ReEncodeFont " <[XCh_o3e.enc <XCharter-Italic.pfb
-XCharter-Italic-osfx-t1--base XCharter-Italic " AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX ReEncodeFont " <[XCh_57c.enc <XCharter-Italic.pfb
-XCharter-Italic-osfx-sc-ly1--base XCharter-Italic " AutoEnc_gev73zslq7un6el5psm4425p2eX ReEncodeFont " <[XCh_gev.enc <XCharter-Italic.pfb
-XCharter-Italic-osfx-sc-t1--base XCharter-Italic " AutoEnc_7yasjxah7llw4rtugy54bqnqofX ReEncodeFont " <[XCh_7ya.enc <XCharter-Italic.pfb
-XCharter-Roman-osfx-ly1--base XCharter-Roman " AutoEnc_o3eiyzejerk3kg6suhmkr63b3hX ReEncodeFont " <[XCh_o3e.enc <XCharter-Roman.pfb
-XCharter-Roman-osfx-t1--base XCharter-Roman " AutoEnc_57c3kjpgjfgm77mkj7rccpop3bX ReEncodeFont " <[XCh_57c.enc <XCharter-Roman.pfb
-XCharter-Roman-osfx-sc-ly1--base XCharter-Roman " AutoEnc_nhqiuun3uzujlzih2vbqcnuk7aX ReEncodeFont " <[XCh_nhq.enc <XCharter-Roman.pfb
-XCharter-Roman-osfx-sc-t1--base XCharter-Roman " AutoEnc_774cbp6dtpfhjjvh4rbnfjz76eX ReEncodeFont " <[XCh_774.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-ly1--base XCharter-Roman "AutoEnc_kaakcjyb4jlgitatdq753repib ReEncodeFont" <[XCh_kaakcj.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t1--base XCharter-Roman "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-ly1--base XCharter-Roman "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t1--base XCharter-Roman "AutoEnc_774cbp6dtpfhjjvh4rbnfjz76e ReEncodeFont" <[XCh_774cbp.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-ly1--base XCharter-Roman "AutoEnc_nhqiuun3uzujlzih2vbqcnuk7a ReEncodeFont" <[XCh_nhqiuu.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-ts1--base XCharter-Roman "AutoEnc_rvnb4vwnh67sodmukenhr2ljra ReEncodeFont" <[XCh_rvnb4v.enc <XCharter-Roman.pfb
+XCharter1-Bold-tosf-t1--base XCharter1-Bold "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter1-Bold.pfb
+XCharter1-Bold-tosf-ly1--base XCharter1-Bold "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter1-Bold.pfb
+XCharter1-Bold-tosf-sc-t1--base XCharter1-Bold "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter1-Bold.pfb
+XCharter1-Bold-tosf-sc-ly1--base XCharter1-Bold "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter1-Bold.pfb
+XCharter1-BoldItalic-tosf-t1--base XCharter1-BoldItalic "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter1-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-ly1--base XCharter1-BoldItalic "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter1-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t1--base XCharter1-BoldItalic "AutoEnc_7yasjxah7llw4rtugy54bqnqof ReEncodeFont" <[XCh_7yasjx.enc <XCharter1-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-ly1--base XCharter1-BoldItalic "AutoEnc_gev73zslq7un6el5psm4425p2e ReEncodeFont" <[XCh_gev73z.enc <XCharter1-BoldItalic.pfb
+XCharter1-Italic-tosf-t1--base XCharter1-Italic "AutoEnc_ptibkqp547zw5iym7kq36jvzab ReEncodeFont" <[XCh_ptibkq.enc <XCharter1-Italic.pfb
+XCharter1-Italic-tosf-ly1--base XCharter1-Italic "AutoEnc_mgl6fo3pkowiwkzk5cc57oqane ReEncodeFont" <[XCh_mgl6fo.enc <XCharter1-Italic.pfb
+XCharter1-Italic-tosf-sc-t1--base XCharter1-Italic "AutoEnc_z56e5dblkv74lkfzvwdpmpzrsb ReEncodeFont" <[XCh_z56e5d.enc <XCharter1-Italic.pfb
+XCharter1-Italic-tosf-sc-ly1--base XCharter1-Italic "AutoEnc_c7a5t5urqwnxoogu3ab7a44a2d ReEncodeFont" <[XCh_c7a5t5.enc <XCharter1-Italic.pfb
+XCharter1-Roman-tosf-t1--base XCharter1-Roman "AutoEnc_57c3kjpgjfgm77mkj7rccpop3b ReEncodeFont" <[XCh_57c3kj.enc <XCharter1-Roman.pfb
+XCharter1-Roman-tosf-ly1--base XCharter1-Roman "AutoEnc_o3eiyzejerk3kg6suhmkr63b3h ReEncodeFont" <[XCh_o3eiyz.enc <XCharter1-Roman.pfb
+XCharter1-Roman-tosf-sc-t1--base XCharter1-Roman "AutoEnc_774cbp6dtpfhjjvh4rbnfjz76e ReEncodeFont" <[XCh_774cbp.enc <XCharter1-Roman.pfb
+XCharter1-Roman-tosf-sc-ly1--base XCharter1-Roman "AutoEnc_nhqiuun3uzujlzih2vbqcnuk7a ReEncodeFont" <[XCh_nhqiuu.enc <XCharter1-Roman.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-ly1--base.tfm
deleted file mode 100644
index f5eaec7a3cb..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-ly1--base.tfm
deleted file mode 100644
index 1a60f0a8151..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-t1--base.tfm
deleted file mode 100644
index f19f7116a42..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-t1--base.tfm
deleted file mode 100644
index 8ad30c0edbc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ly1.tfm
index 8eac32f9389..8eac32f9389 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-ly1--base.tfm
index f3c317d7f38..f3c317d7f38 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-ly1.tfm
index aa239a1afd4..aa239a1afd4 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-t1--base.tfm
index 39c412cda7e..39c412cda7e 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-t1.tfm
index 7054afa1704..7054afa1704 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-t1--base.tfm
index 68022e6a89c..68022e6a89c 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-t1.tfm
index e5a6fec1592..e5a6fec1592 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ts1--base.tfm
index 4a6150fd9ec..4a6150fd9ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ts1.tfm
index 1d07d8768c3..1d07d8768c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-ly1--base.tfm
deleted file mode 100644
index 663153c3004..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1--base.tfm
deleted file mode 100644
index 9e6227c8f84..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-t1--base.tfm
deleted file mode 100644
index 9ccaa9fc967..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-t1--base.tfm
deleted file mode 100644
index 6923c5bab81..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ly1--base.tfm
index ca4b621cac8..ca4b621cac8 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ly1.tfm
index 90ea2825f5a..90ea2825f5a 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1--base.tfm
index 0d6c33fdf2b..0d6c33fdf2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1.tfm
index 1279983ba02..1279983ba02 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-t1--base.tfm
index e2d221eb598..e2d221eb598 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-t1.tfm
index d3ed2eaae0e..d3ed2eaae0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-t1--base.tfm
index dcddd7a1720..dcddd7a1720 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-t1.tfm
index 730c1175837..730c1175837 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ts1--base.tfm
index 467af554ea0..467af554ea0 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ts1.tfm
index 98384915b22..98384915b22 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-ly1--base.tfm
deleted file mode 100644
index 3bcc96c8555..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-ly1--base.tfm
deleted file mode 100644
index 8158c163a0f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-t1--base.tfm
deleted file mode 100644
index 508208fda54..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-t1--base.tfm
deleted file mode 100644
index 33e0ac46a95..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ly1--base.tfm
index 36395fe4146..36395fe4146 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ly1.tfm
index 27dc363369d..27dc363369d 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-ly1--base.tfm
index 9fa924bfd60..9fa924bfd60 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-ly1.tfm
index 8ff649f9bb9..8ff649f9bb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-t1--base.tfm
index 961830b6f92..961830b6f92 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-t1.tfm
index 7bc07c4eee7..7bc07c4eee7 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-t1--base.tfm
index 39106f58f33..39106f58f33 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-t1.tfm
index cb91a986c09..cb91a986c09 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ts1--base.tfm
index 89f614e25a6..89f614e25a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ts1.tfm
index 95b959b0a6f..95b959b0a6f 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-ly1--base.tfm
deleted file mode 100644
index 62bf6ccb122..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-ly1--base.tfm
deleted file mode 100644
index 453a8cc1a0b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1--base.tfm
deleted file mode 100644
index 1bac353d56f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1.tfm
deleted file mode 100644
index c3975f67ab1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1--base.tfm
deleted file mode 100644
index 3dc65f16cc8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1.tfm
deleted file mode 100644
index 32a2ba86152..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ly1--base.tfm
index 3a83f67df04..3a83f67df04 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ly1.tfm
index 7864fed750b..7864fed750b 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-ly1--base.tfm
index abe2fc00e5b..abe2fc00e5b 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-ly1.tfm
index 46a2f3cbdc9..46a2f3cbdc9 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-t1--base.tfm
index e9d0493d76e..e9d0493d76e 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-t1.tfm
index c3975f67ab1..c3975f67ab1 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-t1--base.tfm
index dc9d7ddea3c..dc9d7ddea3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-t1.tfm
index 32a2ba86152..32a2ba86152 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ts1--base.tfm
index e02049dd9b5..e02049dd9b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ts1.tfm
index 1efef712737..1efef712737 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-ly1--base.tfm
index dfc37acca99..11e0dd2bcd2 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-ly1.tfm
index 8eac32f9389..1d7de785cee 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..2876cba08ca
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-ly1.tfm
index aa239a1afd4..ce885b3a0cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-t1--base.tfm
new file mode 100644
index 00000000000..bb87949221c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-t1.tfm
index 7054afa1704..d9a96c6f9e7 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-t1--base.tfm
new file mode 100644
index 00000000000..0ef9b9f854a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-t1.tfm
index e5a6fec1592..94e7d7b0c5e 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Bold-osfx-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Bold-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-ly1--base.tfm
new file mode 100644
index 00000000000..ab38b3a168b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-ly1.tfm
index 90ea2825f5a..d934f86fd4b 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..f250e0248e9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1.tfm
index 1279983ba02..368a676abf2 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 00000000000..c18a4506e92
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1.tfm
index d3ed2eaae0e..5a8cdd460d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-t1--base.tfm
new file mode 100644
index 00000000000..86d6f037ea1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-t1.tfm
index 730c1175837..2a3f5e4d723 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-BoldItalic-osfx-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-BoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-ly1--base.tfm
new file mode 100644
index 00000000000..8e3e1ad18ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-ly1.tfm
index 27dc363369d..24230d397f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..f190bfff0d2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-ly1.tfm
index 8ff649f9bb9..903ed8c8cf1 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-t1--base.tfm
new file mode 100644
index 00000000000..b776dc7701a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-t1.tfm
index 7bc07c4eee7..3e65b24fd53 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-t1--base.tfm
new file mode 100644
index 00000000000..b2feb43b3b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-t1.tfm
index cb91a986c09..81691a2467f 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Italic-osfx-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Italic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-ly1--base.tfm
new file mode 100644
index 00000000000..f0a7bbbde8e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-ly1.tfm
index 7864fed750b..f892940d8b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..f4bd87fc738
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-ly1.tfm
index 46a2f3cbdc9..ea893832945 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter-Roman-osfx-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1--base.tfm
new file mode 100644
index 00000000000..13d2098476e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1.tfm
new file mode 100644
index 00000000000..967399f268e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1--base.tfm
new file mode 100644
index 00000000000..cd5fe21f0db
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1.tfm
new file mode 100644
index 00000000000..ba9de0ea149
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharter1-Roman-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Bold.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Bold.pfb
new file mode 100644
index 00000000000..bde0eafd9ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-BoldItalic.pfb
new file mode 100644
index 00000000000..21d699f917e
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Italic.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Italic.pfb
new file mode 100644
index 00000000000..90fb9e5dd9b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Italic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Roman.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Roman.pfb
new file mode 100644
index 00000000000..23dabef9ed4
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharter1-Roman.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-ly1.vf
index 44c0e28e9bb..ff1d1e151ee 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-sc-ly1.vf
index 9c220acf60b..76f03363b44 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-sc-t1.vf
index 536b8a182d0..6ee8113760a 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-t1.vf
index ea541ce1ed8..e2c9e80b993 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osfx-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-ts1.vf
index bca3e83f2e8..684b126ee2a 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-ly1.vf
index 25ceae4d08b..1082e211aac 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1.vf
index cc70835fb2a..79350c5ab82 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-sc-t1.vf
index 7b9ed20674b..2d4985f6ad4 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-t1.vf
index 1590f056c9c..a890dd98467 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osfx-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-ts1.vf
index eae568df35c..8768311d0be 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-ly1.vf
index 16fe8a26bfd..350f204a0ab 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-sc-ly1.vf
index 8f55f6a2218..fc3aa14a009 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-sc-t1.vf
index dcc91e52609..5d74b2df021 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-t1.vf
index 67048deedd9..f82893fafb7 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osfx-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-ts1.vf
index adfd5c60338..83b87344747 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-ly1.vf
deleted file mode 100644
index de10d3f2941..00000000000
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-sc-ly1.vf
index e40faef9048..33d4fcb8840 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-sc-t1.vf
index 097a65c33f3..bfb919771e0 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-t1.vf
index 9188c63dd00..b7fb9173fb3 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-ts1.vf
index 26c028971ae..d289cfa46f1 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-ly1.vf
index 8c26c03e244..8c87905b09d 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-sc-ly1.vf
index a64de0d596f..31c4a5459c3 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-sc-t1.vf
index 671835b53fe..5390bed7552 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-t1.vf
index 8166cb61ceb..058903601be 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Bold-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-ly1.vf
index f1428e6a52a..1dc24b1eee4 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1.vf
index 39c0d142d0b..b7262625a34 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1.vf
index 9d18acda3be..178d8e859aa 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-t1.vf
index 26e5ad9b24d..f1528defbc5 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-BoldItalic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-ly1.vf
index 3bd3ccdd5ee..fff5cba445c 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-sc-ly1.vf
index a77d7f857e1..26380c7387b 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-sc-t1.vf
index cd6b8f0c538..d9ff91f138b 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-t1.vf
index 3527f249349..267c9c4e77a 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Italic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-ly1.vf
index 6139cb7546b..3b89c23c4d6 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osfx-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-sc-ly1.vf
index 1bca47c90c1..e9198765234 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-sc-t1.vf
index 2b6032cd28e..b5e5f09ab0a 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-t1.vf
index d77382e6419..26c507a9d8b 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/XCharter-Roman-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/XCharter1-Roman-tosf-t1.vf
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd
deleted file mode 100644
index 4b1696f498f..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%% Generated by autoinst on 2013/10/24
-%%
-\ProvidesFile{LY1XCharter-OsF.fd}
-    [2013/10/24 (autoinst)  Font definitions for LY1/XCharter-OsF.]
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-\expandafter\ifx\csname XCharter@altone\endcsname\relax
-    \let\XCharter@@altone\@empty
-\else
-    \edef\XCharter@@altone{\XCharter@altone}%
-\fi
-
-\DeclareFontFamily{LY1}{XCharter-OsF}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-osf\XCharter@@altone-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-osf\XCharter@@altone-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{scsl}{
-      <-> ssub * XCharter-OsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{b}{sl}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{scsl}{
-      <-> ssub * XCharter-OsF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{m}{sl}{
-      <-> ssub * XCharter-OsF/m/it
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{sl}{
-      <-> ssub * XCharter-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{scsl}{
-      <-> ssub * XCharter-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{sc}{
-      <-> ssub * XCharter-OsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{n}{
-      <-> ssub * XCharter-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{it}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{XCharter-OsF}{bx}{scit}{
-      <-> ssub * XCharter-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd
new file mode 100644
index 00000000000..2df3042f741
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd
@@ -0,0 +1,92 @@
+%% Generated by autoinst on 2013/11/30
+%%
+\ProvidesFile{LY1XCharter-TOsF.fd}
+    [2013/11/30 (autoinst)  Font definitions for LY1/XCharter-TOsF.]
+
+\expandafter\ifx\csname XCharter@scale\endcsname\relax
+    \let\XCharter@@scale\@empty
+\else
+    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
+\fi
+
+\expandafter\ifx\csname XCharter@altone\endcsname\relax
+    \let\XCharter@@altone\@empty
+\else
+    \edef\XCharter@@altone{\XCharter@altone}%
+\fi
+
+\DeclareFontFamily{LY1}{XCharter-TOsF}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{sc}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{n}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{it}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{scit}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{scsl}{
+      <-> ssub * XCharter-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{sl}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sc}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{n}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{it}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scit}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scsl}{
+      <-> ssub * XCharter-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sl}{
+      <-> ssub * XCharter-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{sl}{
+      <-> ssub * XCharter-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{scsl}{
+      <-> ssub * XCharter-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{sc}{
+      <-> ssub * XCharter-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{n}{
+      <-> ssub * XCharter-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{it}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{scit}{
+      <-> ssub * XCharter-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd
deleted file mode 100644
index 332568db769..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%% Generated by autoinst on 2013/10/24
-%%
-\ProvidesFile{T1XCharter-OsF.fd}
-    [2013/10/24 (autoinst)  Font definitions for T1/XCharter-OsF.]
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-\expandafter\ifx\csname XCharter@altone\endcsname\relax
-    \let\XCharter@@altone\@empty
-\else
-    \edef\XCharter@@altone{\XCharter@altone}%
-\fi
-
-\DeclareFontFamily{T1}{XCharter-OsF}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-sc-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-osf\XCharter@@altone-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-osf-sc\XCharter@@altone-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{scsl}{
-      <-> ssub * XCharter-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{b}{sl}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-sc-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-sc-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{scsl}{
-      <-> ssub * XCharter-OsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{m}{sl}{
-      <-> ssub * XCharter-OsF/m/it
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{sl}{
-      <-> ssub * XCharter-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{scsl}{
-      <-> ssub * XCharter-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{sc}{
-      <-> ssub * XCharter-OsF/b/sc
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{n}{
-      <-> ssub * XCharter-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{it}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{XCharter-OsF}{bx}{scit}{
-      <-> ssub * XCharter-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd
new file mode 100644
index 00000000000..cb40b4d42eb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd
@@ -0,0 +1,92 @@
+%% Generated by autoinst on 2013/11/30
+%%
+\ProvidesFile{T1XCharter-TOsF.fd}
+    [2013/11/30 (autoinst)  Font definitions for T1/XCharter-TOsF.]
+
+\expandafter\ifx\csname XCharter@scale\endcsname\relax
+    \let\XCharter@@scale\@empty
+\else
+    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
+\fi
+
+\expandafter\ifx\csname XCharter@altone\endcsname\relax
+    \let\XCharter@@altone\@empty
+\else
+    \edef\XCharter@@altone{\XCharter@altone}%
+\fi
+
+\DeclareFontFamily{T1}{XCharter-TOsF}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{sc}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{n}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{it}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{scit}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{scsl}{
+      <-> ssub * XCharter-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{sl}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{sc}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{n}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{it}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{scit}{
+      <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{scsl}{
+      <-> ssub * XCharter-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{sl}{
+      <-> ssub * XCharter-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{sl}{
+      <-> ssub * XCharter-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{scsl}{
+      <-> ssub * XCharter-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{sc}{
+      <-> ssub * XCharter-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{n}{
+      <-> ssub * XCharter-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{it}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{scit}{
+      <-> ssub * XCharter-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd
deleted file mode 100644
index 2d0f47b5c28..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd
+++ /dev/null
@@ -1,50 +0,0 @@
-%% Generated by autoinst on 2013/10/27
-%%
-\ProvidesFile{TS1XCharter-OsF.fd}
-    [2013/10/27 (autoinst)  Font definitions for TS1/XCharter-OsF.]
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{XCharter-OsF}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{b}{sl}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{m}{sl}{
-      <-> ssub * XCharter-OsF/m/it
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{bx}{sl}{
-      <-> ssub * XCharter-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{bx}{n}{
-      <-> ssub * XCharter-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{XCharter-OsF}{bx}{it}{
-      <-> ssub * XCharter-OsF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
new file mode 100644
index 00000000000..c67572fcb89
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
@@ -0,0 +1,50 @@
+%% Generated by autoinst on 2013/11/30
+%%
+\ProvidesFile{TS1XCharter-TOsF.fd}
+    [2013/11/30 (autoinst)  Font definitions for TS1/XCharter-TOsF.]
+
+\expandafter\ifx\csname XCharter@scale\endcsname\relax
+    \let\XCharter@@scale\@empty
+\else
+    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{XCharter-TOsF}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{
+      <-> \XCharter@@scale XCharter-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{
+      <-> \XCharter@@scale XCharter-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{sl}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{
+      <-> \XCharter@@scale XCharter-Roman-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{
+      <-> \XCharter@@scale XCharter-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{
+      <-> ssub * XCharter-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{sl}{
+      <-> ssub * XCharter-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{n}{
+      <-> ssub * XCharter-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{it}{
+      <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index 9ae032c2f90..ab4a1287942 100644
--- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
+++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
@@ -3,8 +3,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 
-\def\fileversion{1.00}
-\def\filedate{2013/10/27}
+\def\fileversion{1.01}
+\def\filedate{2013/12/01}
 
 \ProvidesPackage{XCharter}[\filedate\space v\fileversion]
 
@@ -27,7 +27,7 @@
   \fontfamily{XCharter-TLF}\selectfont }
 \DeclareRobustCommand{\osfstyle}{%
   \not@math@alphabet\osfstyle\relax
-  \fontfamily{XCharter-OsF}\selectfont }
+  \fontfamily{XCharter-TOsF}\selectfont }
 \def\textlf#1{{\lfstyle #1}}
 %\def\textosf#1{{\osfstyle #1}}
 
@@ -44,16 +44,16 @@
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 
-\def\XCharter@altone{x}% default is to use 1, not I
+\def\XCharter@altone{1}% default is to use 1, not I
 \newif\if@XCh@sups
 \DeclareOptionX{lf}{\edef\XCharter@figurestyle{TLF}}
 \DeclareOptionX{lining}{\edef\XCharter@figurestyle{TLF}}
-\DeclareOptionX{oldstyle}{\edef\XCharter@figurestyle{OsF}%
-\edef\XCharter@altone{x}}
-\DeclareOptionX{oldstyleI}{\edef\XCharter@figurestyle{OsF}%
+\DeclareOptionX{oldstyle}{\edef\XCharter@figurestyle{TOsF}%
+\edef\XCharter@altone{1}}
+\DeclareOptionX{oldstyleI}{\edef\XCharter@figurestyle{TOsF}%
 \edef\XCharter@altone{}}
-\DeclareOptionX{osf}{\edef\XCharter@figurestyle{OsF}\edef\XCharter@altone{x}}
-\DeclareOptionX{osfI}{\edef\XCharter@figurestyle{OsF}\edef\XCharter@altone{}}
+\DeclareOptionX{osf}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{1}}
+\DeclareOptionX{osfI}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{}}
 \DeclareOptionX{sups}{\@XCh@supstrue}
 
 \edef\bfseries@rm{b}
@@ -61,8 +61,8 @@
 \ExecuteOptionsX{lining}
 \ProcessOptionsX\relax
 
-\def\useosf{\renewcommand*{\rmdefault}{XCharter-OsF}\def\XCharter@altone{x}}
-\def\useosfI{\renewcommand*{\rmdefault}{XCharter-OsF}\def\XCharter@altone{}}
+\def\useosf{\renewcommand*{\rmdefault}{XCharter-TOsF}\def\XCharter@altone{1}}
+\def\useosfI{\renewcommand*{\rmdefault}{XCharter-TOsF}\def\XCharter@altone{}}
 \@onlypreamble\useosf
 \@onlypreamble\useosfI
 
@@ -76,16 +76,16 @@
 \DeclareFontFamily{T1}{XCharterx}{}
 
 \DeclareFontShape{T1}{XCharterx}{m}{n}{
-   <-> s*[\XCharter@scale]  XCharter-Roman-osfx-t1
+   <-> s*[\XCharter@scale]  XCharter1-Roman-tosf-t1
 }{}
 \DeclareFontShape{T1}{XCharterx}{m}{it}{
-   <-> s*[\XCharter@scale]  XCharter-Italic-osfx-t1
+   <-> s*[\XCharter@scale]  XCharter1-Italic-tosf-t1
 }{}
 \DeclareFontShape{T1}{XCharterx}{b}{n}{
-   <-> s*[\XCharter@scale]  XCharter-Bold-osfx-t1
+   <-> s*[\XCharter@scale]  XCharter1-Bold-tosf-t1
 }{}
 \DeclareFontShape{T1}{XCharterx}{b}{it}{
-   <-> s*[\XCharter@scale]  XCharter-BoldItalic-osfx-t1
+   <-> s*[\XCharter@scale]  XCharter1-BoldItalic-tosf-t1
 }{}
 
 
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 2a870070567..02192d739f8 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -606,6 +606,7 @@ my @TLP_no_check = (
   "seetexk",		# binary
   "synctex",		# binary
   "t1utils",		# binary
+  "tds",		# stable, don't worry until next update
   "tetex",		# our sources
   "tex",		# binary
   "tex-virtual-academy-pl",# GUST, requested 2012