xcharter (29jun20)

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

7 files changed, 80 insertions, 457 deletions

diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd
deleted file mode 100644
index 3739a2ae29d..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Generated by autoinst on 2019/11/21
-%%
-\ProvidesFile{T2ASRBXCharter-Sup.fd}
-    [2019/11/21 (autoinst)  Font definitions for T2ASRB/XCharter-Sup.]
-
-\ifcsname s@fct@alias\endcsname\else
-\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
-\gdef\@font@aliasinfo#1{%
-    \@font@info{Font\space shape\space `\curr@fontshape'\space will
-        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
-}
-\fi
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2ASRB}{XCharter-Sup}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{
-      <-> \XCharter@@scale XCharter-Bold-sup-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb
-}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{it}{
-      <-> \XCharter@@scale XCharter-Italic-sup-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{n}{
-      <-> \XCharter@@scale XCharter-Roman-sup-t2asrb
-}{}
-
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{
-      <-> alias * XCharter-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{it}{
-      <-> alias * XCharter-Sup/regular/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{
-      <-> alias * XCharter-Sup/regular/n
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{
-      <-> alias * XCharter-Sup/bold/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{it}{
-      <-> alias * XCharter-Sup/bold/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{
-      <-> alias * XCharter-Sup/bold/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{sl}{
-      <-> ssub * XCharter-Sup/b/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{it}{
-      <-> ssub * XCharter-Sup/b/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{n}{
-      <-> ssub * XCharter-Sup/b/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd
deleted file mode 100644
index cc9fb1c328a..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd
+++ /dev/null
@@ -1,157 +0,0 @@
-%% Generated by autoinst on 2019/11/21
-%%
-\ProvidesFile{T2ASRBXCharter-TLF.fd}
-    [2019/11/21 (autoinst)  Font definitions for T2ASRB/XCharter-TLF.]
-
-\ifcsname s@fct@alias\endcsname\else
-\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
-\gdef\@font@aliasinfo#1{%
-    \@font@info{Font\space shape\space `\curr@fontshape'\space will
-        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
-}
-\fi
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2ASRB}{XCharter-TLF}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scsl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb
-}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scsl}{
-      <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{n}{
-      <-> \XCharter@@scale XCharter-Roman-tlf-t2asrb
-}{}
-
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{
-      <-> alias * XCharter-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{
-      <-> alias * XCharter-TLF/regular/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{
-      <-> alias * XCharter-TLF/regular/scit
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{
-      <-> alias * XCharter-TLF/regular/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{
-      <-> alias * XCharter-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{n}{
-      <-> alias * XCharter-TLF/regular/n
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{
-      <-> alias * XCharter-TLF/bold/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{
-      <-> alias * XCharter-TLF/bold/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{
-      <-> alias * XCharter-TLF/bold/scsl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{
-      <-> alias * XCharter-TLF/bold/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{
-      <-> alias * XCharter-TLF/bold/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{
-      <-> alias * XCharter-TLF/bold/scit
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{
-      <-> ssub * XCharter-TLF/b/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sc}{
-      <-> ssub * XCharter-TLF/b/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{
-      <-> ssub * XCharter-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{
-      <-> ssub * XCharter-TLF/b/scit
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{
-      <-> ssub * XCharter-TLF/b/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{
-      <-> ssub * XCharter-TLF/b/scsl
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd
deleted file mode 100644
index bc516cb3af2..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd
+++ /dev/null
@@ -1,157 +0,0 @@
-%% Generated by autoinst on 2019/11/21
-%%
-\ProvidesFile{T2ASRBXCharter-TOsF.fd}
-    [2019/11/21 (autoinst)  Font definitions for T2ASRB/XCharter-TOsF.]
-
-\ifcsname s@fct@alias\endcsname\else
-\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
-\gdef\@font@aliasinfo#1{%
-    \@font@info{Font\space shape\space `\curr@fontshape'\space will
-        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
-}
-\fi
-
-\expandafter\ifx\csname XCharter@scale\endcsname\relax
-    \let\XCharter@@scale\@empty
-\else
-    \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2ASRB}{XCharter-TOsF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{n}{
-      <-> \XCharter@@scale XCharter-Roman-tosf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tosf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scsl}{
-      <-> \XCharter@@scale XCharter-Slanted-tosf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-tosf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scsl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb
-}{}
-
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{n}{
-      <-> alias * XCharter-TOsF/regular/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{
-      <-> alias * XCharter-TOsF/regular/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{
-      <-> alias * XCharter-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{
-      <-> alias * XCharter-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sl}{
-      <-> alias * XCharter-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{
-      <-> alias * XCharter-TOsF/regular/scit
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{
-      <-> alias * XCharter-TOsF/bold/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{
-      <-> alias * XCharter-TOsF/bold/scit
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{
-      <-> alias * XCharter-TOsF/bold/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{
-      <-> alias * XCharter-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{
-      <-> alias * XCharter-TOsF/bold/scsl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{
-      <-> alias * XCharter-TOsF/bold/it
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{
-      <-> ssub * XCharter-TOsF/b/n
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{
-      <-> ssub * XCharter-TOsF/b/scit
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sc}{
-      <-> ssub * XCharter-TOsF/b/sc
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{
-      <-> ssub * XCharter-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{
-      <-> ssub * XCharter-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{
-      <-> ssub * XCharter-TOsF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd
index 0cd91d03a6f..c70ced78012 100644
--- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd
@@ -1,7 +1,6 @@
-%% Generated by autoinst on 2017/06/25
 %%
 \ProvidesFile{TS1XCharter-TLF.fd}
-    [2017/06/25 (autoinst)  Font definitions for TS1/XCharter-TLF.]
+    [2020/05/25 (msharpe)  Font definitions for TS1/XCharter-TLF.]
 
 \expandafter\ifx\csname XCharter@scale\endcsname\relax
     \let\XCharter@@scale\@empty
@@ -12,27 +11,27 @@
 \DeclareFontFamily{TS1}{XCharter-TLF}{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tlf-ts1
+      <-> \XCharter@@scale XCharter-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{b}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-ts1
+      <-> \XCharter@@scale XCharter-BoldSlanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tlf-ts1
+      <-> \XCharter@@scale XCharter-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-tlf-ts1
+      <-> \XCharter@@scale XCharter-Roman-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{m}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-tlf-ts1
+      <-> \XCharter@@scale XCharter-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tlf-ts1
+      <-> \XCharter@@scale XCharter-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TLF}{bx}{it}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
index 04fc700b7cf..5014f62a871 100644
--- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
@@ -1,7 +1,6 @@
-%% Generated by autoinst on 2017/06/25
 %%
 \ProvidesFile{TS1XCharter-TOsF.fd}
-    [2017/06/25 (autoinst)  Font definitions for TS1/XCharter-TOsF.]
+    [2020/05/25 (msharpe)  Font definitions for TS1/XCharter-TOsF.]
 
 \expandafter\ifx\csname XCharter@scale\endcsname\relax
     \let\XCharter@@scale\@empty
@@ -12,39 +11,39 @@
 \DeclareFontFamily{TS1}{XCharter-TOsF}{}
 
 \DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tosf-ts1
+      <-> \XCharter@@scale XCharter-BoldItalic-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TOsF}{b}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-ts1
+      <-> \XCharter@@scale XCharter-BoldSlanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-tosf-ts1
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{
+      <-> \XCharter@@scale XCharter-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-tosf-ts1
+      <-> \XCharter@@scale XCharter-Roman-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{
+      <-> \XCharter@@scale XCharter-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tosf-ts1
+      <-> \XCharter@@scale XCharter-Italic-ts1
 }{}
 
 \DeclareFontShape{TS1}{XCharter-TOsF}{bx}{it}{
       <-> ssub * XCharter-TOsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{n}{
-      <-> ssub * XCharter-TOsF/b/n
-}{}
-
 \DeclareFontShape{TS1}{XCharter-TOsF}{bx}{sl}{
       <-> ssub * XCharter-TOsF/b/sl
 }{}
 
+\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{n}{
+      <-> ssub * XCharter-TOsF/b/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index 0b90a171bbb..1fe8b66ccca 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.203}
-\def\filedate{2019/11/21}
+\def\fileversion{1.207}
+\def\filedate{2020/06/27}
 
 \ProvidesPackage{XCharter}[\filedate\space v\fileversion]
 
@@ -12,8 +12,11 @@
 
 \RequirePackage[T2A,LY1,T1]{fontenc}
 \RequirePackage{textcomp}
+\RequirePackage{scalefnt} % only for \textruble
+\DeclareEncodingSubset{TS1}{XCharter-*}{0}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox} %etoolbox loads etex.sty
+\RequirePackage{xstring,ifthen} % for \textfrac
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
     \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
@@ -44,8 +47,38 @@
     \DeclareTextFontCommand{\textde}{\defigures}
     \let\textdenominator\textde
 }{}
-\providecommand*{\textfrac}[2]{%
-	\textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
+\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
+  \mbox{%
+    \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+      {\textlf{#1}\kern.05em}{}%         
+    \textsu{#2}% numerator
+    \StrRight{#2}{1}[\@digit@]%
+    % look for  1, 2, 3, 4, 7
+    \ifcase\@digit@% 0
+    \or% 1
+    \or\kern.03em% 2
+    \or\kern-.01em% 3
+    \or%\kern-.01em% 4
+    \or%\kern.01em% 5
+    \or\kern.01em% 6
+    \or\kern-.09em% 7
+    \fi%
+    \kern\XCh@foresolidus\textfractionsolidus\kern\XCh@aftsolidus%
+    \StrLeft{#3}{1}[\@digit@]%
+    % look for 1, 4, 5, 7
+    \ifcase\@digit@% 0
+    \or\kern -.02em% 1
+    \or\kern .01em% 2
+    \or\kern -.02em% 3
+    \or\kern -.08em% 4
+    \or\kern -.01em% 5
+    \or\kern -.03em% 6
+    \or\kern .02em% 7
+    \fi%
+    \textde{#3}%       denominator [#3]
+  }%
+}
+
 \DeclareRobustCommand{\lfstyle}{%
   \not@math@alphabet\lfstyle\relax
   \fontfamily{XCharter-TLF}\selectfont }
@@ -67,12 +100,16 @@
 }
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
+\def\XCh@foresolidus{-.02em}
+\def\XCh@aftsolidus{-.02em}
 %\newif\ifXCh@babel
 %\ifdefined\bbl@tempa \XCh@babeltrue\fi
 \newif\if@XCh@scosf
 \newif\if@XCh@srb
 \def\XCharter@altone{1}% default is to use 1, not I
 \newif\if@XCh@sups
+\DeclareOptionX{foresolidus}{\gdef\XCh@foresolidus{#1}}
+\DeclareOptionX{aftsolidus}{\gdef\XCh@aftsolidus{#1}}
 \DeclareOptionX{lf}{\edef\XCharter@figurestyle{TLF}}
 \DeclareOptionX{lining}{\edef\XCharter@figurestyle{TLF}}
 \DeclareOptionX{oldstyle}{\edef\XCharter@figurestyle{TOsF}%
@@ -127,6 +164,22 @@
 {\fontfamily{XCharter-TOsF}\fontshape{sc}\selectfont #1}%
 }\fi% use OsF in small caps
 
+\DeclareRobustCommand{\textruble}{\rlap{\kern.03em\rule[.258em]{.1em}{.032em}}\rlap{\kern.03em\rule[.173em]{.41em}{.032em}}{\scalefont{.966}P}}
+
+\DeclareTextCommand{\textcircled}{TS1}[1]{%
+\hmode@bgroup
+   \ooalign{%
+      \hfil \raise .32ex\hbox {\fontencoding{T1}\fontseries{m}\fontshape{sc}\fontsize{7.5}{7.5}\selectfont \lowercase{#1}}\hfil \crcr
+     \char 79 %\textbigcircle 
+   }%
+ \egroup}
+
+%\DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup
+%   \ooalign{%
+%      \hfil \raise .37ex\hbox {\fontencoding{T1}\fontseries{m}\fontshape{sc}\fontsize{7.2}{7.2}\selectfont \lowercase{#1}}\hfil \crcr
+%     \textbigcircle 
+%   }%
+% \egroup}
 
 \if@XCh@sups %
  \ifdefined\sufigures
diff --git a/Master/texmf-dist/tex/latex/xcharter/newtx-xcharter-subs.tex b/Master/texmf-dist/tex/latex/xcharter/newtx-xcharter-subs.tex
deleted file mode 100644
index e88ea8eb7c9..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/newtx-xcharter-subs.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-{f}{-2}
-{j}{-2}
-{p}{-1.5}
-{y}{-1.5}
-{A}{-1.5}
-{B}{-1}
-{D}{-1}
-{H}{-1}
-{I}{-1}
-{K}{-1}
-{L}{-1}
-{M}{-1}
-{N}{-0.5}
-{P}{-1}
-{X}{-1}
-{\rho}{-1}
-{\beta}{-1}
\ No newline at end of file