summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-26 21:21:33 +0000
committerKarl Berry <karl@freefriends.org>2017-06-26 21:21:33 +0000
commit605eda23ba6a6c7cfe3ff351ef665e02befa9403 (patch)
treea119052b46d738e37d22df79b0da4e74b58b39a1 /Master/texmf-dist/tex
parentf844520b7ca021b1d9c45650a3713bacd1d68f22 (diff)
xcharter (26jun17)
git-svn-id: svn://tug.org/texlive/trunk@44702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd43
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd73
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd41
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd82
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd31
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd81
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd55
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd57
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd93
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd93
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd39
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd41
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/XCharter.fontspec4
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/XCharter.sty39
26 files changed, 1186 insertions, 293 deletions
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd
new file mode 100644
index 00000000000..6c9f4fbfa29
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{LY1XCharter-Dnom.fd}
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Dnom.]
+
+\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-Dnom}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{bx}{n}{
+ <-> ssub * XCharter-Dnom/b/n
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{bx}{sl}{
+ <-> ssub * XCharter-Dnom/b/sl
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Dnom}{bx}{it}{
+ <-> ssub * XCharter-Dnom/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd
new file mode 100644
index 00000000000..695de4abf75
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{LY1XCharter-Inf.fd}
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Inf.]
+
+\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-Inf}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{bx}{it}{
+ <-> ssub * XCharter-Inf/b/it
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{bx}{n}{
+ <-> ssub * XCharter-Inf/b/n
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Inf}{bx}{sl}{
+ <-> ssub * XCharter-Inf/b/sl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd
new file mode 100644
index 00000000000..c2cecc7338f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{LY1XCharter-Numr.fd}
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Numr.]
+
+\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-Numr}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{bx}{n}{
+ <-> ssub * XCharter-Numr/b/n
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{bx}{sl}{
+ <-> ssub * XCharter-Numr/b/sl
+}{}
+
+\DeclareFontShape{LY1}{XCharter-Numr}{bx}{it}{
+ <-> ssub * XCharter-Numr/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd
index 96ad5475dcf..3aa0418247f 100644
--- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/27
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{LY1XCharter-Sup.fd}
- [2013/10/27 (autoinst) Font definitions for LY1/XCharter-Sup.]
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Sup.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,42 +9,49 @@
\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-Sup}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-sup-ly1
+\DeclareFontShape{LY1}{XCharter-Sup}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{XCharter-Sup}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{b}{sl}{
- <-> ssub * XCharter-Sup/b/it
+\DeclareFontShape{LY1}{XCharter-Sup}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-sup-ly1
+\DeclareFontShape{LY1}{XCharter-Sup}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-sup-ly1
+\DeclareFontShape{LY1}{XCharter-Sup}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{m}{sl}{
- <-> ssub * XCharter-Sup/m/it
+\DeclareFontShape{LY1}{XCharter-Sup}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{bx}{sl}{
- <-> ssub * XCharter-Sup/b/sl
+\DeclareFontShape{LY1}{XCharter-Sup}{bx}{it}{
+ <-> ssub * XCharter-Sup/b/it
}{}
\DeclareFontShape{LY1}{XCharter-Sup}{bx}{n}{
<-> ssub * XCharter-Sup/b/n
}{}
-\DeclareFontShape{LY1}{XCharter-Sup}{bx}{it}{
- <-> ssub * XCharter-Sup/b/it
+\DeclareFontShape{LY1}{XCharter-Sup}{bx}{sl}{
+ <-> ssub * XCharter-Sup/b/sl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd
index e721284bde8..5728c6266f3 100644
--- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/27
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{LY1XCharter-TLF.fd}
- [2013/10/27 (autoinst) Font definitions for LY1/XCharter-TLF.]
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-TLF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,72 +9,67 @@
\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-TLF}{}
\DeclareFontShape{LY1}{XCharter-TLF}{b}{sc}{
- <-> \XCharter@@scale XCharter-Bold-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-TLF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tlf-ly1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-ly1
}{}
\DeclareFontShape{LY1}{XCharter-TLF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-ly1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ly1
}{}
\DeclareFontShape{LY1}{XCharter-TLF}{b}{scit}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{XCharter-TLF}{b}{scsl}{
- <-> ssub * XCharter-TLF/b/scit
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-ly1
}{}
\DeclareFontShape{LY1}{XCharter-TLF}{b}{sl}{
- <-> ssub * XCharter-TLF/b/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{sc}{
- <-> \XCharter@@scale XCharter-Roman-tlf-sc-ly1
+\DeclareFontShape{LY1}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tlf-ly1
+\DeclareFontShape{LY1}{XCharter-TLF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tlf-ly1
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{scit}{
- <-> \XCharter@@scale XCharter-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{scsl}{
- <-> ssub * XCharter-TLF/m/scit
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{m}{sl}{
- <-> ssub * XCharter-TLF/m/it
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{bx}{sl}{
- <-> ssub * XCharter-TLF/b/sl
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{bx}{scsl}{
- <-> ssub * XCharter-TLF/b/scsl
+\DeclareFontShape{LY1}{XCharter-TLF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ly1
}{}
\DeclareFontShape{LY1}{XCharter-TLF}{bx}{sc}{
<-> ssub * XCharter-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{XCharter-TLF}{bx}{n}{
- <-> ssub * XCharter-TLF/b/n
-}{}
-
\DeclareFontShape{LY1}{XCharter-TLF}{bx}{it}{
<-> ssub * XCharter-TLF/b/it
}{}
@@ -83,4 +78,16 @@
<-> ssub * XCharter-TLF/b/scit
}{}
+\DeclareFontShape{LY1}{XCharter-TLF}{bx}{sl}{
+ <-> ssub * XCharter-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TLF}{bx}{n}{
+ <-> ssub * XCharter-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TLF}{bx}{scsl}{
+ <-> ssub * XCharter-TLF/b/scsl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd
index 2df3042f741..cb0bb0d9adc 100644
--- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/11/30
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{LY1XCharter-TOsF.fd}
- [2013/11/30 (autoinst) Font definitions for LY1/XCharter-TOsF.]
+ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-TOsF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,6 +9,7 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
+
\expandafter\ifx\csname XCharter@altone\endcsname\relax
\let\XCharter@@altone\@empty
\else
@@ -17,52 +18,64 @@
\DeclareFontFamily{LY1}{XCharter-TOsF}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{b}{sc}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{b}{n}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{b}{it}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-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}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{b}{sl}{
- <-> ssub * XCharter-TOsF/b/it
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sc}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{n}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{it}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scit}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{scit}{
+ <-> ssub * XCharter-TOsF/b/scit
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{scsl}{
- <-> ssub * XCharter-TOsF/m/scit
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{sc}{
+ <-> ssub * XCharter-TOsF/b/sc
}{}
-\DeclareFontShape{LY1}{XCharter-TOsF}{m}{sl}{
- <-> ssub * XCharter-TOsF/m/it
+\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{it}{
+ <-> ssub * XCharter-TOsF/b/it
}{}
\DeclareFontShape{LY1}{XCharter-TOsF}{bx}{sl}{
@@ -73,20 +86,8 @@
<-> 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/OT1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd
new file mode 100644
index 00000000000..e8ad316bb17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{OT1XCharter-Dnom.fd}
+ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Dnom.]
+
+\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{OT1}{XCharter-Dnom}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{bx}{it}{
+ <-> ssub * XCharter-Dnom/b/it
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{bx}{sl}{
+ <-> ssub * XCharter-Dnom/b/sl
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Dnom}{bx}{n}{
+ <-> ssub * XCharter-Dnom/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd
new file mode 100644
index 00000000000..84e945259b2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{OT1XCharter-Inf.fd}
+ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Inf.]
+
+\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{OT1}{XCharter-Inf}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{bx}{it}{
+ <-> ssub * XCharter-Inf/b/it
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{bx}{n}{
+ <-> ssub * XCharter-Inf/b/n
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Inf}{bx}{sl}{
+ <-> ssub * XCharter-Inf/b/sl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd
new file mode 100644
index 00000000000..f9dbabfa371
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{OT1XCharter-Numr.fd}
+ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Numr.]
+
+\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{OT1}{XCharter-Numr}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{bx}{sl}{
+ <-> ssub * XCharter-Numr/b/sl
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{bx}{n}{
+ <-> ssub * XCharter-Numr/b/n
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Numr}{bx}{it}{
+ <-> ssub * XCharter-Numr/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd
index ced1a565e2e..e2b73e3ef8c 100644
--- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/24
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{OT1XCharter-Sup.fd}
- [2013/10/24 (autoinst) Font definitions for OT1/XCharter-Sup.]
+ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Sup.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,42 +9,49 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
-\DeclareFontFamily{OT1}{XCharter-Sup}{}
-\DeclareFontShape{OT1}{XCharter-Sup}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-sup-ot1
-}{}
+\expandafter\ifx\csname XCharter@altone\endcsname\relax
+ \let\XCharter@@altone\@empty
+\else
+ \edef\XCharter@@altone{\XCharter@altone}%
+\fi
+
+\DeclareFontFamily{OT1}{XCharter-Sup}{}
\DeclareFontShape{OT1}{XCharter-Sup}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-sup-ot1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-Sup}{b}{sl}{
- <-> ssub * XCharter-Sup/b/it
+\DeclareFontShape{OT1}{XCharter-Sup}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-Sup}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-sup-ot1
+\DeclareFontShape{OT1}{XCharter-Sup}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-ot1
}{}
\DeclareFontShape{OT1}{XCharter-Sup}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-sup-ot1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-ot1
}{}
\DeclareFontShape{OT1}{XCharter-Sup}{m}{sl}{
- <-> ssub * XCharter-Sup/m/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-Sup}{bx}{sl}{
- <-> ssub * XCharter-Sup/b/sl
+\DeclareFontShape{OT1}{XCharter-Sup}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{XCharter-Sup}{bx}{it}{
+ <-> ssub * XCharter-Sup/b/it
}{}
\DeclareFontShape{OT1}{XCharter-Sup}{bx}{n}{
<-> ssub * XCharter-Sup/b/n
}{}
-\DeclareFontShape{OT1}{XCharter-Sup}{bx}{it}{
- <-> ssub * XCharter-Sup/b/it
+\DeclareFontShape{OT1}{XCharter-Sup}{bx}{sl}{
+ <-> ssub * XCharter-Sup/b/sl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd
index a9cc1c6d4be..567e953a608 100644
--- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd
@@ -1,7 +1,7 @@
-%% 2015/07/23
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{OT1XCharter-TLF.fd}
- [2013/10/24 (autoinst) Font definitions for OT1/XCharter-TLF.]
+ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-TLF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,72 +9,67 @@
\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{OT1}{XCharter-TLF}{}
\DeclareFontShape{OT1}{XCharter-TLF}{b}{sc}{
- <-> \XCharter@@scale XCharter-Bold-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{XCharter-TLF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tlf-ot1G
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-ot1
}{}
\DeclareFontShape{OT1}{XCharter-TLF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-ot1G
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ot1
}{}
\DeclareFontShape{OT1}{XCharter-TLF}{b}{scit}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{XCharter-TLF}{b}{scsl}{
- <-> ssub * XCharter-TLF/b/scit
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-ot1
}{}
\DeclareFontShape{OT1}{XCharter-TLF}{b}{sl}{
- <-> ssub * XCharter-TLF/b/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{sc}{
- <-> \XCharter@@scale XCharter-Roman-tlf-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TLF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tlf-ot1G
+\DeclareFontShape{OT1}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tlf-ot1G
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{scit}{
- <-> \XCharter@@scale XCharter-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{scsl}{
- <-> ssub * XCharter-TLF/m/scit
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{m}{sl}{
- <-> ssub * XCharter-TLF/m/it
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{bx}{sl}{
- <-> ssub * XCharter-TLF/b/sl
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{bx}{scsl}{
- <-> ssub * XCharter-TLF/b/scsl
+\DeclareFontShape{OT1}{XCharter-TLF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-ot1
}{}
\DeclareFontShape{OT1}{XCharter-TLF}{bx}{sc}{
<-> ssub * XCharter-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{XCharter-TLF}{bx}{n}{
- <-> ssub * XCharter-TLF/b/n
-}{}
-
\DeclareFontShape{OT1}{XCharter-TLF}{bx}{it}{
<-> ssub * XCharter-TLF/b/it
}{}
@@ -83,4 +78,16 @@
<-> ssub * XCharter-TLF/b/scit
}{}
+\DeclareFontShape{OT1}{XCharter-TLF}{bx}{sl}{
+ <-> ssub * XCharter-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{XCharter-TLF}{bx}{scsl}{
+ <-> ssub * XCharter-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{XCharter-TLF}{bx}{n}{
+ <-> ssub * XCharter-TLF/b/n
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd
index 7afaa895c69..2de1fee0f76 100644
--- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd
@@ -1,91 +1,93 @@
-%% Generated by autoinst on 2013/10/24
+%% Generated by autoinst on 2017/06/25
%%
-\ProvidesFile{OT1XCharter-OsF.fd}
- [2013/10/24 (autoinst) Font definitions for OT1/XCharter-OsF.]
+\ProvidesFile{OT1XCharter-TOsF.fd}
+ [2017/06/25 (autoinst) Font definitions for OT1/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{OT1}{XCharter-OsF}{}
+\DeclareFontFamily{OT1}{XCharter-TOsF}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{sc}{
- <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-osf\XCharter@@altone-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-osf\XCharter@@altone-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{scit}{
- <-> \XCharter@@scale XCharter-BoldItalic-osf\XCharter@@altone-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{scsl}{
- <-> ssub * XCharter-OsF/b/scit
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{b}{sl}{
- <-> ssub * XCharter-OsF/b/it
+\DeclareFontShape{OT1}{XCharter-TOsF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{sc}{
- <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-osf\XCharter@@altone-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{scit}{
- <-> \XCharter@@scale XCharter-Italic-osf\XCharter@@altone-sc-ot1
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{scsl}{
- <-> ssub * XCharter-OsF/m/scit
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{m}{sl}{
- <-> ssub * XCharter-OsF/m/it
+\DeclareFontShape{OT1}{XCharter-TOsF}{b}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{sl}{
- <-> ssub * XCharter-OsF/b/sl
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{scsl}{
+ <-> ssub * XCharter-TOsF/b/scsl
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{scsl}{
- <-> ssub * XCharter-OsF/b/scsl
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{n}{
+ <-> ssub * XCharter-TOsF/b/n
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{sc}{
- <-> ssub * XCharter-OsF/b/sc
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{sl}{
+ <-> ssub * XCharter-TOsF/b/sl
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{n}{
- <-> ssub * XCharter-OsF/b/n
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{scit}{
+ <-> ssub * XCharter-TOsF/b/scit
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{it}{
- <-> ssub * XCharter-OsF/b/it
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{it}{
+ <-> ssub * XCharter-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{XCharter-OsF}{bx}{scit}{
- <-> ssub * XCharter-OsF/b/scit
+\DeclareFontShape{OT1}{XCharter-TOsF}{bx}{sc}{
+ <-> ssub * XCharter-TOsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd
new file mode 100644
index 00000000000..9d05b9d3399
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd
@@ -0,0 +1,44 @@
+%Filename: OT2XCharter-TLF.fd
+%Created by: tex xcharterot2-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{OT2XCharter-TLF.fd}
+ [2017/06/15 Fontinst v1.933 font definitions for OT2/xcharter-tlf.]
+
+\expandafter\ifx\csname XCharter@scale\endcsname\relax
+ \let\XCharter@@scale\@empty
+\else
+ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT2}{XCharter-TLF}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{m}{n}{
+ <-> \XCharter@@scale XCharter-Roman-tlf-ot2
+}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{m}{it}{
+ <-> \XCharter@@scale XCharter-Italic-tlf-ot2
+}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter-Bold-tlf-ot2
+}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{b}{it}{
+ <-> \XCharter@@scale XCharter-BoldItalic-tlf-ot2
+}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter-Slanted-tlf-ot2
+}{}
+
+\DeclareFontShape{OT2}{XCharter-TLF}{b}{sl}{
+ <-> \XCharter@@scale XCharter-BoldSlanted-tlf-ot2
+}{}
+\DeclareFontShape{OT2}{XCharter-TLF}{bx}{sl}{<->ssub * XCharter-TLF/b/sl}{}
+\DeclareFontShape{OT2}{XCharter-TLF}{bx}{n}{<->ssub * XCharter-TLF/b/n}{}
+\DeclareFontShape{OT2}{XCharter-TLF}{bx}{it}{<->ssub * XCharter-TLF/b/it}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd
new file mode 100644
index 00000000000..cce63c88399
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T1XCharter-Dnom.fd}
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Dnom.]
+
+\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-Dnom}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{bx}{sl}{
+ <-> ssub * XCharter-Dnom/b/sl
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{bx}{n}{
+ <-> ssub * XCharter-Dnom/b/n
+}{}
+
+\DeclareFontShape{T1}{XCharter-Dnom}{bx}{it}{
+ <-> ssub * XCharter-Dnom/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd
new file mode 100644
index 00000000000..371423bf9d1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T1XCharter-Inf.fd}
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Inf.]
+
+\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-Inf}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{bx}{n}{
+ <-> ssub * XCharter-Inf/b/n
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{bx}{sl}{
+ <-> ssub * XCharter-Inf/b/sl
+}{}
+
+\DeclareFontShape{T1}{XCharter-Inf}{bx}{it}{
+ <-> ssub * XCharter-Inf/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd
new file mode 100644
index 00000000000..ed218e58ae1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T1XCharter-Numr.fd}
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Numr.]
+
+\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-Numr}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{bx}{n}{
+ <-> ssub * XCharter-Numr/b/n
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{bx}{sl}{
+ <-> ssub * XCharter-Numr/b/sl
+}{}
+
+\DeclareFontShape{T1}{XCharter-Numr}{bx}{it}{
+ <-> ssub * XCharter-Numr/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd
index 3913c739d53..736a7519468 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/27
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{T1XCharter-Sup.fd}
- [2013/10/27 (autoinst) Font definitions for T1/XCharter-Sup.]
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Sup.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,30 +9,37 @@
\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-Sup}{}
+\DeclareFontShape{T1}{XCharter-Sup}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-t1
+}{}
+
\DeclareFontShape{T1}{XCharter-Sup}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-sup-t1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-t1
}{}
\DeclareFontShape{T1}{XCharter-Sup}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-sup-t1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{XCharter-Sup}{b}{sl}{
- <-> ssub * XCharter-Sup/b/it
+\DeclareFontShape{T1}{XCharter-Sup}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-t1
}{}
\DeclareFontShape{T1}{XCharter-Sup}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-sup-t1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-t1
}{}
\DeclareFontShape{T1}{XCharter-Sup}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{XCharter-Sup}{m}{sl}{
- <-> ssub * XCharter-Sup/m/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-t1
}{}
\DeclareFontShape{T1}{XCharter-Sup}{bx}{sl}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd
index 4415e64909f..318cc757eee 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/27
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{T1XCharter-TLF.fd}
- [2013/10/27 (autoinst) Font definitions for T1/XCharter-TLF.]
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-TLF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,72 +9,67 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
-\DeclareFontFamily{T1}{XCharter-TLF}{}
-\DeclareFontShape{T1}{XCharter-TLF}{b}{sc}{
- <-> \XCharter@@scale XCharter-Bold-tlf-sc-t1
-}{}
+\expandafter\ifx\csname XCharter@altone\endcsname\relax
+ \let\XCharter@@altone\@empty
+\else
+ \edef\XCharter@@altone{\XCharter@altone}%
+\fi
-\DeclareFontShape{T1}{XCharter-TLF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tlf-t1
-}{}
+\DeclareFontFamily{T1}{XCharter-TLF}{}
-\DeclareFontShape{T1}{XCharter-TLF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{b}{scit}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{XCharter-TLF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{b}{scsl}{
- <-> ssub * XCharter-TLF/b/scit
+\DeclareFontShape{T1}{XCharter-TLF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{b}{sl}{
- <-> ssub * XCharter-TLF/b/it
+\DeclareFontShape{T1}{XCharter-TLF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{sc}{
- <-> \XCharter@@scale XCharter-Roman-tlf-sc-t1
+\DeclareFontShape{T1}{XCharter-TLF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tlf-t1
+\DeclareFontShape{T1}{XCharter-TLF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tlf-t1
+\DeclareFontShape{T1}{XCharter-TLF}{b}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{scit}{
- <-> \XCharter@@scale XCharter-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{XCharter-TLF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{scsl}{
- <-> ssub * XCharter-TLF/m/scit
+\DeclareFontShape{T1}{XCharter-TLF}{b}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{m}{sl}{
- <-> ssub * XCharter-TLF/m/it
+\DeclareFontShape{T1}{XCharter-TLF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{bx}{sl}{
- <-> ssub * XCharter-TLF/b/sl
+\DeclareFontShape{T1}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{bx}{scsl}{
- <-> ssub * XCharter-TLF/b/scsl
+\DeclareFontShape{T1}{XCharter-TLF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-t1
}{}
\DeclareFontShape{T1}{XCharter-TLF}{bx}{sc}{
<-> ssub * XCharter-TLF/b/sc
}{}
-\DeclareFontShape{T1}{XCharter-TLF}{bx}{n}{
- <-> ssub * XCharter-TLF/b/n
-}{}
-
\DeclareFontShape{T1}{XCharter-TLF}{bx}{it}{
<-> ssub * XCharter-TLF/b/it
}{}
@@ -83,4 +78,16 @@
<-> ssub * XCharter-TLF/b/scit
}{}
+\DeclareFontShape{T1}{XCharter-TLF}{bx}{sl}{
+ <-> ssub * XCharter-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{XCharter-TLF}{bx}{n}{
+ <-> ssub * XCharter-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{XCharter-TLF}{bx}{scsl}{
+ <-> ssub * XCharter-TLF/b/scsl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd
index cb40b4d42eb..cabffa9efe1 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/11/30
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{T1XCharter-TOsF.fd}
- [2013/11/30 (autoinst) Font definitions for T1/XCharter-TOsF.]
+ [2017/06/25 (autoinst) Font definitions for T1/XCharter-TOsF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,6 +9,7 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
+
\expandafter\ifx\csname XCharter@altone\endcsname\relax
\let\XCharter@@altone\@empty
\else
@@ -21,10 +22,6 @@
<-> \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
}{}
@@ -33,22 +30,34 @@
<-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-t1
}{}
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-t1
+}{}
+
\DeclareFontShape{T1}{XCharter-TOsF}{b}{scsl}{
- <-> ssub * XCharter-TOsF/b/scit
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TOsF}{b}{sl}{
- <-> ssub * XCharter-TOsF/b/it
+\DeclareFontShape{T1}{XCharter-TOsF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-t1
}{}
-\DeclareFontShape{T1}{XCharter-TOsF}{m}{sc}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t1
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-t1
}{}
\DeclareFontShape{T1}{XCharter-TOsF}{m}{n}{
<-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-t1
}{}
+\DeclareFontShape{T1}{XCharter-TOsF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t1
+}{}
+
\DeclareFontShape{T1}{XCharter-TOsF}{m}{it}{
<-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-t1
}{}
@@ -57,12 +66,16 @@
<-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{XCharter-TOsF}{m}{scsl}{
- <-> ssub * XCharter-TOsF/m/scit
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{sc}{
+ <-> ssub * XCharter-TOsF/b/sc
}{}
-\DeclareFontShape{T1}{XCharter-TOsF}{m}{sl}{
- <-> ssub * XCharter-TOsF/m/it
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{it}{
+ <-> ssub * XCharter-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{XCharter-TOsF}{bx}{scit}{
+ <-> ssub * XCharter-TOsF/b/scit
}{}
\DeclareFontShape{T1}{XCharter-TOsF}{bx}{sl}{
@@ -73,20 +86,8 @@
<-> 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/T2AXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd
new file mode 100644
index 00000000000..e52998f9c3c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd
@@ -0,0 +1,57 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T2AXCharter-Sup.fd}
+ [2017/06/25 (autoinst) Font definitions for T2A/XCharter-Sup.]
+
+\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{T2A}{XCharter-Sup}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{bx}{sl}{
+ <-> ssub * XCharter-Sup/b/sl
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{bx}{it}{
+ <-> ssub * XCharter-Sup/b/it
+}{}
+
+\DeclareFontShape{T2A}{XCharter-Sup}{bx}{n}{
+ <-> ssub * XCharter-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd
new file mode 100644
index 00000000000..27e737511c6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd
@@ -0,0 +1,93 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T2AXCharter-TLF.fd}
+ [2017/06/25 (autoinst) Font definitions for T2A/XCharter-TLF.]
+
+\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{T2A}{XCharter-TLF}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{b}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{it}{
+ <-> ssub * XCharter-TLF/b/it
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{sc}{
+ <-> ssub * XCharter-TLF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{sl}{
+ <-> ssub * XCharter-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{scsl}{
+ <-> ssub * XCharter-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{n}{
+ <-> ssub * XCharter-TLF/b/n
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TLF}{bx}{scit}{
+ <-> ssub * XCharter-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd
new file mode 100644
index 00000000000..619dcdf63ee
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd
@@ -0,0 +1,93 @@
+%% Generated by autoinst on 2017/06/25
+%%
+\ProvidesFile{T2AXCharter-TOsF.fd}
+ [2017/06/25 (autoinst) Font definitions for T2A/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{T2A}{XCharter-TOsF}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{scit}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{scsl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{sc}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{scit}{
+ <-> ssub * XCharter-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{n}{
+ <-> ssub * XCharter-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{scsl}{
+ <-> ssub * XCharter-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{sl}{
+ <-> ssub * XCharter-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{sc}{
+ <-> ssub * XCharter-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{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 090c543d077..1402d1ef699 100644
--- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/10/27
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{TS1XCharter-TLF.fd}
- [2013/10/27 (autoinst) Font definitions for TS1/XCharter-TLF.]
+ [2017/06/25 (autoinst) Font definitions for TS1/XCharter-TLF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,30 +9,41 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
-\DeclareFontFamily{TS1}{XCharter-TLF}{}
-\DeclareFontShape{TS1}{XCharter-TLF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tlf-ts1
-}{}
+\expandafter\ifx\csname XCharter@altone\endcsname\relax
+ \let\XCharter@@altone\@empty
+\else
+ \edef\XCharter@@altone{\XCharter@altone}%
+\fi
+
+\DeclareFontFamily{TS1}{XCharter-TLF}{}
\DeclareFontShape{TS1}{XCharter-TLF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-ts1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ts1
}{}
\DeclareFontShape{TS1}{XCharter-TLF}{b}{sl}{
- <-> ssub * XCharter-TLF/b/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TLF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ts1
}{}
\DeclareFontShape{TS1}{XCharter-TLF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tlf-ts1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{XCharter-TLF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ts1
}{}
\DeclareFontShape{TS1}{XCharter-TLF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tlf-ts1
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TLF}{m}{sl}{
- <-> ssub * XCharter-TLF/m/it
+\DeclareFontShape{TS1}{XCharter-TLF}{bx}{it}{
+ <-> ssub * XCharter-TLF/b/it
}{}
\DeclareFontShape{TS1}{XCharter-TLF}{bx}{sl}{
@@ -43,8 +54,4 @@
<-> ssub * XCharter-TLF/b/n
}{}
-\DeclareFontShape{TS1}{XCharter-TLF}{bx}{it}{
- <-> ssub * XCharter-TLF/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
index c67572fcb89..631db322fcf 100644
--- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/11/30
+%% Generated by autoinst on 2017/06/25
%%
\ProvidesFile{TS1XCharter-TOsF.fd}
- [2013/11/30 (autoinst) Font definitions for TS1/XCharter-TOsF.]
+ [2017/06/25 (autoinst) Font definitions for TS1/XCharter-TOsF.]
\expandafter\ifx\csname XCharter@scale\endcsname\relax
\let\XCharter@@scale\@empty
@@ -9,42 +9,49 @@
\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{TS1}{XCharter-TOsF}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tosf-ts1
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ts1
}{}
\DeclareFontShape{TS1}{XCharter-TOsF}{b}{sl}{
- <-> ssub * XCharter-TOsF/b/it
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tosf-ts1
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tosf-ts1
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{
- <-> ssub * XCharter-TOsF/m/it
+\DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{sl}{
- <-> ssub * XCharter-TOsF/b/sl
+\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}{it}{
- <-> ssub * XCharter-TOsF/b/it
+\DeclareFontShape{TS1}{XCharter-TOsF}{bx}{sl}{
+ <-> ssub * XCharter-TOsF/b/sl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.fontspec b/Master/texmf-dist/tex/latex/xcharter/XCharter.fontspec
index 98ebeec3c4f..b4d87b2c9e0 100644
--- a/Master/texmf-dist/tex/latex/xcharter/XCharter.fontspec
+++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.fontspec
@@ -1,9 +1,11 @@
\defaultfontfeatures[XCharter]
{
Extension = .otf ,
+ UprightFont = XCharter-Roman,
BoldFont = XCharter-Bold,
ItalicFont = XCharter-Italic,
BoldItalicFont = XCharter-BoldItalic,
- UprightFont = XCharter-Roman,
+ SlantedFont = XCharter-Slanted,
+ BoldSlantedFont = XCharter-BoldSlanted,
SmallCapsFeatures = {Letters=SmallCaps}
}
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index 30804a94ae9..fe69e3be7b3 100644
--- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
+++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
@@ -1,16 +1,16 @@
%% XCharter is an extension of the Bitstream Charter fonts, adding osf,
-% small caps and superior figures. Generated 2013/10/27 by Michael Sharpe.
+% small caps and superior figures. Generated 2017/06/25 by Michael Sharpe.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.08}
-\def\filedate{2017/03/11}
+\def\fileversion{1.09}
+\def\filedate{2017/06/25}
\ProvidesPackage{XCharter}[\filedate\space v\fileversion]
\message{`XCharter' v\fileversion, \filedate\space Text macros for XCharter, an extension of Charter (msharpe)}
-\RequirePackage[LY1,T1]{fontenc}
+\RequirePackage[T2A,LY1,T1]{fontenc}
\RequirePackage{textcomp}
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
\RequirePackage{etoolbox}
@@ -22,7 +22,30 @@
\fontfigurestyle{superior}\selectfont}
\DeclareTextFontCommand{\textsu}{\sufigures}
\let\textsuperior\textsu
+
+ \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
+ \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
+ \def\infigures{\@nomath\infigures
+ \fontfigurestyle{inferior}\selectfont}
+ \DeclareTextFontCommand{\textin}{\infigures}
+ \let\textinferior\textin
+
+ \fa@naming@exception{figures}{{numerators}{proportional}}{Numr}
+ \fa@naming@exception{figures}{{numerators}{tabular}}{Numr}
+ \def\nufigures{\@nomath\nufigures%
+ \fontfigurestyle{numerators}\selectfont}
+ \DeclareTextFontCommand{\textnu}{\nufigures}
+ \let\textnumerator\textnu
+
+ \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+ \def\defigures{\@nomath\defigures%
+ \fontfigurestyle{denominators}\selectfont}
+ \DeclareTextFontCommand{\textde}{\defigures}
+ \let\textdenominator\textde
}{}
+\providecommand*{\textfrac}[2]{%
+ \textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
\DeclareRobustCommand{\lfstyle}{%
\not@math@alphabet\lfstyle\relax
\fontfamily{XCharter-TLF}\selectfont }
@@ -46,6 +69,7 @@
\let\orig@makefnmark=\@makefnmark
%\newif\ifXCh@babel
%\ifdefined\bbl@tempa \XCh@babeltrue\fi
+\newif\if@XCh@scosf
\def\XCharter@altone{1}% default is to use 1, not I
\newif\if@XCh@sups
@@ -58,6 +82,7 @@
\DeclareOptionX{osf}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{1}}
\DeclareOptionX{osfI}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{}}
\DeclareOptionX{sups}{\@XCh@supstrue}
+\DeclareOptionX{scosf}{\@XCh@scosftrue}
\edef\bfseries@rm{b}
\edef\mdseries@rm{m}
@@ -71,6 +96,7 @@
\newcommand{\textosfI}[1]{\oldstylenums{#1}}% to get XCharter osfI
\newcommand{\textosf}[1]{{\fontencoding{T1}\fontfamily{XCharterx}\selectfont #1}}% to get XCharter osf
+
\renewcommand*{\bfdefault}{b}
\renewcommand*{\scdefault}{sc}% for better compatibility with mathdesign
@@ -95,6 +121,11 @@
\renewcommand*{\rmdefault}{XCharter-TLF}
\renewcommand*{\familydefault}{\rmdefault}
+\if@XCh@scosf %
+\DeclareRobustCommand{\textsc}[1]{%
+{\fontfamily{XCharter-TOsF}\fontshape{sc}\selectfont #1}%
+}\fi% use OsF in small caps
+
\if@XCh@sups %
\ifdefined\sufigures