summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-05 20:54:50 +0000
committerKarl Berry <karl@freefriends.org>2021-07-05 20:54:50 +0000
commited74a8842dbbe9c47599815fbe999e7b78f4270c (patch)
tree0bd664e1e7b07f55dae37dba2c26ae2005f3059e
parent919d654bed4c7ab98fc426801eaa655da8f75797 (diff)
titlesec (5jul21)
git-svn-id: svn://tug.org/texlive/trunk@59845 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/README.md7
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titleps.pdfbin134006 -> 134024 bytes
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titleps.tex6
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titlesec.pdfbin490706 -> 491378 bytes
-rw-r--r--Master/texmf-dist/doc/latex/titlesec/titlesec.tex29
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titleps.sty4
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titlesec.sty11
-rw-r--r--Master/texmf-dist/tex/latex/titlesec/titletoc.sty6
8 files changed, 38 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/titlesec/README.md b/Master/texmf-dist/doc/latex/titlesec/README.md
index 7fb1fdff3db..4bdf80bc073 100644
--- a/Master/texmf-dist/doc/latex/titlesec/README.md
+++ b/Master/texmf-dist/doc/latex/titlesec/README.md
@@ -28,6 +28,9 @@ mechanims is used, without intermediate `\leftmark`s or `\rightmark`s.
### Latest changes
```
+2.14 2021-07-05
+ A couple of minor changes (for issues #17, #39).
+
2.13 2019-10-16
- \markboth (which has been redefined in the LaTeX kernel) works
again.
@@ -64,5 +67,5 @@ Further details are available on
### Contact
Please, for suggestions, bug reports, etc., go to
-More
- http://www.texnia.com/contact.html
+
+ https://github.com/jbezos/titlesec/issues
diff --git a/Master/texmf-dist/doc/latex/titlesec/titleps.pdf b/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
index 0a5ea985c2e..6d364232eb1 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 c3af656ae95..8b1f3f5dfae 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titleps.tex
+++ b/Master/texmf-dist/doc/latex/titlesec/titleps.tex
@@ -1,5 +1,5 @@
%
-% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
+% Copyright (C) 1998-2021 Javier Bezos http://www.texnia.com
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -7,8 +7,8 @@
% Repository: https://github.com/jbezos/titlesec
%
-\def\fileversion{2.13}
-\def\docdate{2019/10/16}
+\def\fileversion{2.14}
+\def\docdate{2021/07/05}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
diff --git a/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf b/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
index 18121687138..9bb6f09e9e4 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 6c4d4a8d55f..be9ae49cd9f 100644
--- a/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
+++ b/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
@@ -1,5 +1,5 @@
%
-% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
+% Copyright (C) 1998-2021 Javier Bezos http://www.texnia.com
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -7,8 +7,8 @@
% Repository: https://github.com/jbezos/titlesec
%
-\def\fileversion{2.13}
-\def\docdate{2019/10/16}
+\def\fileversion{2.14}
+\def\docdate{2021/07/05}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
@@ -38,7 +38,7 @@
\title{The \textsf{titlesec}, \textsf{titleps} and \textsf{titletoc}
Packages\footnote{The \textsf{titlesec} package is currently at
-version 2.13. \copyright{} 1998--2019 Javier Bezos.}}
+version 2.14. \copyright{} 1998--2021 Javier Bezos.}}
\author{Javier Bezos\footnote{For bug reports, comments and
suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
@@ -863,7 +863,7 @@ and \textsf{titlesec} does not change by default the definition of
related stuff like counters, macros, format, and spacing is left to the
responsibility of the user. If there is a TOC, also the TOC format,
which might require redefining the corresponding macros to change the
- hardcoded value (either by hand or with \textsf{titletoc}).
+ hardcoded value (either by hand or with \textsf{titletoc}).
\end{warning}
\begin{desc}
@@ -901,6 +901,11 @@ depending of its name and ignoring the class:
except if you use the |newparttoc| option.
\end{itemize}
+\begin{warning}
+ If you set or reset the class, you may need to redefine the format,
+ too.
+\end{warning}
+
\begin{desc}
|loadonly| \quad (Package option)
\end{desc}
@@ -1007,13 +1012,13 @@ unwanted space in the toc.)
That works with standard classes, but if you are using
\textsf{fancyhdr} or \textsf{titlesec} to define headers you need
further refinement to kill the section number. In \textsf{titlesec}
-that's accomplished with |\ifthesection| (see below).
+that's accomplished with |\ifthesection| (see \textsf{titleps.pdf}).
-As you can see, there are no |\addcontentsline|, no
-|\markboth|, no |\section*|, just logical structure. Of
-course you may change it as you wish; for example if you decide
-these sections should be typeset in small typeface, include
-|\small|, and if you realize you do not like that, remove it.
+As you can see, there are no |\addcontentsline|, no |\markboth|, no
+|\section*|, just logical structure. Of course you may change it as you
+wish; for example if you decide these sections should be typeset in
+small typeface, include |\small|, and if you realize you do not like
+that, remove it.
While the standard \LaTeX{} commands are easier and more
direct for simple cases, I think the proposed method above is
@@ -1979,7 +1984,7 @@ with slight changes.
\end{verbatim}
\addtocontents{toc}{\protect\setcounter{tocdepth}{2}\ignorespaces}
-\setcounter{section}{9}
+\setcounter{section}{8}
\endgroup
\bigskip
diff --git a/Master/texmf-dist/tex/latex/titlesec/titleps.sty b/Master/texmf-dist/tex/latex/titlesec/titleps.sty
index 73f7f872158..a5d995f265d 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titleps.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titleps.sty
@@ -1,5 +1,5 @@
%
-% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
+% Copyright (C) 1998-2021 Javier Bezos http://www.texnia.com
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -13,7 +13,7 @@
\ifx\ttl@coreps\@empty\else % START code for package
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titleps}[2019/10/16 v2.13 Page styles]
+\ProvidesPackage{titleps}[2021/07/05 v2.14 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 e99e0b09d31..f4aa050b799 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
@@ -1,5 +1,5 @@
%
-% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
+% Copyright (C) 1998-2021 Javier Bezos http://www.texnia.com
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -34,7 +34,7 @@
% ~~~~~~~
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titlesec}[2019/10/16 v2.13 Sectioning titles]
+\ProvidesPackage{titlesec}[2021/07/05 v2.14 Sectioning titles]
% Initialization
% ~~~~~~~~~~~~~~
@@ -289,8 +289,13 @@
\def\ttl@b{ttlf@#1}%
\def\ttl@a##1{\csname ttl@key@##1\endcsname}% Used as elt in try
\ttl@trylist
+ \ifx\ttl@c\@empty
+ \PackageError{titlesec}{No format for this command}%
+ {If you (re)set the class of a sectioning command, you may\MessageBreak
+ you may need to (re)define its format with \string\titleformat}%
+ \fi
\ifttl@explicit
- \def\ttl@passexplicit{\ttl@case{#4}}%
+ \def\ttl@passexplicit{\ttl@case{#4}}%
\ttl@c{#4}{#2}{#3}{}% ttl@c is returned by ttl@try with ttlf@...
\else
\let\ttl@passexplicit\ttl@case
diff --git a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
index e7a5b6e5187..99164ae1d79 100644
--- a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
+++ b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
@@ -1,5 +1,5 @@
%
-% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
+% Copyright (C) 1998-2021 Javier Bezos http://www.texnia.com
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -7,7 +7,7 @@
% Repository: https://github.com/jbezos/titlesec
%
-\ProvidesPackage{titletoc}[2019/10/16 v2.13 TOC entries]
+\ProvidesPackage{titletoc}[2021/07/05 v2.14 TOC entries]
% The following tags are used:
% ttl@ : the generic one, shared with titlesec
@@ -531,7 +531,7 @@
\AtBeginDocument{%
\ifx\ttl@gobblecontents\@undefined
- \def\ttl@gobblecontents#1#2#3{\ignorespaces}%
+ \def\ttl@gobblecontents#1#2#3#4{\ignorespaces}%
\fi}
\def\ttl@toctop{-1000}