From a82a5441d3e401cbedb31e1f05b04e48bc6ec00c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Oct 2011 23:16:07 +0000 Subject: fontaxes (6oct11) git-svn-id: svn://tug.org/texlive/trunk@24223 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty index 269212d6e97..79d6dd8b158 100644 --- a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty +++ b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty @@ -25,7 +25,7 @@ %% the derived files fontaxes.sty, test-fontaxes.tex and fontaxes.pdf. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fontaxes}[2011/09/16 v1.0 Font selection axes] +\ProvidesPackage{fontaxes}[2011/10/05 v1.0a Font selection axes] \DeclareRobustCommand\upshape{\not@math@alphabet\upshape\relax \fontprimaryshape\updefault\selectfont} \DeclareRobustCommand\itshape{\not@math@alphabet\itshape\mathit @@ -56,16 +56,16 @@ \def\prfigures{\@nomath\prfigures \fontfigurealignment{proportional}\selectfont} \newcommand\fontaxes@fv@prefix{fontaxes@fv@switch@} -\newcommand*\fontaxes@fv@newoption[1] +\newcommand*\fontaxes@fv@newoption[1]% {\expandafter\newcommand\csname\fontaxes@fv@prefix #1\endcsname} -\fontaxes@fv@newoption{text} {\txfigures} -\fontaxes@fv@newoption{osf} {\txfigures} -\fontaxes@fv@newoption{lining} {\lnfigures} -\fontaxes@fv@newoption{lf} {\lnfigures} -\fontaxes@fv@newoption{tabular} {\tbfigures\tabularmath} -\fontaxes@fv@newoption{tab} {\tbfigures\tabularmath} +\fontaxes@fv@newoption{text}{\txfigures} +\fontaxes@fv@newoption{osf}{\txfigures} +\fontaxes@fv@newoption{lining}{\lnfigures} +\fontaxes@fv@newoption{lf}{\lnfigures} +\fontaxes@fv@newoption{tabular}{\tbfigures\tabularmath} +\fontaxes@fv@newoption{tab}{\tbfigures\tabularmath} \fontaxes@fv@newoption{proportional}{\prfigures\proportionalmath} -\fontaxes@fv@newoption{prop} {\prfigures\proportionalmath} +\fontaxes@fv@newoption{prop}{\prfigures\proportionalmath} \newcommand\fontaxes@fv@list{} \newcommand\fontaxes@fv{} \DeclareRobustCommand*\figureversion[1]{% @@ -124,8 +124,8 @@ \fontaxes@get@shape \edef\fontaxes@shape@two{#1}\fontaxes@set@shape} \newcommand*\fontaxes@math@weight{normal} \newcommand*\fontaxes@math@align{proportional} -\newcommand*\fontaxes@family@base{MinionPro} -\newcommand*\fontaxes@figure@style{text} +\newcommand*\fontaxes@family@base{cmr} +\newcommand*\fontaxes@figure@style{lining} \newcommand*\fontaxes@figure@align{proportional} \newcommand*\fontaxes@shape@one{n} \newcommand*\fontaxes@shape@two{ulc} @@ -347,7 +347,10 @@ \let\fontaxes@split@suffix\relax \edef\@tempa{#5}% \ifx\@tempa\@empty - \ifx\@empty#4\else + \ifx\@empty#4% + \def\fontaxes@split@prefix{#1#2#3}% + \def\fontaxes@split@suffix{x}% + \else \def\fontaxes@split@prefix{#1#2#3}% \def\fontaxes@split@suffix{#4}% \fi -- cgit v1.2.3