From 8c11fe37546bc263967ee51a315a45ed9ed17f78 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 8 Oct 2019 18:47:54 +0900 Subject: aeb-minitoc (20191008) --- texmf-dist/doc/latex/aeb-minitoc/README.md | 5 +++- texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf | Bin 305767 -> 307794 bytes texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf | Bin 276674 -> 219042 bytes texmf-dist/doc/latex/aeb-minitoc/aebminitocman.tex | 3 +-- .../doc/latex/aeb-minitoc/examples/minitoc-art.pdf | Bin 123829 -> 139921 bytes .../source/latex/aeb-minitoc/aeb-minitoc.dtx | 29 +++++++++++++++------ texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty | 18 ++++++++----- tlpkg/texlive.tlpdb | 12 ++++----- 8 files changed, 44 insertions(+), 23 deletions(-) diff --git a/texmf-dist/doc/latex/aeb-minitoc/README.md b/texmf-dist/doc/latex/aeb-minitoc/README.md index 4cd0160e..b1749e21 100644 --- a/texmf-dist/doc/latex/aeb-minitoc/README.md +++ b/texmf-dist/doc/latex/aeb-minitoc/README.md @@ -1,12 +1,15 @@ The aeb-minitoc package Author: D. P. Story -Dated: 2018-09-29 +Dated: 2019-10-06 This package creates mini-TOCs through the use of the \insertminitoc command. The system is powerful and flexible and allows for some amount of logic. The package works for a the usual workflows +What's New (2019-10-06) The introduction of \protected@file@percent broke this package, this version +heals the package. + What's New (2018-09-29): Delayed the redefinition of \addtocontents until beginning of document, to avoid incompatability with the siunitx package. diff --git a/texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf b/texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf index 05f0568b..56471660 100644 Binary files a/texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf and b/texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf differ diff --git a/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf b/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf index a224aabf..99b68e3b 100644 Binary files a/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf and b/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf differ diff --git a/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.tex b/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.tex index 3ae2c755..f91ed343 100644 --- a/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.tex +++ b/texmf-dist/doc/latex/aeb-minitoc/aebminitocman.tex @@ -75,7 +75,7 @@ email={dpstory@acrotex.net}, subject={Documentation for the aeb-minitoc package from AcroTeX: Inserting TOCs within a section}, talksite={\url{www.acrotex.net}}, - version={1.7, 2018/09/29}, + version={1.9, 2019/10/06}, Keywords={AcroTeX, mini-toc}, copyrightStatus=True, copyrightNotice={Copyright (C) \the\year, D. P. Story}, @@ -253,7 +253,6 @@ the document body, and this is the result of that favor. %\end{minipage} %\end{center} - \section{Required packages and options} This package has been tested for the \texttt{book}, \texttt{report}, and \texttt{article} classes. It uses diff --git a/texmf-dist/doc/latex/aeb-minitoc/examples/minitoc-art.pdf b/texmf-dist/doc/latex/aeb-minitoc/examples/minitoc-art.pdf index 9bec1861..0994a3a5 100644 Binary files a/texmf-dist/doc/latex/aeb-minitoc/examples/minitoc-art.pdf and b/texmf-dist/doc/latex/aeb-minitoc/examples/minitoc-art.pdf differ diff --git a/texmf-dist/source/latex/aeb-minitoc/aeb-minitoc.dtx b/texmf-dist/source/latex/aeb-minitoc/aeb-minitoc.dtx index 873a1e46..139e2f2d 100644 --- a/texmf-dist/source/latex/aeb-minitoc/aeb-minitoc.dtx +++ b/texmf-dist/source/latex/aeb-minitoc/aeb-minitoc.dtx @@ -16,7 +16,7 @@ % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{aeb-minitoc} -% [2018/09/29 v1.7 Creates a simple mini-toc] +% [2019/10/06 v1.9 Creates a simple mini-toc] %<*driver> \documentclass{ltxdoc} \usepackage[colorlinks,hyperindex=false,linktocpage,bookmarksnumbered]{hyperref} @@ -343,15 +343,28 @@ \def\mtoc@TOC{toc} \def\mtocCL#1#2{#1} % \end{macrocode} +% (2019/10/06) Fix the \cs{protected@file@percent} problem, the solution continues +% into the definition of \cs{addtocontents@mtoc}. +% \changes{v1.8}{2019/10/05}{\string\cs{LaTeX}/\string\pkg{hyperref} introduced +% \string\cs{protected@file@percent}, which breaks this package. We do a fix.} +% \changes{v1.9}{2019/10/06}{Additional fix to \string\cs{protected@file@percent} solution} +% \begin{macrocode} +\@ifundefined{add@percent@to@temptokena} + {\let\protected@file@percent\@empty\def\mtoc@protect{}} + {\def\mtoc@protect{\protect}} +% \end{macrocode} % Here, we modify the macro \cs{addtocontents} to insert \cs{mtocCL}. % \changes{v1.7}{2018/09/29}{Delay redefinition of \string\cs{addtocontents} until beginning of document, -% to avoid incompatability with \string\pkg{siunitx}.} -% \begin{macrocode} -\newcommand\addtocontents@mtoc[2]{% - \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC - \global\advance\@minitocCnt\@ne - \mtoc@addtocontents{#1}{\protect\mtocCL{#2}{\the\@minitocCnt}}\else - \mtoc@addtocontents{#1}{#2}\fi} +% to avoid incompatibility with \string\pkg{siunitx}.} +% \begin{macrocode} +\newcommand\addtocontents@mtoc[2]{\bgroup + \let\protected@file@percent\@empty + \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC + \global\advance\@minitocCnt\@ne + \mtoc@addtocontents{#1}{\protect + \mtocCL{#2}{\the\@minitocCnt}\mtoc@protect + \protected@file@percent}\else + \mtoc@addtocontents{#1}{#2}\fi\egroup} \AtBeginDocument{\let\mtoc@addtocontents\addtocontents \let\addtocontents\addtocontents@mtoc} % \end{macrocode} diff --git a/texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty b/texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty index 2f0cd2f1..9c3643fb 100644 --- a/texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty +++ b/texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{aeb-minitoc} - [2018/09/29 v1.7 Creates a simple mini-toc] + [2019/10/06 v1.9 Creates a simple mini-toc] \newif\ifMiniTocListings \MiniTocListingstrue \DeclareOption{nominitocs}{\AtEndOfPackage{\MiniTocListingsfalse \let\insertminitoc\insertminitocNOT}} @@ -124,11 +124,17 @@ \AtEndDocument{\mtoc@start@toc} \def\mtoc@TOC{toc} \def\mtocCL#1#2{#1} -\newcommand\addtocontents@mtoc[2]{% - \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC - \global\advance\@minitocCnt\@ne - \mtoc@addtocontents{#1}{\protect\mtocCL{#2}{\the\@minitocCnt}}\else - \mtoc@addtocontents{#1}{#2}\fi} +\@ifundefined{add@percent@to@temptokena} + {\let\protected@file@percent\@empty\def\mtoc@protect{}} + {\def\mtoc@protect{\protect}} +\newcommand\addtocontents@mtoc[2]{\bgroup + \let\protected@file@percent\@empty + \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC + \global\advance\@minitocCnt\@ne + \mtoc@addtocontents{#1}{\protect + \mtocCL{#2}{\the\@minitocCnt}\mtoc@protect + \protected@file@percent}\else + \mtoc@addtocontents{#1}{#2}\fi\egroup} \AtBeginDocument{\let\mtoc@addtocontents\addtocontents \let\addtocontents\addtocontents@mtoc} \def\tableofcontents{% diff --git a/tlpkg/texlive.tlpdb b/tlpkg/texlive.tlpdb index dfe892fd..975e99d1 100644 --- a/tlpkg/texlive.tlpdb +++ b/tlpkg/texlive.tlpdb @@ -7,7 +7,7 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2019-nonfree -depend revision/241 +depend revision/242 name 00texlive.installation category TLCore @@ -288,7 +288,7 @@ runfiles size=198 texmf-dist/tex/latex/acrotex/websec.def catalogue-contact-home http://www.acrotex.net catalogue-ctan /macros/latex/contrib/acrotex -catalogue-date 2019-06-03 13:36:23 +0200 +catalogue-date 2019-09-28 23:47:00 +0200 catalogue-license lppl catalogue-topics collection pdf-forms @@ -656,13 +656,13 @@ catalogue-version 2.2 name aeb-minitoc category Package -revision 159 +revision 242 shortdesc Create mini-tocs longdesc This package creates mini-TOCs through the use of the longdesc \insertminitoc command. The system is powerful and flexible and longdesc allows for some amount of logic. The package works for the longdesc usual workflows. -docfiles size=199 +docfiles size=190 texmf-dist/doc/latex/aeb-minitoc/README.md details="Readme" texmf-dist/doc/latex/aeb-minitoc/aeb-minitoc.pdf details="Technical documentation" texmf-dist/doc/latex/aeb-minitoc/aebminitocman.pdf details="User manual" @@ -681,7 +681,7 @@ runfiles size=3 texmf-dist/tex/latex/aeb-minitoc/aeb-minitoc.sty catalogue-also minitoc catalogue-ctan /macros/latex/contrib/aeb-minitoc -catalogue-date 2018-10-03 15:46:44 +0200 +catalogue-date 2019-10-07 15:54:54 +0200 catalogue-license lppl1.2 catalogue-topics toc-etc @@ -1845,7 +1845,7 @@ runfiles size=4 texmf-dist/tex/latex/eq-save/eq-save.sty catalogue-also exerquiz catalogue-ctan /macros/latex/contrib/eq-save -catalogue-date 2019-06-21 10:04:24 +0200 +catalogue-date 2019-09-30 14:55:07 +0200 catalogue-license lppl1.2 catalogue-topics exercise exam -- cgit v1.2.3