From 6a43749c68fb713c7747927e2dbce5fecebeef41 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Nov 2010 00:33:32 +0000 Subject: interfaces 2.0 (9nov10) git-svn-id: svn://tug.org/texlive/trunk@20388 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/interfaces/interfaces-LaTeX.sty | 176 +-------------------- .../tex/latex/interfaces/interfaces-appendix.sty | 2 +- .../tex/latex/interfaces/interfaces-base.sty | 4 +- .../tex/latex/interfaces/interfaces-bookmark.sty | 2 +- .../tex/latex/interfaces/interfaces-embedfile.sty | 2 +- .../tex/latex/interfaces/interfaces-enumitem.sty | 2 +- .../tex/latex/interfaces/interfaces-environ.sty | 2 +- .../tex/latex/interfaces/interfaces-etoolbox.sty | 2 +- .../tex/latex/interfaces/interfaces-fancyhdr.sty | 66 +++++++- .../tex/latex/interfaces/interfaces-fancyvrb.sty | 2 +- .../tex/latex/interfaces/interfaces-hypbmsec.sty | 2 +- .../tex/latex/interfaces/interfaces-hyperref.sty | 2 +- .../tex/latex/interfaces/interfaces-makecell.sty | 14 +- .../tex/latex/interfaces/interfaces-marks.sty | 2 +- .../tex/latex/interfaces/interfaces-pgfkeys.sty | 85 ++++++---- .../tex/latex/interfaces/interfaces-scrlfile.sty | 2 +- .../tex/latex/interfaces/interfaces-tikz.sty | 123 +++++++++----- .../tex/latex/interfaces/interfaces-titlesec.sty | 2 +- .../tex/latex/interfaces/interfaces-tocloft.sty | 22 ++- .../tex/latex/interfaces/interfaces-truncate.sty | 2 +- .../tex/latex/interfaces/interfaces-umrand.sty | 2 +- .../texmf-dist/tex/latex/interfaces/interfaces.sty | 4 +- 22 files changed, 243 insertions(+), 279 deletions(-) (limited to 'Master/texmf-dist/tex/latex/interfaces') diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty index d5a4bcc072f..34b9ae0a791 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -45,7 +45,7 @@ %% Copyright (C) 2010 by Florent Chervet %% \ProvidesPackage{interfaces-LaTeX} - [2010/10/27 v1.2 pgfkeys macros for LaTeX (FC)] + [2010/10/31 v2.0 pgfkeys macros for LaTeX (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys \newrobustcmd*\changefont[1]{\itf@pgfkeys @@ -85,178 +85,6 @@ \pgfkeysifdefined{/itf/LaTeX/changefont/color/.@cmd}{} {\pgfkeys{/itf/LaTeX/changefont/color/.code=\color{#1}}}% }% AfterPackage xcolor -\newtoks\itf@everycr@tok % better than colortbl turnaround for \everycr -\newcommand*\rowfont{\noalign{\ifnum0=`}\fi\itf@rowfont} -\newrobustcmd*\itf@rowfont[2][]{% - \global\itf@everycr@tok\everycr - \global\let\itf@@cellleft\itf@cellleft - \global\let\itf@@cellright\itf@cellright - \gdef\itf@cellfont{#2}% - \ifcsname itf@cell@#1\endcsname % row alignment - \csname itf@cell@#1\endcsname - \else\lowercase{% - \ifcsname itf@cell@#1\endcsname - \csname itf@cell@#1\endcsname - \fi - }\fi - \toks@\expandafter{\itf@cellleft\itf@cellfont}% inside \noalign group ok - \xdef\itf@cellleft{\the\toks@}% - \global\everycr\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\everycr\expandafter\itf@rowfont@reset}% - \ifnum0=`{\fi}% end of noalign group -}% \rowfont -\def\itf@rowfont@reset{% - \noalign{% - \global\let\itf@cellleft\itf@@cellleft - \global\let\itf@cellright\itf@@cellright - \global\let\itf@cellfont\@empty - \global\let\itf@celllalign\@empty - \global\let\itf@cellralign\@empty - \global\everycr\itf@everycr@tok - \global\itf@everycr@tok{}% - }% -}% \itf@rowfont@reset -\newif\ifitf@cellright -\def\itf@prepnext@tok{% only if array is loaded - \itf@cnt = \count@ - \advance \itf@cnt -\@tempcnta - \ifcase \itf@cnt % (case 0): previous token is left - \itf@cellrighttrue % consequently the token to prepare is right ! - \toks\count@\expandafter{% augment the previous (left) token - \expandafter\itf@celllalign - \the\toks\count@ - \itf@cellleft}% - \or % (case 1) - \ifitf@cellright % previous token is right - \itf@cellrightfalse% consequently the token to prepare is not right ! - \toks\count@=\expandafter{% augment the previous (right) token - \the\toks\count@ - \itf@cellright - \itf@cellralign}% - \fi - \else % special column: do not change the token - \itf@cellrightfalse % the token to prepare cannot be right ! - \fi - \advance \count@ \@ne \toks\count@{}% \prepnext@tok original def -}% \itf@prepnext@tok -\AfterPackage*{array}{% - \global\let\array@prepnext@tok\prepnext@tok % frozen original definition - \global\let\prepnext@tok\itf@prepnext@tok -}% \AfterPackage*{array} -\let\itf@cellleft\@empty -\let\itf@cellright\@empty -\def\itf@celllalign{\itf@cellleft}% the row font spec. applies to pre-column material -\let\itf@cellralign\@empty -\let\itf@cellfont\@empty -\let\ifitf@colortbl\iffalse -\AfterPackage*{colortbl}{\let\ifitf@colortbl\iftrue} -\def\itf@cell@l{% force alignment to left - \gdef\itf@celllalign{\itf@removehfil - \raggedright\arraybackslash - \itf@cellleft}% - \gdef\itf@cellralign{\itf@flush1\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\raggedright\arraybackslash}% local (noalign group) - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@l -\def\itf@cell@c{% force alignment to center - \gdef\itf@celllalign{\itf@removehfil - \centering\arraybackslash - \itf@flush{.5}\itf@cellleft}% - \gdef\itf@cellralign{\itf@flush{.5}\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\centering\arraybackslash}% local (noalign group) - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@c -\def\itf@cell@r{% force alignment to right - \gdef\itf@celllalign{\itf@removehfil - \raggedleft\arraybackslash - \itf@flush1\itf@cellleft}% - \gdef\itf@cellralign{\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\raggedleft\arraybackslash}% local (noalign group) - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@r -\def\itf@cell@j{% force justification (for p, m, b columns) - \gdef\itf@celllalign{\itf@justify\itf@cellleft}% - \global\let\itf@cellralign\@empty - \toks@\expandafter{\itf@cellleft\itf@justify}% local (noalign group) - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@j -\def\itf@justify{% - \leftskip\z@skip \@rightskip\leftskip \rightskip\@rightskip - \parfillskip\@flushglue -}% \itf@justify -\AfterPackage*{ragged2e}{% -\def\itf@cell@L{% force alignment to left (ragged2e) - \gdef\itf@celllalign{\itf@removehfil - \RaggedRight\arraybackslash - \itf@cellleft}% - \gdef\itf@cellralign{\itf@flush1\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\RaggedRight\arraybackslash}% - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@L -\def\itf@cell@C{% force alignment to center (ragged2e) - \gdef\itf@celllalign{\itf@removehfil - \Centering\arraybackslash - \itf@flush{.5}\itf@cellleft}% - \gdef\itf@cellralign{\itf@flush{.5}\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\Centering\arraybackslash}% - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@C -\def\itf@cell@R{% force alignment to right (ragged2e) - \gdef\itf@celllalign{\itf@removehfil - \RaggedLeft\arraybackslash - \itf@flush1\itf@cellleft}% - \gdef\itf@cellralign{\itf@ignorehfil}% - \toks@\expandafter{\itf@cellleft\RaggedLeft\arraybackslash}% - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@R -\def\itf@cell@J{% force justification (ragged2e) - \gdef\itf@celllallign{\justifying\arraybackslash\itf@cellleft}% - \global\let\itf@cellralign\@empty - \toks@\expandafter{\itf@cellleft\justifying\arraybackslash}% - \xdef\itf@cellleft{\the\toks@}% -}% \itf@cell@J -}% AfterPackage ragged2e -\def\itf@flush#1{% - \ifitf@colortbl % colortbl uses \hfill rather than \hfil - \hskip \ifnum\currentgrouptype>13 \stretch{#1}% - \else\ifdim#1pt<1pt \itf@cellskip - \else \stretch{#1} - \fi\fi \relax - \else % array.sty - \ifnum \currentgrouptype>13\relax - \hfil \hskip1sp - \fi - \fi -}% \itf@flush -\newskip\itf@cellskip -\let\itf@hfil\hfil -\let\itf@hfill\hfill -\let\itf@hskip\hskip -\def\itf@removehfil{% - \ifitf@colortbl - \unkern \itf@cellskip = \lastskip - \ifnum\gluestretchorder\itf@cellskip = \tw@ \hskip-\itf@cellskip - \else \itf@cellskip = \z@skip - \fi - \else - \ifdim\lastskip=1sp\unskip\fi - \ifnum\gluestretchorder\lastskip = \@ne - \hfilneg % \hfilneg for array.sty but not for colortbl... - \fi - \fi -}% \itf@removehfil -\def\itf@nohfil{% \hfil -> do nothing + restore original \hfil - \def\hfil{\let\hfil\itf@hfil}% local to (alignment template) group -}% \itf@nohfil -\AfterPackage*{colortbl}{% - \def\itf@nohfil{% - \def\hfil{\let\hfil\itf@hfil}% local to (alignment template) group - \def\hfill{\let\hfill\itf@hfill}% (colortbl uses \hfill) pfff... - \def\hskip##1\relax{\let\hskip\itf@hskip}}% local -}% AfterPackage colortbl -\def\itf@ignorehfil{% - \aftergroup\itf@nohfil -}% \itf@ignorehfil \endinput %% %% End of file `interfaces-LaTeX.sty'. diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty index 14b9ae13929..0e6ae032d24 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty index 91b0c045237..d79fd449547 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -45,7 +45,7 @@ %% Copyright (C) 2010 by Florent Chervet %% \ProvidesPackage{interfaces-base} - [2010/10/27 v1.2 Basic macros for interfaces package (FC)] + [2010/10/31 v2.0 Basic macros for interfaces package (FC)] \RequirePackage{etex,ltxcmds,etoolbox,pgfkeys,scrlfile} \AtEndOfPackage{% \RequirePackage{interfaces-etoolbox}% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty index 4b2b05d5779..29348e6fc37 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty index 93aefe12516..de14a11b3e3 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty index 3ca0e663794..55488092d97 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty index 422fe40a39a..80069ab563d 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty index ee6e38dbf1d..fe13130ee83 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty index b1c15e77e8f..1bf260db93c 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -163,124 +163,172 @@ font/.style={head/font={#1},foot/font={#1}},% font+/.style={head/font+={#1},foot/font+={#1}},% font*/.alias=font+,% + color/.style={head/color={#1},foot/color={#1},head/rule/color={#1},foot/rule/color={#1}},% head/.style={head/left={#1},head/center={#1},head/right={#1}},% head/font/.style={head/left/font={#1},head/center/font={#1},head/right/font={#1}},% head/font+/.style={head/left/font+={#1},head/center/font+={#1},head/right/font+={#1}},% head/font*/.alias=head/font+,% - nohead/.style={head=,head/font=,head/rule=}, + head/color/.style={head/left/color={#1},head/center/color={#1},head/right/color={#1},head/rule/color={#1}},% + nohead/.style={head=,head/font=,head/rule=,head/rule/font=}, foot/.style={foot/left={#1},foot/center={#1},foot/right={#1}},% foot/font/.style={foot/left/font={#1},foot/center/font={#1},foot/right/font={#1}},% foot/font+/.style={foot/left/font+={#1},foot/center/font+={#1},foot/right/font+={#1}},% foot/font*/.alias=foot/font+,% - nofoot/.style={foot=,foot/font=,foot/rule=}, + foot/color/.style={foot/left/color={#1},foot/center/color={#1},foot/right/color={#1},foot/rule/color={#1}},% + nofoot/.style={foot=,foot/font=,foot/rule=,foot/rule/font=}, left/.style={head/left={#1},foot/left={#1}},% left/font/.style={head/left/font={#1},foot/left/font={#1}},% left/font+/.style={head/left/font+={#1},foot/left/font+={#1}},% left/font*/.alias=left/font+,% + left/color/.style={head/left/color={#1},foot/left/color={#1}},% center/.style={head/center={#1},foot/center={#1}},% center/font/.style={head/center/font={#1},foot/center/font={#1}},% center/font+/.style={head/center/font+={#1},foot/center/font+={#1}},% center/font*/.alias=center/font+,% + center/color/.style={head/center/color={#1},foot/center/color={#1}},% right/.style={head/right={#1},foot/right={#1}},% right/font/.style={head/right/font={#1},foot/right/font={#1}},% right/font+/.style={head/right/font+={#1},foot/right/font+={#1}},% right/font*/.alias=right/font+,% + right/color/.style={head/right/color={#1},foot/right/color={#1}},% head/left/.style={head/left/even={#1},head/left/odd={#1}},% head/left/font/.style={head/left/even/font={#1},head/left/odd/font={#1}},% head/left/font+/.style={head/left/even/font+={#1},head/left/odd/font+={#1}},% head/left/font*/.alias=head/left/font+,% + head/left/color/.style={head/left/even/color={#1},head/left/odd/color={#1}},% head/center/.style={head/center/even={#1},head/center/odd={#1}},% head/center/font/.style={head/center/even/font={#1},head/center/odd/font={#1}},% head/center/font+/.style={head/center/even/font+={#1},head/center/odd/font+={#1}},% head/center/font*/.alias=head/center/font+,% + head/center/color/.style={head/center/even/color={#1},head/center/odd/color={#1}},% head/right/.style={head/right/even={#1},head/right/odd={#1}},% head/right/font/.style={head/right/even/font={#1},head/right/odd/font={#1}},% head/right/font+/.style={head/right/even/font+={#1},head/right/odd/font+={#1}},% head/right/font*/.alias=head/right/font+,% + head/right/color/.style={head/right/even/color={#1},head/right/odd/color={#1}},% foot/left/.style={foot/left/even={#1},foot/left/odd={#1}},% foot/left/font/.style={foot/left/even/font={#1},foot/left/odd/font={#1}},% foot/left/font+/.style={foot/left/even/font+={#1},foot/left/odd/font+={#1}},% foot/left/font*/.alias=foot/left/font+,% + foot/left/color/.style={foot/left/even/color={#1},foot/left/odd/color={#1}},% foot/center/.style={foot/center/even={#1},foot/center/odd={#1}},% foot/center/font/.style={foot/center/even/font={#1},foot/center/odd/font={#1}},% foot/center/font+/.style={foot/center/even/font+={#1},foot/center/odd/font+={#1}},% foot/center/font*/.alias=foot/center/font+,% + foot/center/color/.style={foot/center/even/color={#1},foot/center/odd/color={#1}},% foot/right/.style={foot/right/even={#1},foot/right/odd={#1}},% foot/right/font/.style={foot/right/even/font={#1},foot/right/odd/font={#1}},% foot/right/font+/.style={foot/right/even/font+={#1},foot/right/odd/font+={#1}},% foot/right/font*/.alias=foot/right/font+,% + foot/right/color/.style={foot/right/even/color={#1},foot/right/odd/color={#1}},% head/left/odd/.fancy@hf=olh,% head/left/odd/font/.store as code,% + head/left/odd/color/.style={head/left/odd/font+=\color{#1}},% odd/head/left/.alias=head/left/odd,% odd/head/left/font/.alias*=head/left/odd/font,% + odd/head/left/color/.alias=head/left/odd/color,% head/odd/left/.alias=head/left/odd,% head/odd/left/font/.alias*=head/left/odd/font,% + head/odd/left/color/.alias=head/left/odd/color,% head/center/odd/.fancy@hf=och,% head/center/odd/font/.store as code,% + head/center/odd/color/.style={head/center/odd/font+=\color{#1}},% odd/head/center/.alias=head/center/odd,% odd/head/center/font/.alias*=head/center/odd/font,% + odd/head/center/color/.alias=head/center/odd/color,% head/odd/center/.alias=head/center/odd,% head/odd/center/font/.alias*=head/center/odd/font,% + head/odd/center/color/.alias=head/center/odd/color,% head/right/odd/.fancy@hf=orh,% head/right/odd/font/.store as code,% + head/right/odd/color/.style={head/right/odd/font+=\color{#1}},% odd/head/right/.alias=head/right/odd,% odd/head/right/font/.alias*=head/right/odd/font,% + odd/head/right/color/.alias=head/right/odd/color,% head/odd/right/.alias=head/right/odd,% head/odd/right/font/.alias*=head/right/odd/font,% + head/odd/right/color/.alias=head/right/odd/color,% head/left/even/.fancy@hf=elh,% head/left/even/font/.store as code,% + head/left/even/color/.style={head/left/even/font+=\color{#1}},% even/head/left/.alias=head/left/even,% even/head/left/font/.alias*=head/left/even/font,% + even/head/left/color/.alias=head/left/even/color,% head/even/left/.alias=head/left/even,% head/even/left/font/.alias*=head/left/even/font,% + head/even/left/color/.alias=head/left/even/color,% head/center/even/.fancy@hf=ech,% head/center/even/font/.store as code,% + head/center/even/color/.style={head/center/even/font+=\color{#1}},% even/head/center/.alias=head/center/even,% even/head/center/font/.alias*=head/center/even/font,% + even/head/center/color/.alias=head/center/even/color,% head/even/center/.alias=head/center/even,% head/even/center/font/.alias*=head/center/even/font,% + head/even/center/color/.alias=head/center/even/color,% head/right/even/.fancy@hf=erh,% head/right/even/font/.store as code,% + head/right/even/color/.style={head/right/even/font+=\color{#1}},% even/head/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% + even/head/right/color/.alias=head/right/even/color,% head/even/right/.alias=head/right/even,% even/head/right/font/.alias*=head/right/even/font,% + even/head/right/color/.alias=head/right/even/color,% foot/left/odd/.fancy@hf=olf,% foot/left/odd/font/.store as code,% + foot/left/odd/color/.style={foot/left/odd/font+=\color{#1}},% odd/foot/left/.alias=foot/left/odd,% odd/foot/left/font/.alias*=foot/left/odd/font,% + odd/foot/left/color/.alias=foot/left/odd/color,% foot/odd/left/.alias=foot/left/odd,% foot/odd/left/font/.alias*=foot/left/odd/font,% + foot/odd/left/color/.alias=foot/left/odd/color,% foot/center/odd/.fancy@hf=ocf,% foot/center/odd/font/.store as code,% + foot/center/odd/color/.style={foot/center/odd/font+=\color{#1}},% odd/foot/center/.alias=foot/center/odd,% odd/foot/center/font/.alias*=foot/center/odd/font,% + odd/foot/center/color/.alias=foot/center/odd/color,% foot/odd/center/.alias=foot/center/odd,% foot/odd/center/font/.alias*=foot/center/odd/font,% + foot/odd/center/color/.alias=foot/center/odd/color,% foot/right/odd/.fancy@hf=orf,% foot/right/odd/font/.store as code,% + foot/right/odd/color/.style={foot/right/odd/font+=\color{#1}},% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% + odd/foot/right/color/.alias=foot/right/odd/color,% odd/foot/right/.alias=foot/right/odd,% odd/foot/right/font/.alias*=foot/right/odd/font,% + odd/foot/right/color/.alias=foot/right/odd/color,% foot/left/even/.fancy@hf=elf,% foot/left/even/font/.store as code,% + foot/left/even/color/.style={foot/left/even/font+=\color{#1}},% even/foot/left/.alias=foot/left/even,% even/foot/left/font/.alias*=foot/left/even/font,% + even/foot/left/color/.alias=foot/left/even/color,% foot/even/left/.alias=foot/left/even,% foot/even/left/font/.alias*=foot/left/even/font,% + foot/even/left/color/.alias=foot/left/even/color,% foot/center/even/.fancy@hf=ecf,% foot/center/even/font/.store as code,% + foot/center/even/color/.style={foot/center/even/font+=\color{#1}},% even/foot/center/.alias=foot/center/even,% even/foot/center/font/.alias*=foot/center/even/font,% + even/foot/center/color/.alias=foot/center/even/color,% foot/even/center/.alias=foot/center/even,% foot/even/center/font/.alias*=foot/center/even/font,% + foot/even/center/color/.alias=foot/center/even/color,% foot/right/even/.fancy@hf=erf,% foot/right/even/font/.store as code,% + foot/right/even/color/.style={foot/right/even/font+=\color{#1}},% even/foot/right/.alias=foot/right/even,% even/foot/right/font/.alias*=foot/right/even/font,% + even/foot/right/color/.alias=foot/right/even/color,% foot/even/right/.alias=foot/right/even,% foot/even/right/font/.alias*=foot/right/even/font,% + foot/even/right/color/.alias=foot/right/even/color,% offset/.style={head/offset={#1},foot/offset={#1}},% offset+/.style={head/offset+={#1},foot/offset+={#1}},% offset-/.style={head/offset-={#1},foot/offset-={#1}},% @@ -311,49 +359,61 @@ head/left/offset*/.style={head/left/even/offset*={#1},head/left/odd/offset*={#1}},% offset/head/left/.alias*=head/left/offset,% offset/left/head/.alias*=head/left/offset,% + left/head/offset/.alias*=head/left/offset,% head/right/offset/.style={head/right/even/offset={#1},head/right/odd/offset={#1}},% head/right/offset+/.style={head/right/even/offset+={#1},head/right/odd/offset+={#1}},% head/right/offset-/.style={head/right/even/offset-={#1},head/right/odd/offset-={#1}},% head/right/offset*/.style={head/right/even/offset*={#1},head/right/odd/offset*={#1}},% offset/head/right/.alias*=head/right/offset,% offset/right/head/.alias*=head/right/offset,% + right/head/offset/.alias*=head/right/offset,% foot/left/offset/.style={foot/left/even/offset={#1},foot/left/odd/offset={#1}},% foot/left/offset+/.style={foot/left/even/offset+={#1},foot/left/odd/offset+={#1}},% foot/left/offset-/.style={foot/left/even/offset-={#1},foot/left/odd/offset-={#1}},% foot/left/offset*/.style={foot/left/even/offset*={#1},foot/left/odd/offset*={#1}},% offset/foot/left/.alias*=foot/left/offset,% offset/left/foot/.alias*=foot/left/offset,% + left/foot/offset/.alias*=foot/left/offset,% foot/right/offset/.style={foot/right/even/offset={#1},foot/right/odd/offset={#1}},% foot/right/offset+/.style={foot/right/even/offset+={#1},foot/right/odd/offset+={#1}},% foot/right/offset-/.style={foot/right/even/offset-={#1},foot/right/odd/offset-={#1}},% foot/right/offset*/.style={foot/right/even/offset*={#1},foot/right/odd/offset*={#1}},% offset/foot/right/.alias*=foot/right/offset,% offset/right/foot/.alias*=foot/right/offset,% + right/foot/offset/.alias*=foot/right/offset,% head/left/even/offset/.store in skip cs=f@ncyO@elh,% head/left/even/offset/.append code=\fancy@setoffs,% offset/head/left/even/.alias*=head/left/even/offset,% + left/even/head/offset/.alias*=head/left/even/offset,% head/left/odd/offset/.store in skip cs=f@ncyO@olh,% head/left/odd/offset/.append code=\fancy@setoffs,% offset/head/left/odd/.alias*=head/left/odd/offset,% offset/head/left/odd/.alias*=head/left/odd/offset,% + left/odd/head/offset/.alias*=head/left/odd/offset,% head/right/even/offset/.store in skip cs=f@ncyO@erh,% head/right/even/offset/.append code=\fancy@setoffs,% offset/head/right/even/.alias*=head/right/even/offset,% + right/even/head/offset/.alias*=head/right/even/offset,% head/right/odd/offset/.store in skip cs=f@ncyO@orh,% head/right/odd/offset/.append code=\fancy@setoffs,% offset/head/right/odd/.alias*=head/right/odd/offset,% + right/odd/head/offset/.alias*=head/right/odd/offset,% foot/left/even/offset/.store in skip cs=f@ncyO@elf,% foot/left/even/offset/.append code=\fancy@setoffs,% offset/foot/left/even/.alias*=foot/left/even/offset,% + left/even/foot/offset/.alias*=foot/left/even/offset,% foot/left/odd/offset/.store in skip cs=f@ncyO@olf,% foot/left/odd/offset/.append code=\fancy@setoffs,% offset/foot/left/odd/.alias*=foot/left/odd/offset,% + left/odd/foot/offset/.alias*=foot/left/odd/offset,% foot/right/even/offset/.store in skip cs=f@ncyO@erf,% foot/right/even/offset/.append code=\fancy@setoffs,% offset/foot/right/even/.alias*=foot/right/even/offset,% + right/even/foot/offset/.alias*=foot/right/even/offset,% foot/right/odd/offset/.store in skip cs=f@ncyO@orf,% foot/right/odd/offset/.append code=\fancy@setoffs,% offset/foot/right/odd/.alias*=foot/right/odd/offset,% + right/odd/foot/offset/.alias*=foot/right/odd/offset,% reset/.style={norule,head=,foot=,offset=\z@,foot/rule/skip,rule/font=,font=},% reset/.value forbidden,% }% keys for \pagesetup (stored into token \itf@tk) diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty index 5891236408f..88dd0a6ba32 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty index 8819bc539d1..194defeafb5 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty index a122bd3c026..df338429f86 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty index 9d3e0b92bff..1e36d8a467e 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -126,7 +126,7 @@ {\pgfkeysgetvalue{/itf/makecell/repeatcell/cr/row\the\itf@col}\itf@thecr} {\pgfkeysgetvalue{/itf/makecell/repeatcell/cr}\itf@thecr}% \toks@\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\toks@\itf@thecr}% + \expandafter\the\expandafter\toks@\itf@thecr}% \fi \advance\itf@col\@ne \itf@row\z@ @@ -148,7 +148,7 @@ {\pgfkeysgetvalue{/itf/makecell/repeatcell/cr/row\the\itf@row}\itf@thecr} {\pgfkeysgetvalue{/itf/makecell/repeatcell/cr}\itf@thecr}% \toks@\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\toks@\itf@thecr}% + \expandafter\the\expandafter\toks@\itf@thecr}% \fi \advance\itf@row\@ne \itf@col\z@ @@ -279,7 +279,7 @@ \protected\def\itf@cell@calc#1#2{% \edef#1{\def\noexpand#1{#2}}% \toks@\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\toks@#1}% + \expandafter\the\expandafter\toks@#1}% #1% }% \itf@cell@calc \protected\def\itf@cell@numcalc#1#2{% @@ -319,7 +319,7 @@ \itf@cell@getifdefined{text/row\the\itf@row}\itf@cellrow \itf@cell@getifdefined{text/col\the\itf@col}\itf@cellcol \toks@\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\toks@\itf@cellfont}% + \expandafter\the\expandafter\toks@\itf@cellfont}% \ifx\itf@cellrow\@empty \ifx\itf@cellcol\@empty \itf@cell\expandafter\expandafter\expandafter{% @@ -347,10 +347,10 @@ \fi \fi \itf@cell\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\itf@cell\itf@tp}% + \expandafter\the\expandafter\itf@cell\itf@tp}% \edef\itf@tp{\itf@makecell{\the\itf@cell}}% \toks@\expandafter\expandafter\expandafter{% - \expandafter\the\expandafter\toks@\itf@tp}% + \expandafter\the\expandafter\toks@\itf@tp}% }% \itf@cell@insert \def\itf@diaghead(#1)#2#3{% \begingroup diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty index 9757f2aeea0..f957c16e722 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty index 6347d988c1e..b2fea1ea476 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/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -47,18 +47,20 @@ \ProvidesPackage{interfaces-pgfkeys} [2010/10/27 v1.2 pgfkeys handlers definitions (FC)] \RequirePackage{interfaces-base} -\AtEndOfPackage{% - \let\itf@pgfkeys@unpack\pgfkeys@unpack - \let\itf@pgfkeys@case@three\pgfkeys@case@three - \let\itf@pgfkeys@exp@call\pgfkeys@exp@call - \let\itf@pgfkeysaddvalue\pgfkeysaddvalue -}% AtEndOfPackage +\ifdefined\pgfkeys@ifexecutehandler % pgf version 2.1 \def\itf@pgfkeys{% - \global\let\pgfkeys@unpack\itf@pgfkeys@unpack - \global\let\pgfkeys@case@three\itf@pgfkeys@case@three - \global\let\pgfkeys@exp@call\itf@pgfkeys@exp@call - \global\let\pgfkeysaddvalue\itf@pgfkeysaddvalue + \global\let\pgfkeys@unpack \itf@pgfkeys@unpack + \global\let\pgfkeys@case@three \itf@pgfkeys@case@three + \global\let\pgfkeys@case@three@handleall\itf@pgfkeys@case@three@handleall }% \itf@pgfkeys +\else +\def\itf@pgfkeys{% + \global\let\pgfkeys@unpack \itf@pgfkeys@unpack + \global\let\pgfkeys@case@three \itf@pgfkeys@case@three + \global\let\pgfkeysaddvalue \itf@pgfkeysaddvalue + \global\let\pgfkeys@exp@call \itf@pgfkeys@exp@call +}% \itf@pgfkeys +\fi \AtBeginDocument{% \itf@pgfkeys \let\itf@pgfkeys\relax @@ -72,10 +74,8 @@ \unexpanded\expandafter\expandafter\expandafter{% \csname pgfk@#1\endcsname}% }% \pgfkeysvalueof@unexpanded -\newrobustcmd*\pgfkeysEsetvalue[2]{% - \expandafter\edef\csname pgfk@#1\endcsname{#2}% -}% \pgfkeysEsetvalue -\renewrobustcmd*\pgfkeysaddvalue[3]{% \cspreappto{pgfk@#1}{#2}{#3} (bug in pgfkeys.code.tex) +\ifdefined\pgfkeys@ifexecutehandler \else % pgf v2.1: bug fixed +\def\itf@pgfkeysaddvalue#1#2#3{% (pgf v2.0: bug in pgfkeys.code.tex) \edef\pgfkeys@global@temp{% \unexpanded{#2}% \ifcsname pgfk@#1\endcsname @@ -84,8 +84,14 @@ \fi \unexpanded{#3}}% \pgfkeyslet{#1}\pgfkeys@global@temp -}% \pgfkeysaddvalue -\newrobustcmd*\pgfkeysEaddvalue[3]{% \csepreappto{pgfk@#1}{#2}{#3} +}% \itf@pgfkeysaddvalue +\fi +\ifdefined\pgfkeys@ifexecutehandler \long \fi % pgf version 2.1 +\def\pgfkeysEsetvalue#1#2{% + \expandafter\edef\csname pgfk@#1\endcsname{#2}% +}% \pgfkeysEsetvalue +\ifdefined\pgfkeys@ifexecutehandler \long \fi % pgf v2.1 +\def\pgfkeysEaddvalue#1#2#3{% \csepreappto{pgfk@#1}{#2}{#3} \edef\pgfkeys@global@temp{% #2% \ifcsname pgfk@#1\endcsname @@ -96,9 +102,12 @@ \pgfkeyslet{#1}\pgfkeys@global@temp }% \pgfkeysaddvalue %% missed a pair of braces around the argument in pgfkeys.code.tex ( code could break if it contains = or , ) -\def\pgfkeys@exp@call#1{\pgfkeysalso{\pgfkeyscurrentpath={#1}}} +\ifdefined\pgfkeys@ifexecutehandler\else % pgf v2.1 (bug corrected in v2.1) + \def\itf@pgfkeys@exp@call#1{\pgfkeysalso{\pgfkeyscurrentpath={#1}}}% +\fi %% The value is now checked by \itf@pgfkeys@default@blank@required: -\def\pgfkeys@unpack#1=#2=#3\pgfkeys@stop{% +\ifdefined\pgfkeys@ifexecutehandler \long \fi % pgf v2.1 +\def\itf@pgfkeys@unpack#1=#2=#3\pgfkeys@stop{% \pgfkeys@spdef\pgfkeyscurrentkey{#1}% \edef\pgfkeyscurrentkey{\pgfkeyscurrentkey}% \ifx\pgfkeyscurrentkey\pgfkeys@empty @@ -110,7 +119,7 @@ \pgfkeyscurrentkey % \pgfkeys@case@one % \fi -}% \pgfkeys@unpack +}% \itf@pgfkeys@unpack \def\itf@pgfkeys@default@blank@required#1#2{% \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text% Hmm... no value \pgfkeysifdefined{#1/.@def}% @@ -136,7 +145,7 @@ }% \itf@pgfkeys@default@blank@required %% To handle the cases of: /handler/.default= /handler/.blank= /handler/.value required, %% it is necessary to redefine \pgfkeys@case@three -\renewcommand*\pgfkeys@case@three{% +\def\itf@pgfkeys@case@three{% \pgfkeys@split@path \pgfkeysifdefined{/handlers/\pgfkeyscurrentname/.@cmd} {% @@ -145,7 +154,11 @@ \expandafter\pgfkeys@code\pgfkeyscurrentvalue\pgfeov}% } \pgfkeys@unknown % no handler, thus the key is unknown -}% \pgfkeys@case@three +}% \itf@pgfkeys@case@three +\ifdefined\pgfkeys@ifexecutehandler + \let\itf@pgfkeys@case@three@handleall \itf@pgfkeys@case@three +\fi +\itf@pgfkeys \pgfkeys{% /handlers/.alias/.code=\itf@pgfkeys@ifaliasexists{#1}{% \pgfkeysedef\pgfkeyscurrentpath{\noexpand\pgfkeysalso{\pgfkeysdefaultpath#1={##1}}}},% @@ -314,7 +327,7 @@ \pgfkeys{% /handlers/.store as number/.code={% \pgfkeysedef\pgfkeyscurrentpath{% - \normalcolor\pgfkeyssetvalue{\pgfkeyscurrentpath}{\numexpr##1\relax}}% + \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\numexpr##1\relax}}% \pgfkeyslet\pgfkeyscurrentpath\z@ \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ @@ -332,7 +345,8 @@ \pgfkeys{% /handlers/.estore as number/.code={% \pgfkeysedef\pgfkeyscurrentpath{% - \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\number\numexpr##1\relax}}% + \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{% + \noexpand\number\numexpr##1\relax}}% \pgfkeyslet\pgfkeyscurrentpath\z@ \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@ \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ @@ -355,7 +369,7 @@ \pgfkeysedef{\pgfkeyscurrentpath\x}{% \letcs\noexpand\pgfkeys@temp{% \noexpand\ifcsname#1\endcsname - #1\noexpand\else z@\noexpand\fi}% + #1\noexpand\else\if*\x @ne\else z@\fi\noexpand\fi}% \edef\noexpand\pgfkeys@temp{% \noexpand\pgfkeysalso{\pgfkeyscurrentpath={% \noexpand\expandonce\noexpand\pgfkeys@temp @@ -377,7 +391,7 @@ \pgfkeysedef{\pgfkeyscurrentpath\x}{% \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% \noexpand\csname\noexpand\ifcsname#1\endcsname - #1\noexpand\else z@\noexpand\fi\endcsname + #1\noexpand\else\if*\x @ne\else z@\fi\noexpand\fi\endcsname \x \numexpr##1\relax}}% \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% @@ -386,8 +400,23 @@ /handlers/.estore as number in cs/.value required,% }% /.estore as number in cs \pgfkeys{% - /handlers/.defcounter/.code=\pgfkeysdef\pgfkeyscurrentpath{\defcounter{#1}{##1}}% -}% /.defcounter + /handlers/.store in counter cs/.code={% + \pgfkeysdef\pgfkeyscurrentpath{% + \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text + \else\csname#1\endcsname\numexpr##1\relax\fi}% + \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@ + \@tfor\x:=+-*\do{% + \pgfkeysedef{\pgfkeyscurrentpath\x}{% + \noexpand\pgfkeysalso{\pgfkeyscurrentpath=% + \noexpand\csname\noexpand\ifcsname#1\endcsname + #1\noexpand\else\if*\x @ne\else z@\fi\noexpand\fi\endcsname + \x + \numexpr##1\relax}}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}% + \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\@ne\else\z@\fi}% + }},% + /handlers/.store in counter cs/.value required,% +}% /.store in counter cs \pgfkeys{% /handlers/.store as glue/.code={% \pgfkeysedef\pgfkeyscurrentpath{% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty index 2fea8b7f97f..0deb6520434 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty index 4ff52230a3b..cb441271425 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -45,7 +45,7 @@ %% Copyright (C) 2010 by Florent Chervet %% \ProvidesPackage{interfaces-tikz} - [2010/10/27 v1.2 load of tikz libraries easily (FC)] + [2010/10/31 v2.0 load tikz libraries easily - pgf 2.0 & 2.1 (FC)] \RequirePackage{interfaces-base} \itf@pgfkeys %% Some catcode checking @@ -56,48 +56,85 @@ }% }% \newcommand*\alltikzpackages{% - pgf,pgfmath,pgfcalendar,pgfplots,pgfpages,tikz% + tikz,pgf,pgfcore,pgfcalendar,pgffor,pgfkeys,pgfpages,pgfrcs,tikzexternal,xxcolor,% + pgfplots,pgfsys,pgfmath,% + pgfpic2e,fp,% + fp required for fixedpointarithmetic }% \alltikzpackages -\newcommand*\allpgfmodules{matrix,plot} -\newcommand*\alltikzlibraries{% - arrows,% - chains,% - er,% - scopes,% - snakes,% - shapes,% - shapes.misc,% - shapes.geometric,% - shapes.arrows,% - shapes.multipart,% - shapes.callouts,% - shapes.symbols,% - shapes.gates.logic.US,% - shapes.gates.logic.IEC,% - decorations,% - decorations.pathmorphing,% - decorations.pathreplacing,% - decorations.shapes,% - decorations.text,% - decorations.markings,% - decorations.fractals,% - decorations.footprints,% - positioning,trees,% - automata,% - patterns,% - fadings,% - shadows,% - through,% - backgrounds,% - petri,% - fit,% - mindmap,% - folding,% - plothandlers,% - plotmarks,% - calc,% - matrix% -%% topath,placements,% +\newcommand*\allpgfmodules{datavisualization,% +decorations,% +matrix,% +oo,% +parser,% +plot,% +shapes,% +snakes,% +sorting% +}% \allpgfmodules +\newcommand*\alltikzlibraries{3d,% +arrows,% +automata,% +backgrounds,% +calc,% +calendar,% +chains,% +circuits,% +circuits.ee,% +circuits.ee.IEC,% +circuits.logic,% +circuits.logic.CDH,% +circuits.logic.IEC,% +circuits.logic.US,% +datavisualization,% +datavisualization.3d,% +datavisualization.barcharts,% +datavisualization.formats.functions,% +datavisualization.polar,% +datavisualization.sparklines,% +decorations,% +decorations.footprints,% +decorations.fractals,% +decorations.markings,% +decorations.pathmorphing,% +decorations.pathreplacing,% +decorations.shapes,% +decorations.text,% +er,% +external,% +fadings,% +fit,% +fixedpointarithmetic,% +folding,% +fpu,% +graphs,% +graphs.basic,% +intersections,% +lindenmayersystems,% +matrix,% +mindmap,% +patterns,% +petri,% +plothandlers,% +plotmarks,% +positioning,% +scopes,% +shadings,% +shadows,% +shapes,% +shapes.arrows,% +shapes.callouts,% +shapes.gates.logic.IEC,% +shapes.gates.logic.US,% +shapes.geometric,% +shapes.misc,% +shapes.multipart,% +shapes.symbols,% +snakes,% +spy,% +svg.path,% +through,% +topaths,% +trees,% +turtle% }% \alltikzlibraries \pgfqkeys{/itf/tikz}{% basic/.code={% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty index 2dc5fd60f5f..677b18d6958 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty index e69fdb47ef1..814ec117f6f 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -82,6 +82,7 @@ title/font/.store as code in cs=cft#1titlefont,% title/format/.alias*=title/font,% title/after/.store as code in cs=cftafter#1title,% + title/command/.code=\csdef{@cftmake#1title}####1{##1},% dotsep/.code=\itf@units@mu\itf@musk{##1}% converts to mu \edef\cftdotsep{\itf@strip@mu\itf@musk},% dotsep/.default=4.5mu,% @@ -199,8 +200,10 @@ \itf@cft@newlistof{lot} %% Specific to toc only ------------------------------------------------------- \pgfqkeys{/itf/tocloft/toc}{% - depth/.defcounter=tocdepth,% - depth/.value required,% + depth/.store in counter cs=c@tocdepth,% + depth/.append code= + \global\c@tocdepth\c@tocdepth + \addtocontents{toc}{\c@tocdepth\the\c@tocdepth\relax},% tocdepth/.alias=depth,% title/.store as code in cs=contentsname,% contentsname/.alias=title,% @@ -229,8 +232,12 @@ \pgfqkeys{/itf/tocloft}{% lof/pagenumbers/.style={figure/pagenumbers={#1},subfigure/pagenumbers={#1}},% lof/pagenumber/.alias=lof/pagenumbers,% + lof/depth/.store in counter cs=c@lofdepth,% + lof/depth/.append code=\global\c@lofdepth\c@lofdepth\addtocontents{lof}{\c@lofdepth\the\c@lofdepth\relax},% lot/pagenumbers/.style={figure/pagenumbers={#1},subfigure/pagenumbers={#1}},% lot/pagenumber/.alias=lot/pagenumbers,% + lot/depth/.store in counter cs=c@lotdepth,% + lot/depth/.append code=\global\c@lotdepth\c@lotdepth\addtocontents{lot}{\c@lotdepth\the\c@lotdepth\relax},% }% \else \pgfqkeys{/itf/tocloft}{% @@ -284,9 +291,12 @@ leader/.cft@def=.#1.leader,% leader/.default=\cftdotfill{\csname\itf@cft@name.#1.dotsep\@nil\endcsname},% leaders/.alias=leader,% - dotsep/.code={\itf@units@mu\itf@musk{##1}% - \csedef{\itf@cft@name.#1.dotsep\@nil}{\itf@strip@mu\itf@musk}},% - dotsep/.default=\cftdotsep,% + dotsep/.code={\ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text + \csdef{\itf@cft@name.#1.dotsep\@nil}{\cftdotsep}% + \else + \itf@units@mu\itf@musk{##1}% + \csedef{\itf@cft@name.#1.dotsep\@nil}{\itf@strip@mu\itf@musk}} + \fi,% dotsep/.blank=\cftnodots,% nodots/.code=\csdef{\itf@cft@name.#1.dotsep\@nil}{\cftnodots},% nodots/.value forbidden,% diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty index a52e1504781..7f33f43223e 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty index d552fc4b706..1526da731c1 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces.sty index 57d430c43b6..82a073283cb 100644 --- a/Master/texmf-dist/tex/latex/interfaces/interfaces.sty +++ b/Master/texmf-dist/tex/latex/interfaces/interfaces.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% interfaces : 2010/10/20 v1.1 - interfaces : interfaces with keys for other packages (FC) +%% interfaces : 2010/10/31 v2.0 - 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 @@ -46,7 +46,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{interfaces} - [2010/10/27 v1.2 - pgfkeys macros for other packages (FC)] + [2010/10/31 v2.0 - pgfkeys (pgf 2.0 et 2.1 macros for interfaces (FC)] \RequirePackage{interfaces-base} \DeclareOption{LaTeX}{\AtEndOfPackage{\LoadInterface{LaTeX}}} \DeclareOption{marks}{\AtEndOfPackage{\LoadInterface{marks}}} -- cgit v1.2.3