From a04aebac3624ac65e1aea39dd682bbd3f4578fcf Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 20 Dec 2011 01:22:59 +0000
Subject: fontaxes (19dec11)

git-svn-id: svn://tug.org/texlive/trunk@24880 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty | 46 ++++++++++++-----------
 1 file changed, 24 insertions(+), 22 deletions(-)

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

diff --git a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
index 315777a540e..794f8a5a973 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/11/04 v1.0b Font selection axes]
+\ProvidesPackage{fontaxes}[2011/12/16 v1.0c Font selection axes]
 \DeclareRobustCommand\upshape{\not@math@alphabet\upshape\relax
   \fontprimaryshape\updefault\selectfont}
 \DeclareRobustCommand\itshape{\not@math@alphabet\itshape\mathit
@@ -81,20 +81,6 @@
     }%
   }%
 }
-\AtBeginDocument{
-  \@ifpackageloaded{hyperref}{%
-    \pdfstringdefDisableCommands{%
-      \let\figureversion\@gobble
-      \let\textfigures\@firstofone
-      \let\liningfigures\@firstofone
-      \let\tabularfigures\@firstofone
-      \let\proportionalfigures\@firstofone
-      \let\textsw\@firstofone
-      \let\textssc\@firstofone
-      \let\textulc\@firstofone
-    }%
-  }{}%
-}
 \DeclareTextFontCommand{\textfigures}{\txfigures}
 \DeclareTextFontCommand{\liningfigures}{\lnfigures}
 \DeclareTextFontCommand{\tabularfigures}{\tbfigures\tabularmath}
@@ -109,19 +95,35 @@
 \def\proportionalmath{\@nomath\proportionalmath
   \mathfigurealignment{proportional}}
 \DeclareRobustCommand\mathweight[1]{%
-  \fontaxes@get@math \edef\fontaxes@math@weight{#1}\fontaxes@set@math}
+  \fontaxes@get@math\edef\fontaxes@math@weight{#1}\fontaxes@set@math}
 \DeclareRobustCommand\mathfigurealignment[1]{%
-  \fontaxes@get@math \edef\fontaxes@math@align{#1}\fontaxes@set@math}
+  \fontaxes@get@math\edef\fontaxes@math@align{#1}\fontaxes@set@math}
 \DeclareRobustCommand\fontfigurestyle[1]{%
-  \fontaxes@get@family \edef\fontaxes@figure@style{#1}\fontaxes@set@family}
+  \fontaxes@get@family\edef\fontaxes@figure@style{#1}\fontaxes@set@family}
 \DeclareRobustCommand\fontfigurealignment[1]{%
-  \fontaxes@get@family \edef\fontaxes@figure@align{#1}\fontaxes@set@family}
+  \fontaxes@get@family\edef\fontaxes@figure@align{#1}\fontaxes@set@family}
 \DeclareRobustCommand\fontbasefamily[1]{%
-  \fontaxes@get@family \edef\fontaxes@family@base{#1}\fontaxes@set@family}
+  \fontaxes@get@family\edef\fontaxes@family@base{#1}\fontaxes@set@family}
 \DeclareRobustCommand\fontprimaryshape[1]{%
-  \fontaxes@get@shape \edef\fontaxes@shape@one{#1}\fontaxes@set@shape}
+  \fontaxes@get@shape\edef\fontaxes@shape@one{#1}\fontaxes@set@shape}
 \DeclareRobustCommand\fontsecondaryshape[1]{%
-  \fontaxes@get@shape \edef\fontaxes@shape@two{#1}\fontaxes@set@shape}
+  \fontaxes@get@shape\edef\fontaxes@shape@two{#1}\fontaxes@set@shape}
+\AtBeginDocument{
+  \@ifpackageloaded{hyperref}{%
+    \pdfstringdefDisableCommands{%
+      \let\fontfigurestyle\@gobble
+      \let\fontfigurealignment\@gobble
+      \let\fontbasefamily\@gobble
+      \let\textfigures\@firstofone
+      \let\liningfigures\@firstofone
+      \let\tabularfigures\@firstofone
+      \let\proportionalfigures\@firstofone
+      \let\textsw\@firstofone
+      \let\textssc\@firstofone
+      \let\textulc\@firstofone
+    }%
+  }{}%
+}
 \newcommand*\fontaxes@math@weight{normal}
 \newcommand*\fontaxes@math@align{proportional}
 \newcommand*\fontaxes@family@base{cmr}
-- 
cgit v1.2.3

