From fa59cb948eadc84e6ce38162e9c451134b9a1aa2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 17 Dec 2016 20:38:20 +0000 Subject: baskervillef (17dec16) git-svn-id: svn://tug.org/texlive/trunk@42734 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/baskervillef/baskervillef.sty | 29 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/baskervillef') diff --git a/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty b/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty index bcc5ed2e2a9..94c42f0fd46 100644 --- a/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty +++ b/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty @@ -1,14 +1,14 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.02} -\def\filedate{2016/11/28} +\def\fileversion{1.04} +\def\filedate{2016/12/17} \ProvidesPackage{baskervillef} [\filedate\space v\fileversion. Style file for BaskervilleF.] \RequirePackage[LY1,T1]{fontenc} \RequirePackage{textcomp} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} -\RequirePackage{etoolbox} +\RequirePackage{etoolbox,xstring,ifthen} \IfFileExists{fontaxes.sty}{ \RequirePackage{fontaxes} \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax @@ -30,8 +30,27 @@ \DeclareTextFontCommand{\textde}{\defigures} \let\textdenominators\textde }{} -\providecommand*{\textfrac}[2]{% - \textsu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}} +%\providecommand*{\textfrac}[2]{% +% \textsu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}} + +%Variant of Todd Lehman's macro +\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}% + \StrRight{#2}{1}[\@digit@]% + % look for 1, 2, 3, 4, 7 + \ifcase\@digit@\or\kern.02em\or\kern.03em\or\kern.01em\or\kern.02em\or\or\or\kern-.09em\fi% + \kern.03em\textfractionsolidus\kern.02em% + \StrLeft{#3}{1}[\@digit@]% + % look for 1, 4, 5, 7 + \ifcase\@digit@\or\kern.02em\or\or\or\kern-.06em\or\kern-.04em\or\or\kern.06em\fi% + \textde{#3}% denominator [#3] + }% +} + + \IfFileExists{xkeyval.sty}{ \newcommand*{\BaskervilleF@scale}{1} -- cgit v1.2.3