texlive[52413] Master/texmf-dist: titlesec (16oct19)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 16 22:56:43 CEST 2019
Revision: 52413
http://tug.org/svn/texlive?view=revision&revision=52413
Author: karl
Date: 2019-10-16 22:56:43 +0200 (Wed, 16 Oct 2019)
Log Message:
-----------
titlesec (16oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/titlesec/README.md
trunk/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
trunk/Master/texmf-dist/doc/latex/titlesec/titleps.tex
trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
trunk/Master/texmf-dist/tex/latex/titlesec/titleps.sty
trunk/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
trunk/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
Modified: trunk/Master/texmf-dist/doc/latex/titlesec/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/titlesec/README.md 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/doc/latex/titlesec/README.md 2019-10-16 20:56:43 UTC (rev 52413)
@@ -28,9 +28,14 @@
### Latest changes
```
+2.13 2019-10-16
+ - \markboth (which has been redefined in the LaTeX kernel) works
+ again.
+
2.12 2019-09-09
- Fix - Partial TOCs were severely broken.
- Fix - An undefined section doesn't raise an error any more.
+
2.11 2019-07-16
- New license: MIT.
- Option nostruts, to remove struts inserted by titlesec.
@@ -61,5 +66,3 @@
Please, for suggestions, bug reports, etc., go to
More
http://www.texnia.com/contact.html
-
-
Modified: trunk/Master/texmf-dist/doc/latex/titlesec/titleps.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/titlesec/titleps.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/titlesec/titleps.tex 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/doc/latex/titlesec/titleps.tex 2019-10-16 20:56:43 UTC (rev 52413)
@@ -7,8 +7,8 @@
% Repository: https://github.com/jbezos/titlesec
%
-\def\fileversion{2.12}
-\def\docdate{2019/09/09}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
Modified: trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.tex 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/doc/latex/titlesec/titlesec.tex 2019-10-16 20:56:43 UTC (rev 52413)
@@ -7,8 +7,8 @@
% Repository: https://github.com/jbezos/titlesec
%
-\def\fileversion{2.12}
-\def\docdate{2019/09/09}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\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.12. \copyright{} 1998--2019 Javier Bezos.}}
+version 2.13. \copyright{} 1998--2019 Javier Bezos.}}
\author{Javier Bezos\footnote{For bug reports, comments and
suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
Modified: trunk/Master/texmf-dist/tex/latex/titlesec/titleps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/titlesec/titleps.sty 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/tex/latex/titlesec/titleps.sty 2019-10-16 20:56:43 UTC (rev 52413)
@@ -13,7 +13,7 @@
\ifx\ttl at coreps\@empty\else % START code for package
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titleps}[2019/09/09 v2.12 Page styles]
+\ProvidesPackage{titleps}[2019/10/16 v2.13 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
@@ -217,9 +217,15 @@
% \ttl at markboth redefines temporarily \mark to fetch changes made by
% babel or ams, saved in \ttl at running. When this is done, the actual
% \mark es emitted, which has \ttl at running as part of the markset (see
-% the \newtitlemark above).
+% the \newtitlemark above). As of 2019 and due to a change in the LaTex
+% kernel, we consider two possibilities (2.13).
-\def\ttl at mb@mark{\markboth}
+\expandafter\ifx\csname markboth \endcsname\relax
+ \def\ttl at mb@mark{\markboth}
+\else
+ \edef\ttl at mb@mark{\expandafter\noexpand\csname markboth \endcsname}
+\fi
+
\def\ttl at mb@warn{%
\PackageWarningNoLine{titleps}
{Direct use of \string\markboth\space and \string\markleft\space
@@ -495,33 +501,65 @@
\fi}
% Another tool:
+% As of 2019 and due to a change in the LaTex kernel, we consider two
+% possibilities (2.13).
-\newcommand\setmarkboth{%
- \ifx\markboth\ttl at mb@use\else
- \let\ttl at mb@mark\markboth
- \let\markboth\ttl at mb@use
- \fi
- \def\ttl at mb@new##1##2}
+\expandafter\ifx\csname markboth \endcsname\relax
-% \ttl at mb@temp is a trick to allow resetting inside \setmarkboth.
+ \newcommand\setmarkboth{%
+ \ifx\markboth\ttl at mb@use\else
+ \let\ttl at mb@mark\markboth
+ \let\markboth\ttl at mb@use
+ \fi
+ \def\ttl at mb@new##1##2}
-\def\ttl at mb@use#1#2{%
- \let\markboth\ttl at mb@mark
- \def\ttl at mb@temp{\let\markboth\ttl at mb@use}%
- \ttl at mb@new{#1}{#2}%
- \ttl at mb@temp
- \let\ttl at mb@temp\@undefined}
+ % \ttl at mb@temp is a trick to allow resetting inside \setmarkboth.
-\newcommand\resetmarkboth{%
- \ifx\ttl at mb@temp\@undefined
+ \def\ttl at mb@use#1#2{%
\let\markboth\ttl at mb@mark
- \def\ttl at mb@mark{\markboth}%
- \else
- \def\ttl at mb@temp{%
+ \def\ttl at mb@temp{\let\markboth\ttl at mb@use}%
+ \ttl at mb@new{#1}{#2}%
+ \ttl at mb@temp
+ \let\ttl at mb@temp\@undefined}
+
+ \newcommand\resetmarkboth{%
+ \ifx\ttl at mb@temp\@undefined
\let\markboth\ttl at mb@mark
- \def\ttl at mb@mark{\markboth}}%
- \fi}
+ \def\ttl at mb@mark{\markboth}%
+ \else
+ \def\ttl at mb@temp{%
+ \let\markboth\ttl at mb@mark
+ \def\ttl at mb@mark{\markboth}}%
+ \fi}
+\else
+
+ \newcommand\setmarkboth{%
+ \expandafter\ifx\csname markboth \endcsname\ttl at mb@use\else
+ \expandafter\let\expandafter\ttl at mb@mark\csname markboth \endcsname
+ \expandafter\let\csname markboth \endcsname\ttl at mb@use
+ \fi
+ \def\ttl at mb@new##1##2}
+
+ \def\ttl at mb@use#1#2{%
+ \expandafter\let\csname markboth \endcsname\ttl at mb@mark
+ \def\ttl at mb@temp{\expandafter\let\csname markboth \endcsname\ttl at mb@use}%
+ \ttl at mb@new{#1}{#2}%
+ \ttl at mb@temp
+ \let\ttl at mb@temp\@undefined}
+
+ \newcommand\resetmarkboth{%
+ \ifx\ttl at mb@temp\@undefined
+ \expandafter\let\csname markboth \endcsname\ttl at mb@mark
+ \edef\ttl at mb@mark{\expandafter\noexpand\csname markboth \endcsname}%
+ \else
+ \def\ttl at mb@temp{%
+ \expandafter\let\csname markboth \endcsname\ttl at mb@mark
+ \edef\ttl at mb@mark{\expandafter\noexpand\csname markboth \endcsname}}%
+ \fi}
+
+\fi
+
% ===========
% EXTRA MARKS
% ===========
Modified: trunk/Master/texmf-dist/tex/latex/titlesec/titlesec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/titlesec/titlesec.sty 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/tex/latex/titlesec/titlesec.sty 2019-10-16 20:56:43 UTC (rev 52413)
@@ -34,7 +34,7 @@
% ~~~~~~~
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{titlesec}[2019/09/09 v2.12 Sectioning titles]
+\ProvidesPackage{titlesec}[2019/10/16 v2.13 Sectioning titles]
% Initialization
% ~~~~~~~~~~~~~~
@@ -254,6 +254,9 @@
% is not lost inside a box by saving it into \ttl at mk,
% which in turn is used by the sect and chap commands.
+% As of 2019 and due the LaTex
+% kernel modifies \markboth, we consider two possibilities (2.13).
+
\newif\ifttl at explicit
\def\ttl at gmk#1{\gdef\ttl at mk{#1}}
@@ -272,8 +275,13 @@
\let\ttl at page@i \ttl at nest@error
\let\ttl at newpage\newpage
\def\newpage{\ttl at savewrite\ttl at newpage}%
- \def\markboth##1##2{\protect\ttl at gmk{\protect\markboth{##1}{##2}}}%
- \def\markright##1{\protect\ttl at gmk{\protect\markright{##1}}}%
+ \expandafter\ifx\csname markboth \endcsname\relax
+ \def\markboth##1##2{\protect\ttl at gmk{\protect\markboth{##1}{##2}}}%
+ \def\markright##1{\protect\ttl at gmk{\protect\markright{##1}}}%
+ \else
+ \@namedef{markboth }##1##2{\protect\ttl at gmk{\markboth{##1}{##2}}}%
+ \@namedef{markright }##1{\protect\ttl at gmk{\markright{##1}}}%
+ \fi
\def\@mkboth##1##2{\protect\ttl at gmk{\protect\@mkboth{##1}{##2}}}%
\def\footnote{\@ifnextchar[%
{\ttl at savefn\z@}{\ttl at savefn\@ne[]}}%
Modified: trunk/Master/texmf-dist/tex/latex/titlesec/titletoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/titlesec/titletoc.sty 2019-10-16 20:56:31 UTC (rev 52412)
+++ trunk/Master/texmf-dist/tex/latex/titlesec/titletoc.sty 2019-10-16 20:56:43 UTC (rev 52413)
@@ -7,7 +7,7 @@
% Repository: https://github.com/jbezos/titlesec
%
-\ProvidesPackage{titletoc}[2019/09/09 v2.12 TOC entries]
+\ProvidesPackage{titletoc}[2019/10/16 v2.13 TOC entries]
% The following tags are used:
% ttl@ : the generic one, shared with titlesec
More information about the tex-live-commits
mailing list