From a04aebac3624ac65e1aea39dd682bbd3f4578fcf Mon Sep 17 00:00:00 2001 From: Karl Berry 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/doc/latex/fontaxes/fontaxes.pdf | Bin 112719 -> 112735 bytes .../texmf-dist/source/latex/fontaxes/fontaxes.dtx | 69 +++++++++++---------- Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty | 46 +++++++------- 3 files changed, 60 insertions(+), 55 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf index fd44b9c90a3..d591500b68f 100644 Binary files a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf and b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf differ diff --git a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx index f810f73b50e..1cacc533237 100644 --- a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx +++ b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx @@ -22,10 +22,10 @@ % %\iffalse %<*driver> -\ProvidesFile{fontaxes.dtx}[2011/11/14 v1.0b Font selection axes] +\ProvidesFile{fontaxes.dtx}[2011/12/16 v1.0c Font selection axes] % %\NeedsTeXFormat{LaTeX2e} -%\ProvidesPackage{fontaxes}[2011/11/04 v1.0b Font selection axes] +%\ProvidesPackage{fontaxes}[2011/12/16 v1.0c Font selection axes] %<*driver> \documentclass{ltxdoc} @@ -57,7 +57,7 @@ % %\fi % -% \CheckSum{726} +% \CheckSum{732} % \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 @@ -182,8 +182,8 @@ % % \DescribeMacro\fontbasefamily % % If you want to change the font family without changing the figure version, -% use |\fontbasefamily|\marg{value}. (All these commands require a successive -% |\selectfont| to make the changes take effect.) +% use |\fontbasefamily|\marg{value}. (All |\font|\dots\ commands +% require a successive |\selectfont| to make the changes take effect.) % % For choosing the figure versions to be used in math mode, you can use the % corresponding axis \axis{math figure alignment}. Note that there is @@ -427,27 +427,6 @@ }% } % \end{macrocode} -% We have made |\figureversion| robust to protect it in moving arguments -% (e.g., section titles). Additionally, we want it to simply be ignored when -% hyperref is building \acro{PDF} strings (e.g., for bookmarks). The same is -% true for similar commands, but we only include a selection of them (only the -% forms with arguments). -% \begin{macrocode} -\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 - }% - }{}% -} -% \end{macrocode} % \end{macro} % % \noindent Axis 3: base family |\fontbasefamily{...}| @@ -511,9 +490,9 @@ % \begin{macro}{\mathfigurealignment} % \begin{macrocode} \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} % \end{macrocode} % \end{macro} % \end{macro} @@ -523,11 +502,11 @@ % \begin{macro}{\fontbasefamily} % \begin{macrocode} \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} % \end{macrocode} % \end{macro} % \end{macro} @@ -537,13 +516,37 @@ % \begin{macro}{\fontsecondaryshape} % \begin{macrocode} \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} % \end{macrocode} % \end{macro} % \end{macro} % +% \changes{v1.0c}{2011/12/16}{Disabled more commands for hyperref} +% We have made most commands robust to protect them in moving arguments +% (e.g.\ section titles). Additionally, we want these commands to +% be ignored when \pkg{hyperref} is building \acro{PDF} strings +% (e.g.\ for bookmarks). +% \begin{macrocode} +\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 + }% + }{}% +} +% \end{macrocode} +% % \subsection{Internals (Layer 3)} % \begingroup\parindent0pt\obeylines % |\fontaxes@set@math| sets |\mathversion|; 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