interfaces 2.5 (8dec10)

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

21 files changed, 481 insertions, 370 deletions

diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-LaTeX.sty
index 4ed27252e33..f50ffa70f00 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-LaTeX}
-   [2010/10/31 v2.0 pgfkeys macros for LaTeX (FC)]
+   [2010/12/07 v2.5 pgfkeys macros for LaTeX (FC)]
 \RequirePackage{interfaces-base}
 \itf@pgfkeys
 \newrobustcmd*\changefont[1]{\itf@pgfkeys
@@ -64,16 +64,23 @@
    size/.estore as dimen in cs=f@size,%
    size/.append code=\set@fontsize\f@linespread\f@size\f@baselineskip,%
       siz/.alias*=size,%
-   baselineskip/.store as glue in cs=f@baselineskip,%
+   baselineskip/.estore as glue in cs=f@baselineskip,%
    baselineskip/.append code=\set@fontsize\f@linespread\f@size\f@baselineskip,%
       skip/.alias*=baselineskip,%
-   linespread/.estore as dimen in cs=f@linespread,%
-   linespread/.add code={\ifx\f@linespread\@empty\let\f@linespread\@ne\fi}%
-                        {\edef\f@linespread{\expandafter\rem@pt\f@linespread}%
-                         \set@fontsize\f@linespread\f@size\f@baselineskip},%
-   linespread+/.prefix code=\ifx\f@linespread\@empty\let\f@linespread\@ne\fi,%
-   linespread-/.prefix code=\ifx\f@linespread\@empty\let\f@linespread\@ne\fi,%
-   linespread*/.prefix code=\ifx\f@linespread\@empty\let\f@linespread\@ne\fi,%
+   @linespread/.estore as dimen,%
+   @linespread/.append code=
+      \pgfkeysgetvalue{/itf/LaTeX/changefont/@linespread}\pgfkeys@temp
+      \ifx\pgfkeys@temp\@empty \let\pgfkeys@temp \p@ \fi
+      \edef\f@linespread{\expandafter\rem@pt\pgfkeys@temp}%
+      \set@fontsize\f@linespread\f@size\f@baselineskip,%
+   @linespread/.initial=\p@,%
+   linespread/.code=\@defaultunits\itf@sk #1pt\relax\@nnil
+                    \pgfkeysalso{/itf/LaTeX/changefont/@linespread=\itf@sk},%
+   linespread+/.code=\@defaultunits\itf@sk #1pt\relax\@nnil
+                     \pgfkeysalso{/itf/LaTeX/changefont/@linespread+=\itf@sk},%
+   linespread-/.code=\@defaultunits\itf@sk #1pt\relax\@nnil
+                     \pgfkeysalso{/itf/LaTeX/changefont/@linespread-=\itf@sk},%
+   linespread*/.alias=@linespread*,%
       spread/.alias*=linespread,%
 }% \pgfkeys definitions for \changefont
 \itf@AfterPackage{color}{%
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-appendix.sty
index d600f1accbf..610780b131b 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-appendix}
-   [2010/10/27 v1.2 easy control of appendices environment (FC)]
+   [2010/12/07 v2.5 easy control of appendices environment (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{appendix}
 \itf@pgfkeys
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-base.sty
index 7c8e80abdd3..792369ffdea 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,8 +44,8 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-base}
-   [2010/11/26 v2.4 Basic macros for interfaces package (FC)]
-\RequirePackage{etex,ltxcmds,etoolbox,pgfkeys,scrlfile}
+   [2010/12/07 v2.5 Basic macros for interfaces package (FC)]
+\RequirePackage{etex,ltxcmds,etoolbox,pgfkeys,scrlfile,infwarerr}
 \AtEndOfPackage{%
    \RequirePackage{interfaces-etoolbox}%
    \RequirePackage{interfaces-scrlfile}%
@@ -81,30 +81,9 @@
 \newrobustcmd*\itf@AfterPackage[1]{%
    \csname\ltx@ifpackageloaded{#1}{ltx@secondoftwo}{@AfterPackage}\endcsname{#1}%
 }% \itf@AfterPackage
-\AfterPackage*{colortbl}{%
-   \renewcommand*\endarray{%
-      \crcr \egroup \egroup \@arrayright \gdef\@preamble{}\CT@end}%
-}% AfterPackage colortbl
-\AfterPackage*{arydshln}{%
-   \ltx@ifpackageloaded{colortbl}
-      {% colortbl
-      \def\endarray{%
-       \adl@endarray \egroup \adl@arrayrestore \CT@end \egroup %<original>
-       \@arrayright     % <FC>
-       \gdef\@preamble{}% <FC>
-                  }%
-      }
-      {% no colortbl
-      \def\endarray{%
-       \adl@endarray \egroup \adl@arrayrestore \egroup %<original>
-       \@arrayright     % <FC>
-       \gdef\@preamble{}% <FC>
-                   }%
-      }%
-}% AfterPackage arydshln
 \AfterPackage{colortbl}{%
    {\ltx@ifpackageloaded{arydshln}
-      {\PackageWarning{interfaces-base}
+      {\@PackageWarningNoLine{interfaces-base}
          {The package arydshln should be loaded after colortbl
          \MessageBreak because both redefine \string\@classz}}%
       {}}%
@@ -136,11 +115,19 @@
    \catcode`\#=6%
    \let\itf@tp#2%
    #1\itf@tp{#3}{#4}%
-   {\let#2\itf@tp
+   {\ifx#1\patchcmd \itf@patch@inside@{#1}{#3}{#4}\fi
+    \let#2\itf@tp
     \AtBeginDocument{#5}%
    }
    {#6}%
 }% \itf@patch@inside (for \patchcmd)
+\def\itf@patch@inside@#1#2#3{%
+   \loop
+      \let\@tempa \itf@tp
+      #1\itf@tp{#2}{#3}{}{}%
+      \unless\ifx \@tempa\itf@tp
+   \repeat
+}% \itf@patch@inside@
 \newskip\itf@sk
 \newmuskip\itf@musk
 \newtoks\itf@tk
@@ -177,6 +164,37 @@
    \else remove@to@nnil%
    \fi \endcsname
 }% \itf@number@@@
+\protected\def\itf@setlength#1#2{#1\glueexpr#2\relax}
+%% glue * 1.5 = glue * 98302 / 65536
+%% glue * 3/2 = glue * 3/2
+\def\itf@units@scale#1!{\itf@units@scale@normalize#1/\@nnil/\@nil}
+\def\itf@units@scale@normalize#1/#2/#3\@nil{%
+   \ifx#2\@nnil \number\dimexpr#1pt\relax/65536
+   \else#1/#2
+   \fi
+}% \itf@units@scale@normalize
+\def\itf@units@scaleNoCalc#1!{\itf@units@scale@normalizeNoCalc#1/\@nnil/\@nil}
+\let\itf@units@scale@normalizeNoCalc \itf@units@scale@normalize
+\protected\def\itf@setlength@calc#1#2{\begingroup
+   \let\calc@multiply@by@real \itf@calc@multiply@by@real
+   \let\calc@Adimen \itf@calc@Askip  \let\calc@Bdimen \itf@calc@Bskip
+   \setlength{#1}{#2}%
+   \expandafter\endgroup\expandafter#1\the#1\relax
+}% \itf@setlength@calc
+\def\itf@units@scale@normalize@calc#1/#2/#3\@nil{%
+   \ifx#2\@nnil 1*\ratio{\dimexpr#1pt\relax}\p@
+   \else        1*\ratio{\dimexpr#1pt\relax}/{\dimexpr#2pt\relax}%
+   \fi
+}% \itf@units@scale@normalize@calc
+\def\itf@calc@multiply@by@real#1{%
+   \calc@Bdimen\glueexpr\calc@B*\number\dimexpr#1pt\relax/65536\relax
+   \calc@B\calc@Bdimen
+}% \itf@calc@multiply@by@real
+\AfterPackage*{calc}{%
+   \newskip\itf@calc@Askip \newskip\itf@calc@Bskip
+   \let\itf@setlength \itf@setlength@calc
+   \let\itf@units@scale@normalize \itf@units@scale@normalize@calc
+}% AfterPackage calc
 %%   U N I T S   F O R   D I M E N S
 \def\itf@strip@mu{\expandafter\itf@rem@mu\the}
 {%
@@ -230,15 +248,6 @@
       \@defaultunits#1 #2pt\relax\@nnil
    \fi
 }}}% \itf@units@pt
-%% glue * 1.5 = glue * 98302 / 65536
-%% glue * 3/2 = glue * 3/2
-\def\itf@units@scale#1!{\itf@units@scale@normalize#1/\@nnil/\@nil}
-\def\itf@units@scale@normalize#1/#2/#3\@nil{%
-   \ifx#2\@nnil
-      \number\dimexpr#1pt\relax/65536
-   \else#1/#2
-   \fi
-}% \itf@units@normalize
 \AtBeginDocument{%
    \ltx@ifpackageloaded{xcolor}
       {\@ifundefinedcolor{default}
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-bookmark.sty
index e1517b3d828..13feb89eeb0 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-bookmark}
-   [2010/11/15 v2.1 more control on bookmarks (FC)]
+   [2010/12/07 v2.5 more control on bookmarks (FC)]
 \RequirePackage{interfaces-base}
 \RequirePackage{interfaces-hyperref}
 \RequirePackage{refcount}
@@ -52,10 +52,10 @@
 \itf@pgfkeys
 \expandafter\itf@patch\expandafter\patchcmd\csname\string\bookmark\endcsname
    {\immediate\write\@mainaux}{\itf@BKM@write}
-   {\PackageInfo{interfaces-bookmark}
+   {\@PackageInfoNoLine{interfaces-bookmark}
       {Command \expandafter\string\csname\string\bookmark\endcsname\space
       successfully patched!}}
-   {\PackageWarning{interfaces-bookmark}
+   {\@PackageWarningNoLine{interfaces-bookmark}
       {Command \expandafter\string\csname\string\bookmark\endcsname\space
       could not be patched\MessageBreak
       Loading of interfaces-bookmark is canceled}%
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-embedfile.sty
index cc932de241e..2ca5932057c 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-embedfile}
-   [2010/10/27 v1.2 easy macros to embed files into pdf (FC)]
+   [2010/12/07 v2.5 easy macros to embed files into pdf (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{embedfile}
 \newrobustcmd*\embedthisfile{\@ifstar
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-enumitem.sty
index c59d47a4a76..53f1d81172a 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-enumitem}
-   [2010/11/15 v2.1 more control on lists (FC)]
+   [2010/12/07 v2.5 more control on lists (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{enumitem}
 \itf@pgfkeys
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-environ.sty
index 5892b353716..7385a488252 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-environ}
-   [2010/07/23 v1.0 ReNewEnviron = RenewEnviron (FC)]
+   [2010/12/07 v2.5 ReNewEnviron = RenewEnviron (FC)]
 \RequirePackage{interfaces-base}
 \AfterPackage{environ}{
    \ifundef\ReNewEnviron
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-etoolbox.sty
index 6da5d77020e..43500969361 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-etoolbox}
-   [2010/10/27 v1.2 some more etoolbox-like commands (FC)]
+   [2010/12/07 v2.5 some more etoolbox-like commands (FC)]
 \RequirePackage{interfaces-base}
 \begingroup\catcode`\&=3
    \long\gdef\etb@doitem#1&{\do{#1}}
@@ -71,7 +71,6 @@
 }% \csepreappto
 \providerobustcmd*\csgpreappto{\global\cspreappto}
 \providerobustcmd*\csxpreappto{\global\csepreappto}
-%%----------------------------------------------------------------------------
 \providerobustcmd\removefrom[2]{\in@false
    \long\def\itf@tp##1\itf@tp{%
       \in@true
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-fancyhdr.sty
index f7ed2f8da0c..39147fe3bf3 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-fancyhdr}
-   [2010/11/26 v2.4 pgfkeys macros for fancyhdr (FC)]
+   [2010/12/07 v2.5 pgfkeys macros for fancyhdr (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{fancyhdr}
 \itf@pgfkeys
@@ -88,7 +88,7 @@
 \pgfkeys{%
    /handlers/.fancy@hf/.code=%
       \edef\itf@tp{\pgfkeyscurrentpath}%
-      \pgfkeysalso{\pgfkeyscurrentpath/.store as code=}%
+      \pgfkeysalso{\pgfkeyscurrentpath/.store as code}%
       \pgfkeysalso{\pgfkeyscurrentpath/.append code/.expanded=%
          \csdef{f@ncy#1}{%
             \noexpand\pgfkeysvalueof{\itf@tp/font}
@@ -156,7 +156,7 @@
       rules/font*/.alias=rule/font+,%
    rule/color/.style={head/rule/color={#1},foot/rule/color={#1}},%
       rules/color/.alias=rule/color,%
-   foot/rule/skip/.store as glue in cs=footruleskip,%
+   foot/rule/skip/.estore as glue in cs=footruleskip,%
       foot/rule/skip/.default=.3\normalbaselineskip,%
       foot/rule/skip/.blank=\z@,%
       foot/ruleskip/.alias*=foot/rule/skip,%
@@ -167,6 +167,8 @@
    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+/.style={head/left+={#1},head/center+={#1},head/right+={#1}},
+   head*/.alias=head+,%
      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+,%
@@ -174,6 +176,8 @@
                         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+/.style={foot/left+={#1},foot/center+={#1},foot/right+={#1}},
+   foot*/.alias=foot+,%
      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+,%
@@ -181,76 +185,94 @@
                         foot/rule/color={#1}},%
    nofoot/.style={foot=,foot/font=,foot/rule=,foot/rule/font=},
    left/.style={head/left={#1},foot/left={#1}},%
+   left+/.style={head/left+={#1},foot/left+={#1}},%
+   left*/.alias=left+,%
       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+/.style={head/center+={#1},foot/center+={#1}},%
+   center*/.alias=center+,%
       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+/.style={head/right+={#1},foot/right+={#1}},%
+   right*/.alias=right+,%
       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+/.style={head/left/even+={#1},head/left/odd+={#1}},%
+   head/left*/.alias=head/left+,%
       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}},%
-         left/head/.alias=head/left,%
+         left/head/.alias*=head/left,%
          left/head/font/.alias*=head/left/font,%
          left/head/color/.alias=head/left/color,%
    head/center/.style={head/center/even={#1},head/center/odd={#1}},%
+   head/center+/.style={head/center/even+={#1},head/center/odd+={#1}},%
+   head/center*/.alias=head/center+,%
       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}},%
-         center/head/.alias=head/center,%
+         center/head/.alias*=head/center,%
          center/head/font/.alias*=head/center/font,%
          center/head/color/.alias=head/center/color,%
    head/right/.style={head/right/even={#1},head/right/odd={#1}},%
+   head/right+/.style={head/right/even+={#1},head/right/odd+={#1}},%
+   head/right*/.alias=head/right+,%
       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}},%
-         right/head/.alias=head/right,%
+         right/head/.alias*=head/right,%
          right/head/font/.alias*=head/right/font,%
          right/head/color/.alias=head/right/color,%
    foot/left/.style={foot/left/even={#1},foot/left/odd={#1}},%
+   foot/left+/.style={foot/left/even+={#1},foot/left/odd+={#1}},%
+   foot/left*/.alias=foot/left+,%
       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}},%
-         left/foot/.alias=foot/left,%
+         left/foot/.alias*=foot/left,%
          left/foot/font/.alias*=foot/left/font,%
          left/foot/color/.alias=foot/left/color,%
    foot/center/.style={foot/center/even={#1},foot/center/odd={#1}},%
+   foot/center+/.style={foot/center/even+={#1},foot/center/odd+={#1}},%
+   foot/center*/.alias=foot/center,%
       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}},%
-         center/foot/.alias=foot/center,%
+         center/foot/.alias*=foot/center,%
          center/foot/font/.alias*=foot/center/font,%
          center/foot/color/.alias=foot/center/color,%
    foot/right/.style={foot/right/even={#1},foot/right/odd={#1}},%
+   foot/right+/.style={foot/right/even+={#1},foot/right/odd+={#1}},%
+   foot/right*/.alias=foot/right+,%
       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}},%
-         right/foot/.alias=foot/right,%
+         right/foot/.alias*=foot/right,%
          right/foot/font/.alias*=foot/right/font,%
          right/foot/color/.alias=foot/right/color,%
    head/left/odd/.fancy@hf=olh,%
    head/left/odd/font/.store as code,%
    head/left/odd/color/.style={head/left/odd/font+=\color{#1}},%
-         head/odd/left/.alias=head/left/odd,%
-         odd/head/left/.alias=head/left/odd,%
-         odd/left/head/.alias=head/left/odd,%
-         left/odd/head/.alias=head/left/odd,%
-         left/head/odd/.alias=head/left/odd,%
+         head/odd/left/.alias*=head/left/odd,%
+         odd/head/left/.alias*=head/left/odd,%
+         odd/left/head/.alias*=head/left/odd,%
+         left/odd/head/.alias*=head/left/odd,%
+         left/head/odd/.alias*=head/left/odd,%
          head/odd/left/font/.alias*=head/left/odd/font,%
          odd/head/left/font/.alias*=head/left/odd/font,%
          odd/left/head/font/.alias*=head/left/odd/font,%
@@ -264,11 +286,11 @@
    head/center/odd/.fancy@hf=och,%
    head/center/odd/font/.store as code,%
    head/center/odd/color/.style={head/center/odd/font+=\color{#1}},%
-         head/odd/center/.alias=head/center/odd,%
-         odd/head/center/.alias=head/center/odd,%
-         odd/center/head/.alias=head/center/odd,%
-         center/odd/head/.alias=head/center/odd,%
-         center/head/odd/.alias=head/center/odd,%
+         head/odd/center/.alias*=head/center/odd,%
+         odd/head/center/.alias*=head/center/odd,%
+         odd/center/head/.alias*=head/center/odd,%
+         center/odd/head/.alias*=head/center/odd,%
+         center/head/odd/.alias*=head/center/odd,%
          head/odd/center/font/.alias*=head/center/odd/font,%
          odd/head/center/font/.alias*=head/center/odd/font,%
          odd/center/head/font/.alias*=head/center/odd/font,%
@@ -282,11 +304,11 @@
    head/right/odd/.fancy@hf=orh,%
    head/right/odd/font/.store as code,%
    head/right/odd/color/.style={head/right/odd/font+=\color{#1}},%
-         head/odd/right/.alias=head/right/odd,%
-         odd/head/right/.alias=head/right/odd,%
-         odd/right/head/.alias=head/right/odd,%
-         right/odd/head/.alias=head/right/odd,%
-         right/head/odd/.alias=head/right/odd,%
+         head/odd/right/.alias*=head/right/odd,%
+         odd/head/right/.alias*=head/right/odd,%
+         odd/right/head/.alias*=head/right/odd,%
+         right/odd/head/.alias*=head/right/odd,%
+         right/head/odd/.alias*=head/right/odd,%
          head/odd/right/font/.alias*=head/right/odd/font,%
          odd/head/right/font/.alias*=head/right/odd/font,%
          odd/right/head/font/.alias*=head/right/odd/font,%
@@ -300,11 +322,11 @@
    head/left/even/.fancy@hf=elh,%
    head/left/even/font/.store as code,%
    head/left/even/color/.style={head/left/even/font+=\color{#1}},%
-         head/even/left/.alias=head/left/even,%
-         even/head/left/.alias=head/left/even,%
-         even/left/head/.alias=head/left/even,%
-         left/even/head/.alias=head/left/even,%
-         left/head/even/.alias=head/left/even,%
+         head/even/left/.alias*=head/left/even,%
+         even/head/left/.alias*=head/left/even,%
+         even/left/head/.alias*=head/left/even,%
+         left/even/head/.alias*=head/left/even,%
+         left/head/even/.alias*=head/left/even,%
          head/even/left/font/.alias*=head/left/even/font,%
          even/head/left/font/.alias*=head/left/even/font,%
          even/left/head/font/.alias*=head/left/even/font,%
@@ -318,11 +340,11 @@
    head/center/even/.fancy@hf=ech,%
    head/center/even/font/.store as code,%
    head/center/even/color/.style={head/center/even/font+=\color{#1}},%
-         head/even/center/.alias=head/center/even,%
-         even/head/center/.alias=head/center/even,%
-         even/center/head/.alias=head/center/even,%
-         center/even/head/.alias=head/center/even,%
-         center/head/even/.alias=head/center/even,%
+         head/even/center/.alias*=head/center/even,%
+         even/head/center/.alias*=head/center/even,%
+         even/center/head/.alias*=head/center/even,%
+         center/even/head/.alias*=head/center/even,%
+         center/head/even/.alias*=head/center/even,%
          head/even/center/font/.alias*=head/center/even/font,%
          even/head/center/font/.alias*=head/center/even/font,%
          even/center/head/font/.alias*=head/center/even/font,%
@@ -336,11 +358,11 @@
    head/right/even/.fancy@hf=erh,%
    head/right/even/font/.store as code,%
    head/right/even/color/.style={head/right/even/font+=\color{#1}},%
-         head/even/right/.alias=head/right/even,%
-         even/head/right/.alias=head/right/even,%
-         even/right/head/.alias=head/right/even,%
-         right/even/head/.alias=head/right/even,%
-         right/head/even/.alias=head/right/even,%
+         head/even/right/.alias*=head/right/even,%
+         even/head/right/.alias*=head/right/even,%
+         even/right/head/.alias*=head/right/even,%
+         right/even/head/.alias*=head/right/even,%
+         right/head/even/.alias*=head/right/even,%
          head/even/right/font/.alias*=head/right/even/font,%
          even/head/right/font/.alias*=head/right/even/font,%
          even/right/head/font/.alias*=head/right/even/font,%
@@ -354,11 +376,11 @@
    foot/left/odd/.fancy@hf=olf,%
    foot/left/odd/font/.store as code,%
    foot/left/odd/color/.style={foot/left/odd/font+=\color{#1}},%
-         foot/odd/left/.alias=foot/left/odd,%
-         odd/foot/left/.alias=foot/left/odd,%
-         odd/left/foot/.alias=foot/left/odd,%
-         left/odd/foot/.alias=foot/left/odd,%
-         left/foot/odd/.alias=foot/left/odd,%
+         foot/odd/left/.alias*=foot/left/odd,%
+         odd/foot/left/.alias*=foot/left/odd,%
+         odd/left/foot/.alias*=foot/left/odd,%
+         left/odd/foot/.alias*=foot/left/odd,%
+         left/foot/odd/.alias*=foot/left/odd,%
          foot/odd/left/font/.alias*=foot/left/odd/font,%
          odd/foot/left/font/.alias*=foot/left/odd/font,%
          odd/left/foot/font/.alias*=foot/left/odd/font,%
@@ -372,11 +394,11 @@
    foot/center/odd/.fancy@hf=ocf,%
    foot/center/odd/font/.store as code,%
    foot/center/odd/color/.style={foot/center/odd/font+=\color{#1}},%
-         foot/odd/center/.alias=foot/center/odd,%
-         odd/foot/center/.alias=foot/center/odd,%
-         odd/center/foot/.alias=foot/center/odd,%
-         center/odd/foot/.alias=foot/center/odd,%
-         center/foot/odd/.alias=foot/center/odd,%
+         foot/odd/center/.alias*=foot/center/odd,%
+         odd/foot/center/.alias*=foot/center/odd,%
+         odd/center/foot/.alias*=foot/center/odd,%
+         center/odd/foot/.alias*=foot/center/odd,%
+         center/foot/odd/.alias*=foot/center/odd,%
          foot/odd/center/font/.alias*=foot/center/odd/font,%
          odd/foot/center/font/.alias*=foot/center/odd/font,%
          odd/center/foot/font/.alias*=foot/center/odd/font,%
@@ -390,11 +412,11 @@
    foot/right/odd/.fancy@hf=orf,%
    foot/right/odd/font/.store as code,%
    foot/right/odd/color/.style={foot/right/odd/font+=\color{#1}},%
-         foot/odd/right/.alias=foot/right/odd,%
-         odd/foot/right/.alias=foot/right/odd,%
-         odd/right/foot/.alias=foot/right/odd,%
-         right/odd/foot/.alias=foot/right/odd,%
-         right/foot/odd/.alias=foot/right/odd,%
+         foot/odd/right/.alias*=foot/right/odd,%
+         odd/foot/right/.alias*=foot/right/odd,%
+         odd/right/foot/.alias*=foot/right/odd,%
+         right/odd/foot/.alias*=foot/right/odd,%
+         right/foot/odd/.alias*=foot/right/odd,%
          foot/odd/right/font/.alias*=foot/right/odd/font,%
          odd/foot/right/font/.alias*=foot/right/odd/font,%
          odd/right/foot/font/.alias*=foot/right/odd/font,%
@@ -408,11 +430,11 @@
    foot/left/even/.fancy@hf=elf,%
    foot/left/even/font/.store as code,%
    foot/left/even/color/.style={foot/left/even/font+=\color{#1}},%
-         foot/even/left/.alias=foot/left/even,%
-         even/foot/left/.alias=foot/left/even,%
-         even/left/foot/.alias=foot/left/even,%
-         left/even/foot/.alias=foot/left/even,%
-         left/foot/even/.alias=foot/left/even,%
+         foot/even/left/.alias*=foot/left/even,%
+         even/foot/left/.alias*=foot/left/even,%
+         even/left/foot/.alias*=foot/left/even,%
+         left/even/foot/.alias*=foot/left/even,%
+         left/foot/even/.alias*=foot/left/even,%
          foot/even/left/font/.alias*=foot/left/even/font,%
          even/foot/left/font/.alias*=foot/left/even/font,%
          even/left/foot/font/.alias*=foot/left/even/font,%
@@ -426,11 +448,11 @@
    foot/center/even/.fancy@hf=ecf,%
    foot/center/even/font/.store as code,%
    foot/center/even/color/.style={foot/center/even/font+=\color{#1}},%
-         foot/even/center/.alias=foot/center/even,%
-         even/foot/center/.alias=foot/center/even,%
-         even/center/foot/.alias=foot/center/even,%
-         center/even/foot/.alias=foot/center/even,%
-         center/foot/even/.alias=foot/center/even,%
+         foot/even/center/.alias*=foot/center/even,%
+         even/foot/center/.alias*=foot/center/even,%
+         even/center/foot/.alias*=foot/center/even,%
+         center/even/foot/.alias*=foot/center/even,%
+         center/foot/even/.alias*=foot/center/even,%
          foot/even/center/font/.alias*=foot/center/even/font,%
          even/foot/center/font/.alias*=foot/center/even/font,%
          even/center/foot/font/.alias*=foot/center/even/font,%
@@ -444,11 +466,11 @@
    foot/right/even/.fancy@hf=erf,%
    foot/right/even/font/.store as code,%
    foot/right/even/color/.style={foot/right/even/font+=\color{#1}},%
-         foot/even/right/.alias=foot/right/even,%
-         even/foot/right/.alias=foot/right/even,%
-         even/right/foot/.alias=foot/right/even,%
-         right/even/foot/.alias=foot/right/even,%
-         right/foot/even/.alias=foot/right/even,%
+         foot/even/right/.alias*=foot/right/even,%
+         even/foot/right/.alias*=foot/right/even,%
+         even/right/foot/.alias*=foot/right/even,%
+         right/even/foot/.alias*=foot/right/even,%
+         right/foot/even/.alias*=foot/right/even,%
          foot/even/right/font/.alias*=foot/right/even/font,%
          even/foot/right/font/.alias*=foot/right/even/font,%
          even/right/foot/font/.alias*=foot/right/even/font,%
@@ -460,43 +482,55 @@
          right/even/foot/color/.alias=foot/right/even/color,%
          right/foot/even/color/.alias=foot/right/even/color,%
    foot/inner/.style={foot/right/even={#1},foot/left/odd={#1}},%
+   foot/inner+/.style={foot/right/even+={#1},foot/left/odd+={#1}},%
+   foot/inner*/.alias=foot/inner+,%
    foot/inner/font/.style={foot/right/even/font={#1},foot/left/odd/font={#1}},%
    foot/inner/color/.style={foot/right/even/color={#1},foot/left/odd/color={#1}},%
    foot/inner/font+/.style={foot/right/even/font+={#1},foot/left/odd/font+={#1}},%
    foot/inner/font*/.alias=foot/inner/font+,%
-      inner/foot/.alias=foot/inner,%
+      inner/foot/.alias*=foot/inner,%
       inner/foot/font/.alias*=foot/inner/font,%
       inner/foot/color/.alias=foot/inner/color,%
    foot/outer/.style={foot/left/even={#1},foot/right/odd={#1}},%
+   foot/outer+/.style={foot/left/even+={#1},foot/right/odd+={#1}},%
+   foot/outer*/.alias=foot/outer+,%
    foot/outer/font/.style={foot/left/even/font={#1},foot/right/odd/font={#1}},%
    foot/outer/color/.style={foot/left/even/color={#1},foot/right/odd/color={#1}},%
    foot/outer/font+/.style={foot/left/even/font+={#1},foot/right/odd/font+={#1}},%
    foot/outer/font*/.alias=foot/outer/font+,%
-      outer/foot/.alias=foot/outer,%
+      outer/foot/.alias*=foot/outer,%
       outer/foot/font/.alias*=foot/outer/font,%
       outer/foot/color/.alias=foot/outer/color,%
    head/inner/.style={head/right/even={#1},head/left/odd={#1}},%
+   head/inner+/.style={head/right/even+={#1},head/left/odd+={#1}},%
+   head/inner*/.alias=head/inner+,%
    head/inner/font/.style={head/right/even/font={#1},head/left/odd/font={#1}},%
    head/inner/color/.style={head/right/even/color={#1},head/left/odd/color={#1}},%
    head/inner/font+/.style={head/right/even/font+={#1},head/left/odd/font+={#1}},%
    head/inner/font*/.alias=head/inner/font+,%
-      inner/head/.alias=head/inner,%
+      inner/head/.alias*=head/inner,%
       inner/head/font/.alias*=head/inner/font,%
       inner/head/color/.alias=head/inner/color,%
    head/outer/.style={head/left/even={#1},head/right/odd={#1}},%
+   head/outer+/.style={head/left/even+={#1},head/right/odd+={#1}},%
+   head/outer*/.alias=head/outer+,%
    head/outer/font/.style={head/left/even/font={#1},head/right/odd/font={#1}},%
    head/outer/color/.style={head/left/even/color={#1},head/right/odd/color={#1}},%
    head/outer/font+/.style={head/left/even/font+={#1},head/right/odd/font+={#1}},%
    head/outer/font*/.alias=head/outer/font+,%
-      outer/head/.alias=head/outer,%
+      outer/head/.alias*=head/outer,%
       outer/head/font/.alias*=head/outer/font,%
       outer/head/color/.alias=head/outer/color,%
    inner/.style={foot/inner={#1},head/inner={#1}},%
+   inner+/.style={foot/inner+={#1},head/inner+={#1}},%
+   inner*/.alias=inner+,%
    inner/font/.style={foot/inner/font={#1},head/inner/font={#1}},%
    inner/font+/.style={foot/inner/font+={#1},head/inner/font+={#1}},%
    inner/font*/.alias=inner/font+,%
    inner/color/.style={foot/inner/color={#1},head/inner/color={#1}},%
    outer/.style={foot/outer={#1},head/outer={#1}},%
+   outer+/.style={foot/outer+={#1},head/outer+={#1}},%
+   outer*/.alias=outer+,%
    outer/font/.style={foot/outer/font={#1},head/outer/font={#1}},%
    outer/font+/.style={foot/outer/font+={#1},head/outer/font+={#1}},%
    outer/font*/.alias=outer/font+,%
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hypbmsec.sty
index 2aa94cdacfa..b53cad10f16 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-hypbmsec}
-      [2010/11/15 v2.1 lastsection (title,anchor, etc. - FC)]
+   [2010/12/07 v2.5 lastsection (title,anchor, etc. - FC)]
 \RequirePackage{interfaces-base}
 \RequirePackage{gettitlestring}
 \itf@Check@Package{hypbmsec}
@@ -60,9 +60,9 @@
 \itf@patch\pretocmd\hbs@process{%
    \itf@hbs@process{#1}%
    }%
-   {\PackageInfo{interfaces-hypbmsec}
+   {\@PackageInfoNoLine{interfaces-hypbmsec}
       {Command \string\hbs@process\space successfully patched}}
-   {\PackageWarning{interfaces-hypbmsec}
+   {\@PackageWarningNoLine{interfaces-hypbmsec}
       {Command \string\hbs@process\space could not be patched
       \MessageBreak loading of `interfaces-hypbmsec` aborted
       \MessageBreak \string\lastsection\space will not work}%
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-hyperref.sty
index c03c0816792..29ecac5cc31 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-hyperref}
-   [2010/10/27 v1.2 provides raised hyperdef (FC)]
+   [2010/12/07 v2.5 provides raised hyperdef (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{hyperref}
 \newrobustcmd\raisedhyperdef[4][]{\begingroup
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-makecell.sty
index 0ae8cf9d05a..9550d65cb2d 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-makecell}
-   [2010/11/26 v2.4 repeatcell to fill in tabulars (FC)]
+   [2010/12/07 v2.5 repeatcell to fill in tabulars (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{makecell}
 \edef\itf@AtEnd{\catcode126 \the\catcode126}% 126 = ~
@@ -116,8 +116,7 @@
          \pgfkeysifdefined{/itf/makecell/repeatcell/cr/row\the\itf@col}%
             {\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}%
+         \toks@\expandafter{\the\expandafter\toks@ \itf@thecr}%
          \fi
          \advance\itf@col\@ne
          \itf@row\z@
@@ -126,9 +125,7 @@
             \ifnum\itf@row>\@ne
                \toks@\expandafter{\the\toks@&}%
             \fi
-            \toks@\expandafter\expandafter\expandafter{%
-               \expandafter\the\expandafter\toks@
-               \itf@cell@init}%
+            \toks@\expandafter{\the\expandafter\toks@ \itf@cell@init}%
             \itf@cell@insert}% rows loop
       }% cols loop
    \else
@@ -138,8 +135,7 @@
          \pgfkeysifdefined{/itf/makecell/repeatcell/cr/row\the\itf@row}%
             {\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}%
+         \toks@\expandafter{\the\expandafter\toks@ \itf@thecr}%
       \fi
       \advance\itf@row\@ne
       \itf@col\z@
@@ -148,9 +144,7 @@
          \ifnum\itf@col>\@ne
             \toks@\expandafter{\the\toks@&}%
          \fi
-         \toks@\expandafter\expandafter\expandafter{%
-                  \expandafter\the\expandafter\toks@
-                  \itf@cell@init}%
+         \toks@\expandafter{\the\expandafter\toks@ \itf@cell@init}%
          \itf@cell@insert}% cols loop
       }% rows loop
    \fi
@@ -269,8 +263,7 @@
 }% \itf@cell@formulaerror
 \protected\def\itf@cell@calc#1#2{%
    \edef#1{\def\noexpand#1{#2}}%
-   \toks@\expandafter\expandafter\expandafter{%
-                     \expandafter\the\expandafter\toks@#1}%
+   \toks@\expandafter{\the\expandafter\toks@ #1}%
    #1%
 }% \itf@cell@calc
 \protected\def\itf@cell@numcalc#1#2{%
@@ -296,25 +289,22 @@
 \def\itf@cell@insert{%
    \pgfkeysvalueof{/itf/makecell/repeatcell/@calc}%
    \ifx\R\@empty\else
-      \toks@\expandafter\expandafter\expandafter{%
-         \expandafter\the\expandafter\toks@
+      \toks@\expandafter{\the\expandafter\toks@
          \expandafter\def\expandafter\r\expandafter{\r}}%
    \fi
    \ifx\C\@empty\else
-      \toks@\expandafter\expandafter\expandafter{%
-         \expandafter\the\expandafter\toks@
+      \toks@\expandafter{\the\expandafter\toks@
          \expandafter\def\expandafter\c\expandafter{\c}}%
    \fi
    \itf@cell@getifdefined{font/row\the\itf@row}\itf@cellfontrow
    \itf@cell@getifdefined{font/col\the\itf@col}\itf@cellfontcol
    \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}%
+   \toks@\expandafter{\the\expandafter\toks@ \itf@cellfont}%
    \ifx\itf@cellrow\@empty
       \ifx\itf@cellcol\@empty
          \itf@cell\expandafter\expandafter\expandafter{%
-            \expandafter\itf@cellfontcol\itf@cellfontrow}%
+            \expandafter\itf@cellfontcol \itf@cellfontrow}%
          \let\itf@tp\itf@celltext
       \else
          \itf@cell\expandafter{\itf@cellfontcol}%
@@ -337,11 +327,9 @@
          \fi
       \fi
    \fi
-   \itf@cell\expandafter\expandafter\expandafter{%
-               \expandafter\the\expandafter\itf@cell\itf@tp}%
+   \itf@cell\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}%
+   \toks@\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 b30088fa206..77f238e6078 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-marks}
-   [2010/11/26 v2.4 easier use of e-TeX marks (FC)]
+   [2010/12/07 v2.5 easier use of e-TeX marks (FC)]
 \RequirePackage{interfaces-base}
 \newrobustcmd\marksthe[2]{%
    \ifcsname marks@#1\endcsname \else \itf@marks@new{#1}\fi
@@ -60,7 +60,7 @@
 }% \marksthecs
 \def\itf@marks@new#1{%
    \expandafter\newmarks\csname marks@#1\endcsname
-   \PackageInfo{interfaces-marks}{New marks `#1' defined}%
+   \PackageInfo{interfaces-marks}{marks `#1' defined}%
 }% \itf@marks@new
 \newcommand*\thefirstmarks[1]{\romannumeral
    \ifcsname marks@#1\endcsname \expandafter\z@
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty
index f51ddd2c9b9..c7eeca0353b 100644
--- a/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty
+++ b/Master/texmf-dist/tex/latex/interfaces/interfaces-pgfkeys.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% interfaces : 2010/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-pgfkeys}
-   [2010/11/26 v2.4 pgfkeys handlers definitions (FC)]
+   [2010/12/07 v2.5 pgfkeys handlers definitions (FC)]
 \RequirePackage{interfaces-base}
 \ifdefined\pgfkeys@ifexecutehandler % pgf version 2.1
 \def\itf@pgfkeys{%
@@ -340,23 +340,6 @@
    /handlers/.store as number/.default=+-*,%
 }% /.store as number
 \pgfkeys{%
-   /handlers/.estore as number/.code={%
-      \pgfkeysedef\pgfkeyscurrentpath{%
-         \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{%
-                     \noexpand\number\numexpr##1\relax}}%
-      \pgfkeyslet\pgfkeyscurrentpath\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
-      \@tfor\x:=#1\do{%
-         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
-            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
-               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}%
-               \x
-               \numexpr##1\relax}}%
-      }},%
-   /handlers/.estore as number/.default=+-*,%
-}% /.estore as number
-\pgfkeys{%
    /handlers/.store as number in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
@@ -379,6 +362,23 @@
    /handlers/.store as number in cs/.value required,%
 }% /.store as number in cs
 \pgfkeys{%
+   /handlers/.estore as number/.code={%
+      \pgfkeysedef\pgfkeyscurrentpath{%
+         \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{%
+                     \noexpand\number\numexpr##1\relax}}%
+      \pgfkeyslet\pgfkeyscurrentpath\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
+      \@tfor\x:=#1\do{%
+         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
+            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
+               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}%
+               \x
+               \numexpr##1\relax}}%
+      }},%
+   /handlers/.estore as number/.default=+-*,%
+}% /.estore as number
+\pgfkeys{%
    /handlers/.estore as number in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
@@ -426,7 +426,7 @@
             \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded=%
                \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}%
                \x
-               \if*\x\noexpand\itf@units@scale##1!
+               \if*\x\noexpand\itf@units@scaleNoCalc##1!
                \else\glueexpr\noexpand\unexpanded{##1}\relax\fi}}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}%
@@ -434,63 +434,6 @@
    /handlers/.store as glue/.default=+-*,%
 }% /.store as glue
 \pgfkeys{%
-   /handlers/.estore as glue/.code={%
-      \pgfkeysedef{\pgfkeyscurrentpath}{%
-         \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{%
-                     \noexpand\the\glueexpr##1\relax}}%
-      \pgfkeyslet\pgfkeyscurrentpath\z@skip
-      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@skip
-      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip
-      \@tfor\x:=#1\do{%
-         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
-            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
-               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x
-               \if*\x \noexpand\itf@units@scale##1!
-               \else\glueexpr##1\relax\fi}}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}%
-      }},%
-   /handlers/.estore as glue/.default=+-*,%
-}% /.estore as glue
-\pgfkeys{%
-   /handlers/.store as dimen/.code={%
-      \pgfkeysedef\pgfkeyscurrentpath{%
-         \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\dimexpr##1\relax}}%
-      \pgfkeyslet\pgfkeyscurrentpath\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
-      \@tfor\x:=#1\do{%
-         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
-            \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded={%
-               \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}%
-               \x
-               \if*\x \noexpand\itf@units@scale##1!
-               \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}%
-      }},%
-   /handlers/.store as dimen/.default=+-*,%
-}% /.store as dimen
-\pgfkeys{%
-   /handlers/.estore as dimen/.code={%
-      \pgfkeysedef\pgfkeyscurrentpath{%
-         \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{%
-                  \noexpand\the\dimexpr##1\relax}}%
-      \pgfkeyslet\pgfkeyscurrentpath\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
-      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
-      \@tfor\x:=#1\do{%
-         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
-            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
-               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x
-               \if*\x   \noexpand\itf@units@scale##1!
-               \else    \dimexpr##1\relax\fi}}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
-      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}%
-      }},%
-   /handlers/.estore as dimen/.default=+-*,%
-}% /.estore as dimen
-\pgfkeys{%
    /handlers/.store as glue in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
@@ -502,10 +445,10 @@
                \noexpand\ifcsname#1\endcsname
                   #1\noexpand\else z@skip\noexpand\fi}%
             \edef\noexpand\pgfkeys@temp{%
-               \noexpand\pgfkeysalso{\pgfkeyscurrentpath={%
+               \noexpand\noexpand\noexpand\pgfkeysalso{\pgfkeyscurrentpath={%
                   \noexpand\expandonce\noexpand\pgfkeys@temp
                   \x
-                  \if*\x\noexpand\itf@units@scale##1!
+                  \if*\x\noexpand\itf@units@scaleNoCalc##1!
                   \else\glueexpr\noexpand\unexpanded{##1}\relax\fi}}%
             }\noexpand\pgfkeys@temp}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}%
@@ -514,10 +457,31 @@
    /handlers/.store as glue in cs/.value required,%
 }% /.store as glue in cs
 \pgfkeys{%
+   /handlers/.estore as glue/.code={%
+      \pgfkeysedef{\pgfkeyscurrentpath}{%
+         \itf@setlength\itf@sk{##1}%
+         \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{%
+                     \noexpand\the\itf@sk}}%
+      \pgfkeyslet\pgfkeyscurrentpath\z@skip
+      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@skip
+      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip
+      \@tfor\x:=#1\do{%
+         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
+            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
+               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x
+               \if*\x \noexpand\itf@units@scale##1!
+               \else\glueexpr##1\relax\fi}}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@skip\fi}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@skip\fi}%
+      }},%
+   /handlers/.estore as glue/.default=+-*,%
+}% /.estore as glue
+\pgfkeys{%
    /handlers/.estore as glue in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
-         \else\csedef{#1}{\the\glueexpr##1\relax}\fi}%
+         \else\itf@setlength\itf@sk{##1}%
+              \csedef{#1}{\the\itf@sk}\fi}%
       \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@skip
       \@tfor\x:=+-*\do{%
          \pgfkeysedef{\pgfkeyscurrentpath\x}{%
@@ -536,7 +500,7 @@
    /handlers/.store in skip cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
-         \else\csname#1\endcsname\glueexpr##1\relax\fi}%
+         \else\expandafter\itf@setlength\csname#1\endcsname{##1}\fi}%
       \pgfkeyslet{/\pgfkeyscurrentpath/.@blank}\z@skip
       \@tfor\x:=+-*\do{%
          \pgfkeysedef{\pgfkeyscurrentpath\x}{%
@@ -551,6 +515,25 @@
    /handlers/.store in skip cs/.value required,%
 }% /.store in skip cs
 \pgfkeys{%
+   /handlers/.store as dimen/.code={%
+      \pgfkeysedef\pgfkeyscurrentpath{%
+         \noexpand\pgfkeyssetvalue{\pgfkeyscurrentpath}{\dimexpr##1\relax}}%
+      \pgfkeyslet\pgfkeyscurrentpath\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
+      \@tfor\x:=#1\do{%
+         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
+            \noexpand\pgfkeysalso{\pgfkeyscurrentpath/.expanded={%
+               \noexpand\pgfkeysvalueof@unexpanded{\pgfkeyscurrentpath}%
+               \x
+               \if*\x \noexpand\itf@units@scaleNoCalc##1!
+               \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}%
+      }},%
+   /handlers/.store as dimen/.default=+-*,%
+}% /.store as dimen
+\pgfkeys{%
    /handlers/.store as dimen in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
@@ -559,37 +542,58 @@
       \@tfor\x:=+-*\do{%
          \pgfkeysedef{\pgfkeyscurrentpath\x}{%
             \letcs\noexpand\pgfkeys@temp{%
-               \ifcsname#1\endcsname#1\else z@\fi}%
+               \noexpand\ifcsname#1\endcsname
+                  #1\noexpand\else z@\noexpand\fi}%
             \edef\noexpand\pgfkeys@temp{%
-            \noexpand\pgfkeysalso{\pgfkeyscurrentpath={%
+            \noexpand\noexpand\noexpand\pgfkeysalso{\pgfkeyscurrentpath={%
                \noexpand\expandonce\noexpand\pgfkeys@temp
                \x
-               \if*\x\noexpand\itf@units@scale##1!
-               \else\dimexpr\noexpand\unexpanded{##1}\fi}}%
+               \if*\x\noexpand\itf@units@scaleNoCalc##1!
+               \else\dimexpr\noexpand\unexpanded{##1}\relax\fi}}%
             }\noexpand\pgfkeys@temp}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}%
    }},%
    /handlers/.store as dimen in cs/.value required,%
-}% /.store as dimen in cs {csname}{+-}
+}% /.store as dimen in cs {csname}{+-*}
+\pgfkeys{%
+   /handlers/.estore as dimen/.code={%
+      \pgfkeysedef\pgfkeyscurrentpath{%
+         \itf@setlength\itf@sk{##1}%
+         \noexpand\pgfkeysEsetvalue{\pgfkeyscurrentpath}{%
+               \noexpand\the\dimexpr\itf@sk}}%
+      \pgfkeyslet\pgfkeyscurrentpath\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@def}\z@
+      \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
+      \@tfor\x:=#1\do{%
+         \pgfkeysedef{\pgfkeyscurrentpath\x}{%
+            \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
+               \noexpand\pgfkeysvalueof{\pgfkeyscurrentpath}\x
+               \if*\x   \noexpand\itf@units@scale##1!
+               \else    \dimexpr##1\relax\fi}}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
+      \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@blank}{\if*\x\@ne\else\z@\fi}%
+      }},%
+   /handlers/.estore as dimen/.default=+-*,%
+}% /.estore as dimen
 \pgfkeys{%
    /handlers/.estore as dimen in cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
-         \else \@defaultunits\itf@sk ##1pt\relax\@nnil
-               \csedef{#1}{\the\dimexpr\itf@sk\relax}\fi}%
+         \else \itf@setlength\itf@sk{##1}%
+               \csedef{#1}{\the\dimexpr\itf@sk}\fi}%
       \pgfkeyslet{\pgfkeyscurrentpath/.@blank}\z@
       \@tfor\x:=+-*\do{%
          \pgfkeysedef{\pgfkeyscurrentpath\x}{%
             \noexpand\ifcsname#1\endcsname
-               \noexpand\@defaultunits\itf@sk
+               \noexpand\@defaultunits \itf@sk
                   \noexpand\csname#1\endcsname pt\relax\noexpand\@nnil
-            \noexpand\else\itf@sk\z@\noexpand\fi
+            \noexpand\else \itf@sk \z@ \noexpand\fi
             \if*\x
-               \itf@sk\dimexpr\itf@sk*\noexpand\itf@units@scale##1!\relax
+               \itf@setlength\itf@sk {\itf@sk*\noexpand\itf@units@scale##1!}%
             \else
-               \noexpand\@defaultunits\@tempdima ##1pt\relax\noexpand\@nnil
-               \advance\itf@sk\x\@tempdima
+               \noexpand\@defaultunits\@tempdima ##1pt \relax\noexpand\@nnil
+               \advance\itf@sk\x \@tempdima
             \fi
             \noexpand\pgfkeysalso{\pgfkeyscurrentpath=\itf@sk}}%
       \pgfkeysEsetvalue{\pgfkeyscurrentpath\x/.@def}{\if*\x\@ne\else\z@\fi}%
@@ -601,12 +605,12 @@
    /handlers/.store in dimen cs/.code={%
       \pgfkeysdef\pgfkeyscurrentpath{%
          \ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
-         \else\csname#1\endcsname\dimexpr##1\relax\fi}%
+         \else\expandafter\itf@setlength\csname#1\endcsname{##1}\fi}%
       \pgfkeyslet{/\pgfkeyscurrentpath/.@blank}\z@
       \@tfor\x:=+-*\do{%
          \pgfkeysedef{\pgfkeyscurrentpath\x}{%
             \if*\x \else
-            \noexpand\@defaultunits\itf@sk ##1pt\relax\noexpand\@nnil
+            \noexpand\@defaultunits\itf@sk ##1pt \relax\noexpand\@nnil
             \fi
             \noexpand\pgfkeysalso{\pgfkeyscurrentpath=%
                \csname#1\endcsname % has been defined as a dimen (not expandable)
@@ -621,7 +625,8 @@
 \pgfkeys{%
    /handlers/.is multiple choice/.code=%
       \pgfkeys{\pgfkeyscurrentpath/.cd,%
-      .unknown/.style={/errors/unknown choice value=\pgfkeyscurrentkey\pgfkeyscurrentvalue},%
+      .unknown/.style={%
+         /errors/unknown choice value=\pgfkeyscurrentkey\pgfkeyscurrentvalue},%
       .code=\expandafter\pgfkeys\expandafter{\pgfkeyscurrentkey/.cd,####1}%
       },%
    /handlers/.is multiple choice/.value forbidden,%
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-scrlfile.sty
index 19c5a6a0c52..feabfd93306 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-scrlfile}
-   [2010/10/27 v1.2 scrlfile hooks improved (FC)]
+   [2010/12/07 v2.5 scrlfile hooks improved (FC)]
 \RequirePackage{interfaces-base}
 \AfterEndPreamble{%
    \let\@pkgextension\ltx@pkgextension
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tikz.sty
index bec495c9196..a1c8d9fab9c 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-tikz}
-   [2010/11/26 v2.4 load tikz libraries easily - pgf 2.0 & 2.1 (FC)]
+   [2010/12/07 v2.5 load tikz libraries easily - pgf 2.0 & 2.1 (FC)]
 \RequirePackage{interfaces-base}
 \itf@pgfkeys
 %% Some catcode checking
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-titlesec.sty
index 8a52e20c4b9..d9b7f0f33e4 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-titlesec}
-   [2010/11/15 v2.1 pgfkeys macros for titlesec (FC)]
+   [2010/12/07 v2.5 pgfkeys macros for titlesec (FC)]
 \RequirePackage{interfaces-base}
 \RequirePackage{auxhook}% <fix for \ttlp@append (odd/even pages)>
 \RequirePackage{gettitlestring}
@@ -56,13 +56,15 @@
    \string\providecommand\string\ttlp@append[2]{}%
 }
 \BeforeFile*{ttlkeys.def}{%
-   \catcode32 9\relax                   % ignore spaces
-   \count@\endlinechar\endlinechar\m@ne % and line feeds
-}
-\AfterFile*{ttlkeys.def}{% restore spaces and line feeds
-   \catcode32 10\relax
-   \endlinechar\count@
+   \expandafter\edef\csname itf@ttlkeys.def\endcsname{%
+         \catcode32 \the\catcode32\relax
+         \catcode37 \the\catcode37\relax
+         \endlinechar\the\endlinechar\relax}%
+   \catcode37 14\relax     % percent=comment (inside .dtx files...)
+   \catcode32 9\relax      % ignore spaces
+   \endlinechar\m@ne       % and line feeds
 }
+\AfterFile*{ttlkeys.def}{\csname itf@ttlkeys.def\endcsname}%
 %%-----------------------------------------------------------------------------
 %% runinifempty =>  like hang but no paragraph break (like runin) if title is empty
 \def\ttlh@runinifempty{%
@@ -93,10 +95,15 @@
       {\itf@ttl@newsection{#1}{#2}}%
    \ifcsundef{ttls@#1#2}{}% no previous spacing settings
       {\expandafter\expandafter\expandafter%
-      \itf@ttl@getspacing\csname ttls@#1#2\endcsname{/itf/titlesec/#1#2}}%
+       \itf@ttl@getspacing\csname ttls@#1#2\endcsname{/itf/titlesec/#1#2}}%
    \ifcsundef{ttlf@#1#2}{}% no previous format settings
-      {\expandafter\expandafter\expandafter%
-      \itf@ttl@getformat\csname ttlf@#1#2\endcsname{/itf/titlesec/#1#2}}%
+      {\ifttl@explicit
+       \expandafter\expandafter\expandafter%
+       \itf@ttl@getformat\csname ttlf@#1#2\endcsname{}{/itf/titlesec/#1#2}%
+       \else
+       \expandafter\expandafter\expandafter%
+       \itf@ttl@getformat\csname ttlf@#1#2\endcsname{/itf/titlesec/#1#2}%
+       \fi}%
 }% \itf@ttl@setup
 \def\itf@ttl@setkey#1#2{\begingroup
    \def\x{\pgfkeysvalueof{#1}}\def\y{#2}%
@@ -139,9 +146,20 @@
          or there is no a \itf@tp.tss file}}%
       \endgroup}
       {}%
-   \ifttl@explicit\@temptokena{\csdef{ttlf@\ttl@a}##1}%
+   \ifttl@explicit \begingroup
+      \pgfkeysgetvalue{#2#3/before}\pgfkeys@temp
+      \toks@\expandafter{\pgfkeys@temp}%
+      \edef\x{\endgroup\def\noexpand\itf@tp####1{\the\toks@}}%
+      \x \pgfkeyslet{#2#3/before@cmd}\itf@tp
+   \@temptokena{\csdef{ttlf@\ttl@a}##1}%
+   \the\@temptokena{%
+      \pgfkeysvalueof{#2#3/shape@cs}%
+      {\pgfkeysvalueof{#2#3/font}}%
+      {\pgfkeysvalueof{#2#3/label}}%
+      {\pgfkeysvalueof{#2#3/sep}}%
+      {\pgfkeysvalueof{#2#3/before@cmd}{##1}}%
+      {\pgfkeysvalueof{#2#3/after}}}%
    \else\@temptokena{\csdef{ttlf@\ttl@a}}%
-   \fi
    \the\@temptokena{%
       \pgfkeysvalueof{#2#3/shape@cs}%
       {\pgfkeysvalueof{#2#3/font}}%
@@ -149,6 +167,7 @@
       {\pgfkeysvalueof{#2#3/sep}}%
       {\pgfkeysvalueof{#2#3/before}}%
       {\pgfkeysvalueof{#2#3/after}}}%
+   \fi
    \csname ttl@compat\ttl@a\endcsname
    \ttl@spacing@ii
       {\pgfkeysvalueof{#2#3/indent first}}%
@@ -201,7 +220,7 @@
       }%
    }%
    \itf@AfterPackage{interfaces-tocloft}{%
-      \itf@cft@newsection{#1}{toc}%
+      \itf@cft@newsection{toc}{#1}%
    }%
    \itf@AfterPackage{interfaces-hypbmsec}{%
       \expandafter\let\csname last#1title\endcsname\relax
@@ -235,13 +254,14 @@
       shape/.value required,%
       shape@cs/.initial=
          \csname ttlh@\pgfkeysvalueof{/itf/titlesec/#1#2/shape}\endcsname,% constant
-         shape@cs/.is private=interface-titlesec,% constant
+         shape@cs/.is private=interfaces-titlesec,% constant
       font/.store as code,%
          format/.alias*=font,%
       label/.store as code,%
       sep/.estore as glue,%
          labelsep/.alias*=sep,%
       before/.store as code,%
+         before@cmd/.is private=interfaces-titlesec,%
       after/.store as code,%
       indent first/.true=\pgfkeyssetvalue{/itf/titlesec/#1#2/indent first}{\@ne},%
       indent first/.false=\pgfkeyssetvalue{/itf/titlesec/#1#2/indent first}{\z@},%
@@ -302,6 +322,10 @@
       bookmark/off/.code=\pgfkeyssetvalue{/itf/titlesec/#1/bookmark/on}{disable=true,},%
          bookmark/off/.value forbidden,%
          bookmark/none/.alias=bookmark/off,%
+      bookmark/on*/.code=\pgfkeyssetvalue{/itf/titlesec/#1/bookmark/on*}{disable*=false,},%
+      bookmark/off*/.code=\pgfkeyssetvalue{/itf/titlesec/#1/bookmark/on*}{disable*=true,},%
+         bookmark/none*/.alias=bookmark/off*,%
+         bookmark/disable*/.alias=bookmark/off*,%
       bookmark/style/.code=\ifblank{##1}
             {\pgfkeyslet{/itf/titlesec/#1/bookmark/style}\@empty}
             {\pgfkeyssetvalue{/itf/titlesec/#1/bookmark/style}{style=##1,}},%
@@ -315,6 +339,7 @@
       bookmark/color/.initial=,%
       bookmark/color*/.initial=,%
       bookmark/on/.initial=,%
+      bookmark/on*/.initial=,%
       bookmark/style/.initial=,%
    }}% \AfterPackage*{interfaces-bookmark}
    }% not starred (numberless) \section
@@ -326,9 +351,9 @@
    \itf@patch\itf@preapptocmd\addcontentsline             % #2=section name in
       {\begingroup\itf@ttl@BKM{/itf/titlesec/#2/bookmark}}%   \addcontentsline
       {\endgroup}
-      {\PackageInfo{interfaces-titlesec}
+      {\@PackageInfoNoLine{interfaces-titlesec}
          {Command \string\addcontentsline\space successfully patched!}}
-      {\PackageWarning{interfaces-titlesec}
+      {\@PackageWarningNoLine{interfaces-titlesec}
          {Patch of \string\addcontentsline\space failed
          \MessageBreak bookmark-style specs for sections
          \MessageBreak will be unavailable}}%
@@ -345,12 +370,14 @@
          \pgfkeysvalueof{#1/color}%
          \pgfkeysvalueof{#1/color*}%
          \pgfkeysvalueof{#1/on}%
+         \pgfkeysvalueof{#1/on*}%
          \pgfkeysvalueof{#1/style}}%
       \ifx\itf@tp\@empty
       \else
          \global\pgfkeyslet{#1/bold*}\@empty
          \global\pgfkeyslet{#1/italic*}\@empty
          \global\pgfkeyslet{#1/color*}\@empty
+         \global\pgfkeyslet{#1/on*}\@empty
          \expandafter\bookmarksetup\expandafter{\itf@tp}%
          \pgfkeysifdefined{/itf/bookmark/*}%
             {% \bookmarksetup{color*=} overwrites \sectionformat...{bookmark/color*=}
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-tocloft.sty
index cd69680eb70..c7e37386583 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-tocloft}
-   [2010/11/26 v2.4 pgfkeys macros for tocloft (FC)]
+   [2010/12/07 v2.5 pgfkeys macros for tocloft (FC)]
 \RequirePackage{interfaces-base}
 \itf@Check@Package{tocloft}
 \itf@pgfkeys
@@ -61,13 +61,20 @@
    \AfterPreamble{\itf@pgfkeys\pgfqkeys{/itf/tocloft/#1}{#2}}%
 }% \listofsetup
 
-\def\itf@cft@newlistof#1{%
+\def\itf@cft@newlistof#1#2#3{% #1=toc/lof (ext.), #2=entry (\newlistof only), #3=title (\newlistof only)
    \pgfqkeys{/itf/tocloft/#1}{%
+      depth/.store in counter cs=c@#1depth,%
+      depth/.append code=\expandafter\global\csname c@#1depth\endcsname
+                                            \csname c@#1depth\endcsname
+               \addtocontents{#1}{\csname c@#1depth\endcsname
+                              \the\csname c@#1depth\endcsname\relax},%
+         #1depth/.alias*=depth,%
       pagestyle/.code=\tocloftpagestyle{##1},%
       parskip/.store in skip cs=cftparskip,%
          parsep/.alias=parskip,%
       mark/.store in cs=cftmark#1,%
          marks/.alias=mark,%
+         mark=,%
       label/.store as code,%
       ref/.store as code,%
          ref/.initial=\csname cft#1title\endcsname,% overwritten (toc,lof,lot)
@@ -80,6 +87,11 @@
          aftertitleskip/.alias*=title/bottom,%
       title/font/.store as code in cs=cft#1titlefont,%
          title/format/.alias*=title/font,%
+      title/color/.store as color,%
+         title/color/.append code=\pgfkeysalso{/itf/tocloft/#1/title/font+={%
+            \color{\pgfkeysvalueof{/itf/tocloft/#1/title/color}}}},%
+         title/font/color/.alias=title/color,%
+         title/format/color/.alias=title/color,%
       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
@@ -126,12 +138,12 @@
          multicols/.alias=columns,%
       twocolumns/.true=\pgfkeysalso{columns=2},%
       twocolumns/.false=\pgfkeysalso{columns=1},%
-      columns/rule/.store as dimen,%
+      columns/rule/.estore as dimen,%
       columns/rule/.default=\columnseprule,%
       columns/rule,% assign default
          columnseprule/.alias*=columns/rule,%
          columns/rule/width/.alias*=columns/rule,%
-      columns/sep/.store as dimen,%
+      columns/sep/.estore as dimen,%
       columns/sep/.default=\columnsep,%
       columns/sep/.blank=10\p@,%
       columns/sep,% assign default
@@ -140,7 +152,7 @@
       columns/rule/color,% assign default (\normalcolor)
          columnseprulecolor/.alias*=columns/rule/color,%
          columns/rulecolor/.alias*=columns/rule/color,%
-      multicolsep/.store as glue,%
+      multicolsep/.estore as glue,%
          multicolsep/.default=0pt plus4pt minus3pt,%
          multicolsep,% sets default
       multicols/begin/.initial=,multicols/begin/.default=,%
@@ -156,7 +168,7 @@
       bookmark/italic/.true=\pgfkeysaddvalue{/itf/tocloft/#1/bookmark}{}{,italic=true},%
       bookmark/italic/.false=\pgfkeysaddvalue{/itf/tocloft/#1/bookmark}{}{,italic=false},%
       bookmark/color/.code=\pgfkeysaddvalue{/itf/tocloft/#1/bookmark}{}{,color={##1}},%
-      bookmark/level/.code=\pgfkeysEaddvalue{/itf/tocloft/#1/bookmark}{}{level={%
+      bookmark/level/.code=\pgfkeysEaddvalue{/itf/tocloft/#1/bookmark}{}{,level={%
                      \ifcsname toclevel@##1\endcsname
                         \csname toclevel@##1\endcsname
                      \else##1\fi}},%
@@ -169,7 +181,7 @@
    }% AfterPackage interfaces-bookmark
    %% while making a format \jobname is expanded to the name of the format...
    %% Therefore, the following commands must be expanded \AtEndPreamble
-   \AtEndPreamble{%
+   \AfterPreamble{%
       \BeforeFile{\jobname.#1}{%
          \pgfkeysvalueof{/itf/tocloft/#1/before}%
          \pgfkeysvalueof{/itf/tocloft/#1/columns/before@hook}%
@@ -181,31 +193,29 @@
    }%
    \ifcsname #1setup\endcsname\else
       \pgfqkeys{/itf/tocloft/#1}{%
-         pagenumbers/.true=\@cftpnumon{#1},%
-         pagenumbers/.false=\@cftpnumoff{#1},%
-           pagenumber/.alias=pagenumbers
+         title={#3},%
+         pagenumbers/.true=\@cftpnumon{#2},%
+         pagenumbers/.false=\@cftpnumoff{#2},%
+            pagenumbers/on/.alias=pagenumbers/true,
+            pagenumbers/off/.alias=pagenumbers/false,
+            pagenumber/.alias=pagenumbers,%
       }%
       \expandafter\pretocmd\csname @cftmake#1title\expandafter\endcsname
-         \expandafter{\expandafter\itf@tocloft\csname cft#1title\endcsname{#1}{listof#1}}
-      {\PackageInfo{interfaces-tocloft}
-         {Command \expandafter\string\csname @cftmake#1title\endcsname
+         \expandafter{\expandafter\itf@tocloft\csname cft#1title\endcsname{#1}{listof#2}}
+      {\@PackageInfoNoLine{interfaces-tocloft}
+         {Command \expandafter\string\csname @cftmake#1title\endcsname\space
             successfully augmented}}
-      {\PackageWarning{interfaces-tocloft}
-         {Command \expandafter\string\csname @cftmake#1title\endcsname
+      {\@PackageWarningNoLine{interfaces-tocloft}
+         {Command \expandafter\string\csname @cftmake#1title\endcsname\space
             \space could not be patched
          \MessageBreak Keys label and bookmark won't work for \string\listofsetup}}%
    \fi
 }% \itf@cft@newlistof
-\itf@cft@newlistof{toc}
-\itf@cft@newlistof{lof}
-\itf@cft@newlistof{lot}
+\itf@cft@newlistof{toc}{}{}
+\itf@cft@newlistof{lof}{}{}
+\itf@cft@newlistof{lot}{}{}
 %% Specific to toc only -------------------------------------------------------
 \pgfqkeys{/itf/tocloft/toc}{%
-   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,%
    ref/.initial=\contentsname,%
@@ -233,14 +243,8 @@
 \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}{%
@@ -255,108 +259,146 @@
    \expandafter\itf@cft@sec@name\csname#1\endcsname{#1}%
 }% \itf@cft@secname
 \def\itf@cft@sec@name#1#2{%
-   \ifx#1\chapter chap\else
-      \ifx#1\section sec\else
-         \ifx#1\subsection subsec\else
-            \ifx#1\subsubsection subsubsec\else
-               \ifx#1\paragraph para\else
-                  \ifx#1\subparagraph subpara\else
-                     \ifx#1\figure fig\else
-                        \ifx#1\subsubfigure subfig\else
-                           \ifx#1\table tab\else
-                              \ifx#1\subtable subtab\else
-                               #2\fi
-   \fi\fi\fi\fi\fi\fi\fi\fi\fi
+   \ifx#1\relax #2\else
+   \ifx#1\section sec\else
+      \ifx#1\subsection subsec\else
+         \ifx#1\subsubsection subsubsec\else
+            \ifx#1\paragraph para\else
+               \ifx#1\subparagraph subpara\else
+                  \ifx#1\figure fig\else
+                     \ifx#1\subsubfigure subfig\else
+                        \ifx#1\table tab\else
+                           \ifx#1\subtable subtab\else
+                              \ifx#1\chapter chap\else
+                                  #2\fi
+   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
 }% \itf@cft@section@name
 %% tocloft setup for tables sections :
 \pgfkeys{%
-/handlers/.cft@def/.style={\pgfkeyscurrentpath/.store in cs=\itf@cft@name #1\@nil},%
-/handlers/.cft@code/.style={\pgfkeyscurrentpath/.store as code in cs=\itf@cft@name #1\@nil},%
-/handlers/.cft@length/.style={\pgfkeyscurrentpath/.store in skip cs=\itf@cft@name #1\@nil},%
+/handlers/.cft@def/.style={%
+   \pgfkeyscurrentpath/.store in cs=\itf@cft@name #1\@nil},%
+/handlers/.cft@code/.style={%
+   \pgfkeyscurrentpath/.store as code in cs=\itf@cft@name #1\@nil},%
+/handlers/.cft@length/.style={%
+   \pgfkeyscurrentpath/.store in skip cs=\itf@cft@name #1\@nil},%
 }
 \def\itf@cft@newsection{\itf@cft@new@section{/itf/tocloft}}
-\def\itf@cft@new@section#1#2#3{% #2=part / chap / sec / subsec etc., #3 = toc | lof | lot
-   \pgfqkeys{#1/#3/#2}{%
-      skip/.cft@length=before.#2.skip,%
+\def\itf@cft@new@section#1#2#3{% #2 = toc | lof | lot, #3=part / chap / sec / subsec etc.
+   \pgfqkeys{#1/#2/#3}{%
+      skip/.cft@length=before.#3.skip,%
          beforeskip/.alias*=skip,%
          top/.alias*=skip,%
-      indent/.cft@length=.#2.indent,%
-      font/.cft@code=.#2.font,%
-      font/.append code={\pgfkeysalso{/itf/tocloft/#3/#2/pagenumber/font={##1}}},%
+      indent/.cft@length=.#3.indent,%
+      font/.cft@code=.#3.font,%
+      font/.append code=\pgfkeysalso{/itf/tocloft/#2/#3/pagenumber/font={##1}},%
          format/.alias*=font,%
-      number/width/.cft@length=.#2.numwidth,%
+      color/.store as color,%
+         color/.append code=\pgfkeysalso{/itf/tocloft/#2/#3/font+={%
+            \color{\pgfkeysvalueof{/itf/tocloft/#2/#3/color}}%
+            \ifdefined\hypersetup \hypersetup{%
+               linkcolor=\pgfkeysvalueof{/itf/tocloft/#2/#3/color}}%
+            \fi}},%
+         font/color/.alias=color,%
+         format/color/.alias=color,%
+      number/width/.cft@length=.#3.numwidth,%
          numwidth/.alias*=number/width,%
-      presnum/.cft@code=.#2.presnum,%
+      presnum/.cft@code=.#3.presnum,%
          number/before/.alias*=presnum,%
-      aftersnum/.cft@code=.#2.aftersnum,%
+      aftersnum/.cft@code=.#3.aftersnum,%
          number/after/.alias*=aftersnum,%
-      aftersnumb/.cft@code=.#2.aftersnumb,%
+      aftersnumb/.cft@code=.#3.aftersnumb,%
          title/before/.alias*=aftersnumb,%
-      leader/.cft@def=.#2.leader,%
-         leader/.default=\cftdotfill{\csname\itf@cft@name.#2.dotsep\@nil\endcsname},%
+      leader/.cft@def=.#3.leader,%
+         leader/.default=\cftdotfill{\csname\itf@cft@name.#3.dotsep\@nil\endcsname},%
          leaders/.alias=leader,%
       dotsep/.code={\ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text
-         \csdef{\itf@cft@name.#2.dotsep\@nil}{\cftdotsep}%
+         \csdef{\itf@cft@name.#3.dotsep\@nil}{\cftdotsep}%
          \else
             \itf@units@mu\itf@musk{##1}%
-            \csedef{\itf@cft@name.#2.dotsep\@nil}{\itf@strip@mu\itf@musk}%
+            \csedef{\itf@cft@name.#3.dotsep\@nil}{\itf@strip@mu\itf@musk}%
          \fi},%
          dotsep/.blank=\cftnodots,%
-      nodots/.code=\csdef{\itf@cft@name.#2.dotsep\@nil}{\cftnodots},%
+      nodots/.code=\csdef{\itf@cft@name.#3.dotsep\@nil}{\cftnodots},%
          nodots/.value forbidden,%
-      pagefont/.cft@code=.#2.pagefont,%
+      pagefont/.cft@code=.#3.pagefont,%
          page/font/.alias*=pagefont,%
          pagenumber/font/.alias*=pagefont,%
-      afterpnum/.cft@code=.#2.afterpnum,%
+         pagenumbers/font/.alias*=pagefont,%
+      page/color/.store as color,%
+         page/color/.append code=\pgfkeysalso{/itf/tocloft/#2/#3/pagefont+={%
+            \color{\pgfkeysvalueof{/itf/tocloft/#2/#3/page/color}}%
+            \ifdefined\hypersetup \hypersetup{%
+               linkcolor=\pgfkeysvalueof{/itf/tocloft/#2/#3/page/color}}%
+            \fi}},%
+         pagenumber/color/.alias=page/color,%
+         pagenumbers/color/.alias=page/color,%
+         page/font/color/.alias=page/color,%
+         pagenumber/font/color/.alias=page/color,%
+         pagenumbers/font/color/.alias=page/color,%
+      afterpnum/.cft@code=.#3.afterpnum,%
          page/after/.alias*=afterpnum,%
          pagenumber/after/.alias*=afterpnum,%
-      pagenumbers/.on=\@cftpnumon{\itf@cft@secname{#2}},%
-      pagenumbers/.off=\@cftpnumoff{\itf@cft@secname{#2}},%
+      pagenumbers/.on=\@cftpnumon{\itf@cft@secname{#3}},%
+      pagenumbers/.off=\@cftpnumoff{\itf@cft@secname{#3}},%
          pagenumber/.alias=pagenumbers,%
    }% \pgfqkeys
 }% \itf@cft@new@section
 \@for\itf@tp:=part,chap,chapter,sec,section,subsec,subsection,%
               subsubsec,subsubsection,para,paragraph,subpara,subparagraph%
-   \do{\expandafter\itf@cft@newsection\expandafter{\itf@tp}{toc}}%
+   \do{\edef\itf@tp{\noexpand\itf@cft@newsection{toc}{\itf@tp}}\itf@tp}%
 \if@cftsubfigopt
    \@for\itf@tp:=fig,figure,subfig,subfigure%
-      \do{\expandafter\itf@cft@newsection\expandafter{\itf@tp}{lof}}%
+      \do{\edef\itf@tp{\noexpand\itf@cft@newsection{lof}{\itf@tp}}\itf@tp}%
    \@for\itf@tp:=tab,table,subtab,subtable%
-      \do{\expandafter\itf@cft@newsection\expandafter{\itf@tp}{lot}}%
+      \do{\edef\itf@tp{\noexpand\itf@cft@newsection{lot}{\itf@tp}}\itf@tp}%
 \else
    \@for\itf@tp:=fig,figure%
-      \do{\expandafter\itf@cft@newsection\expandafter{\itf@tp}{lof}}%
+      \do{\edef\itf@tp{\noexpand\itf@cft@newsection{lof}{\itf@tp}}\itf@tp}%
    \@for\itf@tp:=tab,table%
-      \do{\expandafter\itf@cft@newsection\expandafter{\itf@tp}{lot}}%
+      \do{\edef\itf@tp{\noexpand\itf@cft@newsection{lot}{\itf@tp}}\itf@tp}%
 \fi
 \itf@patch\pretocmd\@cftmaketoctitle
    {\itf@tocloft\contentsname{toc}{tableofcontents}}
-   {\PackageInfo{interfaces-tocloft}
+   {\@PackageInfoNoLine{interfaces-tocloft}
       {Command \string\@cftmaketoctitle\space successfully augmented}}
-   {\PackageWarning{interfaces-tocloft}
+   {\@PackageWarningNoLine{interfaces-tocloft}
       {Command \string\@cftmaketoctitle\space could not be patched
       \MessageBreak label and bookmark keys for \string\tocsetup\space won't work}}%
 \itf@patch\pretocmd\@cftmakeloftitle
    {\itf@tocloft\listfigurename{lof}{listoffigures}}
-   {\PackageInfo{interfaces-tocloft}
+   {\@PackageInfoNoLine{interfaces-tocloft}
       {Command \string\@cftmakeloftitle\space successfully augmented}}
-   {\PackageWarning{interfaces-tocloft}
+   {\@PackageWarningNoLine{interfaces-tocloft}
       {Command \string\@cftmakeloftitle\space could not be patched
       \MessageBreak label and bookmark keys for \string\lofsetup\space won't work}}%
 \itf@patch\pretocmd\@cftmakelottitle
    {\itf@tocloft\listtablename{lot}{listoftables}}
-   {\PackageInfo{interfaces-tocloft}
+   {\@PackageInfoNoLine{interfaces-tocloft}
       {Command \string\@cftmakelottitle\space successfully augmented}}
-   {\PackageWarning{interfaces-tocloft}
+   {\@PackageWarningNoLine{interfaces-tocloft}
       {Command \string\@cftmakelottitle\space could not be patched
       \MessageBreak label and bookmark keys for \string\lotsetup\space won't work}}%
-\itf@patch\apptocmd\newlistentry
-   {\itf@cft@newlistof{#2}}
-   {\PackageInfo{interfaces-tocloft}
+\expandafter\itf@patch\expandafter\patchcmd\csname\string\newlistof\endcsname
+   {#4}{\csname cft#3title\endcsname}
+   {\@PackageInfoNoLine{interfaces-tocloft}
+      {Command \string\newlistof\space successfully patched}}
+   {\@PackageWarningNoLine{interfaces-tocloft}
+      {Command \string\newlistof\space could not be patched
+      \MessageBreak \string\listofsetup\space will not work}}%
+\expandafter\itf@patch\expandafter\apptocmd\csname\string\newlistof\endcsname
+   {\itf@cft@newlistof{#3}{#2}{#4}}
+   {\@PackageInfoNoLine{interfaces-tocloft}
+      {Command \string\newlistof\space successfully augmented}}
+   {\@PackageWarningNoLine{interfaces-tocloft}
+      {Command \string\newlistof\space could not be patched
+      \MessageBreak \string\listofsetup\space will not work}}%
+\expandafter\itf@patch\expandafter\apptocmd\csname\string\newlistentry\endcsname
+   {\itf@cft@newsection{#3}{#2}}
+   {\@PackageInfoNoLine{interfaces-tocloft}
       {Command \string\newlistentry\space successfully augmented}}
-   {\PackageWarning{interfaces-tocloft}
+   {\@PackageWarningNoLine{interfaces-tocloft}
       {Command \string\newlistentry\space could not be patched
-      \MessageBreak \string\listofsetup\space will not work}}%
+      \MessageBreak \string\listofsetup\space will not work}}
 \def\itf@tocloft#1#2#3{%
    \expandafter\def\expandafter#1\expandafter{%
       \expandafter\itf@cft@label
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-truncate.sty
index 7822dbdf80a..500e00aec70 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces-umrand.sty
index 7a38f525aa4..eab38389a7e 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -44,7 +44,7 @@
 %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% 
 \ProvidesPackage{interfaces-umrand}
-   [2010/07/23 v1.0 patch for umrand.sty ifnotempty (FC)]
+   [2010/12/07 v2.5 patch for umrand.sty ifnotempty (FC)]
 \RequirePackage{interfaces-base}
 \BeforePackage{umrand}{%
    \let\itf@newif\newif
diff --git a/Master/texmf-dist/tex/latex/interfaces/interfaces.sty b/Master/texmf-dist/tex/latex/interfaces/interfaces.sty
index 0b2b2a12a09..94ff27a9a10 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/11/26 v2.4 - interfaces : interfaces with keys for other packages (FC)
+%% interfaces : 2010/12/07 v2.5 - interfaces : interfaces with keys for other packages (FC)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{interfaces}
-   [2010/11/26 v2.4 - pgfkeys (pgf 2.0 et 2.1 macros for interfaces (FC)]
+   [2010/12/07 v2.5 - pgfkeys (pgf 2.0 et 2.1 macros for interfaces (FC)]
 \RequirePackage{interfaces-base}
 \DeclareOption{LaTeX}{\AtEndOfPackage{\LoadInterface{LaTeX}}}
 \DeclareOption{marks}{\AtEndOfPackage{\LoadInterface{marks}}}