summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/titlesec/titlesec.sty')
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titlesec.sty47
1 files changed, 30 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
index c9c4f5d1650..ab4d0177cc7 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
@@ -2,10 +2,10 @@
% | Typeset titlesec.tex to get the documentation. |
% +--------------------------------------------------+
%
-% Copyright (c) 1998-2011 by Javier Bezos.
+% Copyright (c) 1998-2016 by Javier Bezos.
% All Rights Reserved.
%
-% This file is part of the titlesec distribution release 2.10.0
+% This file is part of the titlesec distribution release 2.10.1
% -----------------------------------------------------------
%
% It may be distributed and/or modified under the
@@ -48,7 +48,7 @@
% ~~~~~~~
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titlesec}[2011/12/15 v2.10.0 Sectioning titles]
+\ProvidesPackage{titlesec}[2016/03/15 v2.10.1 Sectioning titles]
% Initialization
% ~~~~~~~~~~~~~~
@@ -281,7 +281,9 @@
\global\let\ttl@mk\@empty % global because of rigidchapters
\global\let\ttl@fn\@empty
\begingroup
- \everypar{\setbox\z@\lastbox\strut}% or \hskip-\parindent?
+ \if@inlabel\else % Keep item's \everypar
+ \everypar{\setbox\z@\lastbox\strut}%
+ \fi
\let\ttl@straight@i\ttl@nest@error
\let\ttl@top@i \ttl@nest@error
\let\ttl@part@i \ttl@nest@error
@@ -321,18 +323,20 @@
#1%
\let\ttl@try\@gobble}} % locally modified to `break' testings
-% \ttl@write writes marks and toc. tocdepth is taken
-% care of when the toc is typesetted and not here.
-% Used always through ttl@savewrite
+% \ttl@write writes marks and toc. tocdepth is taken care of when
+% the toc is typesetted and not here. Used always through
+% ttl@savewrite, which is reset to \@empty to avoid duplicated
+% calls.
\def\ttl@write#1#2{%
\ttl@blinemarks
\csname#1mark\endcsname{#2}%
\def\ttl@a{\protect\numberline{\@nameuse{the#1}}}%
\@nameuse{ttl@toc#1}% eg, \ttl@tocpart modifies \ttl@a
- \ttl@addcontentsline{#1}{#2}% Depends on toctitles
+ \ttl@addcontentsline{#1}{#2}% Depends on toctitles, uses \ttl@a
\ttl@elinemarks
- \global\ttl@toclabelfalse}
+ \global\ttl@toclabelfalse
+ \global\let\ttl@savewrite\@empty}
\newif\ifttl@premark % to be used in ttlps.def
\ttl@premarkfalse
@@ -355,12 +359,12 @@
\def\ttl@labelling#1#2{%
\let\ttl@Hy@saveanchor\@empty
- \ifttl@label % First: if star
+ \ifttl@label % 1st - if star
\def\ttl@savewrite{\ttl@write{#1}{#2}}%
\@nameuse{ttl@#1label}% eg, sets if mainmatter in chapter.
- \ifttl@label % Second, eg, if not main matter
+ \ifttl@label % 2nd - eg, if not main matter
\ifnum\@nameuse{ttll@#1}>\c@secnumdepth\relax
- \ttl@labelfalse % Third: if too deep
+ \ttl@labelfalse % 3rd - if too deep
\else
\ttl@Hy@refstepcounter{#1}%
\@nameuse{ttl@#1out}%
@@ -471,7 +475,11 @@
\def\ttl@part@i#1[#2]#3{%
\gdef\ttl@savemark{\csname#1mark\endcsname{#3}}%
- \def\ttl@savewrite{\ttl@write{#1}{#3}}% A default value. Not #2!
+ \ifx\ttl@notocparts\@undefined
+ \def\ttl@savewrite{\ttl@write{#1}{#3}}% Not #2!
+ \else
+ \let\ttl@savewrite\@empty
+ \fi
\def\ttl@savetitle{#3}%
\ttl@labelling{#1}{#2}%
\ttl@startargs\ttl@part@ii{#1}{#3}}
@@ -496,7 +504,11 @@
\def\ttl@page@i#1[#2]#3{%
\gdef\ttl@savemark{\csname#1mark\endcsname{#3}}%
- \def\ttl@savewrite{\ttl@write{#1}{#3}}% A default value. Not #2!
+ \ifx\ttl@notocparts\@undefined
+ \def\ttl@savewrite{\ttl@write{#1}{#3}}% Not #2!
+ \else
+ \let\ttl@savewrite\@empty
+ \fi
\def\ttl@savetitle{#3}%
\ttl@labelling{#1}{#2}%
\ttl@startargs\ttl@page@ii{#1}{#3}}
@@ -741,12 +753,11 @@
#1{\ifhmode\ttl@hmode@error\fi
\ttl@glcmds
\parindent\z@
- \leavevmode
\begingroup
\ifttl@label
\sbox\z@{#2\strut\ttl@calc\hspace{#3}}%
- \advance\leftskip\wd\z@
- \llap{\box\z@}%
+ \hangindent\wd\z@
+ \noindent\box\z@
\fi
#4{#8}%
\kern\z@\strut\@@par
@@ -970,6 +981,8 @@
\def\ttl@tocpart{\def\ttl@a{\thepart\hspace{1em}}}}
\DeclareOption{newparttoc}{%
\let\ttl@tocpart\relax}
+\DeclareOption{notocpart*}{%
+ \let\ttl@notocparts\@empty}
\DeclareOption{rm}{%
\protected@xdef\ttl@fonts{\ttl@fonts\protect\rmfamily}}