summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-16 22:33:36 +0000
committerKarl Berry <karl@freefriends.org>2016-03-16 22:33:36 +0000
commit4c11a739919c6fe82bd1e3890115da2a7b447bee (patch)
tree52f12b4a0a273d23c0829596222f7c3b7041bf82 /Master/texmf-dist
parent0633160feb499eda3f63828de6cc6301911627b9 (diff)
titlesec (16mar16)
git-svn-id: svn://tug.org/texlive/trunk@40048 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/CHANGES19
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/README6
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titleps.pdfbin116637 -> 132752 bytes
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titleps.tex98
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titlesec.pdfbin181154 -> 180358 bytes
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titlesec.tex33
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/block.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/drop.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/frame.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/leftmargin.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/margin.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/rightmargin.tss6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titleps.sty6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titlesec.sty47
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titletoc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/ttlkeys.def6
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/ttlps.def70
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/wrap.tss6
18 files changed, 224 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/latex/titlesec/CHANGES b/Master/texmf-dist/doc/latex/titlesec/CHANGES
index ebe6031d2ab..3cbfae5c8a3 100644
--- a/Master/texmf-dist/doc/latex/titlesec/CHANGES
+++ b/Master/texmf-dist/doc/latex/titlesec/CHANGES
@@ -241,4 +241,21 @@ History of v.2.9.1
History of v.2.9.2
~~~~~~~~~~~~~~~~~~
-2011-11-11 Fixed a typo in ttlps.def (\MessageBreag) \ No newline at end of file
+2011-11-11 Fixed a typo in ttlps.def (\MessageBreag)
+
+History of v.2.10.0
+~~~~~~~~~~~~~~~~~~~~
+
+2011-12-15 Split titlesp
+
+History of v.2.10.1
+~~~~~~~~~~~~~~~~~~~~
+
+2015-02-27 Fix: An explict \newpage in 'after' wrote the toc entry twice
+2015-03-09 Fix (partial): A list containing just a sectioning command
+ raised an error
+
+History of titleps v.1.1.1
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+2016-03-15 New macro \setmarkboth for compatibility
+
diff --git a/Master/texmf-dist/doc/latex/titlesec/README b/Master/texmf-dist/doc/latex/titlesec/README
index cd36dc30329..66725fe563b 100644
--- a/Master/texmf-dist/doc/latex/titlesec/README
+++ b/Master/texmf-dist/doc/latex/titlesec/README
@@ -55,13 +55,13 @@ Web site, manual in PDF format and info
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Further details are available on
- http://www.tex-tipografia.com/titlesec.html
+ http://www.texnia.com/titlesec.html
Contact
~~~~~~~
Please, for suggestions, bug reports, etc., go to
More
- http://www.tex-tipografia.com/contact.html
+ http://www.texnia.com/contact.html
Known problems
~~~~~~~~~~
@@ -70,5 +70,5 @@ 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.
-2011/12/15
+2016/03/15
diff --git a/Master/texmf-dist/doc/latex/titlesec/titleps.pdf b/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
index b4f8bd4f65d..37626bbceed 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
+++ b/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/titlesec/titleps.tex b/Master/texmf-dist/doc/latex/titlesec/titleps.tex
index 5dab28b7eab..6cea538de5c 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titleps.tex
+++ b/Master/texmf-dist/doc/latex/titlesec/titleps.tex
@@ -2,10 +2,10 @@
% | Typeset this file 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
@@ -20,14 +20,14 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{1.1.0}
-\def\docdate{2011-12-15}
+\def\fileversion{1.1.1}
+\def\docdate{2016-03-15}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
\usepackage{titletoc}
\def\gobble#1{}
-\def\cs#1{\expandafter\gobble\string\\#1}
+\DeclareRobustCommand\cs[1]{\expandafter\gobble\string\\#1}
\makeatletter
\newenvironment{desc}
{\if@nobreak
@@ -43,11 +43,11 @@
\title{Headers and footers with \textsf{titleps}\footnote{The
\textsf{titleps} package is currently at version \fileversion.
-\copyright{} 2011 Javier Bezos. All Rights Reserved.}}
+\copyright{} 2016 Javier Bezos. All Rights Reserved.}}
\author{Javier Bezos\footnote{For bug reports, comments and
-suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
-{\texttt{http://www.tex-tipografia.com/contact.html}}. English
+suggestions go to \href{http://www.texnia.com/contact.html}%
+{\texttt{http://www.texnia.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,
@@ -144,7 +144,8 @@ for example, thank to the \textit{extra marks} described below.
It works with standard classes and many others; however, additional
\LaTeX{} layout adjustments could be necessary in some of them (for
-instance the \textsc{AMS} classes).\footnote{%
+instance the \textsc{AMS} classes) and several packages emitting marks
+directly with \verb|\markboth| and \verb|\markleft|.\footnote{%
Two columns layout requires the \textsf{fix2col} package by David
Carlisle.}
@@ -247,15 +248,6 @@ deprecated. Now
The starred version |\settitlemarks*| creates parallel extra marks
as described below.
-Note |\markboth| is a command to set the |myheadings| marks and
-here does not make sense. In fact, using it can lead to unpredictable
-results. Anyway, using directly the marking commands is discouraged
-(see |titlesec.pdf|), but if you need them, you may write:
-\begin{verbatim}
-\chapter*{My Chapter}
-\chaptermark{My Chapter}
-\end{verbatim}
-
\begin{desc}
|\headrule \footrule|\\
|\setheadrule{<length>} \setfootrule{<length>}|
@@ -304,6 +296,49 @@ above and a red rule below (the \textsf{color} package is required):
Of course, the material to be used as rule is not restricted to actual
rules; pictures and leaders, for instance, are allowed, too.
+\section{On \texttt{\cs{markboth}} and \texttt{\cs{markleft}}}
+
+As \textit{The \LaTeX{} Companion explains} ``Leslie Lamport had a
+specific marking scheme in mind when he designed those
+commands''. They are clearly intended for the \verb|heading| and
+\verb|myheading| pagestyles, with a \textit{main-mark} on the left
+page and a \textit{sub-mark} on the right one.
+
+In order to provide the functionality offered by \textsf{titleps}, a
+more general, less specific mechanism is devised, which means
+|\markboth| here does not make sense, because it doesn't work like in
+standard \LaTeX, and in fact, can lead to unpredictable results.
+
+Therefore, using directly the marking commands is discouraged (see
+|titlesec.pdf|), but if you need them, you may write:
+\begin{verbatim}
+\chapter*{My Chapter}
+\chaptermark{My Chapter}
+\end{verbatim}
+
+But some issues remain, because there are a number of packages
+assuming the pagestyle is \verb|heading| or \verb|myheading|. This is,
+of course, a reasonable guess, but not always correct (even if
+\textsf{titleps} is not used at all). Most of them do the right thing
+-- \verb|\markboth| is encapsulated into a macro easily redefinable so
+that the user can modify it if necessary. This is true, for example,
+for \textsf{biblatex}, but unfortunately not for \textsf{endnotes}.
+When this happens, you can resort to the following macro.
+
+\begin{desc}
+|\setmarkboth{<code-to-use>}|
+\end{desc}
+
+From this point on, \verb|\markboth| behaves as defined. It doesn't
+redefine directly the command, but rather provides a replacement code
+(you can use |#1| and |#2| for the two arguments). With
+|\resetmarkboth| (which can be used inside |\setmarkboth|) the
+original definition will be again in force. For example, to cancel the
+next |\markboth|:
+\begin{verbatim}
+\setmarkboth{\resetmarkboth\markboth{}{}}
+\end{verbatim}
+
\section{Headline/footline width}
\begin{desc}
@@ -587,14 +622,14 @@ commands, you might still need an empty title mark (like
hand.
In many cases, the following “short” marks mechanism will be enough.
-With it, you simply say with \verb|\setshormark| the name of a command
+With it, you simply say with \verb|\newshormark| the name of a command
to be used in heads or foots, and then emit the mark at appropiated
places (short marks for variables are not available). An example
illustrates how this is carried out:
\begin{verbatim}
\newcommand\lemmatitle{}
-\setshortmark\lemmatitle
+\newshortmark\lemmatitle
\newcommand\lemma[1]{%
\renewcommand\lemmatitle{#1}%
@@ -629,13 +664,12 @@ For a more general approach use the following tools.
A \textit{markset} contains a set of related commands and variables
intended to be emitted simultaneously as marks, so that their values
-can be retrieved in heads/foots. A typical \textit{markset} could be a
-title and its counter (and perhaps, in a multilingual document, the
-active language, i.e., \verb|\languagename| in \textsf{babel}, or an
-intermediate command). There
-is always a special unnamed \textit{markset} for sectioning marks, which is
-the main one and handled with the tools described above (with |title|
-in their names).
+can be retrieved in heads/foots. A typical \textit{markset} could be
+a title and its counter (and perhaps, in a multilingual document, the
+active language, i.e., \verb|\languagename| in \textsf{babel}, or an
+intermediate command). There is always a special unnamed
+\textit{markset} for sectioning marks, which is the main one and
+handled with the tools described above (with |title| in their names).
\begin{desc}
|\newextramark{<markset>}{<macro-name>}|\\
@@ -729,7 +763,7 @@ define a command. For example:
\section{A couple of examples}
-Because of the way marks are handled, special constructions like this are
+Because of the way marks are handled, special constructs like this are
allowed:
\begin{verbatim}
\newpagestyle{main}[\small\sffamily]{
@@ -743,7 +777,8 @@ allowed:
As you can see, the range of sections in a page with |\thesection| is
printed in both left and right heads. Of course, this example should
be fine tuned to collapse the ranges if there is a single section in a
-page (with |\ifsamemark|), but it gives a hint of how to get stunning headers.
+page (with |\ifsamemark|), but it gives a hint of how to get stunning
+headers.
In this document, the following styles are used:
\begin{verbatim}
@@ -756,9 +791,8 @@ In this document, the following styles are used:
\sethead{titlesec -- titleps}{\sectiontitle}{\thepage}}
\end{verbatim}
-The following definitions provide page styles similar to
-those in Lamport's \textit{The \LaTeX\ book} (with the \textsf{calc}
-package):
+The following definitions provide page styles similar to those in
+Lamport's \textit{The \LaTeX\ book} (with the \textsf{calc} package):
\begin{verbatim}
\widenhead*{0pt}{\marginparsep + \marginparwidth} % symmetrically
\renewpagestyle{plain}{}
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
index 5c8c11e2511..60e026ffeb9 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
+++ b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
index 463ae8e711e..823ca55c46b 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
+++ b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
@@ -2,10 +2,10 @@
% | Typeset this file 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
@@ -20,8 +20,8 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{2.10.0}
-\def\docdate{2011-12-15}
+\def\fileversion{2.10.1}
+\def\docdate{2016-03-15}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
@@ -43,10 +43,10 @@
\title{The \textsf{titlesec}, \textsf{titleps} and \textsf{titletoc}
Packages\footnote{The \textsf{titlesec} package is currently at
-version 2.10.0. \copyright{} 1998--2011 Javier Bezos.
+version 2.10.1. \copyright{} 1998--2016 Javier Bezos.
The \textsf{titletoc} package is currently at
version 1.6. The \textsf{titleps} package is currently at version
-1.1.0 \copyright{} 1999--2011 Javier Bezos. All Rights
+1.1.1 \copyright{} 1999--2016 Javier Bezos. All Rights
Reserved.}}
\author{Javier Bezos\footnote{For bug reports, comments and
@@ -273,7 +273,15 @@ lines long and the \texttt{hang} shape is used, except with explicit
\item[display] puts the label in a separate paragraph. (Like the
standard |\chapter|.)
-\item[runin] A run-in title. (Like the standard |\paragraph|.)
+\item[runin] A run-in title, like the standard
+ |\paragraph|.\footnote{Well, not quite. The title is first boxed to
+ avoid some unexpected results if, for example, there is a
+ \texttt{\string\color} between the title and the
+ text. Unfortunately, due to an optimization done by \TeX{}
+ discretionaries may be lost. I have found no solution, except using
+ \textsf{luatex}, which works as one could expect. Anyway, if the
+ title doesn't contain hyphen or dashes, this is not usually a real
+ problem.}
\item[leftmargin] puts the title at the left margin. Titles at the
very end of a page will be moved to the next one and will not stick
@@ -731,8 +739,17 @@ TOC entries, which will be based on the full title.
titles by a space in running heads and TOC entries. This way, you
do not have to repeat the title just to remove a formatting command.
+\begin{desc}
+|notocpart*| \quad (Package option)
+\end{desc}
-
+\fbox{2.10.1} Long ago (by the year 2000) I decided for some reason
+\verb|\part*| would behave like the AMS classes and therefore there
+should be a contents entry for it. This is somewhat odd, indeed, but
+the very fact is nobody has complained until now! On the other hand,
+restoring the behaviour one could expect after 15 years doesn't seem a
+good idea. A new page/part style in on the way, but for the moment
+this option restores the standard behaviour.
\subsection{Extended Settings}
%~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Master/texmf-dist/tex/latex/titlesec/block.tss b/Master/texmf-dist/tex/latex/titlesec/block.tss
index 34b2747a84f..bb98ae6da3b 100644
--- a/Master/texmf-dist/tex/latex/titlesec/block.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/block.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{block.tss}[2011/12/15]
+\ProvidesFile{block.tss}[2016/03/15]
\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 be0d638c085..67d956a8b8d 100644
--- a/Master/texmf-dist/tex/latex/titlesec/drop.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/drop.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{drop.tss}[2011/12/15]
+\ProvidesFile{drop.tss}[2016/03/15]
\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 b386347010e..d9a2d526219 100644
--- a/Master/texmf-dist/tex/latex/titlesec/frame.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/frame.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{frame.tss}[2011/12/15]
+\ProvidesFile{frame.tss}[2016/03/15]
\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 e2d17301f88..6399ae7d9dd 100644
--- a/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/leftmargin.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{leftmargin.tss}[2011/12/15]
+\ProvidesFile{leftmargin.tss}[2016/03/15]
\gdef\ttlh@leftmargin#1#2#3#4#5#6#7#8{%
\global\@noskipsectrue
diff --git a/Master/texmf-dist/tex/latex/titlesec/margin.tss b/Master/texmf-dist/tex/latex/titlesec/margin.tss
index 4fc8cb3729b..81290221f6a 100644
--- a/Master/texmf-dist/tex/latex/titlesec/margin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/margin.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{margin.tss}[2011/12/15]
+\ProvidesFile{margin.tss}[2016/03/15]
\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 dc35f615985..33527ffe904 100644
--- a/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/rightmargin.tss
@@ -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
% -----------------------------------------------------------
%
%
@@ -21,7 +21,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{rightmargin.tss}[2011/12/15]
+\ProvidesFile{rightmargin.tss}[2016/03/15]
\gdef\ttlh@rightmargin#1#2#3#4#5#6#7#8{%
\global\@noskipsectrue
diff --git a/Master/texmf-dist/tex/latex/titlesec/titleps.sty b/Master/texmf-dist/tex/latex/titlesec/titleps.sty
index b52e3d83d04..e4d341ad063 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titleps.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titleps.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
@@ -24,7 +24,7 @@
% ~~~~~~~
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titleps}[2011/12/15 v1.1.0 Page styles]
+\ProvidesPackage{titleps}[2016/03/15 v1.1.1 Page styles]
% This package is mainly a wrapper for the pagestyle macros provided
% by titlesec, so that they can be used without it. Functionality is
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}}
diff --git a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
index 1e758e76cdf..79a315e714c 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
@@ -2,10 +2,10 @@
% | Documentation is in the titlesec.tex file. |
% +---------------------------------------------+
%
-% 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
diff --git a/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def b/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
index 19d5cac879c..a55895b8391 100644
--- a/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
+++ b/Master/texmf-dist/tex/latex/titlesec/ttlkeys.def
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{ttlkeys.def}[2011/12/15]
+\ProvidesFile{ttlkeys.def}[2016/03/15]
% 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 b68c4ece33c..5ac38905d79 100644
--- a/Master/texmf-dist/tex/latex/titlesec/ttlps.def
+++ b/Master/texmf-dist/tex/latex/titlesec/ttlps.def
@@ -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
@@ -63,7 +63,7 @@
% right pages at all. There are some issues related to top marks which
% are explained by Knuth in \textit{The \TeX book}, pp. 259f, as well
% as an uncompatibility between them and \LaTeX{} floats. To overcome
-% both limitations, in the \textsf{titlesec} page styles, the second
+% both limitations, in the \textsf{titleps} page styles, the second
% part in |\cs{firstmark}| is a \emph{fixed} top mark and the first one
% the actual first mark; the right way to get the bot mark is from the
% second part. Marks are stored at each section and used before and
@@ -72,7 +72,7 @@
% values in the mark before the title, and the current values in the
% mark after.
-\ProvidesFile{ttlps.def}[2011/12/15]
+\ProvidesFile{ttlps.def}[2016/03/15]
%
% Page Styles
@@ -172,6 +172,14 @@
% \mark es emitted, which has \ttl@running as part of the markset (see
% the \newtitlemark above).
+\def\ttl@mb@mark{\markboth}
+\def\ttl@mb@warn{%
+ \PackageWarningNoLine{titleps}
+ {Direct use of \string\markboth\space and \string\markleft\space
+ can lead\MessageBreak
+ to unpredictable results. Please, read the manual\MessageBreak
+ for an explanation of this warning.}}
+
\def\ttl@markboth#1{%
\begingroup
\let\protect\@unexpandable@protect
@@ -182,11 +190,11 @@
\let\glossary\relax
\let\ttl@c\mark
\def\mark##1{\xdef\ttl@running{\expandafter\@gobble##1}}%
- \markboth{}{\ttl@enccode}%
+ \ttl@mb@mark{}{\ttl@enccode}%
\expandafter\let\csname#1mark\endcsname\@gobble
\xdef\ttl@marks{\ttl@marks}%
\gdef\@themark{{\ttl@marks}{\ttl@prevmarks}}%
- \ttl@c{\@themark}%
+ \ttl@c{\@themark\let\noexpand\ttl@mb@warn\relax}%
\@nameuse{ttl@tem@#1}%
\if@nobreak\ifvmode\nobreak\fi\fi
\endgroup}
@@ -233,7 +241,7 @@
\ttl@moremarks}}}
\def\ttl@setmarks@s#1{% Solo con extramarks
- \PackageError{titlesec}%
+ \PackageError{titleps}%
{You need `extramarks' for \string\settitlemarks*}%
{\string\settitlemarks* requires the package option `extramarks'}}
@@ -400,22 +408,22 @@
\addtolength\linewidth{#4}%
\ifx#2\@empty\else
\setbox\z@\hb@xt@\linewidth{%
- \color@begingroup
- #2%
- \color@endgroup}%
- \wd\z@\z@
- \ht\z@\z@
- \dp\z@\z@
- \box\z@
+ \color@begingroup
+ #2%
+ \color@endgroup}%
+ \wd\z@\z@
+ \ht\z@\z@
+ \dp\z@\z@
+ \box\z@
\fi
\ttl@titlemarks % Must precede the format. Defines \ttl@running
\def\ttl@enccode{\ttl@headinline#1{}{}{}}% which contains ttl@enccode
\ttl@running
\ttl@calcneg\hspace{#4}}%
-
+
\def\ttl@makehead#1\@@{\ttl@makeboth{#1}\makeheadrule}
\def\ttl@makefoot#1\@@{\ttl@makeboth{#1}\makefootrule}
-
+
\renewcommand\widenhead{%
\@ifstar{\ttl@dupltwoargsrev\ttl@widenhd}%
{\@ifnextchar[{\ttl@widenhd}{\ttl@dupltwoargs\ttl@widenhd}}}
@@ -439,6 +447,34 @@
\expandafter\@secondoftwo
\fi}
+% Another tool:
+
+\newcommand\setmarkboth{%
+ \ifx\markboth\ttl@mb@use\else
+ \let\ttl@mb@mark\markboth
+ \let\markboth\ttl@mb@use
+ \fi
+ \def\ttl@mb@new##1##2}
+
+% \ttl@mb@temp is a trick to allow resetting inside \setmarkboth.
+
+\def\ttl@mb@use#1#2{%
+ \let\markboth\ttl@mb@mark
+ \def\ttl@mb@temp{\let\markboth\ttl@mb@use}%
+ \ttl@mb@new{#1}{#2}%
+ \ttl@mb@temp
+ \let\ttl@mb@temp\@undefined}
+
+\newcommand\resetmarkboth{%
+ \ifx\ttl@mb@temp\@undefined
+ \let\markboth\ttl@mb@mark
+ \def\ttl@mb@mark{\markboth}%
+ \else
+ \def\ttl@mb@temp{%
+ \let\markboth\ttl@mb@mark
+ \def\ttl@mb@mark{\markboth}}%
+ \fi}
+
% ===========
% EXTRA MARKS
% ===========
@@ -653,7 +689,7 @@
\def\ttl@replace#1#2#3#4{%
\@ifundefined{ttlr@#1#2@#3#4}%
{\@ifundefined{ttlr@#1#2@#3}{}%
- {\@namedef{ttlr@#1#2}{\@nameuse{ttlr@#1#2@#3}}}}%
+ {\@namedef{ttlr@#1#2}{\@nameuse{ttlr@#1#2@#3}}}}%
{\csname ttlr@xx@x#4\endcsname\@gobble
{\expandafter\let\csname ttlr@#1#2\expandafter\endcsname
\csname ttlr@#1#2@#3#4\endcsname}}}
diff --git a/Master/texmf-dist/tex/latex/titlesec/wrap.tss b/Master/texmf-dist/tex/latex/titlesec/wrap.tss
index e0351dfd1eb..c9072d3e586 100644
--- a/Master/texmf-dist/tex/latex/titlesec/wrap.tss
+++ b/Master/texmf-dist/tex/latex/titlesec/wrap.tss
@@ -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
@@ -20,7 +20,7 @@
%
% The Current Maintainer of this work is Javier Bezos.
-\ProvidesFile{wrap.tss}[2011/12/15]
+\ProvidesFile{wrap.tss}[2016/03/15]
\gdef\ttlh@wrap#1#2#3#4#5#6#7#8{%
\global\@noskipsectrue