From 605eda23ba6a6c7cfe3ff351ef665e02befa9403 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 26 Jun 2017 21:21:33 +0000
Subject: xcharter (26jun17)

git-svn-id: svn://tug.org/texlive/trunk@44702 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/xcharter/XCharter.sty | 39 ++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/xcharter/XCharter.sty')

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
-- 
cgit v1.2.3

