From 924aabd7fe0359d9fc6e837807f8eee7bf41717c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Jun 2022 20:00:40 +0000 Subject: thmtools (2jun22) git-svn-id: svn://tug.org/texlive/trunk@63477 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/thmtools/README.md | 4 ++-- Master/texmf-dist/doc/latex/thmtools/VERSION.tex | 2 +- Master/texmf-dist/doc/latex/thmtools/changes.txt | 17 ++++++++++++++++- .../doc/latex/thmtools/thmtools-manual.pdf | Bin 237505 -> 250299 bytes .../doc/latex/thmtools/thmtools-manual.tex | 9 +++++---- .../texmf-dist/source/latex/thmtools/aliasctr.dtx | 20 +++++++++++++++++--- .../source/latex/thmtools/thm-autoref.dtx | 2 +- Master/texmf-dist/tex/latex/thmtools/aliasctr.sty | 12 ++++++++++-- Master/texmf-dist/tex/latex/thmtools/parseargs.sty | 2 +- .../texmf-dist/tex/latex/thmtools/thm-amsthm.sty | 2 +- .../texmf-dist/tex/latex/thmtools/thm-autoref.sty | 4 ++-- .../texmf-dist/tex/latex/thmtools/thm-beamer.sty | 2 +- Master/texmf-dist/tex/latex/thmtools/thm-kv.sty | 2 +- .../texmf-dist/tex/latex/thmtools/thm-listof.sty | 2 +- Master/texmf-dist/tex/latex/thmtools/thm-llncs.sty | 2 +- .../texmf-dist/tex/latex/thmtools/thm-ntheorem.sty | 2 +- Master/texmf-dist/tex/latex/thmtools/thm-patch.sty | 2 +- .../texmf-dist/tex/latex/thmtools/thm-restate.sty | 2 +- .../tex/latex/thmtools/thmdef-mdframed.sty | 2 +- .../tex/latex/thmtools/thmdef-shaded.sty | 2 +- .../tex/latex/thmtools/thmdef-thmbox.sty | 2 +- Master/texmf-dist/tex/latex/thmtools/thmtools.sty | 2 +- Master/texmf-dist/tex/latex/thmtools/unique.sty | 2 +- 23 files changed, 68 insertions(+), 30 deletions(-) diff --git a/Master/texmf-dist/doc/latex/thmtools/README.md b/Master/texmf-dist/doc/latex/thmtools/README.md index 5314288e980..fe6df2a9e4f 100644 --- a/Master/texmf-dist/doc/latex/thmtools/README.md +++ b/Master/texmf-dist/doc/latex/thmtools/README.md @@ -12,6 +12,6 @@ Provided features: License: LPPL 1.3c -Currently the package is maintained by Yukai Chou, muzimuzhi at gmail.com +Currently the package is maintained by Yukai Chou. -Previous Maintainer was Ulrich M. Schwarz, ulmi at absatzen.de +Previous Maintainer was Ulrich M. Schwarz. diff --git a/Master/texmf-dist/doc/latex/thmtools/VERSION.tex b/Master/texmf-dist/doc/latex/thmtools/VERSION.tex index 68d76a77e34..97f602a1867 100644 --- a/Master/texmf-dist/doc/latex/thmtools/VERSION.tex +++ b/Master/texmf-dist/doc/latex/thmtools/VERSION.tex @@ -1 +1 @@ -\def\VERSION{2020/08/01 v0.72} +\def\VERSION{2022/06/01 v0.73} diff --git a/Master/texmf-dist/doc/latex/thmtools/changes.txt b/Master/texmf-dist/doc/latex/thmtools/changes.txt index 7eae39f61a7..9f4262f7991 100644 --- a/Master/texmf-dist/doc/latex/thmtools/changes.txt +++ b/Master/texmf-dist/doc/latex/thmtools/changes.txt @@ -36,6 +36,21 @@ * thm-list.dtx: made \listoftheorems compatible with ams classes, #6 - + * thmtools-manual.tex: documented new changes and keys of \listoftheorems + +2021-05-27 Yukai Chou + + * aliasctr.dtx: + made \@aliasctr compatible with cleveref, #22 + +2022-06-01 Yukai Chou + + * aliasctr.dtx: + fixed wrong use of \@ifdefinable, #28 + +2022-06-01 Yukai Chou + + * thm-autoref.dtx: + fixed non-global restoration for \cs{the\thmt@envname}, #27 diff --git a/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.pdf b/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.pdf index cb908e17df9..b3efdd93dba 100644 Binary files a/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.pdf and b/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.tex b/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.tex index dc357480ed2..5d1c1fd5ab0 100644 --- a/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.tex +++ b/Master/texmf-dist/doc/latex/thmtools/thmtools-manual.tex @@ -37,6 +37,7 @@ \hypersetup{ colorlinks, linkcolor=RoyalBlue, + urlcolor=RoyalBlue, linktoc=all } \usepackage{cleveref}[2010/05/01] @@ -159,14 +160,14 @@ \input{VERSION.tex} \title{\Thmtools Users' Guide} -\author{Dr. Ulrich M. Schwarz -- ulmi@absatzen.de\thanks{% +\author{2008–2014 Dr. Ulrich M. Schwarz -- ulmi@absatzen.de\thanks{% who would like to thank the users for testing, encouragement, feature requests, and bug reports. In particular, Denis Bitouz\'e prompted further improvement when \thmtools got stuck in a ``good enough for me'' slump.} \and - Yukai Chou -- muzimuzhi@gmail.com + \rule{20pt}{0pt}2020-- Yukai Chou\rule{20pt}{0pt} % force newline } -\date{\VERSION} +\date{\VERSION\\{\small\url{https://github.com/muzimuzhi/thmtools}}} \begin{document} \maketitle @@ -680,7 +681,7 @@ For every prime $p$, there is a prime $p'>p$. In particular, the list of primes, \begin{equation}\label{eq:1} - 2,3,45,7,\dots + 2,3,5,7,\dots \end{equation} is infinite. \end{restatable} diff --git a/Master/texmf-dist/source/latex/thmtools/aliasctr.dtx b/Master/texmf-dist/source/latex/thmtools/aliasctr.dtx index 3c75e11c98e..2d88038c083 100644 --- a/Master/texmf-dist/source/latex/thmtools/aliasctr.dtx +++ b/Master/texmf-dist/source/latex/thmtools/aliasctr.dtx @@ -79,7 +79,7 @@ \csname ##2\endcsname }% \@ifundefined{c@#2}{\@nocounterr{#2}}{% - \@ifdefinable{c@#1}{% + \expandafter\@ifdefinable\csname c@#1\endcsname{% % \end{macrocode} % Four values make a counter foo: % \begin{itemize} @@ -93,10 +93,24 @@ \@@gletover{c@#1}{c@#2}% \@@gletover{the#1}{the#2}% % \end{macrocode} -% I don't see \@counteralias being called hundreds of times, -% let's just unconditionally create |\theHctr|-macros for hyperref. +% I don't see |\@counteralias| being called hundreds of times, +% let's just unconditionally create |\theHctr|-macros for \pkg{hyperref}. % \begin{macrocode} \@@gletover{theH#1}{theH#2}% +% \end{macrocode} +% YkC: Compatibility with \pkg{cleveref}, copied from \pkg{cleveref}'s +% support for \pkg{aliascnt}. +% Here |\cref@resetby| requires its first argument to be the actual counter +% name, not a macro storing the name. Thanks to Willie Wong. +% \begin{macrocode} + \@ifpackageloaded{cleveref}{% + \edef\aliasctr@temp{% + \noexpand\cref@resetby{#2}{\noexpand\cref@result}}% + \aliasctr@temp + \ifx\cref@result\relax\else% + \cref@addtoreset{#1}{\cref@result}% + \fi + }{}% \@@gletover{p@#1}{p@#2}% \expandafter\global \expandafter\def\csname cl@#1\expandafter\endcsname diff --git a/Master/texmf-dist/source/latex/thmtools/thm-autoref.dtx b/Master/texmf-dist/source/latex/thmtools/thm-autoref.dtx index cf84463c098..850d171046e 100644 --- a/Master/texmf-dist/source/latex/thmtools/thm-autoref.dtx +++ b/Master/texmf-dist/source/latex/thmtools/thm-autoref.dtx @@ -33,7 +33,7 @@ \ifthmt@hassibling \@counteralias{\thmt@envname}{\thmt@sibling}% \@xa\def\@xa\thmt@autoreffix\@xa{% - \@xa\let\csname the\thmt@envname\@xa\endcsname + \@xa\global\@xa\let\csname the\thmt@envname\@xa\endcsname \csname the\thmt@sibling\endcsname \def\thmt@autoreffix{}% }% diff --git a/Master/texmf-dist/tex/latex/thmtools/aliasctr.sty b/Master/texmf-dist/tex/latex/thmtools/aliasctr.sty index 12a94a030a5..9fc7f33c69a 100644 --- a/Master/texmf-dist/tex/latex/thmtools/aliasctr.sty +++ b/Master/texmf-dist/tex/latex/thmtools/aliasctr.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {aliasctr}[2020/08/01 v0.72] +\ProvidesPackage {aliasctr}[2022/06/01 v0.73] \def\aliasctr@f@llow#1#2\@nil#3{% \ifx#1\@elt \noexpand #3% @@ -58,10 +58,18 @@ \csname ##2\endcsname }% \@ifundefined{c@#2}{\@nocounterr{#2}}{% - \@ifdefinable{c@#1}{% + \expandafter\@ifdefinable\csname c@#1\endcsname{% \@@gletover{c@#1}{c@#2}% \@@gletover{the#1}{the#2}% \@@gletover{theH#1}{theH#2}% + \@ifpackageloaded{cleveref}{% + \edef\aliasctr@temp{% + \noexpand\cref@resetby{#2}{\noexpand\cref@result}}% + \aliasctr@temp + \ifx\cref@result\relax\else% + \cref@addtoreset{#1}{\cref@result}% + \fi + }{}% \@@gletover{p@#1}{p@#2}% \expandafter\global \expandafter\def\csname cl@#1\expandafter\endcsname diff --git a/Master/texmf-dist/tex/latex/thmtools/parseargs.sty b/Master/texmf-dist/tex/latex/thmtools/parseargs.sty index 81a1b4740ee..3b887d4e48a 100644 --- a/Master/texmf-dist/tex/latex/thmtools/parseargs.sty +++ b/Master/texmf-dist/tex/latex/thmtools/parseargs.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {parseargs}[2020/08/01 v0.72] +\ProvidesPackage {parseargs}[2022/06/01 v0.73] \newtoks\@parsespec \def\parse@endquark{\parse@endquark} diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-amsthm.sty b/Master/texmf-dist/tex/latex/thmtools/thm-amsthm.sty index a2a09cfc803..be13a3cadfe 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-amsthm.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-amsthm.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-amsthm}[2020/08/01 v0.72] +\ProvidesPackage {thm-amsthm}[2022/06/01 v0.73] \providecommand\thmt@space{ } \define@key{thmstyle}{spaceabove}{% diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-autoref.sty b/Master/texmf-dist/tex/latex/thmtools/thm-autoref.sty index 64448e1e184..37cfbdf9a4d 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-autoref.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-autoref.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-autoref}[2020/08/01 v0.72] +\ProvidesPackage {thm-autoref}[2022/06/01 v0.73] \RequirePackage{thm-patch, aliasctr, parseargs, keyval} @@ -34,7 +34,7 @@ \ifthmt@hassibling \@counteralias{\thmt@envname}{\thmt@sibling}% \@xa\def\@xa\thmt@autoreffix\@xa{% - \@xa\let\csname the\thmt@envname\@xa\endcsname + \@xa\global\@xa\let\csname the\thmt@envname\@xa\endcsname \csname the\thmt@sibling\endcsname \def\thmt@autoreffix{}% }% diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-beamer.sty b/Master/texmf-dist/tex/latex/thmtools/thm-beamer.sty index f9b31deafdc..274e4064db0 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-beamer.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-beamer.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-beamer}[2020/08/01 v0.72] +\ProvidesPackage {thm-beamer}[2022/06/01 v0.73] \newif\ifthmt@hasoverlay \def\thmt@parsetheoremargs#1{% \parse{% diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-kv.sty b/Master/texmf-dist/tex/latex/thmtools/thm-kv.sty index 9c118ff5a98..6494bbfbad3 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-kv.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-kv.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-kv}[2020/08/01 v0.72] +\ProvidesPackage {thm-kv}[2022/06/01 v0.73] \let\@xa\expandafter \let\@nx\noexpand diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-listof.sty b/Master/texmf-dist/tex/latex/thmtools/thm-listof.sty index f0856dd0eff..9543fd5e53e 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-listof.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-listof.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-listof}[2020/08/01 v0.72] +\ProvidesPackage {thm-listof}[2022/06/01 v0.73] \let\@xa=\expandafter \let\@nx=\noexpand \RequirePackage{thm-patch,keyval,kvsetkeys} diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-llncs.sty b/Master/texmf-dist/tex/latex/thmtools/thm-llncs.sty index d1eb924ba75..bb5a612b304 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-llncs.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-llncs.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-llncs}[2020/08/01 v0.72] +\ProvidesPackage {thm-llncs}[2022/06/01 v0.73] \@ifclasslater{llncs}{2010/04/15}{}{% \PackageWarningNoLine{thmtools}{% LLNCS.cls too old, not supported by thmtools diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-ntheorem.sty b/Master/texmf-dist/tex/latex/thmtools/thm-ntheorem.sty index 516468a1cac..9f2d6c25542 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-ntheorem.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-ntheorem}[2020/08/01 v0.72] +\ProvidesPackage {thm-ntheorem}[2022/06/01 v0.73] \providecommand\thmt@space{ } diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty b/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty index 0e965779859..5af93fed178 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-patch.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-patch}[2020/08/01 v0.72] +\ProvidesPackage {thm-patch}[2022/06/01 v0.73] \RequirePackage{parseargs} \newif\ifthmt@isstarred diff --git a/Master/texmf-dist/tex/latex/thmtools/thm-restate.sty b/Master/texmf-dist/tex/latex/thmtools/thm-restate.sty index 21b999c2d11..172580eac61 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thm-restate.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thm-restate.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thm-restate}[2020/08/01 v0.72] +\ProvidesPackage {thm-restate}[2022/06/01 v0.73] \RequirePackage{thmtools} \let\@xa\expandafter \let\@nx\noexpand diff --git a/Master/texmf-dist/tex/latex/thmtools/thmdef-mdframed.sty b/Master/texmf-dist/tex/latex/thmtools/thmdef-mdframed.sty index 1dde5be1bb2..97177b2081a 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thmdef-mdframed.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thmdef-mdframed.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thmdef-mdframed}[2020/08/01 v0.72] +\ProvidesPackage {thmdef-mdframed}[2022/06/01 v0.73] \define@key{thmdef}{mdframed}[{}]{% \thmt@trytwice{}{% \RequirePackage{mdframed}% diff --git a/Master/texmf-dist/tex/latex/thmtools/thmdef-shaded.sty b/Master/texmf-dist/tex/latex/thmtools/thmdef-shaded.sty index 5263d8fa47a..547eb1c0070 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thmdef-shaded.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thmdef-shaded.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thmdef-shaded}[2020/08/01 v0.72] +\ProvidesPackage {thmdef-shaded}[2022/06/01 v0.73] \define@key{thmdef}{shaded}[{}]{% \thmt@trytwice{}{% \RequirePackage{shadethm}% diff --git a/Master/texmf-dist/tex/latex/thmtools/thmdef-thmbox.sty b/Master/texmf-dist/tex/latex/thmtools/thmdef-thmbox.sty index d6bbbc2b641..fc3c36cdf6e 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thmdef-thmbox.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thmdef-thmbox.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thmdef-thmbox}[2020/08/01 v0.72] +\ProvidesPackage {thmdef-thmbox}[2022/06/01 v0.73] \define@key{thmdef}{thmbox}[L]{% \thmt@trytwice{% \let\oldproof=\proof diff --git a/Master/texmf-dist/tex/latex/thmtools/thmtools.sty b/Master/texmf-dist/tex/latex/thmtools/thmtools.sty index bdc0b63cf7b..f1319f21173 100644 --- a/Master/texmf-dist/tex/latex/thmtools/thmtools.sty +++ b/Master/texmf-dist/tex/latex/thmtools/thmtools.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {thmtools}[2020/08/01 v0.72] +\ProvidesPackage {thmtools}[2022/06/01 v0.73] \DeclareOption{debug}{% \def\thmt@debug{\typeout}% } diff --git a/Master/texmf-dist/tex/latex/thmtools/unique.sty b/Master/texmf-dist/tex/latex/thmtools/unique.sty index 8914828f34b..2bcf810ff1c 100644 --- a/Master/texmf-dist/tex/latex/thmtools/unique.sty +++ b/Master/texmf-dist/tex/latex/thmtools/unique.sty @@ -22,7 +22,7 @@ %% %% \NeedsTeXFormat {LaTeX2e} -\ProvidesPackage {unique}[2020/08/01 v0.72] +\ProvidesPackage {unique}[2022/06/01 v0.73] \DeclareOption{unq}{% \newwrite\uniq@channel -- cgit v1.2.3