From d82f21bf5bbb6269a51a3b7045e3764cfbccd6b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Jul 2011 21:54:45 +0000 Subject: titlesec (25jul11) git-svn-id: svn://tug.org/texlive/trunk@23221 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/titlesec/CHANGES | 237 +++++++++++ Master/texmf-dist/doc/latex/titlesec/README | 23 +- Master/texmf-dist/doc/latex/titlesec/titlesec.pdf | Bin 230231 -> 194710 bytes Master/texmf-dist/doc/latex/titlesec/titlesec.tex | 473 +++++++++++---------- Master/texmf-dist/tex/latex/titlesec/block.tss | 6 +- Master/texmf-dist/tex/latex/titlesec/drop.tss | 7 +- Master/texmf-dist/tex/latex/titlesec/frame.tss | 6 +- .../texmf-dist/tex/latex/titlesec/leftmargin.tss | 6 +- Master/texmf-dist/tex/latex/titlesec/margin.tss | 6 +- .../texmf-dist/tex/latex/titlesec/rightmargin.tss | 6 +- Master/texmf-dist/tex/latex/titlesec/titlesec.sty | 296 +++---------- Master/texmf-dist/tex/latex/titlesec/titletoc.sty | 6 +- Master/texmf-dist/tex/latex/titlesec/ttlkeys.def | 6 +- Master/texmf-dist/tex/latex/titlesec/ttlps.def | 9 +- Master/texmf-dist/tex/latex/titlesec/wrap.tss | 9 +- 15 files changed, 590 insertions(+), 506 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/titlesec/CHANGES (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/titlesec/CHANGES b/Master/texmf-dist/doc/latex/titlesec/CHANGES new file mode 100644 index 00000000000..8900459dc9f --- /dev/null +++ b/Master/texmf-dist/doc/latex/titlesec/CHANGES @@ -0,0 +1,237 @@ +Titlesec changes + +History of v1.0 +~~~~~~~~~~~~~~~ +1998/02/25 Added nops option +1998/02/28 Added \@mkboth stuff in \setmarks +1998/03/01 Changed test in \ttl@secnum +1998/03/03 Corrected some \fil... commands +1998/03/03 Replaced the faulty \@hangfrom by new commands +1998/03/03 Some \def replaced by \newcommand +1998/03/04 .dtx/.ins scheme finally rejected. Useless + for users, obtrusive for `readers' and proned + to errors +1998/03/04 Tidied up documentation +1998/03/06 \wordsep renamed and documented +1998/03/06 Added dummy asignation in \ttl@chap. +1998/03/06 Removed \ttl@xsect and merged into \tl@sect +1998/03/06 Added \ProvidesPackage + +History of v1.1 +~~~~~~~~~~~~~~~~ +1998/03/25 \chapter corrected, as well as the size options +1998/03/26 Added compact option +1998/03/26 Added flushleft, flushright and center options +1998/04/08 Changed all instances of \noindent by \parindent\z@ +1998/04/14 Added \filinner, \filouter +1998/04/14 Added drop shape +1998/05/01 Added rightmargin shape (and margin renamed to + leftmargin) +1998/05/03 Added \setheadindent + +History of v1.2 (unreleased) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +1998/06/01 Compatibility with AMS classes +1998/06/08 On-demand loading of shapes +1998/06/11 Frame shape. Some \fil... command + modified to work in the label of this + chapter shape. +1998/07/03 Bottomtitle option (at last...) +1998/07/14 ...margin styles bug fixed using a method + similar to bottomtitle. +1998/07/29 \titleline + +==================== + +History of v2.0 +~~~~~~~~~~~~~~~~ + +1998/08/05 to +1998/08/29 Fully reimplemented + +History of v2.1 +~~~~~~~~~~~~~~~~ +1999/01/05 We define in this file the three basic shapes. + Additional ones remain defined in external files. + Unified the shapes for sections and chapters. +1999/01/05 \ttl@shape merged into \ttl@format@iii. +1999/01/05 \titlerule +1999/01/07 \ttl@defkeys splitted from \ttl@keys +1999/01/10 Added the \part stuff, including a definition of \@openright +1999/01/11 Removed unnecessary \ttl@numsecfalse in \ttl@sect@i. +1999/01/14 Optimized \titlerule +1999/01/27 Changed \titleline to correct the spacing at the + top page and to fix a bug which changed the mode + to horizontal, thus introducing unwanted space + (\makebox -> \@makebox). +1999/02/02 \ttl@secnum renamed to \ttl@write and introduced the + \ttl@savewrite mechanism to sincronize the toc/marks + with the title in case there is a \newpage in . +1999/02/03 wrap shape +1999/02/03 Added a \kern\z@ for not to avoid hyphenation + of the last word. Not strictly necessary, but + it is more LaTeX-like. +1999/02/05 \partmark defined (and in \setmarks, too). +1999/02/08 \ttl@row@i simplified. +1999/02/08 \ttl@savefn mechanism. +1999/02/10 Removed extra \leavevmode in display +1999/02/13 Now \titleline doesn't add the width. It's set. +1999/02/17 The part mark is catched, even if unused. +1999/02/17 old/newparttoc added. +1999/02/18 Changed many TeX assignments to the LaTeX + counterpart. +1999/02/19 Introduced \ttl@startargs. + +History of v2.1.1 +~~~~~~~~~~~~~~~~~ +1999/08/04 Moved misplaced lines in \ttl@makeboth + +History of v2.2 (unreleased) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1999/11/03 We load titleps if pagestyles are required, but + some old definitions are restored. +1999/11/06 Improved outermarks test in \ttl@sect@i. Formerly + the section number could be printed if a page ended + with an unnumebered section followed by a numbered one. +1999/11/06 \ttl@startargs now adds (and passes) automatically the + section name. Involved macros modified accordingly. +1999/11/06 Replaced explicit part names by the parameter in + \ttl@part@i. The same for chapter. +1999/11/21 \ttl@try's are not given explicitly, but built by + \ttl@setkeys. Intruduced the \ttl@key@... and + \ttl@extra@... commands. +1999/11/23 Minor problems with keys fixed. +1999/12/10 Added the nobottomtitles* option and \ttl@addstretch. +2000/01/07 First steps towards the calcwidth feature (basic code). +2000/01/08 (Continued.) \titleline* for rules of width \titlewidth. + Option calcwidth implemented. +2000/01/12 Finished with changes in wrap.tss (no longer + "experimental" :-) ) + +History of v2.3 +~~~~~~~~~~~~~~~ +2000/01/19 All keys are grouped in a single file tttkeys. Removed + page.tsk and deleted the corresponding code in the sty. +2000/01/19 Classes begun. +2000/01/19 The level numbers are stored in \ttll@ macros, and not + passed as arguments. +2000/01/21 Introduced the new mark scheme. It's mostly compatible + with the old one, but a compatibility mode seems + imposible (it was introduced in a preliminary test + but eventually removed). +2000/01/23 loadonly package option. +2000/02/01 Classes finished. Many things had to be rewritten. +2000/02/02 Made partially compatible with hyperref (dvips). +2000/02/08 \ttl@savewrite moved from shapes to classes. But + explicit page breaks expand it, too, to avoid wrong + toc entries. +2000/02/18 A new box named \ttl@box stores the title in runin + leftmargin etc shapes, to increase reliability. + +(2.3.1 -- 2.3.3 No changes on this file) + +History of v2.3.4 +~~~~~~~~~~~~~~~~~ +2000/05/12 nonindentfirst redefine \titlespacing instead of + \@afterindent... so that they don't interfere with + the first entry in tocs. +2000/05/17 The marks in \ttl@select are protected to prevent + endless loop if the title is expanded, say, by + \MakeUppercase. + +History of v2.3.5 +~~~~~~~~~~~~~~~~~ +2000/05/21 Restores missing test for secnumdepth in \ttl@mkchap, + and instead of setting \ttl@toclevel in ttlps now is + done in \secdef. Except inside the macros, \ttl@toclevel + is false, so that an explicit \...mark works. +2000/06/04 \partmark defined with \providecommand +2000/06/14 A patch mechanism added, for small bug fixes. + +History of v2.4 +~~~~~~~~~~~~~~~~ +2001/01/18 Minor changes in code. Essentialy an incremental + update. +2001/01/22 \titleformat has a new "easy" starred variant. + +History of v2.5 +~~~~~~~~~~~~~~~ +2002/01/02 New macros for \ttl@assign. Now * length allow + non integer values. +2002/03/22 Added \ttl@calc and \ttl@calcneg to make titlesec + calc-savvy. + - Merged bug fixes of .new into this file. + - Bugs in frame fixed -- gap in lines, misplaced + label, wrong margins (sometimes), + - \leftskip, \rightskip and \linewidth (re)set in + margin shapes. + - Removed obsolete flush... options. + - indentafter and noindentafter, new names for + indentfirst and nonindentfirst. + - A new level (\titleclass) without its "location" + now raises a meaningful error. + - Bug in top-level \titleclass fixed. +2002/03/23 Tests for undefined and unformatted sectioning levels, + and horizontal material in . + - Missing \if@openright inside \if@twoside in + page class added. + - Removed extra (but inoffensive) \expandafter + in \ttl@class@iii. +2002/03/27 Added \titlewidthfirst and ...last + - "Not definable" gives a more meaningful message in + the context of the package. + +History of v.2.6 +~~~~~~~~~~~~~~~~ +2004/08/30 Corrected typo in margin \hsiz -> \hsize. +2004/10/17 Added a couple of missing \noexpand's in drop. +2004/12/01 Removed the error about the mode in block because this + style is general purpose. +2005/01/16 Missing braces around #2 in the last else part of + \ttl@headinline added + - Replaced explicit \makeatother's by a saved value as + the macros can be used in a class/package file. +2005/01/18 newlinetospace mechanism + - // does not break pages; option pageatnewline to + restore the LaTeX behaviour. +2005/01/19 \...break in top shape. + - Renumbered several scratch registers to follow the + TeXbook (p. 346), with \ttl@box in a few cases. In + wrap \titlewidthfirst and \titlewidthlast made global. + - Float heads and foots have now a further argument for + additional stuff (eg, to remove rules). Option is now + psfloats while floatps enters in compatibility mode. + - \ttl@savetitle in all classes. Option toctitles. +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. + - Added \titlepagestyle. +2007-03-29 Fixed wrong number for chapter in log + - Patch file named .270 instead of .new +2007-05-09 Added 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. + +History of v.2.9 +~~~~~~~~~~~~~~ +2010-05-04 Add \nobreak in \ttl@addcontentsline, to prevent the title + going to footnotes (!) in runin style in some (rare) cases. +2010-05-06 Option uppercase (and \ttl@case). +2011-02-25 \iftitlemeasuring test +2011-07-14 Fixed \assignpagestyle +2011-07-15 Introduced the \scantokens mechanism to make sure section + names are 'letters' and not 'others' +2011-07-18 Removed \if@nobreak test in wrap/drop, which added a line + to the title after another section (why?) + \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/titlesec/README b/Master/texmf-dist/doc/latex/titlesec/README index c46f3f2a5e2..12350ceaecf 100644 --- a/Master/texmf-dist/doc/latex/titlesec/README +++ b/Master/texmf-dist/doc/latex/titlesec/README @@ -4,7 +4,7 @@ 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. +Current version is 2.9. Titletoc package ~~~~~~~~~~~~~~~~ @@ -15,6 +15,17 @@ 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. +What's new (2.9) +~~~~~~~~~~~~~~~~ + +- Fixed \assignpagestyle, which did not work except in a +few cases. +- Fixed an incompatibility with hyperref (wrong appendix +name). +- Added \iftitlemeasuring +- Added package option uppercase +- Fixed a bug when reckoning the number of lines in wrap/drop. + Installation ~~~~~~~~~~~~ No .ins/.dtx preinstalation is required. Move the files to a place @@ -24,11 +35,9 @@ 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). +Formerly there were files with extension .new (titlesec.new and +titletoc.new) used to patch the packages, but if present should be +removed (they will be ignored, however). Web site, manual in PDF format and info ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -49,5 +58,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. -2007/08/12 +2011/07/25 diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf index b8077cb8940..ce1b38070e9 100644 Binary files a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf and b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf differ diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex index 82d34e69224..5611fadcd39 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-2007 by Javier Bezos. +% Copyright (c) 1998-2011 by Javier Bezos. % All Rights Reserved. % -% This file is part of the titlesec distribution release 2.8 +% This file is part of the titlesec distribution release 2.9 % ----------------------------------------------------------- % % 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.8} -\def\docdate{2007-08-12} +\def\fileversion{2.9} +\def\docdate{2011-07-25} \documentclass[a4paper]{ltxguide} \usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec} @@ -43,9 +43,9 @@ \title{The \textsf{titlesec} and \textsf{titletoc} Packages\footnote{The \textsf{titlesec} package is currently at -version 2.8. \copyright{} 1998--2007 Javier Bezos. +version 2.9. \copyright{} 1998--2011 Javier Bezos. The \textsf{titletoc} package is currently at -version 1.6. \copyright{} 1999--2007 Javier Bezos. All Rights +version 1.6. \copyright{} 1999--2011 Javier Bezos. All Rights Reserved.}} \author{Javier Bezos\footnote{For bug reports, comments and @@ -124,7 +124,7 @@ Appendix shows a good deal of examples, so jump forward right now! \item Headers and footers defined with no |\...mark| intermediates, and perhaps containing top, first \emph{and} bot marks at the same time. -Top marks correctly synchronized with titles, and without +Top marks correctly synchronized with titles, without incompatibilities with the float mechanism. Decorative elements easily added, including picture environments. @@ -134,12 +134,15 @@ of entries in the middle of a document. \end{itemize} \textsf{Titlesec} works with the standard classes and with many others, including the AMS ones, and it runs smoothly with -\textsf{hyperref}.\footnote{However, be aware that the AMS classes +\textsf{hyperref}.\footnote{However, be aware the AMS classes reimplement the original internal commands. These changes will be lost here. The compatibility with \textsf{hyperref} has been tested -with \textsf{dvips}, \textsf{dvipdfm} and \textsf{pdftex} but it's an -unsupported feature. Please, check that your version of +with \textsf{dvips}, \textsf{dvipdfm} and \textsf{pdftex} but it is an +unsupported feature. Please, check your version of \textsf{hyperref} is compatible with \textsf{titlesec}.} +Unfortunately, it is not compatible with \textsf{memoir}, which +provides its own tools with a limited subset of the features available +in \textsf{titlesec}. As usual, load the package in the standard way with |\usepackage|. Then, redefine the sectioning commands with the @@ -157,7 +160,7 @@ should be changed with the help of the ``Advanced Interface.'' The easiest way to change the format is by means of a set of package options and a couple of commands. If you feel happy with the -functionality provided by this set of tools, you needn't go +functionality provided by this set of tools, you need not go further in this manual. Just read this section and ignore the subsequent ones. @@ -194,6 +197,15 @@ Control the alignment. This option is independent from those above and reduces the spacing above and below the titles. +\subsection{Uppercase} + +\begin{desc} +|uppercase| +\end{desc} + +\fbox{2.9} Uppercases titles. Depending on the class, it might not work in +\verb|\chapter| and \verb|\part|. + \subsection{Tools} \begin{desc} @@ -262,7 +274,7 @@ standard |\chapter|.) \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 -out in the bottom margin, which means that large titles can lead to +out in the bottom margin, which means large titles can lead to underfull pages.\footnote{However, floats following the title a couple of lines after will interfere with the page breaking used here and sometimes the title may stick out.} In this case you may increase the @@ -273,23 +285,23 @@ A deprecated synonymous is |margin|. \item[rightmargin] is like |leftmargin| but at the right margin. -\item[drop] wraps the text around the title, provided that the +\item[drop] wraps the text around the title, provided the first paragraph is longer than the title (if not, they overlap). -The comments in |leftmargin| also applies here. +The comments in |leftmargin| also apply here. -\item[wrap] is quite similar to drop. The only difference is that +\item[wrap] is quite similar to drop. The only difference is while the space reserved in drop for the title is fixed, in wrap is automatically readjusted to the longest line. The limitations -explained below related to |calcwidth| also applies here. +explained below related to |calcwidth| also apply here. -\item[frame] similar to display, but the title will be framed. +\item[frame] Similar to display, but the title will be framed. \end{description} -Note, however, that some shapes don't make sense in chapters and +Note, however, some shapes do not make sense in chapters and parts. \begin{desc} -|\titleformat{}[]{}{