summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-10 00:33:32 +0000
committerKarl Berry <karl@freefriends.org>2010-11-10 00:33:32 +0000
commit6a43749c68fb713c7747927e2dbce5fecebeef41 (patch)
tree34f43407f72e4b10c32d13b2b54c57d891472171 /Master
parent6c695847dd86eb6feee74b5f466414efa62ca037 (diff)
interfaces 2.0 (9nov10)
git-svn-id: svn://tug.org/texlive/trunk@20388 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex2
-rw-r--r--Master/texmf-dist/doc/latex/interfaces/interfaces.pdfbin1123046 -> 1070476 bytes
-rw-r--r--Master/texmf-dist/source/latex/interfaces/interfaces.drv14
-rw-r--r--Master/texmf-dist/source/latex/interfaces/interfaces.dtx978
-rw-r--r--Master/texmf-dist/source/latex/interfaces/interfaces.ins8
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty176
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty4
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty66
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-fancyvrb.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty14
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-marks.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty85
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty123
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty22
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty2
-rw-r--r--Master/texmf-dist/tex/latex/interfaces/interfaces.sty4
27 files changed, 596 insertions, 928 deletions
diff --git a/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex b/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex
index d613aeb5ddd..c77c520e769 100644
--- a/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex
+++ b/Master/texmf-dist/doc/latex/interfaces/interfaces-hypbmsec.code.tex
@@ -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/doc/latex/interfaces/interfaces.pdf b/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf
index 7342269c8e8..f46ecacfa5b 100644
--- a/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf
+++ b/Master/texmf-dist/doc/latex/interfaces/interfaces.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.drv b/Master/texmf-dist/source/latex/interfaces/interfaces.drv
index 7ad3d19c56f..a89ec436035 100644
--- a/Master/texmf-dist/source/latex/interfaces/interfaces.drv
+++ b/Master/texmf-dist/source/latex/interfaces/interfaces.drv
@@ -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,8 +47,8 @@
\let\CTANLinks=y
\edef\thisfile{\jobname}
\def\thisinfo{interfaces with keys for other packages (\FC)}
-\def\thisdate{2010/10/27}
-\def\thisversion{1.2}
+\def\thisdate{2010/10/31}
+\def\thisversion{2.0}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/}
\def\LocalOrCTAN#1#2{\ifx y\CTANLinks#2\else#1\fi}
\def\LOCALDOC{file:C:/texmf/doc/latex}
@@ -58,7 +58,7 @@
\usepackage[latin1]{inputenc}
\usepackage[american]{babel}
\usepackage[T1]{fontenc}
-\usepackage{txfonts,times,marvosym,wasysym,pifont,bbding,nicefrac,numprint}
+\usepackage{txfonts,times,marvosym,wasysym,nicefrac,numprint,hologo}
\usepackage[expansion=all,protrusion=none,shrink=50,stretch=20]{microtype}
\PassOptionsToPackage{svgnames}{xcolor}
\usepackage{etoolbox,atveryend,calc}
@@ -75,11 +75,12 @@
\usepackage{zref,zref-user,zref-savepos}
\usetikz{basic,decorations.pathmorphing}
\csname endofdump\endcsname
-%%\FPmessagesfalse
+\RequirePackage{tabu}
+%%\OnlyDescription
\CodelineNumbered
\usepackage{fancyvrb} \fvset{gobble=1}
\lastlinefit999 \widowpenalty5000 \clubpenalty10000 \doublehyphendemerits100000
-\geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm}
+\geometry{top=0pt,includehead,headheight=.8cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=2.5cm,right=1cm}
\hypersetup{%
pdftitle={The interfaces package},%
pdfsubject={interfaces with keys for other packages},%
@@ -87,7 +88,6 @@
pdfpagemode=UseNone,%
colorlinks,linkcolor=reflink,filecolor=reffilecolor,%
pdfstartview={FitH},%
- hyperindex=true,%
pdfkeywords={tex, e-tex, latex, package, interfaces, pgfkeys,%
scrlfile, titlesec, fancyhdr, tocloft, environ,%
fancyvrb, embedfile, bookmark, hypbmsec, truncate,%
diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.dtx b/Master/texmf-dist/source/latex/interfaces/interfaces.dtx
index e7352ad0782..c7ecc203c9b 100644
--- a/Master/texmf-dist/source/latex/interfaces/interfaces.dtx
+++ b/Master/texmf-dist/source/latex/interfaces/interfaces.dtx
@@ -1,5 +1,5 @@
% \iffalse meta-comment
-% interfaces : 2010/10/27 v1.2 - interfaces with keys for other packages (FC)
+% interfaces : 2010/10/31 v2.0 - 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
@@ -57,7 +57,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/10/27 v1.2 - interfaces: interfaces with keys for other packages (FC)}
+\Msg{* Package: 2010/10/31 v2.0 - interfaces: interfaces with keys for other packages (FC)}
\Msg{************************************************************************}
\keepsilent
@@ -68,7 +68,7 @@
This is a generated file.
-interfaces : 2010/10/27 v1.2 - 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
@@ -134,7 +134,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{interfaces-fancyvrb.sty}{\from{interfaces.dtx}{fancyvrb}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{interfaces.drv}{\from{interfaces.dtx}{driver}}%
}
@@ -163,8 +163,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\let\CTANLinks=y
\edef\thisfile{\jobname}
\def\thisinfo{interfaces with keys for other packages (\FC)}
-\def\thisdate{2010/10/27}
-\def\thisversion{1.2}
+\def\thisdate{2010/10/31}
+\def\thisversion{2.0}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/}
\def\LocalOrCTAN#1#2{\ifx y\CTANLinks#2\else#1\fi}
\def\LOCALDOC{file:C:/texmf/doc/latex}
@@ -174,7 +174,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\usepackage[latin1]{inputenc}
\usepackage[american]{babel}
\usepackage[T1]{fontenc}
-\usepackage{txfonts,times,marvosym,wasysym,pifont,bbding,nicefrac,numprint}
+\usepackage{txfonts,times,marvosym,wasysym,nicefrac,numprint,hologo}
\usepackage[expansion=all,protrusion=none,shrink=50,stretch=20]{microtype}
\PassOptionsToPackage{svgnames}{xcolor}
\usepackage{etoolbox,atveryend,calc}
@@ -191,11 +191,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\usepackage{zref,zref-user,zref-savepos}
\usetikz{basic,decorations.pathmorphing}
\csname endofdump\endcsname
-%%\FPmessagesfalse
+\RequirePackage{tabu}
+%%\OnlyDescription
\CodelineNumbered
\usepackage{fancyvrb} \fvset{gobble=1}
\lastlinefit999 \widowpenalty5000 \clubpenalty10000 \doublehyphendemerits100000
-\geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm}
+\geometry{top=0pt,includehead,headheight=.8cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=2.5cm,right=1cm}
\hypersetup{%
pdftitle={The interfaces package},%
pdfsubject={interfaces with keys for other packages},%
@@ -203,7 +204,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
pdfpagemode=UseNone,%
colorlinks,linkcolor=reflink,filecolor=reffilecolor,%
pdfstartview={FitH},%
- hyperindex=true,%
pdfkeywords={tex, e-tex, latex, package, interfaces, pgfkeys,%
scrlfile, titlesec, fancyhdr, tocloft, environ,%
fancyvrb, embedfile, bookmark, hypbmsec, truncate,%
@@ -217,7 +217,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%</driver>
% \fi
%
-% \CheckSum{5859}
+% \CheckSum{5549}
%
% \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
@@ -318,6 +318,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% }
% ^^A----------------------------------------------------------------------------
% \parindent\z@\parskip.4\baselineskip\topsep\parskip\partopsep\z@
+% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07}
% \g@addto@macro\macro@font{\macrocodecolor\let\AltMacroFont\macro@font}
% \font\ttMacroFont=cmtt10 scaled 900
% \def\MacroFont{\ttMacroFont}
@@ -436,17 +437,21 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \def\M@brace#1#2{\M@Bracket\{{#1{#2}}\}}
% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}}
% \newrobustcmd*\OR{{\rred\upshape\textttbf\textbar}}
+% \newcommand*\NibRight{{\changefont{encoding=U,fam=ding}\symbol{'035}}}
+% \newcommand*\HandRight{{\changefont{enc=U,family=ding}\symbol{'021}}}
+% \newcommand*\Pisymbol[1]{{\changefont{enc=U,fam=pzd,ser=m,sha=n}\symbol{#1}}}
% \renewcommand\usepackage{\@ifstar{\use@package[\pkgcolor]}\use@package}
% \renewcommand\LoadInterface[1]{\hbox{\cs[\lk]{LoadInterface}\M*{\xpackage{#1}}}}
% \newrobustcmd\use@package[2][]{\hbox{\cs[\lk]{usepackage}\M*{{#1{\xpackage{#2}}}}}}
% \pagesetup[corpus]{%
-% head/rule/width=.4pt,
+% head/rule/width=.1pt,head/rule/color=LightSteelBlue,
% left/offset=1cm,
-% head/font=\scriptsize\color[gray]{.35},%
-% foot/font=\scriptsize\color[gray]{.35},%
+% font=\scriptsize\color[gray]{.35},%
+% foot/left/font+=\ssmall\tiny,%
% head/left=The \thispackage package -- \thisinfo,%
% head/right=\thefirstmarks{section},%
-% foot/left=\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC,%
+% foot/left/offset=.7in,
+% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC}}}},
% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}},%
% }
% \pagestyle{corpus}
@@ -456,18 +461,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% head=,
% }
%
-% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07}
% \newrobustcmd*\IMPLEMENTATION{%
% \clearpage
% \hypersetup{bookmarksopenlevel=2}
-% ^^A\geometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm}
-% \newgeometry{top=1.5cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=4cm,right=.5cm}
+% ^^A\geometry{top=0pt,includehead,headheight=1cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=2.5cm,right=1cm}
+% \newgeometry{top=0pt,includehead,headheight=.8cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=4cm,right=.5cm}
% \pagesetup*{%
-% ^^Apagestyle=corpus,
% left/offset+=1.5cm,
% right/offset-=.5cm,
% head/left=The \thispackage package (implementation) -- \thisinfo,
-% head/right/font+=\smaller,
+% ^^Ahead/right/font+=\tiny,
% head/right=\thefirstmarks{subsection},
% }%
% \bookmarksetup{depth=4}
@@ -520,7 +523,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \deffootnote{1em}{0pt}{\rlap{\textsuperscript{\thefootnotemark}}\kern1em}
% \title{\vspace*{-36pt}\mdseries The {\bfseries\thispackage\footnotemark}\kern.6em package}
% \author{\tiny\xemail{florent.chervet at free.fr}}
-% \date{\thisdate~--~version \thisversion}
+% \date{\thisdate~--~version \thisversion~--~\xpackage{pgf} v2.1 / \xpackage{pgf} v2.0 compatible}
% \subtitle{\thisinfo}
% \maketitle
%
@@ -695,161 +698,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% {\small Finally, \cs{changefont} is compatible with \xpackage{hyperref} thank to \cs{pdfstringdefDisableCommands}.}
%
-% \begin{declcs}[\red]{rowfont}\M[alignment]\M{font specification}
-% \end{declcs}
-%
-% \cs[\red]{rowfont} modifies the font for each cell in a row of a tabular or array.
-%
-% \cs[\red]{rowfont} specifications have priority over column specifications, exactly like \cs{rowcolor} has priority
-% over \cs{columncolor} in the \xpackage{colortbl} package.
-%
-% The implementation must be compatible with all packages that are compatible with the \xpackage{array} package,
-% which is required (\cs[\red]{rowfont} is not defined if the standard package \xpackage{array.sty} is not loaded).
-% In particular, \cs{rowfont} compatibility has been tested with success with \xpackage{colortbl}, \xpackage{hhline},
-% \xpackage{arydshln}, \xpackage{tabularx}, \xpackage{longtable}, \xpackage{delarray}, \xpackage{dcolumn}, \xpackage{ragged2e}...
-%
-% The alignment of each cell in one row can also be changed to: \topsep=0pt
-% \begin{center}
-% \begin{tabular}{>{\pkgcolor\ttfamily}r@{\,$=$\,}l!{\qquad\itshape\smaller or\, for \xpackage{ragged2e} settings: }>{\pkgcolor\ttfamily}r}
-% l &left &L \\
-% c &center &C \\
-% r &right &R \\
-% j &justify &J \\
-% \end{tabular}
-% \end{center}
-%
-% Any other value for the optional \meta{alignment} parameter is silently ignored. If \xpackage{ragged2e} is not loaded,
-% \textt[\pkgcolor]L\, \textt[\pkgcolor]R\, \textt[\pkgcolor]C\, and\, \textt[\pkgcolor]J\, are synonymous with the
-% lowercase equivalent.
-%
-% \bigskip
-%
-% \centerline{\lk
-% \tikz\draw [decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% \quad \textsc{\scshape Example with package \xpackage{colortbl}} \quad
-% \tikz\draw [cm={-1,0,0,0,(0,0)},anchor=east,decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% }
-% {\footnotesize
-% \begin{Verb*}
-% \begin{($dg$underline(tabular))}{|l|>{($db(\columncolor)){Salmon}\itshape\mdseries}c|lcr|} \hline
-% ($db(\rowcolor)){GreenYellow}($red(\rowfont)){\bfseries}
-% <-------- type --------> &<-- center --> &<-- left --> &<-- center --> &<-- right --> \\\hline
-% normal &1 &2 &3 &4 \\
-% ($db(\rowcolor)){LightSkyBlue}%($itshape$lk overwrites \columncolor)
-% ($red(\rowfont))[($pkgcolor(l))]{\itshape}
-% to left &1 &2 &3 &4 \\
-% ($red(\rowfont))[($pkgcolor(c))]{\sffamily\bfseries}%($itshape$lk overwrites \mdseries)
-% to center &1 &2 &3 &4 \\
-% ($db(\rowcolor)){MediumSpringGreen}
-% ($red(\rowfont))[($pkgcolor(r))]{\larger\upshape\bottopstrut}%($itshape$lk overwrites \itshape)
-% to right &1 &2 &3 &4 \\\hline
-% \end{($dg$underline(tabular))}
-% \end{Verb*}
-% }
-% \medskip
-%
-% \begin{center}
-% \begin{tabular}{|l|>{\columncolor{Salmon}\itshape\mdseries}c|lcr|} \hline
-% \rowcolor{GreenYellow}\rowfont\bfseries
-% <-------- type --------> &<-- center --> &<-- left --> &<-- center --> &<-- right --> \\\hline
-% normal &1 &2 &3 &4 \\
-% \rowcolor{LightSkyBlue}
-% \rowfont[l]{\itshape}
-% to left &1 &2 &3 &4 \\
-% \rowfont[c]{\sffamily\bfseries}
-% to center &1 &2 &3 &4 \\
-% \rowcolor{MediumSpringGreen}
-% \rowfont[r]{\larger\upshape\bottopstrut}
-% to right &1 &2 &3 &4 \\\hline
-% \end{tabular}\par
-% {\raggedleft\scriptsize A very bad looking example !\par}
-% \end{center}
-% \pagebreak
-%
-% Limitations for the alignment parameter:
-% \begin{itemize}^^A[topsep=0pt,parsep=0pt,itemsep=0pt]
-% \item The alignment parameter is essentially provided to format the first title line of the tabular in ``one shot'' and
-% in simple cases. Otherwise, prefer \cs{thead} (package \xpackage{makecell}) for each title cell.
-% \item be aware that changing the alignment with \cs{rowfont} in a row whose cells contains
-% tabulars or arrays will give poor results (but \cs{multicolumn}, \cs{makecell} and \csref[\red]{repeatcell}
-% have their own alignment parameter).
-% \item Changing the alignment with \cs{rowfont} in mathematical mode (\ie in arrays) does not work presently
-% \item Avoid the \xpackage{ragged2e} settings if you don't know the package \xpackage{ragged2e} very well.
-% It contains a lot of parameters for paragraph glues and indentations...
-% \end{itemize}
-%
-%
-% \bigbreak
-% \centerline{\lk
-% \quad \textsc{\scshape Example for paragraph columns (with package \xpackage{colortbl} as well)} \quad
-% }\nobreak
-% {\arrayrulewidth=.8pt
-% \def\parag#1{This is a paragraph, not too long and not excessively short, to see what happens with {\color{red}\textttbf{m columns}} {\color{Blue} initially #1}}
-% \def\tabtest{\parag {justified} & \parag {raggedright} & \parag {centering} & \parag {raggedleft}} \def\colwidth{.18\linewidth}
-% \begin{center}\scriptsize
-% \begin{tabular}{|l|>{\columncolor{Beige}}m{\colwidth}|>{\columncolor{Lavender}\raggedright\arraybackslash}m{\colwidth}|>{\columncolor{MintCream}\centering\arraybackslash}m{\colwidth}|>{\columncolor{OldLace}\raggedleft\arraybackslash}m{\colwidth}|} \hline
-% \rowfont{\larger\bfseries}
-% Initial & m column & \cs{raggedright} m column & \cs{centering} m column & \cs{raggedleft} m column \\ \hline
-% \rowcolor{Honeydew}
-% normal & \tabtest \\ \hline
-% \rowfont[L]{\itshape}
-% to left& \tabtest \\ \hline
-% \rowfont[C]{\bfseries}
-% to center& \tabtest \\ \hline
-% \rowfont[R]{\slshape}
-% to right& \tabtest \\ \hline
-% \rowfont[J]{}
-% to justify& \tabtest \\ \hline
-% \end{tabular}
-% \end{center}
-% }
-%
-% \bigbreak
-% {%
-% \centerline{\lk
-% \tikz\draw [decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% \quad \textsc{\scshape Explanations for \LaTeX en} \quad
-% \tikz\draw [cm={-1,0,0,0,(0,0)},anchor=east,decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% }\nobreak
-% \footnotesize
-% \xpackage{array} defines the preamble of each tabular with a pseudo code like:
-% \begin{Verb*}
-% \hskip...\d@llarbegin \the\toks i \ignorespaces #\unskip \the\toks i+1 \relax\d@llarend... &
-% \end{Verb*}
-% where {\ttfamily\cs{toks} i} and {\ttfamily\cs{toks} i+1} contain user defined commands placed before (left side of)
-% and after (right side of) each column specification, for example: \topsep=0pt
-% \begin{center}
-% \begin{tikzpicture}
-% \node (L) at (1,1) {$\underbrace{\hbox{>\M*{\cs{bfseries}\cs{color}\M*{red}}}}$}
-% node [anchor=west] (r) at (L.east) {\raise.5ex\hbox{\larger r}}
-% node [anchor=west] (R) at (r.east) {$\underbrace{\hbox{<\M*{\cs{color}\M*{black}\cs ,\cs\$}}}$}
-% node [anchor=center] at (L.south) {\cs{toks}<$i$>}
-% node [anchor=center] at (R.south) {\cs{toks}<$i+1$>};
-% \end{tikzpicture}
-% \end{center}
-%
-% There are also other types of ``pseudo code'' for \texttbf p and \texttbf m columns, and for special \texttbf @
-% and \texttbf ! columns but the implementation is the same. For more details, please refer to the implementation part.
-%
-% \thispackage append to each such \cs{toks}\meta{$i$} a control sequence named \cs{itf@cellleft} and to each
-% such \cs{toks}\meta{$i+1$} a control sequence named \cs{itf@cellright}, similar to \cs{@arrayleft} and \cs{@arrayright}
-% for the whole tabular.
-% Those control sequences can be globally modified in order to change the font (with \cs{itf@cellleft}) in each cell
-% in a row. \cs{itf@cellright} is also used when modifying the alignment for the row.
-%
-% Both \cs{itf@cellleft} and \cs{itf@cellright} are equal to \cs{@empty}, unless \cs{rowfont} is used. Therefore,
-%
-% }
-%
-% This implementation is fair, and compatible with \xpackage{colortbl}, \xpackage{tabularx}, \xpackage{arydshln}, \xpackage{hhline},
-% \xpackage{longtable},\xpackage{delarray}, \xpackage{dcolumn} and certainly any package compatible with \xpackage{array}.
-%
-% {\bfseries\macrocodecolor However, you must know that \xpackage{arydshln} does not like special \textt @\, and\, \textt !\, columns.
-% If you encounter problems with \textt @\, or\, \textt !\, columns while \xpackage{arydshln} is loaded
-% (that is, the vertical lines are not correctly positionned), it's not the fault of \thispackage... }
-%
-%
-% \ClearPage*
+% \ClearPage
% \Section[TikZ](Interface TikZ)[Interface TikZ]{Interface TikZ \raise.1ex\hbox{\smaller(\HR\doclink[\LocalOrCTAN{\LOCALDOC/../generic/pgf/pgfmanual.pdf}{\CTANbaseurl/graphics/pgf/base/doc/generic/pgf/pgfmanual.pdf}]{\mdseries pgfmanual})}}
%
% \begin{declcs}[\red]{usetikz}
@@ -934,45 +783,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% they append their content to the previous value. Ex: \key{font}\stform+$=$\M*{\cs{larger}} adds \cs{larger} to the previous settings.
%
% For dimensions or skips, the \stform+ key adds, the \stform- key substract and the \stform* key scales.
-% \clearpage
%
-% \centerline{\bfseries\large\lk
-% \tikz\draw [decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% \quad \textsc{\bfseries Example} \quad
-% \tikz\draw [cm={-1,0,0,0,(0,0)},anchor=east,decoration=snake,decorate,thick] (0,1) -- ++(3,0);
-% }
-% {\vspace*{-10pt}\small
-% \begin{Verb*}[frame=lines]
-% $cs[$red](sectionformat)$cs[$rred](section)[$texttbf(hang)]{% ($nnn this is the same as:) shape = hang
-% ($opt font)=\bfseries\scshape,
-% ($opt label)=\Roman{chapter}\ \textbullet\ \arabic{section},
-% ($opt bottom)=1ex plus.4ex minus.2ex,
-% ($opt top$stform+)=3pt,
-% ($opt(mark))=\markright{$#1},% ($nnn=> this defines ) \def\sectionmark#1{\markright{#1}}
-% ($opt(break))=\goodbreak %($nnn=> this defines ) \def\sectionbreak{\goodbreak}
-% ($opt(thesection))=\Roman{chapter}.\arabic{section} } %($nnn redefines ) \def\thesection{...}
-% \end{Verb*}
-% }
-% {\small
-% \xpackage{titlesec} provides \emph{extended settings} for numberless (\ie starred) sections with the syntax:
-% \begin{Verb*}
-% \titleformat{name=\section,numberless}{...}
-% \end{Verb*}
%
-% One swallow does not a summer make, \thispackage[interface-titlesec] does not provides this feature in a \textt{key=value} stuff
-% but just type:
-% \begin{Verb*}
-% ($red(\sectionformat))\section$stform*{ key=value }
-% \end{Verb*}
-% to give to your\, \cs{section}\stform*\, command a special format. Keys \textt[\opt]{label} and \textt[\opt]{labelsep} are not ignored,
-% this means that\, \cs{section}\stform*\, can be defined in a way it produces a numbered section! Albeit, this would be weird
-% because the \meta{section} counter is not updated for starred sections...
-% }
+% \medskip
+%
% \let\keydefault\db
% \def\EQUIV{{\normalcolor$\mathbf\equiv$}}
%
-% \medskip
-%
% \centerline{\bfseries\large\lk
% \tikz\draw [decoration=snake,decorate,thick] (0,1) -- ++(3,0);
% \quad \textsc{\bfseries Memo} \quad
@@ -1016,7 +833,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% The syntax: \cs[\red]{sectionformat}\cs[\rred]{subsection}\M*{{\opt bookmark}=\M*{bold,italic,color=green,on,view=FitB}} also works.
%
% {\smex\small\itshape Key \textt{bookmark} is an example of a key defined with the handler \handler/.is multiple choice/\,}.
-% \pagebreak
+%
%
%
% The starred keys \textt[\opt]{bold}\stform*, \textt[\opt]{italic}\stform* and \textt[\opt]{color}\stform* are also provided.
@@ -1032,6 +849,40 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \bigskip
%
+% \centerline{\bfseries\large\lk
+% \tikz\draw [decoration=snake,decorate,thick] (0,1) -- ++(3,0);
+% \quad \textsc{\bfseries Example} \quad
+% \tikz\draw [cm={-1,0,0,0,(0,0)},anchor=east,decoration=snake,decorate,thick] (0,1) -- ++(3,0);
+% }
+% {\vspace*{-10pt}\small
+% \begin{Verb*}[frame=lines]
+% $cs[$red](sectionformat)$cs[$rred](section)[$texttbf(hang)]{% ($nnn this is the same as:) shape = hang
+% ($opt font)=\bfseries\scshape,
+% ($opt label)=\Roman{chapter}\ \textbullet\ \arabic{section},
+% ($opt bottom)=1ex plus.4ex minus.2ex,
+% ($opt top$stform+)=3pt,
+% ($opt(mark))=\markright{$#1},% ($nnn=> this defines ) \def\sectionmark#1{\markright{#1}}
+% ($opt(break))=\goodbreak %($nnn=> this defines ) \def\sectionbreak{\goodbreak}
+% ($opt(thesection))=\Roman{chapter}.\arabic{section} } %($nnn redefines ) \def\thesection{...}
+% \end{Verb*}
+% }
+% {\small
+% \xpackage{titlesec} provides \emph{extended settings} for numberless (\ie starred) sections with the syntax:
+% \begin{Verb*}
+% \titleformat{name=\section,numberless}{...}
+% \end{Verb*}
+%
+% One swallow does not a summer make, \thispackage[interface-titlesec] does not provides this feature in a \textt{key=value} stuff
+% but just type:
+% \begin{Verb*}
+% ($red(\sectionformat))\section$stform*{ key=value }
+% \end{Verb*}
+% to give to your\, \cs{section}\stform*\, command a special format. Keys \textt[\opt]{label} and \textt[\opt]{labelsep} are not ignored,
+% this means that\, \cs{section}\stform*\, can be defined in a way it produces a numbered section! Albeit, this would be weird
+% because the \meta{section} counter is not updated for starred sections...
+% }
+%
+%
% Presently, \cs[\red]{sectionformat} does not implement the \emph{extended settings} of \xpackage{titlesec}
% for \textt{odd} and \textt{even} pages.
%
@@ -1054,7 +905,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% You can set a negativ value: \cs{bottomtitles}$\,=-1$ to allow bottom titles.
%
-% \ClearPage
+% \ClearPage*
%
% \Section[hyperref](Interface hyperref)[Interface hyperref]{\sectitle[\LocalOrCTAN{\LOCALDOC/hyperref/manual.pdf}{\CTANbaseurl/macros/latex/contrib/hyperref/doc/manual.pdf}]{hyperref}}
%
@@ -1121,7 +972,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% with the \texttbf{[atend]} option (otherwise, \xfile{bookmark.sty} gives a warning).
%
%
-% \ClearPage
+% \ClearPage*
%
% \Section[hypbmsec](Interface hypbmsec)[Interface hypbmsec]{\sectitle[\LocalOrCTAN{\LOCALDOC/oberdiek/hypbmsec}{\CTANbaseurl/macros/latex/contrib/oberdiek/hypbmsec}]{hypbmsec}}
%
@@ -1187,7 +1038,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{declcs}[\red]{tocsetup}\{\hskip-2.2cm\staractive
% \makecell[tl]{\small
% \begin{tabularx}\linewidth[t]{oX}
-% depth &\cs{setcounter}\M\*{tocdepth} {\smaller This is a \LaTeX{} rather than \xpackage{tocloft}'s ...} \\
+% depth &\cs{setcounter}\M\*{tocdepth} {\smaller This is a \LaTeX{} rather than \xpackage{tocloft}'s ...} \endgraf However with \thispackage you can change the t.o.c. depth anywhere inside your document, just like bookmarks depths (two runs are required) \\
% title\OR contentsname &redefines \cs{contentsname} \\
% title/top\OR title/top\stform+\OR title/top\stform-\OR title/top\stform* &vertical space before the title (set\OR add\OR substract\OR scale) \\
% title/bottom \OR title/bottom\stform+ \etc &vertical space after the title \\
@@ -1613,35 +1464,36 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% {\footnotesize \def\${\textt[\pkgcolor]\textdollar}
% \begin{Verb}[commandchars=£:;]
% \def\listofx{ -4 , -2 , 0 , 2.25 , 7 }
-% $$\begin{:£dg£underline:array;;}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
+% $$\begin{:£dg£underline:tabu;;}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
% :£red\rowfont;{\large\color{blue}}
% x &:£red:\repeatcell;;\listofx{ text=\C\column } \\ \hline\hline
% f(x)=2x-3 &:£red:\repeatcell;;\listofx{ fx = £$2*\c-3£$, text=\fx } \\ \hline
% x^2 &:£red:\repeatcell;;\listofx{ xsquare = £$\C\column^2£$ , text = \xsquare } \\ \hline
% h(x) = \sqrt{x^2+1} &:£red:\repeatcell;;\listofx{ x=\C\column, hx = {£$sqrt(pow(\x,2)+1)£$}, text = \hx } \\ \hline
-% \end{:£dg£underline:array;;}$$
+% \end{:£dg£underline:tabu;;}$$
% \end{Verb}
% §
% \def\listofx{ -4 , -2 , 0 , 2.25 , 7 }
-% $$\begin{array}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
+% $$\begin{tabu}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
% \rowfont{\large\color{db}}
% x &\repeatcell\listofx{ text=\C\column } \\ \hline\hline
% f(x)=2x-3 &\repeatcell\listofx{ fx = $2*\c-3$, text=\fx } \\ \hline
% x^2 &\repeatcell\listofx{ xsquare = $\C\column^2$ , text = \xsquare } \\ \hline
% h(x) = \sqrt{x^2+1} &\repeatcell\listofx{ x=\C\column, hx = {$sqrt(pow(\x,2)+1)$}, text = \hx } \\ \hline
-% \end{array}$$
+% \end{tabu}$$
% \centerline{\$\cs{pgfmath}\$ computations}§
%
-% $$\begin{array}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
+% $$\begin{tabu}{|c<{\bottopstrut}|*{5}{|D..{5.5}}|} \hline
% \rowfont{\large\color{db}}
% x &\repeatcell\listofx{ text=\C\column } \\ \hline\hline
% f(x)=2x-3 &\repeatcell\listofx{ fx = {$$round(2*\c-3,5)$$}, text=\fx } \\ \hline
% x^2 &\repeatcell\listofx{ xsquare = {$$round(abs(\C\column)^2,5)$$} , text = \xsquare } \\ \hline
% h(x) = \sqrt{x^2+1} &\repeatcell\listofx{ x=\C\column, hx = {$$round(root(2,abs(\x)^2+1),5)$$}, text = \hx } \\ \hline
-% \end{array}$$
+% \end{tabu}$$
% \centerline{And the same with \$\$\cs{FPeval}\$\$\, (\xpackage{fp} package)}
% }
%
+% \ClearPage*
% \subsection{Double entry array: the Body Mass Index}
% {\smaller \def\${\textt[\pkgcolor]\textdollar}
% \begin{Verb}[commandchars=£:;]
@@ -1653,7 +1505,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \ifdim#1pt<17pt denutrition\else \ifdim#1pt<19pt skinniness\else \ifdim#1pt<26pt normal\else
% \ifdim#1pt<30pt obesity\else \ifdim#1pt<35pt serious obesity\else morbid obesity\fi\fi\fi\fi\fi}}
%
-% \begin{:£dg£underline:tabular;;}{*{:£dr:\countvalues;;:£db:\heightlist;;}{|c}|} \hline
+% \begin{:£dg£underline:tabu;;}{*{:£dr:\countvalues;;:£db:\heightlist;;}{|c}|} \hline
% :£dr:\repeatcell;; :£db:\heightlist;; {%
% rows = :£db:\weightlist;;,
% :£pkgcolor:height;; = \ifnum\column>1 :£pkgcolor\c;\else 1\fi,
@@ -1663,11 +1515,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% text/row1 = :£pkgcolor\c;, font/row1 = \color{NavyBlue}, cr/row1 = \\ \hline,
% text/col1 = :£pkgcolor\r;, font/col1 = \color{DarkViolet},
% } \\ \hline
-% \end{:£dg£underline:tabular;;}\quad
-% \begin{:£dg£underline:tabular;;}{|c|}
+% \end{:£dg£underline:tabu;;}\quad
+% \begin{:£dg£underline:tabu;;}{|c|}
% :£dr:\repeatcell;;{denutrition,skinniness,normal,obesity,serious obesity,morbid obesity}{%
% text=\cellcolor{:£pkgcolor\c;}{:£pkgcolor\c;},:£opt:transpose;;,font=\large\bfseries\bottopstrut}
-% \end{:£dg£underline:tabular;;}
+% \end{:£dg£underline:tabu;;}
% \end{Verb}
%
% \def\weightlist{weight in kg, 30, 45, 50, 55, 60, 65, 70, 80, 90, 95, 100, 110, 120}
@@ -1678,8 +1530,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \ifdim#1pt<17pt denutrition\else \ifdim#1pt<19pt skinniness\else \ifdim#1pt<26pt normal\else
% \ifdim#1pt<30pt obesity\else \ifdim#1pt<35pt serious obesity\else morbid obesity\fi\fi\fi\fi\fi}}
%
-% \iffalse%true ^^A set to true to compute.
-% \begin{tabular}{*{\countvalues\heightlist}{|c}|} \hline
+% \iftrue ^^A set to true to compute.
+% \begin{tabu}{*{\countvalues\heightlist}{|c}|} \hline
% \repeatcell\heightlist{%
% rows=\weightlist,
% height=\ifnum\column>1 \c\else 1\fi,
@@ -1690,14 +1542,14 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% cr/row1=\\ \hline,
% text/col1=\r, font/col1=\color{DarkViolet},
% } \\ \hline
-% \end{tabular}\quad
-% \begin{tabular}{|c|}
+% \end{tabu}\quad
+% \begin{tabu}{|c|}
% \repeatcell{denutrition,skinniness,normal,obesity,serious obesity,morbid obesity}{%
% text=\cellcolor{\c}{\c},transpose,font=\large\bfseries\bottopstrut}
-% \end{tabular}
+% \end{tabu}
% \medskip
%
-% \begin{tabular}{*{\countvalues\weightlist}{|c}|} \hline
+% \begin{tabu}{*{\countvalues\weightlist}{|c}|} \hline
% \repeatcell\heightlist{transpose,
% rows=\weightlist,
% height=\ifnum\column>1 \c\else 1\fi,
@@ -1707,7 +1559,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% text/row1=\c, font/row1=\color{NavyBlue}, cr/row1=\\ \hline,
% text/col1=\r, font/col1=\color{DarkViolet},
% } \\ \hline
-% \end{tabular}\par\nobreak
+% \end{tabu}\par\nobreak
% \centerline{The same with \textt[\opt]{transpose}}
% \fi
%
@@ -1770,9 +1622,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{declcs}[\red]{interitem}
% \end{declcs}
%
-% {\def\AMS{{$\cal A$\kern-.1667em\lower.5ex\hbox{$\cal M$}\kern-.125em$\cal S$}}
-% Just like \AMS{} \cs{intertext} in math formul\ae, \cs[\red]{interitem} allows to put some non intented text inside
-% a list environment. Example:}
+% Just like \hologo{AmS} \cs{intertext} in math formul\ae, \cs[\red]{interitem} allows to put some non intented text inside
+% a list environment. Example:
%
% \begin{Verb}[commandchars=£:;]
% \begin{:£dg£underline:enumerate;;}[label=\roman*)\,,parsep=0pt]
@@ -1817,7 +1668,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% This macro will measure the width of\, \textt{text}$_1$,\textt{text}$_2$,$\ldots$,\textt{text}$_n$ and adjust them for truncation:
%
% {\arrayrulewidth=.7pt
-% \begin{tabular}{*{5}{|c}|} \hline
+% \begin{tabu}{*{5}{|c}|} \hline
% \rowfont[c]{\ttfamily\bfseries}\rowcolor{AliceBlue}
% text & width & adusted width & $\gamma$ (truncated?) & Returned width\\ \hline
% \repeatcell 5{%
@@ -1833,7 +1684,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% &
% & $\displaystyle\mathsmaller{ \sum \omega_i \leqslant \meta{total width}} $
% \\ \hline
-% \end{tabular}}§
+% \end{tabu}}§
% {\raggedleft\scriptsize Another example of a tabular made with \csref[\red]{repeatcell}\par}
%
% The widths can be accessed with\, \cs{htruncwidth}\M{i}\, and then:
@@ -2328,7 +2179,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \makeatletter \newcounter{PatchedCommand}
% \newcolumntype\X{>{\centering\arraybackslash}X}
% \newrobustcmd\PatchedCommand[4][]{\begingroup\small \stepcounter{PatchedCommand}%
-% \hbox{\llap{\ding{\number\numexpr181+\value{PatchedCommand}}\,\,}
+% \hbox{\llap{\Pisymbol{\number\numexpr181+\value{PatchedCommand}}\,\,}
% \begin{tabularx}\linewidth{|\X|c|\X|\X|c|}\hline
% Patched command &Type & Importance &Module & ref. page \\\hline
% \makecell[l]{\repeatcell{#2}{text=\csbf[\macrocodecolor]{\c},transpose}}
@@ -2401,15 +2252,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \end{Verb*}
% \end{multicols}
%
-% \subsection[array]{\xpackage{array}}
-%
-% \PatchedCommand[array]{prepnext@tok}{interfaces-makecell}{1}
-%
-% \cs{prepnext@tok} is replaced by \cs{itf@prepnext@tok} for the purpose of inserting \cs{itf@celllalign} and \cs{itfcellleft}
-% at the left edge of each cell in a tabular and \cs{itf@cellright} \cs{itf@cellralign} at the right edge of each cell.
-%
-% This allows \cs{rowfont} to change the font (and optionally the alignment) for all cells in a tabular or array row.
-%
% \subsection[bookmark]{\xpackage{bookmark} \cs{\backslashchar bookmark}}
%
% \PatchedCommand[bookmark]{bookmark}{interface-bookmark}{2}
@@ -2482,7 +2324,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \subsection[pgfkeys]{\xfile{pgfkeys.code.tex}}
%
-% \PatchedCommand[pgfkeys]{pgfkeys@unpack,pgfkeys@case@three,pgfkeys@exp@call}{interfaces-pgfkeys}{2}
+% \PatchedCommand[pgfkeys]{pgfkeys@unpack,pgfkeys@case@three}{interfaces-pgfkeys}{2}
%
% \cs{pgfkeys@unpack} is modified to handle the case of the \handler/.blank/ handler: this is here that
% the value is conditionnally compared against \handler/.default/, \handler/.blank/ or \handler/.value required/.
@@ -2508,13 +2350,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \sectionformat\subsection{bookmark/color=pkgcolor}
% \subsection{Interfaces}
%
-% The package namespace is \textttbf{\db itf@}.
+% The package namespace is \textttbf{\macrocodecolor itf@}.
%
% \begin{macrocode}
%<*package>
\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)]
% \end{macrocode}
%
% \subsubsection{Requirements}
@@ -2556,7 +2398,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*base>
\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}%
@@ -2949,7 +2791,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*LaTeX>
\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
% \end{macrocode}
@@ -3009,302 +2851,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
}% AfterPackage xcolor
% \end{macrocode}
%
-% \subsubsection{\cs{rowfont}}
-%
-% \begin{macro}{\rowfont}
-%
-% \cs{rowfont} uses the control sequences \cs{itf@celllalign}, \cs{itf@cellleft}, \cs{itf@cellright}\linebreak
-% and \cs{itf@cellralign} which have been placed on purpose into the user-defined tokens inserted
-% in any preamble by the \xpackage{array} package.
-%
-% \cs{itf@celllalign} and \cs{itf@cellralign} are used to modify the alignment. If the optional
-% \M[alignment] parameter of \cs{rowfont} is not specified, then those control sequence expand
-% to \cs{@empty}.
-%
-% \cs{itf@cellleft} contains the font-modification information.
-%
-% Placement of those control sequences into the user-tokens that are inserted in the preamble
-% by the \xpackage{array} package is explained below under the macro \cs{itf@prepnext@tok}.
-%
-% \begin{macrocode}
-\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
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\itf@rowfont@reset}
-% This macro resets \cs{itf@celllalign},\, \cs{itf@cellleft},\, \cs{itf@cellright},\, \cs{itf@cellralign}\, and\,
-% \cs{everycr} to the value they had before the expansion of \cs{rowfont}.
-%
-% It expands when a new row is inserted into the tabular or array.
-% \begin{macrocode}
-\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
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\itf@prepnext@tok}
-% \patchlabel[prepend]{prepnext@tok}\label{itf@prepnext@tok}
-%
-% \cs{itf@prepnext@tok} will replace \cs{prepnext@tok} (in \xfile{array.sty}): its purpose is to add
-% the control sequences \cs{itf@celllalign},\, \cs{itf@cellleft},\, \cs{itf@cellright}\, and\, \cs{itf@cellralign}\,
-% at the right position in the ``preamble'' for \cs{halign}. Those control sequences are not inserted directly
-% into the preamble, but by the means of the user-tokens placed there by the \xpackage{array} package.
-%
-% The package \xpackage{array} defines a macro \cs{prenext@tok} to initialize each user-token
-% inserted at both side of each ``normal'' column. For ``special`' \texttbf @ and \texttbf ! columns,
-% there is only one token. \topsep=0pt
-% \begin{center}
-% \begin{tikzpicture}
-% \node (L) at (1,1) {$\underbrace{\hbox{>\M*{\cs{bfseries}\cs{color}\M*{red}}}}$}
-% node [anchor=west] (r) at (L.east) {\raise.5ex\hbox{\larger r}}
-% node [anchor=west] (R) at (r.east) {$\underbrace{\hbox{<\M*{\cs{color}\M*{black}\cs ,\cs\$}}}$}
-% node [anchor=center] at (L.south) {\cs{toks}<$i$>}
-% node [anchor=center] at (R.south) {\cs{toks}<$i+1$>};
-% \end{tikzpicture}
-% \end{center}
-%
-% When a column is inserted in the tabular preamble (\cs{@preamble}), the \TeX{} counter \cs{count@}
-% is equal to $i+1$ (\ie the right token) and the counter \cs{@tempcnta} is equal to $i$ (\ie the left token).
-% If the column is special (\ie \texttbf @ or \texttbf !) \cs{@tempcnta} is not updated.
-%
-% Thus, when a new token is ``prepared'' by \cs{prepnext@tok}:
-% \begin{description}
-% \item[either: $\mathbf{i=}$\cs{count@}$\,=$\cs{@tempcnta}]: the token to prepare (\ie \cs{toks}$<i+1>$)
-% is the right one of a ``normal'' column. The switch \cs{ifitf@cellright} is set to \textt{true}. \\
-% The \emph{previous} token (\cs{toks}$<i>=$\cs{toks}\cs{count@}) is necessarily the left one of this ``normal'' column:
-% we prepend \cs{itf@celllalign} and append \cs{itf@cellleft} to this token (\cs{toks}$<i>$).
-% This token is finished and will not change afterwards.
-%
-% \item[or: $\mathbf{i=}$\cs{count@}$\,=$\cs{@tempcnta}$+1$]: the token to prepare (\cs{toks}$<i+1>$) is either the left one of a normal column,
-% or the single one of a special\, \texttbf @ or \texttbf !\, column.\\
-% If the switch \cs{ifitf@cellright} is true, then the \emph{previous} token \cs{toks}$<i>$ is the right one of the last inserted column
-% (which was a ``normal'' column, thus):, \cs{itf@cellright}\cs{itf@cellralign}\, is appended to it, and the switch
-% \cs{ititf@cellright} is reset to \texttt{false}.
-% May be \cs{prepnext@tok} will be expanded again (by \cs{save@decl}): if it happens,
-% then again\, \cs{count@}$\,=$\cs{@tempcnta}$+1$\, (same case) but \cs{ifitf@cellright} is \textt{false} and nothing is changed.
-%
-% \item[else:] The token to prepare (which is \cs{toks}$<i+1>=$\cs{toks}\cs{count@}$+1$), cannot be the right one of a ``normal'' column:
-% \cs{ifitf@cellright} is set to \textt{false}. \\
-% The fact that\, $\vert$\cs{count@}$-$\cs{@tempcnta}$\vert>1$\, tells us that the previous token \cs{toks}$<i>$
-% is necessarily the single one of a ``special''\, \texttbf @ or \texttbf !\, column. We don't modify this token, as
-% long as \emph{special columns are always inserted as is}:\, \cs{rowcolor} has no effect on special
-% columns, nor\, \cs{rowfont}.
-% \end{description}
-% Thereafter, the original initialisation sequence occurs: \cs{advance}\cs{count@}\textt{ by}\cs{@ne} and initialize the token
-% to prepare (\cs{toks}\cs{count@}$\,=$\cs{toks}$<i+1>$) to an empty one.
-%
-% \begin{macrocode}
-\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}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\itf@cellleft}
-% \begin{macro}{\itf@celllalign}
-% \begin{macro}{\itf@cellright}
-% \begin{macro}{\itf@cellralign}
-% \begin{macro}{\itf@cellfont}
-% First initialisation to \cs{@empty}.
-% \begin{macrocode}
-\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
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\itf@cell@l}
-% \begin{macro}{\itf@cell@c}
-% \begin{macro}{\itf@cell@r}
-% \begin{macro}{\itf@cell@j}
-% Setup macros to modify the alignment. The skips inserted to make the standard alignment
-% specified in the \textt{tabular} preamble are not the same with standard \xpackage{array} tabulars
-% and \xpackage{colortbl} tabulars, hence the switch \cs{ifitf@colortbl}.
-% \begin{macrocode}
-\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
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\itf@removehfil}
-% \begin{macro}{\itf@ignorehfil}
-% \cs{itf@removehfil} removes (eventually) the infinite stretchable glue inserted
-% \emph{before} the cell (in the preamble of \cs{halign}) to make the column alignment.
-%
-% \cs{itf@ignorehfil} removes (eventually) the infinite stretchable glue inserted
-% \emph{after} the cell (in the preamble of \cs{halign}) to make the column alignment.
-% \begin{macrocode}
-\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
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
%
% \begin{macrocode}
%</LaTeX>
@@ -3315,7 +2861,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*tikz>
\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
% \end{macrocode}
@@ -3343,7 +2889,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% Record ``modules'' that must be loaded with \cs{usepackage}:
% \begin{macrocode}
\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
% \end{macrocode}
% \end{macro}
@@ -3351,7 +2899,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macro}{\allpgfmodules}
% Record modules that must be loaded with \cs{usepgfmodule}:
% \begin{macrocode}
-\newcommand*\allpgfmodules{matrix,plot}
+\newcommand*\allpgfmodules{datavisualization,%
+decorations,%
+matrix,%
+oo,%
+parser,%
+plot,%
+shapes,%
+snakes,%
+sorting%
+}% \allpgfmodules
% \end{macrocode}
% \end{macro}
%
@@ -3361,45 +2918,71 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% If a module is a module is not found in any of the three lists \cs{alltikzpackage},\,
% \cs{allpgfmodules},\, and\, \cs{alltikzlibraries}\, then \cs{usetikzlibrary} is used by default.
% \begin{macrocode}
-\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*\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
% \end{macrocode}
% \end{macro}
@@ -4421,124 +4004,172 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
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}},%
@@ -4551,7 +4182,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
foot/offset/.style={foot/left/offset={#1},foot/right/offset={#1}},%
foot/offset+/.style={foot/left/offset+={#1},foot/right/offset+={#1}},%
foot/offset-/.style={foot/left/offset-={#1},foot/right/offset-={#1}},%
- foot/offset*/.style={foot/left/offset*={#1},foot/right/offset*={#1}},%
+ foot/offset*/.style={foot/left/offset*={#1},foot/right/offset*={#1}},%
offset/foot/.alias*=foot/offset,%
left/offset/.style={foot/left/offset={#1},head/left/offset={#1}},%
left/offset+/.style={foot/left/offset+={#1},head/left/offset+={#1}},%
@@ -4569,49 +4200,61 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
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,%
+ 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}},%
+ 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)
@@ -4811,6 +4454,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
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,%
@@ -4937,8 +4581,10 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%% 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,%
@@ -4967,8 +4613,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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}{%
@@ -5045,9 +4695,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
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,%
@@ -5275,7 +4928,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
{\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@
@@ -5297,7 +4950,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
{\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@
@@ -5452,7 +5105,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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{%
@@ -5501,7 +5154,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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{%
@@ -5529,10 +5182,10 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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
% \end{macrocode}
% \end{macro}
@@ -6022,18 +5675,20 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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@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\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\pgfkeysaddvalue \itf@pgfkeysaddvalue
+ \global\let\pgfkeys@exp@call \itf@pgfkeys@exp@call
}% \itf@pgfkeys
+\fi
\AtBeginDocument{%
\itf@pgfkeys
\let\itf@pgfkeys\relax
@@ -6063,14 +5718,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \paragraph{Some pgfkeys macros redefinition/corrections}
%
-% \begin{macro}{\pgfkeysEsetvalue}
% \begin{macro}{\pgfkeysaddvalue (bug correction)}
-% \begin{macro}{\pgfkeysEaddvalue}
+%
+% Bug in \cs{pgfkeysaddvalue} for pgf v2.0, fixed in v2.1
+%
% \begin{macrocode}
-\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
@@ -6079,8 +5733,20 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\fi
\unexpanded{#3}}%
\pgfkeyslet{#1}\pgfkeys@global@temp
-}% \pgfkeysaddvalue
-\newrobustcmd*\pgfkeysEaddvalue[3]{% \csepreappto{pgfk@#1}{#2}{#3}
+}% \itf@pgfkeysaddvalue
+\fi
+% \end{macrocode}
+%
+%
+% \begin{macro}{\pgfkeysEsetvalue}
+% \begin{macro}{\pgfkeysEaddvalue}
+% \begin{macrocode}
+\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
@@ -6099,7 +5765,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% Missed the braces around the argument (in case the argument contains a comma or an $=$ sign...):
% \begin{macrocode}
%% 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
% \end{macrocode}
% \end{macro}
%
@@ -6107,7 +5775,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \patchlabel[redef]{pgfkeys@unpack}
% \begin{macrocode}
%% 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
@@ -6119,7 +5788,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\pgfkeyscurrentkey % <FC>
\pgfkeys@case@one % <FC>
\fi
-}% \pgfkeys@unpack
+}% \itf@pgfkeys@unpack
% \end{macrocode}
%
% \begin{macro}{\itf@pgfkeys@default@blank@required}
@@ -6159,7 +5828,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%% 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}
{%
@@ -6168,7 +5837,17 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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
+% \end{macrocode}
+%
+% \bookmarksetup{disable*}
+% \paragraph{Loading interfaces modifications for pgfkeys}
+%
+% \begin{macrocode}
+\itf@pgfkeys
% \end{macrocode}
%
% \paragraph(/.alias){Handlers definition: \handler/.alias/, \handler/.blank/}
@@ -6409,7 +6088,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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@
@@ -6432,7 +6111,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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@
@@ -6460,7 +6140,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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
@@ -6487,7 +6167,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\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}%
@@ -6497,12 +6177,27 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
}% /.estore as number in cs
% \end{macrocode}
%
-% \paragraph(/.defcounter){Handlers definition: \handler/.defcounter/}
+% \paragraph(/.store in counter cs){Handlers definition: \handler/.store in counter cs/}
%
% \begin{macrocode}
\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
% \end{macrocode}
%
% \paragraph(/.store as glue){Handlers definition: \handler/.store as glue/}
@@ -6947,6 +6642,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \begin{History}
%
+% \begin{Version}{2010/10/31 v2.0}
+% \item Comptability of \thispackage[interfaces-pgfkeys] with \xpackage{pgf} version 2.1
+% \item Modification of the key \textt{depth} for \csref{tocsetup} to be able to change the t.o.c.
+% depth anywhere inside the document (just like bookmarks depths).
+% \item handler \handler/.defcounter/ has been replaced by more powerful \handler/.store in counter cs/
+% \end{Version}
+%
% \begin{Version}{2010/10/27 v1.2}
% \item \thispackage[interfaces-hypbmsec] needed some corrections.
% \item The \textt{offset} keys for fancyhdr didn't work. Fixed.
@@ -7009,8 +6711,10 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \clearpage\restoregeometry
% \pagesetup*{
+% left/offset-=1.5cm,
+% right/offset+=.5cm,
% head/right=\leftmark,
-% head/right/font=\normalsize\bfseries\sffamily\pkgcolor
+% head/right/font=\small\bfseries\sffamily\pkgcolor
% }
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/interfaces/interfaces.ins b/Master/texmf-dist/source/latex/interfaces/interfaces.ins
index 9c4e7dc681b..f53846132c9 100644
--- a/Master/texmf-dist/source/latex/interfaces/interfaces.ins
+++ b/Master/texmf-dist/source/latex/interfaces/interfaces.ins
@@ -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,7 +47,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/10/27 v1.2 - interfaces: interfaces with keys for other packages (FC)}
+\Msg{* Package: 2010/10/31 v2.0 - interfaces: interfaces with keys for other packages (FC)}
\Msg{************************************************************************}
\keepsilent
@@ -58,7 +58,7 @@
This is a generated file.
-interfaces : 2010/10/27 v1.2 - 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
@@ -124,7 +124,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{interfaces-fancyvrb.sty}{\from{interfaces.dtx}{fancyvrb}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{interfaces.drv}{\from{interfaces.dtx}{driver}}%
}
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 <florent.chervet@free.fr>
%%
\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 <florent.chervet@free.fr>
%%
\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 % <FC>
\pgfkeys@case@one % <FC>
\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 <florent.chervet@free.fr>
%%
\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}}}