From eee2451718ac90a84e576225ad73094dcddc93af Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Sep 2019 21:20:00 +0000 Subject: titlesec (9sep19) git-svn-id: svn://tug.org/texlive/trunk@52065 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/titlesec/titleps.sty | 2 +- Master/texmf-dist/tex/latex/titlesec/titlesec.sty | 9 ++++++--- Master/texmf-dist/tex/latex/titlesec/titletoc.sty | 24 +++++++++++++++-------- 3 files changed, 23 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/titlesec/titleps.sty b/Master/texmf-dist/tex/latex/titlesec/titleps.sty index 2d2a03cbea0..7e8b1b7ed4d 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titleps.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titleps.sty @@ -13,7 +13,7 @@ \ifx\ttl@coreps\@empty\else % START code for package \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{titleps}[2019/07/16 v2.11 Page styles] +\ProvidesPackage{titleps}[2019/09/09 v2.12 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 f1f943fd211..caf149e0dad 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty @@ -34,7 +34,7 @@ % ~~~~~~~ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{titlesec}[2019/07/16 v2.11 Sectioning titles] +\ProvidesPackage{titlesec}[2019/09/09 v2.12 Sectioning titles] % Initialization % ~~~~~~~~~~~~~~ @@ -1572,13 +1572,16 @@ \ttl@a} \def\ttl@extract#1{% + \ifx#1\@undefined + \let#1\relax % Avoid error if undefined + \fi \expandafter\in@\expandafter\@startsection\expandafter{#1}% \ifin@ \expandafter\ttl@@extract#1#1% \else \PackageWarningNoLine{titlesec}% - {Non standard sectioning command detected\MessageBreak - Using default spacing and no format} + {Non standard sectioning command \string#1\MessageBreak + detected. Using default spacing and no format}% \titlespacing*#1{\z@}{*3}{*2}% \fi} diff --git a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty index e54bce01730..ddf9e298c0e 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty @@ -7,7 +7,7 @@ % Repository: https://github.com/jbezos/titlesec % -\ProvidesPackage{titletoc}[2019/07/16 v2.11 TOC entries] +\ProvidesPackage{titletoc}[2019/09/09 v2.12 TOC entries] % The following tags are used: % ttl@ : the generic one, shared with titlesec @@ -213,9 +213,6 @@ \let\ttl@fixhyperref\relax \def\ttl@contents@i#1#2[#3]#4#5#6#7{% - \@ifundefined{ttll@#2}% - {\expandafter\def\csname ttll@#2\endcsname{-1000}}% - {}% \ifcase#1\relax \def\ttl@fixhyperref{% \ifx\Hy@tocdestname\@undefined\else @@ -289,6 +286,18 @@ \def\ttl@lasttoc{-1000} % An inital dummy assignment +\def\ttl@providettll#1#2{% + \@ifundefined{ttll@#1#2}% + {\global\expandafter\let\csname ttll@#1#2\expandafter\endcsname + \csname ttll@#2\endcsname}% + {}% + \@ifundefined{ttll@#1#2}% + {\PackageWarning{titletoc}% + {Unknown TOC type #1#2. I'll set it for you with\MessageBreak + level -1000.}% + \expandafter\gdef\csname ttll@#1#2\endcsname{-1000}}% + {}} + % 1 ifblock, 2 sect name, 3 left, 4 before, % 5 {with}{without}, 6 filler/page, 7 title 8 pageno @@ -352,6 +361,7 @@ \def\ttl@tocentry#1#2#3#4#5#6#7#8{% \ttl@fixhyperref + \ttl@providettll{}{#2}% \xdef\ttl@b{\csname ttll@#2\endcsname}% \ifnum\ttl@b>\c@tocdepth\else \ifnum\ttl@b<\ttl@toctop\else @@ -487,7 +497,7 @@ \newcommand\printcontents[3][default]{% \def\ttl@a{[#1]{toc}{#2}{#3}}% \ttl@preprint} - + \newcommand\printlist[3][default]{% \def\ttl@a{[#1]{#2}{#3}{-1001}}% \ttl@preprint} @@ -509,9 +519,7 @@ \let\ttl@xcontentsline\contentsline \let\contentsline\ttl@gobblecontents \def\ttl@contentsline##1{% - \@ifundefined{ttll@#3##1}% - {\expandafter\let\csname ttll@#3##1\expandafter\endcsname - \csname ttll@##1\endcsname}{}% + \ttl@providettll{#3}{##1}% \@ifundefined{l@#3##1}% {\ttl@xcontentsline{##1}}% {\ttl@xcontentsline{#3##1}}}% -- cgit v1.2.3