From b9cdcfa7770322ac6a61dfb79bc747704cb9170c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Apr 2014 22:17:19 +0000 Subject: xcharter (21apr14) git-svn-id: svn://tug.org/texlive/trunk@33600 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xcharter/XCharter.sty | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty index 00dc35cd154..3e7e420efe0 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.02} -\def\filedate{2013/01/18} +\def\fileversion{1.03} +\def\filedate{2014/04/20} \ProvidesPackage{XCharter}[\filedate\space v\fileversion] @@ -13,6 +13,7 @@ \RequirePackage[LY1,T1]{fontenc} \RequirePackage{textcomp} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} +\RequirePackage{etoolbox} \IfFileExists{fontaxes.sty}{ \RequirePackage{fontaxes} \fa@naming@exception{figures}{{superior}{proportional}}{Sup} @@ -89,13 +90,15 @@ }{} -\renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} +\renewcommand*{\rmdefault}{XCharter-TLF} \renewcommand*{\familydefault}{\rmdefault} + + \if@XCh@sups % \ifdefined\sufigures \def\f@@tn@te{footnote} \def\@makefnmark{% - \ifx\@mpfn\f@@tn@te% + \ifx\@mpfn\f@@tn@te%not in a minipage \ifx\thefootnote\orig@footnote% \hbox{\sufigures\hspace*{.04em}\@thefnmark\hspace*{.04em}}% \else% @@ -107,4 +110,9 @@ \fi% \fi +\AtEndPreamble{% +\renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} +\normalfont} + + \endinput -- cgit v1.2.3