titlesec 2.7 (11aug07)

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

16 files changed, 438 insertions, 359 deletions

diff --git a/Master/texmf-dist/doc/latex/titlesec/README b/Master/texmf-dist/doc/latex/titlesec/README
index 117ac5fe87c..4a2a7e84717 100644
--- a/Master/texmf-dist/doc/latex/titlesec/README
+++ b/Master/texmf-dist/doc/latex/titlesec/README
@@ -1,52 +1,53 @@
-Titlesec package

-~~~~~~~~~~~~~~~~

-This package allows to change the sectioning titles.  Amongst its many 

-features it provides margin titles, different format in left and right 

-pages, rules above and below the title, etc.

-

-Titletoc package

-~~~~~~~~~~~~~~~~

-For toc entries formatting, providing the possibility of changing

-the format in the middle of a document, grouping the entries

-in a single paragraph, pretty free-forms entries, partial tocs, etc.

- 

-The titletoc.sty file is not part of the titlesec package; it's

-an independent package, but it's described in titlesec.tex.

-

-Installation

-~~~~~~~~~~~~

-No .ins/.dtx preinstalation is required.  Move the files to a place 

-where LaTeX can find them and typeset titlesec.tex.  All of files in 

-this directory are necessary for titlesec.sty to work, except the 

-manual titlesec.tex (and this 'readme' file). The manual requires

-titlesec.sty and titletoc.sty, and hence all the .tss, .def 

-and .new files as well.

-

-Files with extension .new (titlesec.new and titletoc.new) 

-are patch files, ie, files with bug fixes, which are loaded 

-automatically.

-

-Web site, manual in PDF format and info

-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-More details are available on

-

-   http://texytipografia.com/titlesec.html

-

-Known problems

-~~~~~~~~~~

-Some language styles (for babel) add the indentation

-after a section in a so radical way that titlesec (which uses

-the internal LaTeX macros) cannot supress it again.

-For example, spanish (by myself) and frenchb.

-

-Changes

-~~~~~~~~

-2005/05/19. Patch for titletoc (titletoc.new, level 1) to

-fix a bug when partial tocs are used with \include'd

-files (a partial toc could appear in the wrong context).

-

-2005/05/19

-

-______________________________________________________________

-Javier Bezos                 |    http://texytipografia.com

-..............................................................
\ No newline at end of file
+Titlesec package
+~~~~~~~~~~~~~~~~
+This package allows to change the sectioning titles.  Amongst its many 
+features it provides margin titles, different format in left and right 
+pages, rules above and below the title, etc.
+
+Current version is 2.8.
+
+Titletoc package
+~~~~~~~~~~~~~~~~
+For toc entries formatting, providing the possibility of changing
+the format in the middle of a document, grouping the entries
+in a single paragraph, pretty free-forms entries, partial tocs, etc.
+ 
+The titletoc.sty file is not part of the titlesec package; it's
+an independent package, but it's described in titlesec.tex.
+
+Installation
+~~~~~~~~~~~~
+No .ins/.dtx preinstalation is required.  Move the files to a place 
+where LaTeX can find them and typeset titlesec.tex.  All of files in 
+this directory are necessary for titlesec.sty to work, except the 
+manual titlesec.tex (and this 'readme' file). The manual requires
+titlesec.sty and titletoc.sty, and hence all the .tss and .def 
+files as well.
+
+Files with extension .new (titlesec.new and titletoc.new) 
+used to be patch files, ie, files with bug fixes, which were
+loaded automatically. Since titlesec 2.7 (titletoc 1.6), these
+files do not exist any more and should be removed (however,
+they will be ignored if present).
+
+Web site, manual in PDF format and info
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+More details are available on
+
+   http://www.texytipografia.com/titlesec.html
+
+Contact
+~~~~~~~
+Please, for suggestions, bug reports, etc., go to
+
+   http://www.texytipografia.com/contact.html
+
+Known problems
+~~~~~~~~~~
+Some language styles (for babel) add the indentation
+after a section in a so radical way that titlesec (which
+uses the internal LaTeX macros) cannot supress it again.
+For example, spanish (fixed in version 5.0) and frenchb.
+
+2007/08/12
+
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.new b/Master/texmf-dist/doc/latex/titlesec/titlesec.new
deleted file mode 100644
index 3e6180f6524..00000000000
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.new
+++ /dev/null
@@ -1,16 +0,0 @@
-% titlesec 2.6, patch
-% (c) Javier Bezos 2005, as stated in titlesec.sty
-% 
-% Level 0
-%
-%\def\ttl@a{2005/01/22 v2.6 Sectioning titles}
-%\expandafter\ifx\csname ver@titlesec.sty\endcsname\ttl@a
-%  \message{*** titlesec 2.6, loading patch level 1 ***}
-%\else
-%  \PackageError{titlesec}{Wrong patch version}
-%    {This patch is intended for titlesec v2.6\MessageBreak
-%     and you are using a different version. If you have 
-%     installed a later release, please remove titlesec.new}
-%\fi
-
-\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
index 1b7de55f85d..305b8f27081 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
+++ b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
index 4f73ae70182..1817af2bb50 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
+++ b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
@@ -2,19 +2,26 @@
 % | Typeset this file to get the documentation.      |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\def\fileversion{2.6}
-\def\docdate{January 22, 2005}
+\def\fileversion{2.8}
+\def\docdate{2007-08-12}
 
 \documentclass[a4paper]{ltxguide}
 \usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
@@ -36,18 +43,17 @@
 
 \title{The \textsf{titlesec} and \textsf{titletoc} 
 Packages\footnote{The \textsf{titlesec} package is currently at 
-version 2.6.  \copyright{} 1998--2005 Javier Bezos.
+version 2.8.  \copyright{} 1998--2007 Javier Bezos.
 The \textsf{titletoc} package is currently at 
-version 1.5.  \copyright{} 1999--2005 Javier Bezos.  All Rights 
+version 1.6.  \copyright{} 1999--2007 Javier Bezos.  All Rights 
 Reserved.}}
 
 \author{Javier Bezos\footnote{For bug reports, comments and
-suggestions go to \href{http://www.texytipografia.com/contact.php}%
-{http://www.texytipografia.com/contact.php},
-or to my postal address: Apartado 116.035, E-28080 Madrid, Spain.
-English is not my strong point, so contact me when you find mistakes
-in the manual.  Other packages by the same author: \textsf{gloss}
-(with Jos\'e Luis D\'{\i}az), \textsf{accents, tensind, esindex,
+suggestions go to \href{http://www.texytipografia.com/contact.html}%
+{http://www.texytipografia.com/contact.html}.  English
+is not my strong point, so contact me when you find mistakes in the
+manual.  Other packages by the same author: \textsf{gloss} (with
+Jos\'e Luis D\'{\i}az), \textsf{enumitem, accents, tensind, esindex,
 dotlessi}.}}
 
 \date{\docdate}
@@ -218,21 +224,21 @@ command, as for example:
 \section{Advanced Interface}
 %~~~~~~~~~~~~~~~~~~~~~~~~
 
-Two commands are provided to change the title format.  The first one 
-is used for the ``internal'' format, i.~e., shape, font, label\dots, 
-the second one defines the ``external'' format, i.~e., spacing before 
-and after, indentation, etc. This scheme is intended to easy 
-definitions, since in most of cases you will want to modify either 
-spacing or format.\footnote{Information is ``extracted'' from the 
-class sectioning commands, except for chapter and part.  Standard 
-definitions with |\cs{@startsection}| are presumed, and if an 
-special procedure was followed an arbitrary value is provided, which 
-you may change later.  (Sadly, there is no way to catch the chapter or 
-part formats, and one similar to that of standard classes will be 
-used.)} That redefines existing sectioning commands, but
-does not create \emph{new} ones. New sectioning levels can be
-added with |\titleclass|, as described below, and then their format
-can be set with the commands described here.
+Two commands are provided to change the title format.  The first one
+is used for the ``internal'' format, i.~e., shape, font, label\dots,
+the second one defines the ``external'' format, i.~e., spacing before
+and after, indentation, etc.  This scheme is intended to easy
+definitions, since in most of cases you will want to modify either
+spacing or format.\footnote{Information is ``extracted'' from the
+class sectioning commands, except for chapter and part.  Standard
+definitions with |\cs{@startsection}| are presumed---if sections have
+been defined without that macro, arbitrary values for the format an
+the spacing are provided, which you may change later.  (Sadly, there
+is no way to catch the chapter or part formats, and one similar to
+that of standard classes will be used.)} That redefines existing
+sectioning commands, but does not create \emph{new} ones.  New
+sectioning levels can be added with |\titleclass|, as described below,
+and then their format can be set with the commands described here.
 
 \subsection{Format}
 
@@ -263,7 +269,7 @@ sometimes the title may stick out.} In this case you may increase the
 stretchability of the page elements, use |\raggedbottom| or use the 
 package option |nobottomtitles| described below.  Since the mechanism 
 used is independent from that of the margin pars, they can overlap.  
-A synonymous is |margin|.
+A deprecated synonymous is |margin|.
 
 \item[rightmargin] is like |leftmargin| but at the right margin.
 
@@ -296,15 +302,15 @@ or |\subparagraph|.
 \item The paragraph shape is set by |<shape>|, whose possible
 values are those described above.
 
-\item |<format>| is the format to be applied to the whole 
-title---label and text. This part can contain vertical material (but 
-not always horizontal) which is typeset just after the space above the 
-title.
+\item |<format>| is the format to be applied to the whole
+title---label and text.  This part can contain vertical material (and
+horizontal with some shapes) which is typeset just after the space
+above the title.
 
-\item The label is defined in |<label>|.  You may omit it if
-there is no section label at that level, but note that by removing
-it the number is not suppressed in the table of contents and
-running heads.
+\item The label is defined in |<label>|.  You may left it empty it if
+there is no section label at that level, but note that by doing so 
+the number is not suppressed in the table of contents and running
+heads.
  
 \item |<sep>| is the horizontal separation between label and title 
 body and must be a length (it cannot be left empty). This space is 
@@ -318,10 +324,13 @@ command can take an argument, which is the title
 text.\footnote{Remember that font size can be changed safely between 
 paragraphs only, and that changes in the text should be made local with 
 a group; otherwise the leading can be wrong---too large or too small.}
+However, with the package option \texttt{explicit} the title must
+be given explicitly with |#1| (see below).
 
 \item |<after>| is code following the title body. The typeset
 material is in vertical mode with |hang|, |block| and |display|;
-in horizontal mode with |runin|. Otherwise is ignored.
+in horizontal mode with |runin| and |leftmargin| (\fbox{2.7} with the latter,
+at the beginning of the paragraph). Otherwise is ignored.
 \end{itemize}
 
 \begin{desc}
@@ -584,6 +593,20 @@ be taken into account:
 \titleline*[c]{\titlerule[.8pc]}
 \end{verbatim}
 
+\subsection{Page styles}
+
+\fbox{2.8} You can assign a page style to levels of class |top| and
+|page|, as well as the default chapter with the following command:%
+\footnote{Named in the short-lived version 2.7 as 
+\texttt{\string\titlepagestyle}.}
+\begin{desc}
+|\assignpagestyle{<command>}{<pagestyle>}|
+\end{desc}
+For example, to suppress the page number in chapters write:
+\begin{verbatim}
+\assignpagestyle{\chapter}{empty}
+\end{verbatim}
+
 \subsection{Breaks}
 
 \begin{desc}
@@ -621,10 +644,10 @@ changed to \verb|top| (in this example, parts will continue with the
 \end{desc}
 
 \fbox{2.6} If defined, the usual white space written to lists (ie,
-List of Figures and List od Tables) is replaced by the code in this
+List of Figures and List of Tables) is replaced by the code in this
 command.  If you don't want the white space when a chapter begins,
 define it to empty.  This command is not a general tool to control
-spacing in lists, and it's available only in titles of top class, so
+spacing in lists, and is available only in titles of top class, so
 it will not work with the default chapters except if you change their
 class (on the other hand, |\...tolists| can be used in any title whose
 class is top).
@@ -632,6 +655,19 @@ class is top).
 \subsection{Other Package Options}
 
 \begin{desc}
+|explicit| \quad (Package option)
+\end{desc}
+
+\fbox{2.7} With it, the title is not implicit after |<before>| but
+must be given explicitly with |#1| as in, for example:
+\begin{verbatim} 
+\titleformat{\section}
+ {..}
+ {\thesection}{..}{#1.}
+\end{verbatim}
+(Compare it with the example in section \ref{sec:dotafter}.) 
+
+\begin{desc}
 |newparttoc oldparttoc| \quad (Package options)
 \end{desc}
 
@@ -661,7 +697,7 @@ TOC entries, which will be based on the full title.
 
 \fbox{2.6} Replaces every occurrence of \verb|\\| or \verb|\\*| in
 titles by a space in running heads and TOC entries.  This way, you
-have not to repeat the title just to remove a formatting command.
+don't have to repeat the title just to remove a formatting command.
 
 
 
@@ -739,21 +775,21 @@ must remove the |.aux| file.
 
 \subsection{Creating new levels and changing the class}
 
-While the shapes and the like modify the behaviour of titles related 
-to the surrounding text, title classes allow to change the generic 
-behaviour of them.  With the help of classes you may insert, say, a 
-new |subchapter| level between |chapter| and |section|, or creating a 
-scheme of your own.  \emph{Making a consistent scheme and defining all 
-of related stuff like counters, macros, format and spacing is left to 
-the responsibility of the user.} There are three classes: |page| is 
-like the book |\part|, in a single page, |top| is like |\chapter|, 
-which begins a page and places the title at the top, and |straight| is 
-intended for titles in the middle of text.\footnote{There is an 
-further class named |part| to emulate the article |\cs{part}|, but 
-you should not use it at all.  Use the |straight| class instead.
-Remember that some features rely in these classes and that
-\textsf{titlesec} does not change by default the definition of
-\texttt{\string\part} and \texttt{\string\chapter}.}
+While the shapes and the like modify the behaviour of titles related
+to the surrounding text, title classes allow to change the generic
+behaviour of them.  With the help of classes you may insert, say, a
+new |subchapter| level between |chapter| and |section|, or creating a
+scheme of your own.  \emph{Making a consistent scheme and defining all
+of related stuff like counters, macros, format, spacing and, if there
+is a TOC, TOC format is left to the responsibility of the user.} There
+are three classes: |page| is like the book |\part|, in a single page,
+|top| is like |\chapter|, which begins a page and places the title at
+the top, and |straight| is intended for titles in the middle of
+text.\footnote{There is an further class named |part| to emulate the
+article |\cs{part}|, but you should not use it at all.  Use the
+|straight| class instead.  Remember that some features rely in these
+classes and that \textsf{titlesec} does not change by default the
+definition of \texttt{\string\part} and \texttt{\string\chapter}.}
 
 \begin{desc}
 |\titleclass{<name>}{<class>}|\\
@@ -794,7 +830,7 @@ except if you use the |newparttoc| option.
 |loadonly| \quad (Package option)
 \end{desc}
 
-Now, you want create your sectioning commands from scratch.
+Now, you want to create your sectioning commands from scratch.
 This package option ignores any previous definitions, if any,
 and hence removes the possibility of using the option described
 in ``Quick Reference.'' Then you use the \textsf{titlesec}
@@ -936,6 +972,7 @@ redundant and marking the subsection level as well, you must
 define it accordingly.
 
 \subsection{Putting a Dot after the Section Title}
+\label{sec:dotafter}
 
 Today this styling is not used, but formerly it was fairly common.
 The basic technique was described above, but here is a reminder:
@@ -955,6 +992,8 @@ underlining), you can say:
  {\thesection}{..}{..\periodafter{\ul}} % \ul from soul package
 \end{verbatim}
 
+You might prefer the package option \texttt{explicit}.
+
 \section{Page Styles}
 %~~~~~~~~~~~~~~~~~~~
 
@@ -1022,17 +1061,17 @@ way, the default value.)
 These commands are used by \textsf{titlesec} to typeset the rules.
 If there is no rule, both commands are empty (this value is the 
 default).
-|\setheadrule{d}| just stands for
+|\setheadrule{|\emph{dim}|}| just stands for
 \begin{verbatim}
 \renewcommand{\makeheadrule}{\rule[-.3\baselineskip]{\linewidth}{d}}
 \end{verbatim}
-unless if |d| is 0 pt, which empties
+unless if \emph{dim} is 0 pt, which empties
 |\makeheadrule| (and similarly |\setfootrule|).
 
 You can access the total head/foot width with |\linewidth|
 but the box enclosing the rule is in fact dimensionless. Hence,
 you must be concerned with the rule placement only. Its
-baseline is the same than that of the head/foot. That means that the
+baseline is the same as that of the head/foot. That means that the
 material to be used as rule should be raised or lowered with
 |\raisebox|, the lifting argument in |\rule| or by using sensible
 coordinates in |picture|, for instance. That makes easy to
@@ -1141,7 +1180,7 @@ the very reason these commands are loaded only optionally.}
 \fbox{2.6} The commands below now have a new argument to allow
 extra stuff in running heads/foots. This change is backward
 compatible---just preserve the old name \verb|floatps|, which
-is deprecated.
+is deprecated, if you want the old behaviour.
 
 \begin{desc}
 |\setfloathead*{.}{.}{.}{<extra>}[<which-floats>]|\\
@@ -1149,8 +1188,8 @@ is deprecated.
 (Similarly |\setfloatfoot|.)
 \end{desc}
 
-The arguments with a dot are similar to that of |\sethead|. The final
-argument says that that head is used when there is a float of
+The arguments with a dot are similar to those of |\sethead|. The final
+argument says that head is used when there is a float of
 the specified types (default is |tp| in headers, and |bp| in footers).
 For example:
 \begin{verbatim}
@@ -1173,7 +1212,7 @@ removes the header/footer on float pages, including the rules.
 You may force a header (respectively footer) when a certain
 float is the first top (respectively last bottom) one with
 those commands, where the arguments with a dot are similar to
-that of |\sethead|, just before the corresponding float.
+those of |\sethead|, just before the corresponding float.
 Those commands are used by  themselves, without putting them
 inside |\(re)newpagestyle|.
 
@@ -1230,8 +1269,9 @@ next page. Of course, these commands will not be used very often.
 \end{desc}
 
 Add a macro or a variable to the list of ``marks'' to be saved.
-The macro must lack parameters, and the variable should be in \TeX{}
-form (which is the same in lengths but not in counters).
+The macro must be parameterless, and the variable should be in \TeX{}
+form (which is the same in lengths but not in counters---the latter
+take the form |\c@<counter>|).
 
 \subsection{A couple of examples}
 
@@ -1280,36 +1320,6 @@ package):
 %~~~~~~~~~~~~~~~~~~~~~
 
 \begin{itemize}
-\item A last minute change ---but of course!---
-introduced a bug in version 2.0 which added unwanted
-space before |\titleline|. The manual suggested
-\begin{verbatim}
-\titleline{\hrulefill}%
-\vspace{1pt}%
-\titleline{\hrulefill}%
-\end{verbatim}
-as a way to insert to rules spaced by 1 pt, but in fact the space was 
-a lot larger.  That was fixed in version 2.1 and hence there is a 
-backward incompatibility.  As a solution, I strongly recommend to 
-modify the commands to readjust the spacing, but if for some reason 
-the files have to be preserved in the current state, you can create a 
-style file with the following code:
-\begin{verbatim}
-\def\ttl@line[#1]#2{%
-  \par\hrule height \z@
-  \nobreak
-  \begingroup
-    \parindent\z@
-    \leftskip\z@
-    \rightskip\z@
-    \makebox[\hsize][#1]{\ttl@makeline{#2}}%
-    \par
-  \endgroup
-  \hrule height \z@
-  \nobreak}
-\end{verbatim}
-and then add an |\usepackage| loading it. Don't use
-that in new files.
 
 \item Only a |\footnote| command is allowed in titles, but it
 will work. However, the footnote mark is not removed from
@@ -1318,7 +1328,7 @@ toc entries or running headings; for that use
 \usepackage[stable]{footmisc}
 \end{verbatim}
 
-\item The page styles has been reimplemented in full in version 2.3.  
+\item The page styles have been reimplemented in full in version 2.3.  
 Most of previous definition will work with the current code, even if 
 many things have changed.  In particular, headers using just |\the...| 
 and |\...title| commands, besides |\usepage| and formatting commands 
@@ -1774,7 +1784,7 @@ The commands are:
 
 Here |<list>| is either |lof| or |lot|.  Note as well |\printlist|
 does not have the |<top>| argument, because figures and tables have
-not levels.  Currently (version 2.6), only these two floats are
+not levels.  Currently (version 2.8), only these two floats are
 supported, but in a future release support for more kinds of floats
 will be added.  Unfortunately, many classes write some formatting
 commands to these lists (more precisely, \verb|\addvspace|s in
@@ -2287,13 +2297,10 @@ programs.
 
 \begin{verbatim}
 \usepackage[dvips]{color}
-\usepackage[rigidchapters]{titlesec}
+\usepackage[rigidchapters,explicit]{titlesec}
     
 \DeclareFixedFont{\chapterfont}{T1}{phv}{bx}{n}{11cm}
 
-\newcommand{\chapterformat}[1]{%
-  \put(0,190){\parbox[t]{300pt}{\Huge\sffamily\filright#1}}}
-    
 \titlespacing{\chapter}{0pt}{0pt}{210pt}
 % Most of titles have some depth. The total space is
 % a bit larger than the picture box.
@@ -2307,7 +2314,8 @@ programs.
      \makebox(0,0)[lb]{%
        \Huge\sffamily\underline{Chapter \thechapter}}}}
   {0pt}
-  {\chapterformat}
+  {\put(0,190){\parbox[t]{300pt}{%
+     \Huge\sffamily\filright#1}}}
   [\end{picture}]
 \end{verbatim}
 
diff --git a/Master/texmf-dist/doc/latex/titlesec/titletoc.new b/Master/texmf-dist/doc/latex/titlesec/titletoc.new
deleted file mode 100644
index 682a034d035..00000000000
--- a/Master/texmf-dist/doc/latex/titlesec/titletoc.new
+++ /dev/null
@@ -1,67 +0,0 @@
-% titletoc 1.5, patch
-% (c) Javier Bezos 2005, as stated in titletoc.sty
-% 
-% Level 1
-
-\def\ttl@a{2005/01/22 v1.5 TOC entries}
-\expandafter\ifx\csname ver@titletoc.sty\endcsname\ttl@a
- \message{*** titletoc 1.5, loading patch level 1 ***}
-\else
- \PackageError{titletoc}{Wrong patch version}
-   {This patch is intended for titletoc v1.5\MessageBreak
-    and you are using a different version. If you have 
-    installed a later release, please remove titletoc.new}
-\fi
-
-% 1. 2005/05/03
-% Partial tocs didn't work properly with \include's.
-% If, say, a chapter was removed from the includeonly
-% list, its partial toc was grouped with that of the
-% next included chapter. The fix (found like the bug
-% by F. Mittlebach) is to replace \newcount by
-% \newcounter when using partial list counters, so
-% that they are properly saved in the aux files.
-
-\renewcommand\startlist[2][default]{%
-  \expandafter\ttl@xstartlist\csname ttl@partial#2\endcsname
-  \@ifundefined{c@ttl@#2@#1}%
-    {\newcounter{ttl@#2@#1}}%
-    {\stoplist[#1]{#2}}%  
-  \stepcounter{ttl@#2@#1}%
-  \resumelist[#1]{#2}}
-
-\renewcommand\stoplist[2][default]{%
-  \protected@write\@auxout{}{%
-    \string\ttl@writefile{\csname ttl@partial#2\endcsname}{%
-       \string\ttl@stoptoc{#1@\arabic{ttl@#2@#1}}}}}
-
-\renewcommand\resumelist[2][default]{%
-  \protected@write\@auxout{}{%
-    \string\ttl@writefile{\csname ttl@partial#2\endcsname}{%
-       \string\ttl@starttoc{#1@\arabic{ttl@#2@#1}}}}}
-
-\renewcommand\ttl@printlist[5][default]{%
-  \begingroup
-    \@ifundefined{c@ttl@#2@#1}%
-      {\PackageError{titletoc}{No partial #2 named #1}%
-          {You must start before a partial toc/list\MessageBreak
-          with \string/startcontents/\string\startlist.}}{}%
-    \edef\ttl@ptoc{#1@\arabic{ttl@#2@#1}}%
-    \def\ttl@toctop{#4}%
-    #5%
-    \let\ttl@xcontentsline\contentsline
-    \let\contentsline\ttl@gobblecontents
-    \def\ttl@contentsline##1{%
-      \@ifundefined{ttll@#3##1}%
-        {\expandafter\let\csname ttll@#3##1\expandafter\endcsname
-           \csname ttll@##1\endcsname}{}%
-      \@ifundefined{l@#3##1}%
-        {\ttl@xcontentsline{##1}}%
-        {\ttl@xcontentsline{#3##1}}}%
-    \makeatletter
-    \@input{\jobname.\csname ttl@partial#2\endcsname}%
-    \makeatother
-    \@nobreakfalse
-  \endgroup}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/titlesec/block.tss b/Master/texmf-dist/tex/latex/titlesec/block.tss
index 93055c573b7..056f31c7465 100644
--- a/Master/texmf-dist/tex/latex/titlesec/block.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/block.tss
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{block.tss}[2005/01/22]
+\ProvidesFile{block.tss}[2007/08/12]
 
 \gdef\ttlh@block#1#2#3#4#5#6#7#8{%
   \gdef\ttl@makeline##1{\ttl@calc\hspace{#6}##1\ttl@calc\hspace{#7}}%
diff --git a/Master/texmf-dist/tex/latex/titlesec/drop.tss b/Master/texmf-dist/tex/latex/titlesec/drop.tss
index 823ef3e15f9..2c8c15f3d00 100644
--- a/Master/texmf-dist/tex/latex/titlesec/drop.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/drop.tss
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{drop.tss}[2005/01/22]
+\ProvidesFile{drop.tss}[2007/08/12]
 
 \gdef\ttlh@drop#1#2#3#4#5#6#7#8{%
   \global\@noskipsectrue
diff --git a/Master/texmf-dist/tex/latex/titlesec/frame.tss b/Master/texmf-dist/tex/latex/titlesec/frame.tss
index 3ef381d89b0..00066c331e4 100644
--- a/Master/texmf-dist/tex/latex/titlesec/frame.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/frame.tss
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{frame.tss}[2005/01/22]
+\ProvidesFile{frame.tss}[2007/08/12]
 
 \gdef\ttlh@frame#1#2#3#4#5#6#7#8{%
   \def\ttl@filleft##1{\hfill}%
diff --git a/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss b/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss
index 7e10ecfc55d..57c80a4a97b 100644
--- a/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{leftmargin.tss}[2005/01/22]
+\ProvidesFile{leftmargin.tss}[2007/08/12]
 
 \gdef\ttlh@leftmargin#1#2#3#4#5#6#7#8{%
   \global\@noskipsectrue
@@ -46,7 +53,8 @@
   \dp\ttl@box=\z@
   \gdef\@svsechd##1##2{%   
     \llap{\box\ttl@box##2}%
-    \if@afterindent\hskip\parindent\fi}}
+    \if@afterindent\hskip\parindent\fi
+    #5}}
 
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/titlesec/margin.tss b/Master/texmf-dist/tex/latex/titlesec/margin.tss
index 3773340c8d3..3b445745096 100644
--- a/Master/texmf-dist/tex/latex/titlesec/margin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/margin.tss
@@ -2,18 +2,26 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
 
-\ProvidesFile{margin.tss}[2005/01/22]
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
+
+\ProvidesFile{margin.tss}[2007/08/12]
 
 \gdef\ttlh@margin#1#2#3#4#5#6#7#8{%
   \global\@noskipsectrue
diff --git a/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss b/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss
index 199015a4243..3b1fe0141ea 100644
--- a/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss
@@ -2,18 +2,26 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{rightmargin.tss}[2005/01/22]
+\ProvidesFile{rightmargin.tss}[2007/08/12]
 
 \gdef\ttlh@rightmargin#1#2#3#4#5#6#7#8{%
   \global\@noskipsectrue
diff --git a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
index b43d0f32fcb..7125c5a9055 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
@@ -2,16 +2,23 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
 % History of v1.0
 % ~~~~~~~~~~~~~~~
@@ -191,7 +198,7 @@
 %          -  Removed extra (but inoffensive) \expandafter
 %             in \ttl@class@iii.
 % 2002/03/27  Added \titlewidthfirst and ...last
-%          -  «Not definable» gives a  more meaningful message in
+%          -  "Not definable" gives a  more meaningful message in
 %             the context of the package.
 %
 % History of v.2.6
@@ -218,6 +225,22 @@
 % 2005/01/21  Changed pageatnewline to make it compatible with
 %             titletoc, with \ttl@changecentercr.
 % 2005/01/22  \...tolist in top class.
+%
+% History of v.2.7
+% ~~~~~~~~~~~~~~~~
+% 2007-03-27  Added the `explicit' option.
+% 2007-03-27  Added \titlepagestyle.
+% 2007-03-29  Fixed wrong number for chapter in log
+% 2007-03-29  Patch file named .270 instead of .new
+% 2007-05-09  Added <after> to leftmargin, so that you can add stuff
+%             at the beginning of the paragraph, eg, the sec number.
+% 2007-07-07  Removed the patch mechanism.
+% 2007-08-07  `explicit' improved.
+%
+% History of v.2.8
+% ~~~~~~~~~~~~~~~~
+% 2007-08-12  \titlepagestyle already used by KOMA-Script. Renamed
+%             to \assignpagestyle.
 %  
 % Notes
 % ~~~~~
@@ -247,7 +270,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titlesec}[2005/01/22 v2.6 Sectioning titles]
+\ProvidesPackage{titlesec}[2007/08/12 v2.8 Sectioning titles]
 
 % Initialization
 % ~~~~~~~~~~~~~~
@@ -365,7 +388,7 @@
   \expandafter\edef\csname ttlss@\ttl@b\endcsname{\ttl@a}%
   \let\ttl@a\ttl@toplevel
   \count@\csname ttll@\ttl@toplevel\endcsname
-  \ttl@class@iv}%  \expandafter
+  \ttl@class@iv}
 
 \def\ttl@class@iv{%
   \@ifundefined{ttlss@\ttl@a}{}%
@@ -463,6 +486,8 @@
 % is not lost inside a box by saving it into \ttl@mk,
 % which in turn is used by the sect and chap commands.
 
+\newif\ifttl@explicit
+
 \def\ttl@gmk#1{\gdef\ttl@mk{#1}}
 
 \def\ttl@select#1#2#3#4{%
@@ -486,7 +511,13 @@
    \def\ttl@b{ttlf@#1}%
    \def\ttl@a##1{\csname ttl@key@##1\endcsname}% Used as elt in try
    \ttl@trylist
-   \ttl@c{#2}{#3}{#4}% ttl@c is returned by ttl@try with ttlf@...
+   \ifttl@explicit
+     \def\ttl@passexplicit{#4}% 
+     \ttl@c{#4}{#2}{#3}{}% ttl@c is returned by ttl@try with ttlf@...
+   \else     
+     \let\ttl@passexplicit\@empty 
+     \ttl@c{#2}{#3}{#4}% ttl@c is returned by ttl@try with ttlf@...
+   \fi
   \endgroup}
 
 \let\ttl@savewrite\@empty
@@ -536,6 +567,7 @@
         \ttl@labelfalse     % Third: if too deep
       \else
         \ttl@Hy@refstepcounter{#1}%
+        \@nameuse{ttl@#1out}%
       \fi
     \fi
   \fi
@@ -551,9 +583,13 @@
 
 % Executed by ttl@labelling if the name of section is chapter:
 
-\def\ttl@chapterlabel{%
-  \if@mainmatter\else\ttl@labelfalse\fi
-  \typeout{\chaptertitlename\space\thechapter.}}
+\def\ttl@chapterlabel{\if@mainmatter\else\ttl@labelfalse\fi}
+
+% Executed by ttl@labelling if chapter has a number. Note
+% you can define messages for other sectioning levels (eg,
+% \ttl@sectionout).
+
+\def\ttl@chapterout{\typeout{\chaptertitlename\space\thechapter.}}
 
 % Straight class
 % ~~~~~~~~~~~~~
@@ -593,6 +629,8 @@
     \@ifundefined{#6break}%
       {\addpenalty{\@secpenalty}}%
       {\csname#6break\endcsname}%
+    \@ifundefined{ttl@ps@\string#6}{}%
+      {\PackageWarning{titlesec}{Page style in straight class ignored}}%
     \addvspace{\@tempskipa}%
     \ifdim\bottomtitlespace<\z@
     \else
@@ -649,6 +687,8 @@
 \def\ttl@part@ii#1#2#3#4#5#6#7{%
   \ttl@assign\@tempskipa#3\relax\beforetitleunit
   \vspace*{\@tempskipa}%
+  \@ifundefined{ttl@ps@\string#6}{}%
+    {\PackageWarning{titlesec}{Page style in part class ignored}}%
   \global\@afterindenttrue
   \ifcase#5 \global\@afterindentfalse \fi
   \ttl@assign\@tempskipb#4\relax\aftertitleunit 
@@ -676,7 +716,9 @@
   \else
     \clearpage
   \fi
-  \thispagestyle{plain}%
+  \@ifundefined{ttl@ps@\string#6}%
+    {\thispagestyle{plain}}%
+    {\thispagestyle{\@nameuse{ttl@ps@\string#6}}}%
   \if@twocolumn
     \onecolumn
     \@tempswatrue
@@ -695,7 +737,9 @@
   \if@twoside
     \if@openright
       \null
-      \thispagestyle{empty}%
+      \@ifundefined{ttl@ps@\string#6}%
+        {\thispagestyle{empty}}%
+        {\thispagestyle{\@nameuse{ttl@ps@\string#6}}}%
       \newpage
     \fi
   \fi
@@ -713,6 +757,8 @@
   \gdef\ttl@savemark{\csname#6mark\endcsname{#7}}%
   \let\ttl@savewrite\@empty
   \let\ttl@Hy@saveanchor\@empty
+  \@ifundefined{ttl@ps@\string#6}{}%
+    {\thispagestyle{\@nameuse{ttl@ps@\string#6}}}%
   \let\ifttl@toclabel\ifttl@label
   \ttl@mkchap@i{#1}{#2}{#3}{#4}{#5}{#6}{#7}}
 
@@ -745,7 +791,9 @@
        \clearpage
      \fi}%
     {\csname#6break\endcsname}%
-  \thispagestyle{plain}%
+  \@ifundefined{ttl@ps@\string#6}%
+    {\thispagestyle{plain}}%
+    {\thispagestyle{\@nameuse{ttl@ps@\string#6}}}%
   \global\@topnum\z@
   \@ifundefined{#6tolists}%
     {\addtocontents{lof}{\protect\ttl@tocsep}%
@@ -804,6 +852,8 @@
 % whose content is
 %  \ttl@<shape>{format}{label}{sep}{before}{after}
 
+\newtoks\ttl@toksa
+
 \newcommand\titleformat{%
   \@ifstar{\ttl@format@s}%
           {\ttl@format@i}}
@@ -826,16 +876,17 @@
 
 \def\ttl@format@ii#1[#2]#3#4#5#6{%
   \ttl@getkeys{#1}{titlesec}%
+  \ttl@toksa{{#3}{#4}{#5}{#6}}% Save  arguments
   \@ifnextchar[{%
-    \ttl@format@iii{#2}{#3}{#4}{#5}{#6}%
+    \ttl@format@iii{#2}%
   }{%
-    \ttl@format@iii{#2}{#3}{#4}{#5}{#6}[]}}
+    \ttl@format@iii{#2}[]}}
 
 % First, we get the shape -- if not defined it loads
 % the corresponding file.
 
 
-\def\ttl@format@iii#1#2#3#4#5[#6]{%
+\def\ttl@format@iii#1[#2]{%
   \@ifundefined{ttlh@#1}{%
     \begingroup
     \makeatletter
@@ -845,8 +896,19 @@
           Either you have misspelled the shape\MessageBreak
           or there is no a #1.tss file}}%
     \endgroup}{}%
-  \expandafter\def\csname ttlf@\ttl@a\expandafter\endcsname
-      \expandafter{\csname ttlh@#1\endcsname{#2}{#3}{#4}{#5}{#6}}%
+  \@temptokena{#2}%
+  \ifttl@explicit
+    \edef\ttl@b{%
+      \def\expandafter\noexpand\csname ttlf@\ttl@a\endcsname####1%
+      {\expandafter\noexpand\csname ttlh@#1\endcsname
+       \the\ttl@toksa{\the\@temptokena}}}%
+  \else
+    \edef\ttl@b{%
+      \def\expandafter\noexpand\csname ttlf@\ttl@a\endcsname
+      {\expandafter\noexpand\csname ttlh@#1\endcsname
+       \the\ttl@toksa{\the\@temptokena}}}%
+  \fi
+  \ttl@b
   \csname ttl@compat\ttl@a\endcsname}
 
 % Styles
@@ -857,6 +919,8 @@
 % arguments:
 % {format}{label}{sep}{before}{after}{left}{right}{title}
 % where before and after refer to the format.
+% With the option explicit, #4 contains the title and #8 is
+% empty.
 
 \def\ttlh@display#1#2#3#4#5#6#7#8{%
   \gdef\ttl@makeline##1{\ttl@calc\hspace{#6}##1\ttl@calc\hspace{#7}}%
@@ -1077,6 +1141,8 @@
 
 \DeclareOption{footmarks}{} % Backward compat
 
+\DeclareOption{explicit}{\ttl@explicittrue}
+
 \DeclareOption{clearempty}{%
   \def\cleardoublepage{%
     \clearpage{\ps@empty\if@twoside\ifodd\c@page\else
@@ -1230,6 +1296,10 @@
 %               +-----------------+
 %               |   PAGE STYLES   |
 %               +-----------------+
+%
+% This is generic:
+
+\newcommand\assignpagestyle[2]{\@namedef{ttl@ps@\string#1}{#2}}
 
 % Old pagestyles
 % ~~~~~~~~~~~~~~
@@ -1286,9 +1356,7 @@
      \let\ifttl@toclabel\ifttl@label
      \@dblarg{#1}}}
 
-\@ifundefined{ttl@extract}{}{% Load patches here if we exit
-  \InputIfFileExists{titlesec.new}{}{}%
-  \endinput}
+\@ifundefined{ttl@extract}{}{\endinput}
 
 \newcommand\titlelabel[1]{%
   \def\@seccntformat##1{#1}}
@@ -1329,17 +1397,23 @@
   \ifdim\@tempskipb<\z@
     \if@tempswa
       \titleformat#8[runin]%
-         {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}{\z@}{}%
+         {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+         {\z@}\ttl@passexplicit
     \else
-      \titleformat#8[runin]{#7}{\@seccntformat{#2}}{\z@}{}%
+      \titleformat#8[runin]%
+         {#7}{\@seccntformat{#2}}%
+         {\z@}\ttl@passexplicit
     \fi
     \@tempskipb-\@tempskipb
   \else
     \if@tempswa
       \titleformat#8%
-        {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}{\z@}{}%
+        {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+        {\z@}\ttl@passexplicit 
     \else
-      \titleformat#8{#7}{\@seccntformat{#2}}{\z@}{}%
+      \titleformat#8%
+        {#7}{\@seccntformat{#2}}%
+        {\z@}\ttl@passexplicit
     \fi
     \@ifundefined{ttl@space}{}{%
       \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
@@ -1384,7 +1458,7 @@
   \expandafter\ifx\csname chapter\endcsname\relax\else
    \titleformat\chapter[display]%
     {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
-    {\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@}
+    {\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
   \fi
 
 \fi
@@ -1416,10 +1490,16 @@
   \let\ttl@save@mkschap\@makeschapterhead
 
   \def\@makechapterhead#1{%
-    \gdef\ttl@savemark{\chaptermark{#1}}\ttl@save@mkchap{#1}}
+    \gdef\ttl@savemark{\chaptermark{#1}}%
+    \ttl@save@mkchap{#1}%
+    \@ifundefined{ttl@ps@\string\chapter}{}%
+      {\thispagestyle{\@nameuse{ttl@ps@\string\chapter}}}}
 
   \def\@makeschapterhead#1{%
-    \gdef\ttl@savemark{\chaptermark{#1}}\ttl@save@mkschap{#1}}
+    \gdef\ttl@savemark{\chaptermark{#1}}%
+    \ttl@save@mkschap{#1}%
+    \@ifundefined{ttl@ps@\string\chapter}{}%
+      {\thispagestyle{\@nameuse{ttl@ps@\string\chapter}}}}
 
   \@namedef{ttll@part}{-1}
   \@namedef{ttlss@part}{chapter}
@@ -1446,8 +1526,4 @@
 \titleclass{\paragraph}    {straight}[\subsubsection]
 \titleclass{\subparagraph} {straight}[\paragraph]
 
-% Load patches if necessary
-
-\InputIfFileExists{titlesec.new}{}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
index 8f01805fc50..2bd15c3cfe7 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
@@ -2,16 +2,23 @@
 % | Documentation is in the titlesec.tex file.  |
 % +---------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
 % History of v1.1
 % ~~~~~~~~~~~~~~~
@@ -78,7 +85,13 @@
 %           huge definition and to ease patching.
 % 05/01/22: Work on partial lists finished (but to be resumed).
 
-\ProvidesPackage{titletoc}[2005/01/22 v1.5 TOC entries]
+% History of 1.6
+% ~~~~~~~~~~~~~~
+% 07/05/04: Added the patch 2005/05/03 which fixed a wrong
+%           result with \included (F. Mittelbach)
+% 07/07/14: Removed the patch mechanism.
+
+\ProvidesPackage{titletoc}[2007/08/12 v1.6 TOC entries]
 
 % The following tags are used:
 % ttl@  : the generic one, shared with titlesec
@@ -94,6 +107,7 @@
 
 \newif\ifttl@label
 \newif\ifttl@fromblock
+\newdimen\ttl@leftsep
 
 \providecommand\titleline{%
   \@ifstar{\ttl@line@i{\hb@xt@\titlewidth}}%
@@ -181,6 +195,7 @@
 %   \dimen@\wd\z@
 %   \let\thecontentslabel\ttl@a
 %   \hspace*{-\dimen@}\hb@xt@\dimen@{#1\hfil}
+%  \show\ttl@b \show\ttl@a
     \hspace*{-#2}\hb@xt@#2{#1\hfil}}}
 
 \DeclareOption{rightlabels}{%
@@ -501,10 +516,10 @@
 
 \newcommand\startlist[2][default]{%
   \expandafter\ttl@xstartlist\csname ttl@partial#2\endcsname
-  \@ifundefined{ttl@#2@#1}%
-    {\expandafter\newcount\csname ttl@#2@#1\endcsname}%
+  \@ifundefined{c@ttl@#2@#1}%
+    {\newcounter{ttl@#2@#1}}%
     {\stoplist[#1]{#2}}%  
-  \global\advance\csname ttl@#2@#1\endcsname\@ne
+  \stepcounter{ttl@#2@#1}%
   \resumelist[#1]{#2}}
 
 \newcommand\stopcontents[1][default]{\stoplist[#1]{toc}}
@@ -512,14 +527,14 @@
 \newcommand\stoplist[2][default]{%
   \protected@write\@auxout{}{%
     \string\ttl@writefile{\csname ttl@partial#2\endcsname}{%
-       \string\ttl@stoptoc{#1@\the\csname ttl@#2@#1\endcsname}}}}
+       \string\ttl@stoptoc{#1@\arabic{ttl@#2@#1}}}}}
 
 \newcommand\resumecontents[1][default]{\resumelist[#1]{toc}}
 
 \newcommand\resumelist[2][default]{%
   \protected@write\@auxout{}{%
     \string\ttl@writefile{\csname ttl@partial#2\endcsname}{%
-       \string\ttl@starttoc{#1@\the\csname ttl@#2@#1\endcsname}}}}
+       \string\ttl@starttoc{#1@\arabic{ttl@#2@#1}}}}}
 
 \def\ttl@starttoc#1{%
   \ifx\@writefile\@gobbletwo\else % Is this test necessary?
@@ -547,11 +562,11 @@
 
 \newcommand\ttl@printlist[5][default]{%
   \begingroup
-    \@ifundefined{ttl@#2@#1}%
+    \@ifundefined{c@ttl@#2@#1}%
       {\PackageError{titletoc}{No partial #2 named #1}%
           {You must start before a partial toc/list\MessageBreak
           with \string/startcontents/\string\startlist.}}{}%
-    \edef\ttl@ptoc{#1@\the\csname ttl@#2@#1\endcsname}%
+    \edef\ttl@ptoc{#1@\arabic{ttl@#2@#1}}%
     \def\ttl@toctop{#4}%
     #5%
     \let\ttl@xcontentsline\contentsline
@@ -621,9 +636,5 @@
 \advance\@tempskipa-\@tocrmarg
 \edef\ttl@corr{-\the\@tempskipa}
 
-% Load patches if necessary
-
-\InputIfFileExists{titletoc.new}{}{}
-
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def b/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
index 02d44976628..bb9d16d171e 100644
--- a/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
+++ b/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
-
-\ProvidesFile{ttlkeys.def}[2005/01/22]
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
+
+\ProvidesFile{ttlkeys.def}[2007/08/12]
 
 % This command takes a list in "keyval" format, \ttl@a containing the
 % star spec, and returns \ttl@a with the full string name to be defined
diff --git a/Master/texmf-dist/tex/latex/titlesec/ttlps.def b/Master/texmf-dist/tex/latex/titlesec/ttlps.def
index 6246743cf99..1bbfd017e44 100644
--- a/Master/texmf-dist/tex/latex/titlesec/ttlps.def
+++ b/Master/texmf-dist/tex/latex/titlesec/ttlps.def
@@ -2,16 +2,23 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2005 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.6
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
 % History of v1.0 (actually not 1.0)
 % ~~~~~~~~~~~~~~~
@@ -57,7 +64,7 @@
 % values in the mark before the title, and the current values in the 
 % mark after.
 
-\ProvidesFile{ttlps.def}[2005/01/22]
+\ProvidesFile{ttlps.def}[2007/08/12]
 
 % 
 % Page Styles
diff --git a/Master/texmf-dist/tex/latex/titlesec/wrap.tss b/Master/texmf-dist/tex/latex/titlesec/wrap.tss
index a0f7d6c7340..4c248723f16 100644
--- a/Master/texmf-dist/tex/latex/titlesec/wrap.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/wrap.tss
@@ -2,18 +2,25 @@
 % | Typeset titlesec.tex to get the documentation.   |
 % +--------------------------------------------------+
 %
-% Copyright (c) 1998-2002 by Javier Bezos.
+% Copyright (c) 1998-2007 by Javier Bezos.
 % All Rights Reserved.
 %
-% This file is part of the titlesec distribution release 2.5
+% This file is part of the titlesec distribution release 2.8
 % -----------------------------------------------------------
 %
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+% 
+% This work has the LPPL maintenance status "maintained".
+% 
+% The Current Maintainer of this work is Javier Bezos.
 
-\ProvidesFile{wrap.tss}[2002/03/23]
+\ProvidesFile{wrap.tss}[2007/08/12]
 
 \gdef\ttlh@wrap#1#2#3#4#5#6#7#8{%
   \global\@noskipsectrue