diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty | 197 |
1 files changed, 101 insertions, 96 deletions
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty index f51ddd2c9b9..c7eeca0353b 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -44,7 +44,7 @@ %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %% \ProvidesPackage{interfaces-pgfkeys} - [2010/11/26 v2.4 pgfkeys handlers definitions (FC)] + [2010/12/07 v2.5 pgfkeys handlers definitions (FC)] \RequirePackage{interfaces-base} \ifdefined\pgfkeys@ifexecutehandler % pgf version 2.1 \def\itf@pgfkeys{% @@ -340,23 +340,6 @@ /handlers/.store as number/.default=+-*,% }% /.store as number \pgfkeys{% - /handlers/.estore as number/.code={% - \pgfkeysedef\pgfkeyscurrentpath{% - \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{% - \noexpand\number\numexpr##1\relax}}% - \pgfkeyslet\pgfkeyscurrentpath\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ - \@tfor\x:=#1\do{% - \pgfkeysedef{\pgfkeyscurrentpath\x}{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% - \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}% - \x - \numexpr##1\relax}}% - }},% - /handlers/.estore as number/.default=+-*,% -}% /.estore as number -\pgfkeys{% /handlers/.store as number in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text @@ -379,6 +362,23 @@ /handlers/.store as number in cs/.value required,% }% /.store as number in cs \pgfkeys{% + /handlers/.estore as number/.code={% + \pgfkeysedef\pgfkeyscurrentpath{% + \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{% + \noexpand\number\numexpr##1\relax}}% + \pgfkeyslet\pgfkeyscurrentpath\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ + \@tfor\x:=#1\do{% + \pgfkeysedef{\pgfkeyscurrentpath\x}{% + \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% + \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}% + \x + \numexpr##1\relax}}% + }},% + /handlers/.estore as number/.default=+-*,% +}% /.estore as number +\pgfkeys{% /handlers/.estore as number in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text @@ -426,7 +426,7 @@ \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded=% \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}% \x - \if*\x\noexpand\itf@units@scale##1! + \if*\x\noexpand\itf@units@scaleNoCalc##1! \else\glueexpr\noexpand\unexpanded{##1}\relax\fi}}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}% @@ -434,63 +434,6 @@ /handlers/.store as glue/.default=+-*,% }% /.store as glue \pgfkeys{% - /handlers/.estore as glue/.code={% - \pgfkeysedef{\pgfkeyscurrentpath}{% - \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{% - \noexpand\the\glueexpr##1\relax}}% - \pgfkeyslet\pgfkeyscurrentpath\z@skip - \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@skip - \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip - \@tfor\x:=#1\do{% - \pgfkeysedef{\pgfkeyscurrentpath\x}{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% - \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x - \if*\x \noexpand\itf@units@scale##1! - \else\glueexpr##1\relax\fi}}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}% - }},% - /handlers/.estore as glue/.default=+-*,% -}% /.estore as glue -\pgfkeys{% - /handlers/.store as dimen/.code={% - \pgfkeysedef\pgfkeyscurrentpath{% - \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\dimexpr##1\relax}}% - \pgfkeyslet\pgfkeyscurrentpath\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ - \@tfor\x:=#1\do{% - \pgfkeysedef{\pgfkeyscurrentpath\x}{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded={% - \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}% - \x - \if*\x \noexpand\itf@units@scale##1! - \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}% - }},% - /handlers/.store as dimen/.default=+-*,% -}% /.store as dimen -\pgfkeys{% - /handlers/.estore as dimen/.code={% - \pgfkeysedef\pgfkeyscurrentpath{% - \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{% - \noexpand\the\dimexpr##1\relax}}% - \pgfkeyslet\pgfkeyscurrentpath\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ - \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ - \@tfor\x:=#1\do{% - \pgfkeysedef{\pgfkeyscurrentpath\x}{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% - \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x - \if*\x \noexpand\itf@units@scale##1! - \else \dimexpr##1\relax\fi}}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% - \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}% - }},% - /handlers/.estore as dimen/.default=+-*,% -}% /.estore as dimen -\pgfkeys{% /handlers/.store as glue in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text @@ -502,10 +445,10 @@ \noexpand\ifcsname#1\endcsname #1\noexpand\else z@skip\noexpand\fi}% \edef\noexpand\pgfkeys@temp{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath={% + \noexpand\noexpand\noexpand\pgfkeysalso{\pgfkeyscurrentpath={% \noexpand\expandonce\noexpand\pgfkeys@temp \x - \if*\x\noexpand\itf@units@scale##1! + \if*\x\noexpand\itf@units@scaleNoCalc##1! \else\glueexpr\noexpand\unexpanded{##1}\relax\fi}}% }\noexpand\pgfkeys@temp}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}% @@ -514,10 +457,31 @@ /handlers/.store as glue in cs/.value required,% }% /.store as glue in cs \pgfkeys{% + /handlers/.estore as glue/.code={% + \pgfkeysedef{\pgfkeyscurrentpath}{% + \itf@setlength\itf@sk{##1}% + \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{% + \noexpand\the\itf@sk}}% + \pgfkeyslet\pgfkeyscurrentpath\z@skip + \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@skip + \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip + \@tfor\x:=#1\do{% + \pgfkeysedef{\pgfkeyscurrentpath\x}{% + \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% + \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x + \if*\x \noexpand\itf@units@scale##1! + \else\glueexpr##1\relax\fi}}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}% + }},% + /handlers/.estore as glue/.default=+-*,% +}% /.estore as glue +\pgfkeys{% /handlers/.estore as glue in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text - \else\csedef{#1}{\the\glueexpr##1\relax}\fi}% + \else\itf@setlength\itf@sk{##1}% + \csedef{#1}{\the\itf@sk}\fi}% \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip \@tfor\x:=+-*\do{% \pgfkeysedef{\pgfkeyscurrentpath\x}{% @@ -536,7 +500,7 @@ /handlers/.store in skip cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text - \else\csname#1\endcsname\glueexpr##1\relax\fi}% + \else\expandafter\itf@setlength\csname#1\endcsname{##1}\fi}% \pgfkeyslet{/\pgfkeyscurrentpath/.@blank}\z@skip \@tfor\x:=+-*\do{% \pgfkeysedef{\pgfkeyscurrentpath\x}{% @@ -551,6 +515,25 @@ /handlers/.store in skip cs/.value required,% }% /.store in skip cs \pgfkeys{% + /handlers/.store as dimen/.code={% + \pgfkeysedef\pgfkeyscurrentpath{% + \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\dimexpr##1\relax}}% + \pgfkeyslet\pgfkeyscurrentpath\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ + \@tfor\x:=#1\do{% + \pgfkeysedef{\pgfkeyscurrentpath\x}{% + \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded={% + \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}% + \x + \if*\x \noexpand\itf@units@scaleNoCalc##1! + \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}% + }},% + /handlers/.store as dimen/.default=+-*,% +}% /.store as dimen +\pgfkeys{% /handlers/.store as dimen in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text @@ -559,37 +542,58 @@ \@tfor\x:=+-*\do{% \pgfkeysedef{\pgfkeyscurrentpath\x}{% \letcs\noexpand\pgfkeys@temp{% - \ifcsname#1\endcsname#1\else z@\fi}% + \noexpand\ifcsname#1\endcsname + #1\noexpand\else z@\noexpand\fi}% \edef\noexpand\pgfkeys@temp{% - \noexpand\pgfkeysalso{\pgfkeyscurrentpath={% + \noexpand\noexpand\noexpand\pgfkeysalso{\pgfkeyscurrentpath={% \noexpand\expandonce\noexpand\pgfkeys@temp \x - \if*\x\noexpand\itf@units@scale##1! - \else\dimexpr\noexpand\unexpanded{##1}\fi}}% + \if*\x\noexpand\itf@units@scaleNoCalc##1! + \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}% }\noexpand\pgfkeys@temp}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}% }},% /handlers/.store as dimen in cs/.value required,% -}% /.store as dimen in cs {csname}{+-} +}% /.store as dimen in cs {csname}{+-*} +\pgfkeys{% + /handlers/.estore as dimen/.code={% + \pgfkeysedef\pgfkeyscurrentpath{% + \itf@setlength\itf@sk{##1}% + \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{% + \noexpand\the\dimexpr\itf@sk}}% + \pgfkeyslet\pgfkeyscurrentpath\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ + \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ + \@tfor\x:=#1\do{% + \pgfkeysedef{\pgfkeyscurrentpath\x}{% + \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% + \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x + \if*\x \noexpand\itf@units@scale##1! + \else \dimexpr##1\relax\fi}}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}% + }},% + /handlers/.estore as dimen/.default=+-*,% +}% /.estore as dimen \pgfkeys{% /handlers/.estore as dimen in cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text - \else \@defaultunits\itf@sk ##1pt\relax\@nnil - \csedef{#1}{\the\dimexpr\itf@sk\relax}\fi}% + \else \itf@setlength\itf@sk{##1}% + \csedef{#1}{\the\dimexpr\itf@sk}\fi}% \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ \@tfor\x:=+-*\do{% \pgfkeysedef{\pgfkeyscurrentpath\x}{% \noexpand\ifcsname#1\endcsname - \noexpand\@defaultunits\itf@sk + \noexpand\@defaultunits \itf@sk \noexpand\csname#1\endcsname pt\relax\noexpand\@nnil - \noexpand\else\itf@sk\z@\noexpand\fi + \noexpand\else \itf@sk \z@ \noexpand\fi \if*\x - \itf@sk\dimexpr\itf@sk*\noexpand\itf@units@scale##1!\relax + \itf@setlength\itf@sk {\itf@sk*\noexpand\itf@units@scale##1!}% \else - \noexpand\@defaultunits\@tempdima ##1pt\relax\noexpand\@nnil - \advance\itf@sk\x\@tempdima + \noexpand\@defaultunits\@tempdima ##1pt \relax\noexpand\@nnil + \advance\itf@sk\x \@tempdima \fi \noexpand\pgfkeysalso{\pgfkeyscurrentpath=\itf@sk}}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% @@ -601,12 +605,12 @@ /handlers/.store in dimen cs/.code={% \pgfkeysdef\pgfkeyscurrentpath{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text - \else\csname#1\endcsname\dimexpr##1\relax\fi}% + \else\expandafter\itf@setlength\csname#1\endcsname{##1}\fi}% \pgfkeyslet{/\pgfkeyscurrentpath/.@blank}\z@ \@tfor\x:=+-*\do{% \pgfkeysedef{\pgfkeyscurrentpath\x}{% \if*\x \else - \noexpand\@defaultunits\itf@sk ##1pt\relax\noexpand\@nnil + \noexpand\@defaultunits\itf@sk ##1pt \relax\noexpand\@nnil \fi \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% \csname#1\endcsname % has been defined as a dimen (not expandable) @@ -621,7 +625,8 @@ \pgfkeys{% /handlers/.is multiple choice/.code=% \pgfkeys{\pgfkeyscurrentpath/.cd,% - .unknown/.style={/errors/unknown choice value=\pgfkeyscurrentkey\pgfkeyscurrentvalue},% + .unknown/.style={% + /errors/unknown choice value=\pgfkeyscurrentkey\pgfkeyscurrentvalue},% .code=\expandafter\pgfkeys\expandafter{\pgfkeyscurrentkey/.cd,####1}% },% /handlers/.is multiple choice/.value forbidden,% |