1 files changed, 44 insertions, 17 deletions
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*=}