From 96fcaa5970569331f7765d9892a0e8d0f0f4cd0f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Dec 2013 22:17:38 +0000 Subject: xcharter (2dec13) git-svn-id: svn://tug.org/texlive/trunk@32300 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/xcharter/LY1XCharter-OsF.fd | 91 --------------------- .../tex/latex/xcharter/LY1XCharter-TOsF.fd | 92 ++++++++++++++++++++++ .../tex/latex/xcharter/T1XCharter-OsF.fd | 91 --------------------- .../tex/latex/xcharter/T1XCharter-TOsF.fd | 92 ++++++++++++++++++++++ .../tex/latex/xcharter/TS1XCharter-OsF.fd | 50 ------------ .../tex/latex/xcharter/TS1XCharter-TOsF.fd | 50 ++++++++++++ Master/texmf-dist/tex/latex/xcharter/XCharter.sty | 30 +++---- 7 files changed, 249 insertions(+), 247 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd delete mode 100644 Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd delete mode 100644 Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd (limited to 'Master/texmf-dist/tex/latex/xcharter') 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 }{} -- cgit v1.2.3