summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-08-15 18:44:25 +0000
committerKarl Berry <karl@freefriends.org>2007-08-15 18:44:25 +0000
commita3e65cf58603aec6b27742b833f880c0f3372020 (patch)
tree4da1825a845000efd2cd9f1a9ca1a3e4099456ad /Master/texmf-dist/tex/latex
parent91b4a01237a390c7baa513e9a4117de577a1d49a (diff)
titlesec 2.7 (11aug07)
git-svn-id: svn://tug.org/texlive/trunk@4731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/block.tss21
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/drop.tss21
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/frame.tss21
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/leftmargin.tss24
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/margin.tss22
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/rightmargin.tss22
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titlesec.sty146
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titletoc.sty47
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/ttlkeys.def23
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/ttlps.def21
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/wrap.tss21
11 files changed, 271 insertions, 118 deletions
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