summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/thmtools
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-07-18 03:01:08 +0000
committerNorbert Preining <norbert@preining.info>2020-07-18 03:01:08 +0000
commit63c4f21a5716ebbed11926d0bfbb26d656a766ea (patch)
treec02159e6ceb2453208664129ccda8ff306147328 /macros/latex/contrib/thmtools
parent4ea983e3d411ade406c09b30ece9139457516b6f (diff)
CTAN sync 202007180301
Diffstat (limited to 'macros/latex/contrib/thmtools')
-rw-r--r--macros/latex/contrib/thmtools/README22
-rw-r--r--macros/latex/contrib/thmtools/README.md17
-rw-r--r--macros/latex/contrib/thmtools/TODO3
-rw-r--r--macros/latex/contrib/thmtools/VERSION.tex2
-rw-r--r--macros/latex/contrib/thmtools/changes.txt6
-rw-r--r--macros/latex/contrib/thmtools/doc/COPYING (renamed from macros/latex/contrib/thmtools/COPYING)0
-rw-r--r--macros/latex/contrib/thmtools/doc/VERSION.tex1
-rw-r--r--macros/latex/contrib/thmtools/doc/changes.txt12
-rw-r--r--macros/latex/contrib/thmtools/doc/thmtools-manual.pdfbin0 -> 227619 bytes
-rw-r--r--macros/latex/contrib/thmtools/doc/thmtools-manual.tex (renamed from macros/latex/contrib/thmtools/thmtools-manual.tex)230
-rw-r--r--macros/latex/contrib/thmtools/source/aliasctr.dtx (renamed from macros/latex/contrib/thmtools/aliasctr.dtx)9
-rw-r--r--macros/latex/contrib/thmtools/source/parseargs.dtx (renamed from macros/latex/contrib/thmtools/parseargs.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thm-amsthm.dtx (renamed from macros/latex/contrib/thmtools/thm-amsthm.dtx)11
-rw-r--r--macros/latex/contrib/thmtools/source/thm-autoref.dtx (renamed from macros/latex/contrib/thmtools/thm-autoref.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thm-beamer.dtx (renamed from macros/latex/contrib/thmtools/thm-beamer.dtx)11
-rw-r--r--macros/latex/contrib/thmtools/source/thm-kv.dtx (renamed from macros/latex/contrib/thmtools/thm-kv.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thm-listof.dtx (renamed from macros/latex/contrib/thmtools/thm-listof.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thm-llncs.dtx (renamed from macros/latex/contrib/thmtools/thm-llncs.dtx)11
-rw-r--r--macros/latex/contrib/thmtools/source/thm-ntheorem.dtx (renamed from macros/latex/contrib/thmtools/thm-ntheorem.dtx)11
-rw-r--r--macros/latex/contrib/thmtools/source/thm-patch.dtx (renamed from macros/latex/contrib/thmtools/thm-patch.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thm-restate.dtx (renamed from macros/latex/contrib/thmtools/thm-restate.dtx)18
-rw-r--r--macros/latex/contrib/thmtools/source/thmdef-mdframed.dtx (renamed from macros/latex/contrib/thmtools/thmdef-mdframed.dtx)15
-rw-r--r--macros/latex/contrib/thmtools/source/thmdef-shaded.dtx (renamed from macros/latex/contrib/thmtools/thmdef-shaded.dtx)63
-rw-r--r--macros/latex/contrib/thmtools/source/thmdef-thmbox.dtx43
-rw-r--r--macros/latex/contrib/thmtools/source/thmtools.dtx (renamed from macros/latex/contrib/thmtools/thmtools.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/source/thmtools.ins64
-rw-r--r--macros/latex/contrib/thmtools/source/unique.dtx (renamed from macros/latex/contrib/thmtools/unique.dtx)8
-rw-r--r--macros/latex/contrib/thmtools/thmdef-thmbox.dtx36
-rw-r--r--macros/latex/contrib/thmtools/thmtools.ins61
-rw-r--r--macros/latex/contrib/thmtools/thmtools.pdfbin225947 -> 0 bytes
30 files changed, 395 insertions, 307 deletions
diff --git a/macros/latex/contrib/thmtools/README b/macros/latex/contrib/thmtools/README
deleted file mode 100644
index 711b6051ff..0000000000
--- a/macros/latex/contrib/thmtools/README
+++ /dev/null
@@ -1,22 +0,0 @@
- The \thmtools\ bundle provides several packages for commonly-needed
- features for theorems. As designed, the bundle should work with kernel
- theorems, the theorem package and the amsthm package.
-
- WARNING: Currently, things might still be a bit rough. You
- might want to consider not relying on \thmtools\ for your Ph.D. thesis
- masterpiece.
-
-Provided features:
-a keyval interface to \newtheorem
-a \listoftheorem command
-hyperref/autoref compatibility
-a way of restating entire theorems with a single macro call
-
-License: LPPL 1.3c
-
-Currently the package has no maintainer ... and is looking for one!
-
-Previous Maintainer was Ulrich M. Schwarz, ulmi@absatzen.de
-
-
-$Id: README,v 1.1 2008/02/17 21:13:58 ulmi Exp ulmi $
diff --git a/macros/latex/contrib/thmtools/README.md b/macros/latex/contrib/thmtools/README.md
new file mode 100644
index 0000000000..ffcfb135d3
--- /dev/null
+++ b/macros/latex/contrib/thmtools/README.md
@@ -0,0 +1,17 @@
+The `thmtools` bundle provides several packages for commonly-needed
+features for theorems. As designed, the bundle should work with kernel
+theorems (theorems ‘out of the box’ with LaTeX),
+the [`amsthm`](https://ctan.org/pkg/amsmath) package and
+the [`ntheorem`](https://ctan.org/pkg/ntheorem) package.
+
+Provided features:
+ - a keyval interface to `\newtheorem` and `\newtheoremstyle`
+ - a `\listoftheorem` command with filtering ability
+ - [`hyperref`](https://ctan.org/pkg/hyperref) and [`cleveref`](https://ctan.org/pkg/cleveref) compatibility
+ - a way of restating entire theorems with a single macro call
+
+License: LPPL 1.3c
+
+Currently the package is maintained by Yukai Chou, <span>muzimuzhi@gmail.com</span>
+
+Previous Maintainer was Ulrich M. Schwarz, <span>ulmi@absatzen.de</span>
diff --git a/macros/latex/contrib/thmtools/TODO b/macros/latex/contrib/thmtools/TODO
deleted file mode 100644
index e35b77530a..0000000000
--- a/macros/latex/contrib/thmtools/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- ref close-by/far-away
-- complex refs
- (these two are very similar)
diff --git a/macros/latex/contrib/thmtools/VERSION.tex b/macros/latex/contrib/thmtools/VERSION.tex
deleted file mode 100644
index 466ff0ebce..0000000000
--- a/macros/latex/contrib/thmtools/VERSION.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-% set by hand as I don't use CVS
-\def\x #1-#2-#3 #4 v#5\@{\def\VERSION{#1/#2/#3 v#5}}\x 2019-12-22 00:00:00 +0200 v68\@
diff --git a/macros/latex/contrib/thmtools/changes.txt b/macros/latex/contrib/thmtools/changes.txt
deleted file mode 100644
index 06dc12ef79..0000000000
--- a/macros/latex/contrib/thmtools/changes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-2019-12-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
-
- * thm-kv.dtx:
- removed dependency on etexcmds package
-
-
diff --git a/macros/latex/contrib/thmtools/COPYING b/macros/latex/contrib/thmtools/doc/COPYING
index 2244313901..2244313901 100644
--- a/macros/latex/contrib/thmtools/COPYING
+++ b/macros/latex/contrib/thmtools/doc/COPYING
diff --git a/macros/latex/contrib/thmtools/doc/VERSION.tex b/macros/latex/contrib/thmtools/doc/VERSION.tex
new file mode 100644
index 0000000000..9bfeb6f890
--- /dev/null
+++ b/macros/latex/contrib/thmtools/doc/VERSION.tex
@@ -0,0 +1 @@
+\def\VERSION{2020/07/16 v69}
diff --git a/macros/latex/contrib/thmtools/doc/changes.txt b/macros/latex/contrib/thmtools/doc/changes.txt
new file mode 100644
index 0000000000..c16fb63e78
--- /dev/null
+++ b/macros/latex/contrib/thmtools/doc/changes.txt
@@ -0,0 +1,12 @@
+2019-12-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * thm-kv.dtx:
+ removed dependency on etexcmds package
+
+2020-07-16 Yukai Chou <muzimuzhi@gmail.com>
+
+ * thm-restate.dtx:
+ made compatible with cleveref's \label[]{} syntax
+
+ * thmtools-manual.tex (and comment part of dtx files):
+ refined manual
diff --git a/macros/latex/contrib/thmtools/doc/thmtools-manual.pdf b/macros/latex/contrib/thmtools/doc/thmtools-manual.pdf
new file mode 100644
index 0000000000..8d9ff5fc01
--- /dev/null
+++ b/macros/latex/contrib/thmtools/doc/thmtools-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/thmtools/thmtools-manual.tex b/macros/latex/contrib/thmtools/doc/thmtools-manual.tex
index 111acda6dc..47f1235f5f 100644
--- a/macros/latex/contrib/thmtools/thmtools-manual.tex
+++ b/macros/latex/contrib/thmtools/doc/thmtools-manual.tex
@@ -1,4 +1,4 @@
-%&pdflatex
+% !TeX program = pdflatex
\documentclass[paper=a4, pagesize, DIV=20,
english,
headings=small,11pt,
@@ -27,10 +27,18 @@
\usepackage{listings}
\usepackage{amsmath, amsthm}
+\usepackage{enumitem}
+\setlist[description, 1]{labelindent=2em, leftmargin=2em, rightmargin=2em, labelwidth=!}
\usepackage{tikz}
+\usetikzlibrary{tikzmark}
\usepackage{nameref}
\usepackage{hyperref}
+\hypersetup{
+ colorlinks,
+ linkcolor=RoyalBlue,
+ linktocpage
+}
\usepackage{cleveref}[2010/05/01]
\usepackage{thmtools, thm-restate}
@@ -115,11 +123,13 @@
\input{VERSION.tex}
\title{\Thmtools Users' Guide}
-\author{Dr. Ulrich M. Schwarz -- ulmi@absatzen.de\thanks{
+\author{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.
-}}
+ when \thmtools got stuck in a ``good enough for me'' slump.}
+ \and
+ Yukai Chou -- muzimuzhi@gmail.com
+}
\date{\VERSION}
\begin{document}
@@ -138,7 +148,8 @@
\autoref{cha:reference}.
\begin{multicols}{2}[\section*{\contentsname}]
- \makeatletter\let\chapter\@gobbletwo
+ \makeatletter
+ \let\chapter\@gobbletwo
\tableofcontents
\end{multicols}
\clearpage
@@ -160,13 +171,13 @@
\begin{body}[gobble=4]
% Document code looks like this.
\begin{theorem}[Euclid]
- \label{thm:euclid}%
- For every prime $p$, there is a prime $p'>p$.
- In particular, the list of primes,
- \begin{equation}\label{eq:1}
- 2,3,5,7,\dots
- \end{equation}
- is infinite.
+ \label{thm:euclid}%
+ For every prime $p$, there is a prime $p'>p$.
+ In particular, the list of primes,
+ \begin{equation}\label{eq:1}
+ 2,3,5,7,\dots
+ \end{equation}
+ is infinite.
\end{theorem}
\end{body}
\end{source}
@@ -220,8 +231,8 @@
\end{restatable}
\end{result}
- Instead of ``numberwithin='', you can also use ``parent='' and
- ``within=''. They're all the same, use the one you find easiest to
+ Instead of |numberwithin=|, you can also use |parent=| and
+ |within=|. They're all the same, use the one you find easiest to
remember.
Note the example above looks somewhat bad: sometimes, the name of the environment,
@@ -272,8 +283,8 @@
\end{lemma}
\end{result}
- Again, instead of ``sibling='', you can also use ``numberlike='' and
- ``sharecounter=''.
+ Again, instead of |sibling=|, you can also use |numberlike=| and
+ |sharecounter=|.
Some theorems have a fixed name and are not supposed to get a number.
To this end, \pkg{amsthm} provides |\newtheorem*|, which is
@@ -355,7 +366,8 @@
\begin{preamble}[gobble=6]
\usepackage{amsthm, thmtools}
\usepackage{
- nameref,%\nameref
+ % nameref,%\nameref
+ % n.b. usually nameref is autoloaded by hyperref
hyperref,%\autoref
% n.b. \Autoref is defined by thmtools
cleveref,% \cref
@@ -391,6 +403,7 @@
\end{result}
\section{Styling theorems}
+ \label{sec:styling}
The major backends provide a command |\theoremstyle| to switch
between looks of theorems. This is handled as follows:
@@ -403,10 +416,11 @@
\end{preamble}
\begin{body}[gobble=4]
\begin{Theorem}
- This is a theorem.
+ Note how it still retains the default style,
+ `plain'.
\end{Theorem}
\begin{remark}
- Note how it still retains the default style, `plain'.
+ This is a remark.
\end{remark}
\end{body}
\end{source}
@@ -419,7 +433,7 @@
\end{remark}
\end{result}
- Thmtools also supports the shadethm and thmbox packages:
+ Thmtools also supports the \pkg{shadethm} and \pkg{thmbox} packages:
\begin{source}
\begin{preamble}[gobble=4]
\usepackage{amsthm}
@@ -457,9 +471,9 @@
start with a curly brace, in which case it is assumed that
|\definecolor{colorname}|$\langle$\textsl{what you said}$\rangle$ will be
valid \LaTeX\ code. In our case, we use the rbg model to manually specify
- white. (Shadethm's default value is some sort of gray.)
+ white. (|shadethm|'s default value is {\fboxsep=0pt \fcolorbox{black}[gray]{0.92}{\phantom{XX}}} |[gray]{0.92}|)
- For the thmbox package, use the thmbox key:
+ For the \pkg{thmbox} package, use the |thmbox| key:
\begin{source}
\begin{preamble}[gobble=4]
\usepackage{amsthm}
@@ -498,7 +512,7 @@
\end{boxtheorem S}
\end{result}
- Note that for both thmbox and shaded keys, it's quite possible they will not
+ Note that for both |thmbox| and |shaded| keys, it's quite possible they will not
cooperate with a style key you give at the same time.
\subsection{Declaring new theoremstyles}
@@ -539,52 +553,62 @@
more keys you can pass to |\declaretheoremstyle|: if \thmtools\ cannot
figure out at all what to do with it, it will pass it on to the
|\declaretheorem| commands that use that style. For example, you may use
- the boxed and shaded keys here.
+ the |boxed| and |shaded| keys here.
To change the order in which title, number and note appear, there is a key
- headformat. Currently, the values ``margin'' and ``swapnumber'' are
+ |headformat|. Currently, the values ``margin'' and ``swapnumber'' are
supported. The daring may also try to give a macro here that uses the
commands |\NUMBER|, |\NAME| and |\NOTE|.
You cannot circumvent the fact
- that headpunct comes at the end, though, nor the fonts and braces you
+ that |headpunct| comes at the end, though, nor the fonts and braces you
select with the other keys.
- \begin{figure}\centering
- % please don't make me touch this picture ever again.
- \fbox{
- \begin{minipage}{0.618\textwidth}\Large
- \tikzset{font=\normalfont\small\sffamily\itshape,y=12pt,>=latex}
- \noindent which resulted in the following insight:
- \par
- \tikz{\draw[|<->|] (0,-1)--(0,1);
- \draw[anchor=west] (0,0) node {spaceabove};}
- \par
- \tikz{\draw[|<->|] (-1,0)--(1,0);
- \draw[anchor=south] (0,0) node {headindent};}
- \textbf{Theo%
- \smash{\clap{\tikz{\draw (0,0)--(0,1.2) node [anchor=south]{headfont};}}}%
- rem 1.2
- (\smash{\rlap{\tikz{\draw (0,0)--(0,2.5) node [anchor=base west]{notebraces};}}}%
- Euc%
-\smash{\clap{\tikz{\draw (0,0)--(0,1.2) node [anchor=south]{notefont};}}}%
- lid)%
- .\smash{\rlap{\tikz{\draw (0,0)--(0,1.2) node [anchor=south west]{headpunct};}}}}%
- \tikz{\draw[|<->|] (-1,0)--(1,0);
- \draw[anchor=south] (0,0) node {postheadspace};}
- For every prime $p$, there is a prime $p'>p$.
- In particular, the list of primes,
- $2,3,5,7,\dots$,
- is infinite.
- \hfill{\tikz{\draw[anchor=north east] (0,0) node{qed}; }}$\Box$
- \par
- \tikz{\draw[|<->|] (0,-1)--(0,1);
- \draw[anchor=west] (0,0) node {spacebelow};}
- \par
-
- As a consequence, lorem ipsum dolor sit amet frob-%nicate foo
-% paret.
- \end{minipage}
- }
+ \begin{figure}
+ \centering
+ \fbox{%
+ \begin{tikzpicture}[
+ remember picture,
+ >=latex,
+ nodes={
+ font=\normalfont\sffamily\itshape\small,
+ RoyalBlue
+ },
+ every subnode/.style={
+ inner sep=0pt
+ },
+ tip/.style={|<->|}
+ ]
+ \node[black, font=\Large, text width=.618\textwidth, align=justify]
+ {%
+ which resulted in the following insight: \\
+ \subnode{space above}{\rule{0pt}{1.3\baselineskip}} \\
+ \subnode{head indent}{\strut\hspace*{4em}}
+ \textbf{%
+ \subnode{head}{Theorem} 1.2
+ \subnode{note brace}{(}%
+ \subnode{note}{\textit{Euclid}})%
+ \subnode{head punct}{.} %
+ }
+ \subnode{post head space}{\strut\hspace*{4.5em}}
+ For every prime~$p$, there is a prime~$p'>p$. In particular, the list
+ of primes, $2,3,5,7,\dots$, is infinite. \hfill
+ \subnode{qed}{$\Box$} \\
+ \subnode{space below}{\rule{0pt}{1.3\baselineskip}} \\
+ As a consequence, lorem ipsum dolor sit amet frob-%nicate foo
+ % paret.
+ };
+
+ \draw[tip] (space above.south west) -- node[right] {spaceabove} (space above.north west);
+ \draw[tip] (head indent.west) -- node[above] {headindent} (head indent.east);
+ \draw (head.center) -- +(0, 10pt) node[above] {headfont};
+ \draw (note brace.north) -- +(0, 20pt) node[above] {notebraces};
+ \draw (note.center) -- +(0, 10pt) node[above] {notefont};
+ \draw (head punct.base east) -- +(0, 28pt) node[above] {headpunct};
+ \draw[tip] (post head space.west) -- node[above] {postheadspace} (post head space.east);
+ \node at ([xshift=-12pt]qed.150) {qed};
+ \draw[tip] (space below.south west) -- node[right] {spacebelow} (space below.north west);
+ \end{tikzpicture}%
+ }
\caption{Settable parameters of a theorem style.}
\label{fig:params}
\end{figure}
@@ -631,14 +655,14 @@
mechanism, so that this reference: \autoref{thm:euclid} points to
p.\,\pageref{thm:euclid}, where the unstarred environment is used. (You can
also use a starred environment and an unstarred command, in which case the
- behaviour is reversed.) Also, if you use \pkg{hyperref}, the links will lead you
+ behaviour is reversed.) Also, if you use \pkg{hyperref} (like you see in this manual), the links will lead you
to the unstarred occurence.
Just to demonstrate that we also handle more involved cases, I repeat
another theorem here, but this one was numbered within its section: note
we retain the section number which does not fit the current section:
\begin{source}
- \begin{body}
+ \begin{body}[gobble=6]
\euclidii*
\end{body}
\end{source}
@@ -678,7 +702,7 @@
And you can also restrict to those environments that have an optional
argument given. Note that two theorems disappear compared to the previous
- example. You could also say just ``onlynamed'', in which case it will
+ example. You could also say just |onlynamed|, in which case it will
apply to \emph{all} theorem environments you have defined.
\begin{source}
\begin{body}[gobble=6]
@@ -705,13 +729,16 @@
\emph{optional} argument, which will go into the list of theorems. Be
aware that since we already are within an optional argument, you have to
use an extra level of curly braces:
- |\begin{theorem}[{name=[Short name]A long name,...}]|
+ |\begin{theorem}[name={[Short name]A long name,...]}|
+
\item[label] This will issue a |\label| command after the head. Not very
useful, more of a demo.
+
\item[continues] Saying |continues=foo| will cause the number that is
given to be changed to |\ref{foo}|, and a text is added to the note.
(The exact text is given by the macro |\thmcontinues|, which takes the
label as its argument.)
+
\item[restate] Saying |restate=foo| will hopefully work like
wrapping this theorem in a restatable environment. (It probably still fails
in cases that I didn't think of.) This key also accepts an optional
@@ -766,8 +793,8 @@
|...postheadhook|, |...prefoothook|
and |...postfoothook|.
All of these take an \emph{optional} argument, the name of the
- environment, and the new code as a mandatory argument. The environment is
- optional because there is also a set of ``generic'' hooks added to every
+ environment, and the new code as a mandatory argument. The name of environment is
+ optional because there is also a set of ``generic'' hooks added to every
theorem that you define.
The other way is to use the keys |preheadhook| et al. in your
@@ -796,9 +823,9 @@
handling itself is added as part of the headkeys.)
- \section{Case in point: the shaded key}
+ \section{Case in point: the \texttt{shaded} key}
- Let us look at a reasonably simple example: the shaded key, which we've
+ Let us look at a reasonably simple example: the |shaded| key, which we've
already seen in the first section. You'll observe that we run into a
problem similar to the four-hook mess: your code may either want to modify
parameters that need to be set beforehand, or it wants to modify the
@@ -826,8 +853,8 @@
using internal macros with @ in their name (viz.,
|\thmt@envname| and friends). You can also put them into a
package (then, without the |\makeat...|),
- which is simply a file ending in .sty put somewhere that \LaTeX\ can find
- it, which can then be laoded with |\usepackage|.
+ which is simply a file ending in |.sty| put somewhere that \LaTeX\ can find
+ it, which can then be loaded with |\usepackage|.
To find out where exactly that is, and if you'd need to update
administrative helper files such as a filename database FNDB,
please consult the documentation of your \TeX\ distribution.
@@ -912,7 +939,8 @@
Additionally, a number of keywords are allowed here instead of \LaTeX\
code:
\begin{description}
- \item[margin] Lets the number protude in the (left) margin.
+ \item[margin] Lets the number protrude in the (left) margin.
+
\item[swapnumber] Puts the number before the name. Currently
not working so well for unnumbered theorems.
\item[] \emph{This list is likely to grow}
@@ -932,16 +960,10 @@
|section|.
\key{numberwithin}
- Value: a counter name. The theorem will be reset whenever that counter
- is incremented. Usually, this will be a sectioning level, |chapter| or
- |section|.
- (Same as parent.)
+ (Same as |parent|.)
\key{within}
- Value: a counter name. The theorem will be reset whenever that counter
- is incremented. Usually, this will be a sectioning level, |chapter| or
- |section|.
- (Same as parent.)
+ (Same as |parent|.)
\key{sibling}
@@ -949,31 +971,21 @@
Usually, this is the name of another theorem environment.
\key{numberlike}
- Value: a counter name. The theorem will use this counter for numbering.
- Usually, this is the name of another theorem environment.
- (Same as sibling.)
+ (Same as |sibling|.)
\key{sharenumber}
- Value: a counter name. The theorem will use this counter for numbering.
- Usually, this is the name of another theorem environment.
- (Same as sibling.)
+ (Same as |sibling|.)
\key{title}
Value: \TeX\ code. The title of the theorem. Default is the name of the
environment, with |\MakeUppercase| prepended. You'll have to give
- this if your title starts with a accented character, for example.
+ this if your title starts with an accented character, for example.
\key{name}
- Value: \TeX\ code. The title of the theorem. Default is the name of the
- environment, with |\MakeUppercase| prepended. You'll have to give
- this if your title starts with a accented character, for example.
(Same as title.)
\key{heading}
- Value: \TeX\ code. The title of the theorem. Default is the name of the
- environment, with |\MakeUppercase| prepended. You'll have to give
- this if your title starts with a accented character, for example.
(Same as title.)
\key{numbered}
@@ -1009,14 +1021,14 @@
group defined by the environment.
\key{refname}
- Value: one string, or two string separated by a comma (no spaces). This
+ Value: one string, or two strings separated by a comma (no spaces). This
is the name of the theorem as used by |\autoref|, |\cref| and friends. If it is
two strings, the second is the plural form used by |\cref|. Default
value is the value of |name|, i.e. usually the environment name, with
- \MakeUppercase.
+ |\MakeUppercase| prepended.
\key{Refname}
- Value: one string, or two string separated by a comma (no spaces). This
+ Value: one string, or two strings separated by a comma (no spaces). This
is the name of the theorem as used by |\Autoref|, |\Cref| and friends. If it is
two strings, the second is the plural form used by |\Cref|. This can be
used for alternate spellings, for example if your style requests no
@@ -1041,7 +1053,7 @@
\end{description}
\key{thmbox}
- Value: one of the characters L, M and S; see examples above.
+ Value: one of the characters |L|, |M| and |S|; see examples in \autoref{sec:styling}.
\section{Known keys to in-document theorems}
@@ -1053,16 +1065,16 @@
\key{name} Value: \TeX\ code that will be typeset.
What you would have put in the optional argument in the
non-keyval style, i.e. the note to the head. This is \emph{not} the same
- as the name key to |\declaretheorem|, you cannot override that from within
+ as the |name| key to |\declaretheorem|, you cannot override that from within
the document.
\key{listhack} Value: doesn't matter. (But put something to trigger
- key-val behaviour, maybe listhack=true.) Linebreak styles in \pkg{amsthm}
+ key-val behaviour, maybe |listhack=true|.) Linebreak styles in \pkg{amsthm}
don't linebreak if they start with another list, like an |enumerate|
environment. Giving the |listhack| key fixes that. \emph{Don't} give this
key for non-break styles, you'll get too little vertical space! (Just use
|\leavevmode| manually there.)
- An all-around listhack that handles both situations might come in a
+ An all-around |listhack| that handles both situations might come in a
cleaner rewrite of the style system.
\section{Restatable -- hints and caveats}
@@ -1071,14 +1083,14 @@
\begin{itemize}
\item Some counters are saved so that the same values appear when you
re-use them. The list of these counters is stored in the macro
- |\thmt@innercounters| as a comma-separated list without spaces; default: equation.
+ |\thmt@innercounters| as a comma-separated list without spaces; default: |equation|.
\item To preserve the influence of other counters (think: equation
numbered per section and recall the theorem in another section), we need
to know all macros that are used to turn a counter into printed output.
Again, comma-separated list without spaces, without leading backslash, stored as
|\thmt@counterformatters|. Default:
- |@alph,@Alph,@arabic,@roman,@Roman,@fnsymbol|
+ |@alph,@Alph,@arabic,@roman,@Roman,@fnsymbol|.
All these only take
the \LaTeX\ counter |\c@foo| as arguments. If you bypass this and use
|\romannumeral|, your numbers go wrong and you get what you deserve.
@@ -1101,7 +1113,7 @@
\chapter{\Thmtools for the morbidly curious}\label{cha:sourcecode}
- This chapter consists of the implementation of Thmtools, in case you
+ This chapter consists of the implementation of \thmtools, in case you
wonder how this or that feature was implemented. Read on if you want a
look under the bonnet, but you enter at your own risk, and bring an oily
rag with you.
@@ -1123,18 +1135,18 @@
\subsection{Re-using environments}
\DocInput{thm-restate.dtx}
- \subsection{Fixing autoref and friends}
+ \subsection{Fixing \texttt{autoref} and friends}
\DocInput{thm-autoref.dtx}
\section{Glue code for different backends}
- \subsection{amsthm}
+ \subsection{\texttt{amsthm}}
\DocInput{thm-amsthm.dtx}
- \subsection{beamer}
+ \subsection{\texttt{beamer}}
\DocInput{thm-beamer.dtx}
- \subsection{ntheorem}
+ \subsection{\texttt{ntheorem}}
\DocInput{thm-ntheorem.dtx}
\section{Generic tools}
@@ -1145,7 +1157,7 @@
\subsection{Different counters sharing the same register}
\DocInput{aliasctr.dtx}
- \subsection{Tracking occurences: none, one or many}
+ \subsection{Tracking occurrences: none, one or many}
\DocInput{unique.dtx}
diff --git a/macros/latex/contrib/thmtools/aliasctr.dtx b/macros/latex/contrib/thmtools/source/aliasctr.dtx
index b492f95f56..3c75e11c98 100644
--- a/macros/latex/contrib/thmtools/aliasctr.dtx
+++ b/macros/latex/contrib/thmtools/source/aliasctr.dtx
@@ -1,10 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2005-7 by Ulrich M. Schwarz
+% Copyright (C) 2005-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a. The full license text
-% is available from http://www.latex-project.org/
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
%
%<*code>
% \fi
diff --git a/macros/latex/contrib/thmtools/parseargs.dtx b/macros/latex/contrib/thmtools/source/parseargs.dtx
index 8f4aa42171..4efcd3ecd9 100644
--- a/macros/latex/contrib/thmtools/parseargs.dtx
+++ b/macros/latex/contrib/thmtools/source/parseargs.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thm-amsthm.dtx b/macros/latex/contrib/thmtools/source/thm-amsthm.dtx
index 31a2397f47..b45a6c276e 100644
--- a/macros/latex/contrib/thmtools/thm-amsthm.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-amsthm.dtx
@@ -1,7 +1,14 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
diff --git a/macros/latex/contrib/thmtools/thm-autoref.dtx b/macros/latex/contrib/thmtools/source/thm-autoref.dtx
index 90a164f1af..cf84463c09 100644
--- a/macros/latex/contrib/thmtools/thm-autoref.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-autoref.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thm-beamer.dtx b/macros/latex/contrib/thmtools/source/thm-beamer.dtx
index 7c56099ce6..44319480c7 100644
--- a/macros/latex/contrib/thmtools/thm-beamer.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-beamer.dtx
@@ -1,7 +1,14 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
diff --git a/macros/latex/contrib/thmtools/thm-kv.dtx b/macros/latex/contrib/thmtools/source/thm-kv.dtx
index 4a31a51885..bdac30899d 100644
--- a/macros/latex/contrib/thmtools/thm-kv.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-kv.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thm-listof.dtx b/macros/latex/contrib/thmtools/source/thm-listof.dtx
index e91219eca1..39603b4341 100644
--- a/macros/latex/contrib/thmtools/thm-listof.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-listof.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thm-llncs.dtx b/macros/latex/contrib/thmtools/source/thm-llncs.dtx
index 5a3b480c2e..134acb18b7 100644
--- a/macros/latex/contrib/thmtools/thm-llncs.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-llncs.dtx
@@ -1,7 +1,14 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
diff --git a/macros/latex/contrib/thmtools/thm-ntheorem.dtx b/macros/latex/contrib/thmtools/source/thm-ntheorem.dtx
index ccd12dc30d..ef29870931 100644
--- a/macros/latex/contrib/thmtools/thm-ntheorem.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-ntheorem.dtx
@@ -1,7 +1,14 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
diff --git a/macros/latex/contrib/thmtools/thm-patch.dtx b/macros/latex/contrib/thmtools/source/thm-patch.dtx
index b1e28b6fe4..dd00028ca8 100644
--- a/macros/latex/contrib/thmtools/thm-patch.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-patch.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1.3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thm-restate.dtx b/macros/latex/contrib/thmtools/source/thm-restate.dtx
index 033a48254e..d02b3630ab 100644
--- a/macros/latex/contrib/thmtools/thm-restate.dtx
+++ b/macros/latex/contrib/thmtools/source/thm-restate.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1.3c.txt
%
% \fi
%
@@ -224,7 +226,7 @@
\@xa\let\csname c@#2\endcsname=\c@thmt@dummyctr
\@xa\let\csname theH#2\endcsname=\theHthmt@dummyctr
% disable labeling.
- \let\label=\@gobble
+ \let\label=\thmt@gobble@label
\let\ltx@label=\@gobble% amsmath needs this
% We shall need to restore the counters at the end
% of the environment, so we get
@@ -268,6 +270,14 @@
%% now empty, just used as a marker.
}
+\let\thmt@gobble@label\@gobble
+% cleveref extends syntax of \label to \label[...]{...}
+\AtBeginDocument{
+ \@ifpackageloaded{cleveref}{
+ \renewcommand*\thmt@gobble@label[2][]{}
+ }{}
+}
+
\newenvironment{restatable}{%
\thmt@thisistheonetrue\thmt@restatable
}{%
diff --git a/macros/latex/contrib/thmtools/thmdef-mdframed.dtx b/macros/latex/contrib/thmtools/source/thmdef-mdframed.dtx
index a3fd3658cb..85c5d9bd2d 100644
--- a/macros/latex/contrib/thmtools/thmdef-mdframed.dtx
+++ b/macros/latex/contrib/thmtools/source/thmdef-mdframed.dtx
@@ -1,14 +1,21 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
%<*mdframed>
%\fi
%
-% Mostly, this key wraps the theorem in a mdframed environment.
+% Mostly, this key wraps the theorem in a |mdframed| environment.
% The parameters are set by treating the value we are given as
% a new key-val list, see below.
%
@@ -20,7 +27,7 @@
\addtotheorempreheadhook[\thmt@envname]{%
\begin{mdframed}[#1]}%
\addtotheorempostfoothook[\thmt@envname]{\end{mdframed}}%
- }%
+ }%
}
% \end{macrocode}
%\iffalse (hide this from DocInput)
diff --git a/macros/latex/contrib/thmtools/thmdef-shaded.dtx b/macros/latex/contrib/thmtools/source/thmdef-shaded.dtx
index 6377182c3e..c7501cae36 100644
--- a/macros/latex/contrib/thmtools/thmdef-shaded.dtx
+++ b/macros/latex/contrib/thmtools/source/thmdef-shaded.dtx
@@ -1,14 +1,21 @@
% \iffalse meta-comment
%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
%\fi
%
%\iffalse (hide this from DocInput)
%<*shaded>
%\fi
%
-% Mostly, this key wraps the theorem in a shadebox environment.
+% Mostly, this key wraps the theorem in a |shadebox| environment.
% The parameters are set by treating the value we are given as
% a new key-val list, see below.
%
@@ -24,45 +31,45 @@
}%
}
% \end{macrocode}
-% The docs for shadethm say:
+% The docs for |shadethm| say:
% \begin{quote}
% There are some parameters you could set the default for (try them as is,
% first).
% \begin{itemize}
-% \item shadethmcolor The shading color of the background. See the
+% \item |shadethmcolor|\quad The shading color of the background. See the
% documentation for the color package, but with a `gray' model, I find .97
% looks good out of my printer, while a darker shade like .92 is needed
% to make it copy well. (Black is 0, white is 1.)
-% \item shaderulecolor The shading color of the border of the shaded box.
+% \item |shaderulecolor|\quad The shading color of the border of the shaded box.
% See (i). If shadeboxrule is set to 0pt then this won't print anyway.
-% \item shadeboxrule The width of the border around the shading. Set it to
+% \item |shadeboxrule|\quad The width of the border around the shading. Set it to
% 0pt (not just 0) to make it disappear.
-% \item shadeboxsep The length by which the shade box surrounds the text.
+% \item |shadeboxsep|\quad The length by which the shade box surrounds the text.
% \end{itemize}
% \end{quote}
%
% So, let's just define keys for all of these.
%
% \begin{macrocode}
-\define@key{thmt@shade}{textwidth}{\setlength\shadedtextwidth{#1}}
-\define@key{thmt@shade}{bgcolor}{\thmt@definecolor{shadethmcolor}{#1}}
-\define@key{thmt@shade}{rulecolor}{\thmt@definecolor{shaderulecolor}{#1}}
-\define@key{thmt@shade}{rulewidth}{\setlength\shadeboxrule{#1}}
-\define@key{thmt@shade}{margin}{\setlength\shadeboxsep{#1}}
-\define@key{thmt@shade}{padding}{\setlength\shadeboxsep{#1}}
-\define@key{thmt@shade}{leftmargin}{\setlength\shadeleftshift{#1}}
+\define@key{thmt@shade}{textwidth} {\setlength\shadedtextwidth{#1}}
+\define@key{thmt@shade}{bgcolor} {\thmt@definecolor{shadethmcolor}{#1}}
+\define@key{thmt@shade}{rulecolor} {\thmt@definecolor{shaderulecolor}{#1}}
+\define@key{thmt@shade}{rulewidth} {\setlength\shadeboxrule{#1}}
+\define@key{thmt@shade}{margin} {\setlength\shadeboxsep{#1}}
+\define@key{thmt@shade}{padding} {\setlength\shadeboxsep{#1}}
+\define@key{thmt@shade}{leftmargin} {\setlength\shadeleftshift{#1}}
\define@key{thmt@shade}{rightmargin}{\setlength\shaderightshift{#1}}
% \end{macrocode}
%
% What follows is wizardry you don't have to understand. In essence,
% we want to support two notions of color: one is ``everything that goes
-% after \lstinline|\definecolor{shadethmcolor}|'', such as
-% \lstinline|{rgb}{0.8,0.85,1}|. On the other hand, we'd also like
-% to recognize an already defined color name such as \lstinline|blue|.
+% after |\definecolor{shadethmcolor}|'', such as
+% |{rgb}{0.8,0.85,1}|. On the other hand, we'd also like
+% to recognize an already defined color name such as |blue|.
%
% To handle the latter case, we need to copy the definition of one color
-% into another. The xcolor package offers \lstinline|\colorlet| for that,
-% for the color package, we just cross our fingers.
+% into another. The \pkg{xcolor} package offers |\colorlet| for that,
+% for the \pkg{color} package, we just cross our fingers.
% \begin{macrocode}
\def\thmt@colorlet#1#2{%
%\typeout{don't know how to let color `#1' be like color `#2'!}%
@@ -78,19 +85,19 @@
% \end{macrocode}
% Now comes the interesting part: we assume that a simple color name
% must not be in braces, and a color definition starts with an opening
-% curly brace. (So, if \lstinline|\definecolor| ever gets an optional arg,
+% curly brace. (So, if |\definecolor| ever gets an optional arg,
% we are in a world of pain.)
%
-% If the second argument to \lstinline|\thmt@definecolor| (the key) starts
+% If the second argument to |\thmt@definecolor| (the key) starts
% with a brace,
-% then \lstinline|\thmt@def@color| will have an empty second argument,
+% then |\thmt@def@color| will have an empty second argument,
% delimited by the brace of the key. Hopefully, the key will have exactly
-% enough arguments to satisfy \lstinline|\definecolor|. Then,
-% \lstinline|thmt@drop@relax| will be executed and gobble the fallback
-% values and the \lstinline|\thmt@colorlet|.
+% enough arguments to satisfy |\definecolor|. Then,
+% |thmt@drop@relax| will be executed and gobble the fallback
+% values and the |\thmt@colorlet|.
%
-% If the key does not contain an opening brace, \lstinline|\thmt@def@color|
-% will drop everything up to \lstinline|{gray}{0.5}|. So, first the color
+% If the key does not contain an opening brace, |\thmt@def@color|
+% will drop everything up to |{gray}{0.5}|. So, first the color
% gets defined to a medium gray, but then, it immediately gets overwritten
% with the definition corresponding to the color name.
% \begin{macrocode}
diff --git a/macros/latex/contrib/thmtools/source/thmdef-thmbox.dtx b/macros/latex/contrib/thmtools/source/thmdef-thmbox.dtx
new file mode 100644
index 0000000000..59409fd79e
--- /dev/null
+++ b/macros/latex/contrib/thmtools/source/thmdef-thmbox.dtx
@@ -0,0 +1,43 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2010-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
+%
+% This file may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, version 1.3c.
+% The license can be obtained from
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
+%\fi
+%
+%\iffalse (hide this from DocInput)
+%<*thmbox>
+%\fi
+% The \pkg{thmbox} package does something else: instead of having a separate
+% environment, we have to use a command different from
+% |\newtheorem| to get the boxed style. Fortunately,
+% \thmtools stores the command as |\thmt@theoremdefiner|, so we
+% can modify it. (One of the perks if extension writer and framework writer
+% are the same person.) So, in contrast to the previous example, this time
+% we need to do something before the actual |\newtheorem| is
+% called.
+% \begin{macrocode}
+\define@key{thmdef}{thmbox}[L]{%
+ \thmt@trytwice{%
+ \let\oldproof=\proof
+ \let\oldendproof=\endproof
+ \let\oldexample=\example
+ \let\oldendexample=\endexample
+ \RequirePackage[nothm]{thmbox}
+ \let\proof=\oldproof
+ \let\endproof=\oldendproof
+ \let\example=\oldexample
+ \let\endexample=\oldendexample
+ \def\thmt@theoremdefiner{\newboxtheorem[#1]}%
+ }{}%
+}%
+% \end{macrocode}
+%\iffalse (hide this from DocInput)
+%</thmbox>
+%\fi
diff --git a/macros/latex/contrib/thmtools/thmtools.dtx b/macros/latex/contrib/thmtools/source/thmtools.dtx
index d5139e30c6..32e819c8e1 100644
--- a/macros/latex/contrib/thmtools/thmtools.dtx
+++ b/macros/latex/contrib/thmtools/source/thmtools.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Ulrich M. Schwarz
+% Copyright (C) 2008-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1.3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/source/thmtools.ins b/macros/latex/contrib/thmtools/source/thmtools.ins
new file mode 100644
index 0000000000..461856c73c
--- /dev/null
+++ b/macros/latex/contrib/thmtools/source/thmtools.ins
@@ -0,0 +1,64 @@
+%%
+%% This is a bog-standard .ins file: thmtools.ins
+%%
+\input VERSION.tex
+%\show\VERSION
+\def\dropext #1.#2\relax{#1}
+\input docstrip.tex
+%\keepsilent
+\askonceonly
+\preamble
+This is a generated file.
+
+This file is part of the `thmtools' package.
+The `thmtools' package has the LPPL maintenance status: maintained.
+Current Maintainer is Yukai Chou, muzimuzhi@gmail.com
+
+Copyright (C) 2008-2014 by Ulrich M. Schwarz
+Copyright (C) 2019 by Frank Mittelbach
+Copyright (C) 2020- by Yukai Chou
+
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, version 1.3c.
+This version is obtainable at
+http://www.latex-project.org/lppl/lppl-1-3c.txt
+
+^^J\noexpand\noexpand\noexpand\NeedsTeXFormat{LaTeX2e}^^J\noexpand\noexpand\noexpand\ProvidesPackage{\noexpand\expandafter\noexpand\dropext\outFileName\relax}[\VERSION]
+\endpreamble
+
+\generate{%
+ \file{thmtools.sty} {\from{thmtools.dtx}{thmtools}}
+ \file{thm-restate.sty} {\from{thm-restate.dtx}{restate}}
+ \file{thm-patch.sty} {\from{thm-patch.dtx}{patch}}
+ \file{thm-autoref.sty} {\from{thm-autoref.dtx}{autoref}}
+ \file{thm-listof.sty} {\from{thm-listof.dtx}{listof}}
+ \file{thm-kv.sty} {\from{thm-kv.dtx}{kv}}
+ \file{parseargs.sty} {\from{parseargs.dtx}{parseargs}}
+ \file{aliasctr.sty} {\from{aliasctr.dtx}{code}}
+ \file{unique.sty} {\from{unique.dtx}{code}}
+ \file{thm-amsthm.sty} {\from{thm-amsthm.dtx}{amsthm}}
+ \file{thm-ntheorem.sty} {\from{thm-ntheorem.dtx}{ntheorem}}
+ \file{thm-beamer.sty} {\from{thm-beamer.dtx}{beamer}}
+ \file{thm-llncs.sty} {\from{thm-llncs.dtx}{llncs}}
+ \file{thmdef-shaded.sty} {\from{thmdef-shaded.dtx}{shaded}}
+ \file{thmdef-thmbox.sty} {\from{thmdef-thmbox.dtx}{thmbox}}
+ \file{thmdef-mdframed.sty}{\from{thmdef-mdframed.dtx}{mdframed}}
+}
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following files into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space thmtools.sty}
+\Msg{* \space\space thm-restate.sty}
+\Msg{* \space\space thm-patch.sty}
+\Msg{* \space\space thm-autoref.sty}
+\Msg{* \space\space thm-listof.sty}
+\Msg{* \space\space thm-kv.sty}
+\Msg{* \space\space aliasctr.sty}
+\Msg{* \space\space unique.sty}
+\Msg{* \space\space parseargs.sty}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}
+\endbatchfile
diff --git a/macros/latex/contrib/thmtools/unique.dtx b/macros/latex/contrib/thmtools/source/unique.dtx
index 9afbd2cffa..bf013ca6d4 100644
--- a/macros/latex/contrib/thmtools/unique.dtx
+++ b/macros/latex/contrib/thmtools/source/unique.dtx
@@ -1,11 +1,13 @@
% \iffalse meta-comment
%
-% Copyright (C) 2005-8 by Ulrich M. Schwarz
+% Copyright (C) 2005-2014 by Ulrich M. Schwarz
+% Copyright (C) 2019 by Frank Mittelbach
+% Copyright (C) 2020- by Yukai Chou
%
% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3a.
+% the LaTeX Project Public License, version 1.3c.
% The license can be obtained from
-% http://www.latex-project.org/lppl/lppl-1-3a.txt
+% http://www.latex-project.org/lppl/lppl-1.3c.txt
%
% \fi
%
diff --git a/macros/latex/contrib/thmtools/thmdef-thmbox.dtx b/macros/latex/contrib/thmtools/thmdef-thmbox.dtx
deleted file mode 100644
index ea22cbae97..0000000000
--- a/macros/latex/contrib/thmtools/thmdef-thmbox.dtx
+++ /dev/null
@@ -1,36 +0,0 @@
-% \iffalse meta-comment
-%
-% Copyright (C) 2010 by Ulrich M. Schwarz
-% See file COPYING for more details.
-%\fi
-%
-%\iffalse (hide this from DocInput)
-%<*thmbox>
-%\fi
-% The thmbox package does something else: instead of having a separate
-% environment, we have to use a command different from
-% \lstinline|\newtheorem| to get the boxed style. Fortunately,
-% \thmtools stores the command as \lstinline|\thmt@theoremdefiner|, so we
-% can modify it. (One of the perks if extension writer and framework writer
-% are the same person.) So, in contrast to the previous example, this time
-% we need to do something before the actual \lstinline|\newtheorem| is
-% called.
-% \begin{macrocode}
-\define@key{thmdef}{thmbox}[L]{%
- \thmt@trytwice{%
- \let\oldproof=\proof
- \let\oldendproof=\endproof
- \let\oldexample=\example
- \let\oldendexample=\endexample
- \RequirePackage[nothm]{thmbox}
- \let\proof=\oldproof
- \let\endproof=\oldendproof
- \let\example=\oldexample
- \let\endexample=\oldendexample
- \def\thmt@theoremdefiner{\newboxtheorem[#1]}%
- }{}%
-}%
-% \end{macrocode}
-%\iffalse (hide this from DocInput)
-%</thmbox>
-%\fi
diff --git a/macros/latex/contrib/thmtools/thmtools.ins b/macros/latex/contrib/thmtools/thmtools.ins
deleted file mode 100644
index 4b97aae226..0000000000
--- a/macros/latex/contrib/thmtools/thmtools.ins
+++ /dev/null
@@ -1,61 +0,0 @@
-%%
-%% This is a bog-standard .ins file: thmtools.ins
-%%
-\input VERSION.tex
-%\show\VERSION
-\def\dropext #1.#2\relax{#1}
-\input docstrip.tex
-%\keepsilent
-\askonceonly
-\preamble
-This is a generated file.
-
-This file is part of the `thmtools' package.
-The `thmtools' package has the LPPL maintenance status: unmaintained.
-
-Copyright (C) 2008-2014 by Ulrich M. Schwarz.
-
-This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, version 1.3a.
-This version is obtainable at
-http://www.latex-project.org/lppl/lppl-1-3a.txt
-
-^^J\noexpand\noexpand\noexpand\NeedsTeXFormat{LaTeX2e}^^J\noexpand\noexpand\noexpand\ProvidesPackage{\noexpand\expandafter\noexpand\dropext\outFileName\relax}[\VERSION]
-\endpreamble
-
-\generate{%
- \file{thmtools.sty}{\from{thmtools.dtx}{thmtools}}
- \file{thm-restate.sty}{\from{thm-restate.dtx}{restate}}
- \file{thm-patch.sty}{\from{thm-patch.dtx}{patch}}
- \file{thm-autoref.sty}{\from{thm-autoref.dtx}{autoref}}
- \file{thm-listof.sty}{\from{thm-listof.dtx}{listof}}
- \file{thm-kv.sty}{\from{thm-kv.dtx}{kv}}
- \file{parseargs.sty}{\from{parseargs.dtx}{parseargs}}
- \file{aliasctr.sty}{\from{aliasctr.dtx}{code}}
- \file{unique.sty}{\from{unique.dtx}{code}}
- \file{thm-amsthm.sty}{\from{thm-amsthm.dtx}{amsthm}}
- \file{thm-ntheorem.sty}{\from{thm-ntheorem.dtx}{ntheorem}}
- \file{thm-beamer.sty}{\from{thm-beamer.dtx}{beamer}}
- \file{thm-llncs.sty}{\from{thm-llncs.dtx}{llncs}}
- \file{thmdef-shaded.sty}{\from{thmdef-shaded.dtx}{shaded}}
- \file{thmdef-thmbox.sty}{\from{thmdef-thmbox.dtx}{thmbox}}
- \file{thmdef-mdframed.sty}{\from{thmdef-mdframed.dtx}{mdframed}}
- }
-\Msg{*********************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the}
-\Msg{* following files into a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space thmtools.sty}
-\Msg{* \space\space thm-restate.sty}
-\Msg{* \space\space thm-patch.sty}
-\Msg{* \space\space thm-autoref.sty}
-\Msg{* \space\space thm-listof.sty}
-\Msg{* \space\space thm-kv.sty}
-\Msg{* \space\space aliasctr.sty}
-\Msg{* \space\space unique.sty}
-\Msg{* \space\space parseargs.sty}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*********************************************************}
-\endbatchfile
diff --git a/macros/latex/contrib/thmtools/thmtools.pdf b/macros/latex/contrib/thmtools/thmtools.pdf
deleted file mode 100644
index 5ab3fd1d69..0000000000
--- a/macros/latex/contrib/thmtools/thmtools.pdf
+++ /dev/null
Binary files differ