fontaxes (23mar14)

git-svn-id: svn://tug.org/texlive/trunk@33265 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 26 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/fontaxes/README b/Master/texmf-dist/doc/latex/fontaxes/README
index a7d48e14630..68a4b3fb1cb 100644
--- a/Master/texmf-dist/doc/latex/fontaxes/README
+++ b/Master/texmf-dist/doc/latex/fontaxes/README
@@ -38,7 +38,7 @@ License
 -------
 
 Copyright (c) 2007 by Andreas Buehmann  
-Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
 
 This work may be distributed and modified under the terms and conditions of the
 LaTeX Project Public License, version 1.3c or greater (your choice).
diff --git a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
index d591500b68f..0d4c6e06876 100644
--- a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
+++ b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
diff --git a/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex b/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
index e6c8ff18582..c60471e2816 100644
--- a/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
+++ b/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
@@ -7,7 +7,7 @@
 %% fontaxes.dtx  (with options: `test')
 %% 
 %% Copyright (c) 2007 by Andreas Buehmann
-%% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
index 1cacc533237..326fe4fa55f 100644
--- a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
+++ b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % Copyright (c) 2007 by Andreas B\"uhmann
-% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -22,7 +22,7 @@
 %
 %\iffalse
 %<*driver>
-\ProvidesFile{fontaxes.dtx}[2011/12/16 v1.0c Font selection axes]
+\ProvidesFile{fontaxes.dtx}[2014/03/23 v1.0d Font selection axes]
 %</driver>
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{fontaxes}[2011/12/16 v1.0c Font selection axes]
@@ -57,7 +57,7 @@
 %</driver>
 %\fi
 %
-% \CheckSum{732}
+% \CheckSum{738}
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -532,6 +532,8 @@
 \AtBeginDocument{
   \@ifpackageloaded{hyperref}{%
     \pdfstringdefDisableCommands{%
+      \let\fontprimaryshape\@gobble
+      \let\fontsecondaryshape\@gobble
       \let\fontfigurestyle\@gobble
       \let\fontfigurealignment\@gobble
       \let\fontbasefamily\@gobble
@@ -914,18 +916,9 @@
 %
 % \subsection{Compatibility}
 %
-% If no math versions |tabular| and |boldtabular| are defined in the preamble,
-% we provide defaults by copying the states of |normal| and |bold| (assuming,
-% in turn, that these two exist).
-%    \begin{macrocode}
-\AtBeginDocument{%
-  \fontaxes@provide@mv@copy{tabular}{normal}%
-  \fontaxes@provide@mv@copy{boldtabular}{bold}%
-}
-%    \end{macrocode}
-%
 % \begin{macro}{\fontaxes@provide@mv@copy}
 % \changes{v0.2}{2005/04/28}{Provide default math versions by copy.}
+% \changes{v1.0d}{2014/03/23}{Change order of macro definition and invocation.}
 % Declare math version |#1| to be a copy of math version |#2| if |#1| does not
 % exist already. To accomplish this, we have to know that a math version's
 % configuration is basically stored in a macro |\mv@|\meta{name} (which makes
@@ -941,6 +934,16 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% If no math versions |tabular| and |boldtabular| are defined in the preamble,
+% we provide defaults by copying the states of |normal| and |bold| (assuming,
+% in turn, that these two exist).
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \fontaxes@provide@mv@copy{tabular}{normal}%
+  \fontaxes@provide@mv@copy{boldtabular}{bold}%
+}
+%    \end{macrocode}
+%
 % \subsection{Tools}
 %
 % \begin{macro}{\fontaxes@check@family}
diff --git a/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins b/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
index 7ed577b30a1..d054dd293a4 100644
--- a/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
+++ b/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
@@ -23,7 +23,7 @@
 \preamble
 
 Copyright (c) 2007 by Andreas Buehmann
-Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
index 794f8a5a973..ecbe2df5c92 100644
--- a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
+++ b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
@@ -7,7 +7,7 @@
 %% fontaxes.dtx  (with options: `package')
 %% 
 %% Copyright (c) 2007 by Andreas Buehmann
-%% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -111,6 +111,8 @@
 \AtBeginDocument{
   \@ifpackageloaded{hyperref}{%
     \pdfstringdefDisableCommands{%
+      \let\fontprimaryshape\@gobble
+      \let\fontsecondaryshape\@gobble
       \let\fontfigurestyle\@gobble
       \let\fontfigurealignment\@gobble
       \let\fontbasefamily\@gobble
@@ -305,10 +307,6 @@
 \newcommand*\fontaxes@save[1]{%
   \expandafter\let\csname fontaxes@last@\string#1\endcsname#1%
 }
-\AtBeginDocument{%
-  \fontaxes@provide@mv@copy{tabular}{normal}%
-  \fontaxes@provide@mv@copy{boldtabular}{bold}%
-}
 \newcommand*\fontaxes@provide@mv@copy[2]{%
   \@ifundefined{mv@#1}{%
     \DeclareMathVersion{#1}%
@@ -316,6 +314,10 @@
       \csname mv@#2\endcsname
   }{}%
 }
+\AtBeginDocument{%
+  \fontaxes@provide@mv@copy{tabular}{normal}%
+  \fontaxes@provide@mv@copy{boldtabular}{bold}%
+}
 \newif\iffontaxes@exists
 \newcommand*\fontaxes@check@family[1]{%
   \begingroup