CTAN sync 202004250301

13 files changed, 147 insertions, 116 deletions

diff --git a/macros/latex/contrib/changelog/README.md b/macros/latex/contrib/changelog/README.md
index b582ea33de..93e7c2834e 100644
--- a/macros/latex/contrib/changelog/README.md
+++ b/macros/latex/contrib/changelog/README.md
@@ -13,9 +13,11 @@ File                         | Description
 changelog.sty                | The changelog package
 changelog.pdf                | Documentation (English)
 changelog.tex                | Documentation source
-changelog-doc.sty            | Documentation styles
+example.tex                  | Example use
+example.pdf                  | Example use (PDF)
+screenshot.png               | Sample screenshot
 README.md                    | This file
-LICENSE.md                   | GNU GPLv3
+LICENSE.txt                  | LPPL v1.3c
 
 [keepachangelog.com]: https://keepachangelog.com/
 [changelog]: https://ctan.org/pkg/changelog
diff --git a/macros/latex/contrib/changelog/changelog.pdf b/macros/latex/contrib/changelog/changelog.pdf
index bc54571d96..e6d66a6a02 100644
--- a/macros/latex/contrib/changelog/changelog.pdf
+++ b/macros/latex/contrib/changelog/changelog.pdf
diff --git a/macros/latex/contrib/changelog/changelog.sty b/macros/latex/contrib/changelog/changelog.sty
index 491e78d754..dad913838b 100644
--- a/macros/latex/contrib/changelog/changelog.sty
+++ b/macros/latex/contrib/changelog/changelog.sty
@@ -1,9 +1,9 @@
-\ProvidesPackage{changelog}[2019/07/06 2.1.0 Typesetting changelogs]
+\ProvidesPackage{changelog}[2020/04/23 2.2.1 Typesetting changelogs]
 % Description: Provides the changelog environment for typesetting changelogs
 % License:     LPPL 1.3c
 % Homepage:    https://github.com/9999years/latex-changelog
 %              https://ctan.org/pkg/changelog
-% Maintainer:  Rebecca Turner <637275@gmail.com>
+% Maintainer:  Rebecca Turner <rbt@sent.as>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
 %
 % This work has the LPPL maintenance status `maintained'.
 %
-% The Current Maintainer of this work is Rebecca Turner <637275@gmail.com>.
+% The Current Maintainer of this work is Rebecca Turner <rbt@sent.as>.
 %
 % This work consists of the files changelog.sty and changelog.tex.
 
@@ -28,6 +28,7 @@
 
 % Fallback translations will be used if there is no translation for
 % the current document language
+\DeclareTranslationFallback{changelog}{Changelog}
 \DeclareTranslationFallback{changelog-Added}{Added}
 \DeclareTranslationFallback{changelog-Changed}{Changed}
 \DeclareTranslationFallback{changelog-Deprecated}{Deprecated}
@@ -38,6 +39,7 @@
 \DeclareTranslationFallback{changelog-Unreleased}{Unreleased}
 \DeclareTranslationFallback{changelog-Yanked}{YANKED}
 % English translations
+\DeclareTranslation{English}{changelog}{Changelog}
 \DeclareTranslation{English}{changelog-Added}{Added}
 \DeclareTranslation{English}{changelog-Changed}{Changed}
 \DeclareTranslation{English}{changelog-Deprecated}{Deprecated}
@@ -49,6 +51,7 @@
 \DeclareTranslation{English}{changelog-Yanked}{YANKED}
 % German translations
 % Alternative german translations as comment at the end of the line
+\DeclareTranslation{German}{changelog}{\"Anderungsnachweis}
 \DeclareTranslation{German}{changelog-Added}{Hinzugef\"{u}gt}% Neu
 \DeclareTranslation{German}{changelog-Changed}{Ge\"{a}ndert}
 \DeclareTranslation{German}{changelog-Deprecated}{Überholt}% Veraltet
@@ -58,6 +61,17 @@
 \DeclareTranslation{German}{changelog-Miscellaneous}{Verschiedenes}
 \DeclareTranslation{German}{changelog-Unreleased}{Unver\"{o}ffentlicht}
 \DeclareTranslation{German}{changelog-Yanked}{Zur{\"u}ckgezogen}
+% Spanish translations
+\DeclareTranslation{Spanish}{changelog}{Registro de cambios}
+\DeclareTranslation{Spanish}{changelog-Added}{Agregado}
+\DeclareTranslation{Spanish}{changelog-Changed}{Cambiado}
+\DeclareTranslation{Spanish}{changelog-Deprecated}{Obsoleto}
+\DeclareTranslation{Spanish}{changelog-Removed}{Removido}
+\DeclareTranslation{Spanish}{changelog-Fixed}{Arreglado}
+\DeclareTranslation{Spanish}{changelog-Security}{Seguridad}
+\DeclareTranslation{Spanish}{changelog-Miscellaneous}{Miscel{\'a}neo}
+\DeclareTranslation{Spanish}{changelog-Unreleased}{No Publicado}
+\DeclareTranslation{Spanish}{changelog-Yanked}{REVOCADO}
 
 \newif\ifchangelog@versionfirst
 \newcommand{\changelog@item}[1]{%
@@ -91,7 +105,7 @@
 
 \define@cmdkeys{changelog}{sectioncmd, title, label}
 \define@boolkey{changelog}{section}[true]{}
-\presetkeys{changelog}{sectioncmd=\section, title=Changelog,
+\presetkeys{changelog}{sectioncmd=\section, title=\GetTranslation{changelog},
 	label=sec:changelog, section}{}
 
 \newenvironment{changelogdescription}
diff --git a/macros/latex/contrib/changelog/changelog.tex b/macros/latex/contrib/changelog/changelog.tex
index 22a6222195..c48f26e52a 100644
--- a/macros/latex/contrib/changelog/changelog.tex
+++ b/macros/latex/contrib/changelog/changelog.tex
@@ -20,7 +20,13 @@
 }
 \makeatother
 
-\setmainfont{Tiempos Text}
+\setmainfont{TiemposText}[
+	Extension = .otf ,
+	UprightFont = *-Regular ,
+	ItalicFont = *-RegularItalic ,
+	BoldFont = *-Bold ,
+	BoldItalicFont = *-BoldItalic ,
+]
 \usepackage{FiraSans}
 \usepackage{FiraMono}
 \lstset{basewidth=0.6em}
@@ -31,9 +37,9 @@
 	\begin{description}}
 	{\end{description}}
 
-\author{Rebecca Turner\thanks{Brandeis University; \email{rebeccaturner@brandeis.edu}}}
+\author{Rebecca Turner\thanks{Brandeis University; \email{rbt@sent.as}}}
 \title{The \cl\ Package}
-\date{2019/07/06 2.1.0}
+\date{2020/04/23 2.2.1}
 \begin{document}
 \maketitle
 
@@ -301,7 +307,7 @@ package documentation} and the
 \href{http://mirrors.ctan.org/macros/latex/required/babel/base/babel.pdf}{\texttt{babel}
 package documentation} for more information.
 
-If you create a translation, please \href{mailto:637275@gmail.com}{send me
+If you create a translation, please \href{mailto:rbt@sent.as}{send me
 an email} and I'll incorporate the translation into \cl's next release!
 
 \section{Contributors}%
@@ -311,13 +317,24 @@ an email} and I'll incorporate the translation into \cl's next release!
 	\item[Rebecca Turner] Original implementation.
 	\item[Holger Schieferdecker]
 	Internationalization support and German translations.
+	\item[David Arnold <\email{dar@xoe.solutions}>]
+	Support for translating the changelog's section title and Spanish
+	translations.
 \end{description}
 
 \section{Changelog}
 
 This is this package's actual changelog --- not an example!
 
-\begin{changelog}[author=Rebecca Turner, section=false]
+\begin{changelog}[author=Rebecca Turner <\email{rbt@sent.as}>, section=false]
+\begin{version}[v=2.2.0, date=2020-04-23,
+	author={David Arnold <\email{dar@xoe.solutions}>}]
+\added
+	\item Support for translating the changelog's section title with
+	|\DeclareTranslation{Language}{changelog}{...}|.
+	\item Spanish translations.
+\end{version}
+
 \begin{version}[v=2.1.0, date=2019-06-29,
 	author={Holger Schieferdecker}]
 \added
diff --git a/macros/latex/contrib/changelog/example.pdf b/macros/latex/contrib/changelog/example.pdf
new file mode 100644
index 0000000000..e1a2316a79
--- /dev/null
+++ b/macros/latex/contrib/changelog/example.pdf
diff --git a/macros/latex/contrib/changelog/example.tex b/macros/latex/contrib/changelog/example.tex
new file mode 100644
index 0000000000..ad2272c5b8
--- /dev/null
+++ b/macros/latex/contrib/changelog/example.tex
@@ -0,0 +1,44 @@
+\documentclass{article}
+\usepackage{changelog}
+\begin{document}
+\begin{changelog}[author=Rebecca Turner,
+	sectioncmd=\subsection,
+	title=Example changelog]
+\begin{version}
+\added
+	\item Really cool features
+\end{version}
+
+\begin{version}[date=2019-01-23, short]
+	A version with only a date
+\end{version}
+
+\begin{version}[v=1.1.0, simple]
+	\item A version with no date
+\end{version}
+
+\begin{version}[v=1.0.1, yanked, simple]
+	\item A version with a terrible bug
+\end{version}
+
+\begin{version}[v=1.0.0, date=2018-10-26]
+\added
+	\item A cool feature
+\changed
+	\item Some \textsc{api} detail
+\deprecated
+	\item Something that was a bad idea in the first place
+\removed
+	\item Something that was deprecated 3 versions ago
+\fixed
+	\item A bug that would delete files instead of saving them
+\security
+	\item improved with addition of buffer bound checks
+\misc
+	\item A change that doesn't fit into any other category
+\end{version}
+
+\shortversion{v=0.1.0, date=2018-10-19,
+	changes=Initial beta.}
+\end{changelog}
+\end{document}
diff --git a/macros/latex/contrib/changelog/screenshot.png b/macros/latex/contrib/changelog/screenshot.png
new file mode 100644
index 0000000000..549ea27341
--- /dev/null
+++ b/macros/latex/contrib/changelog/screenshot.png
diff --git a/macros/latex/contrib/embedfile/embedfile.dtx b/macros/latex/contrib/embedfile/embedfile.dtx
index dbdfbaeafc..aed35ec760 100644
--- a/macros/latex/contrib/embedfile/embedfile.dtx
+++ b/macros/latex/contrib/embedfile/embedfile.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: embedfile.dtx
-% Version: 2020-04-14 v2.10
+% Version: 2020-04-24 v2.11
 % Info: Embed files into PDF
 %
 % Copyright (C)
@@ -89,7 +89,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: embedfile 2020-04-14 v2.10 Embed files into PDF (HO)}
+\Msg{* Package: embedfile 2020-04-24 v2.11 Embed files into PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -101,7 +101,7 @@
 This is a generated file.
 
 Project: embedfile
-Version: 2020-04-14 v2.10
+Version: 2020-04-24 v2.11
 
 Copyright (C)
    2006-2011 Heiko Oberdiek
@@ -179,7 +179,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{embedfile.drv}%
-  [2020-04-14 v2.10 Embed files into PDF (HO)]%
+  [2020-04-24 v2.11 Embed files into PDF (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -193,7 +193,7 @@ and the derived files
 % \GetFileInfo{embedfile.drv}
 %
 % \title{The \xpackage{embedfile} package}
-% \date{2020-04-14 v2.10}
+% \date{2020-04-24 v2.11}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/embedfile/issues}}}
 %
@@ -623,7 +623,7 @@ You need Acrobat Reader 8 or higher.
 %<*dtxattach>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2020-04-14 v2.10 Embed \string\jobname.dtx (HO)]%
+  [2020-04-24 v2.11 Embed \string\jobname.dtx (HO)]%
 \RequirePackage{embedfile}[2019/12/03]
 \embedfile[%
   stringmethod=escape,%
@@ -714,7 +714,7 @@ You need Acrobat Reader 8 or higher.
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2020-04-14 v2.10 Embed files into PDF (HO)]%
+  [2020-04-24 v2.11 Embed files into PDF (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -1190,7 +1190,7 @@ You need Acrobat Reader 8 or higher.
             \else\ifx\EmFi@type\EmFi@S@creationdate CreationDate%
             \else\ifx\EmFi@type\EmFi@S@size Size%
             \else S%
-            \fi\fi\fi\fi\fi\fi\fi
+            \fi\fi\fi\fi\fi\fi\fi\fi
             /N(\EmFi@title)%
             \EmFi@@order{\EmFi@order}%
             \ifEmFi@visible
@@ -1966,6 +1966,9 @@ You need Acrobat Reader 8 or higher.
 %   \item Fix issue \#4, the value of afrelationship should not be
 %   converted but name escaped.
 %   \end{Version}
+%   \begin{Version}{2020-04-24 v2.11}
+%   \item Added a missing fi.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/embedfile/embedfile.pdf b/macros/latex/contrib/embedfile/embedfile.pdf
index 66682ebd9f..76d25b9e45 100644
--- a/macros/latex/contrib/embedfile/embedfile.pdf
+++ b/macros/latex/contrib/embedfile/embedfile.pdf
diff --git a/macros/latex/contrib/willowtreebook/README b/macros/latex/contrib/willowtreebook/README
index fa86ae90f3..b1991b8328 100644
--- a/macros/latex/contrib/willowtreebook/README
+++ b/macros/latex/contrib/willowtreebook/README
@@ -1,6 +1,6 @@
 Willow Tree Book Class
-v1.0
-22 April 2020
+v1.01
+24 April 2020
 
 Authors: 
 Ben McKay
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.cls b/macros/latex/contrib/willowtreebook/willowtreebook.cls
index 61964a97fb..28ea7bbc99 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.cls
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.cls
@@ -1,31 +1,21 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{willowtreebook}[2020/04/22 Willow Tree book LaTeX class v1.0]
+\ProvidesClass{willowtreebook}[2020/04/24 Willow Tree Book LaTeX class v1.01]
 \DeclareOption{ContainsChinese}{\def\ChineseTextInThisDocument{}}
-\DeclareOption*{%
-\PassOptionsToClass{\CurrentOption}{article}%
-}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
 \ProcessOptions\relax
-
 \LoadClass{memoir}
-
 \RequirePackage{xparse}
-
-\def\emptystring{}
-
-\edef\mckaybook@title{\emptystring}
-\edef\mckaybook@subtitle{\emptystring}
-\edef\mckaybook@author{\emptystring}
-\edef\mckaybook@bibliography{\emptystring}
-\edef\mckaybook@colophon{This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.}
-
+\def\mckaybook@title{}
+\def\mckaybook@subtitle{}
+\def\mckaybook@author{}
+\def\mckaybook@bibliography{}
+\def\mckaybook@colophon{This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.}
 \NewDocumentCommand\Title{m}{\global\def\mckaybook@title{#1}}
 \NewDocumentCommand\Subtitle{m}{\global\def\mckaybook@subtitle{#1}}
 \NewDocumentCommand\Author{m}{\global\def\mckaybook@author{#1}}
 \NewDocumentCommand\BibliographyFile{m}{\global\def\mckaybook@bibliography{#1}}
 \NewDocumentCommand\Colophon{m}{\global\def\mckaybook@colophon{#1}}
-
 % For handling names like Benjamin McKay, where the letter c should be raised up, type in as Benjamin \scotsMc{}Kay.
-\makeatletter
 \DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
 \DeclareRobustCommand{\scotsMC}{\scotsMcx{\textsc{c}}}
 \DeclareRobustCommand{\scotsMcx}[1]{%
@@ -38,8 +28,6 @@
 \expandafter\def\expandafter\@uclclist\expandafter{%
   \@uclclist\scotsMc\scotsMC
 }
-\makeatother
-
 \RequirePackage{etex}
 \RequirePackage{newunicodechar}
 \RequirePackage[utf8]{inputenc} % Default input file encoding
@@ -49,7 +37,6 @@
 \NewDocumentCommand\Chinese{m}{\begin{CJK*}{UTF8}{gbsn}#1\end{CJK*}}
 \else 
 \fi
-
 \RequirePackage[T1]{fontenc}
 \RequirePackage{lmodern}
 \RequirePackage{isomath}
@@ -72,12 +59,10 @@ shrink=10]{microtype}
 \RequirePackage{braket}
 \RequirePackage{mathtools}
 \mathtoolsset{showonlyrefs,showmanualtags,centercolon,mathic}
-
 % If we need more room between rows of matrices and arrays, we can write
 % \begin{pmatrix}[1.5]
 % instead of 
 % \begin{pmatrix}
-\makeatletter
 \RenewDocumentCommand\env@matrix{O{\arraystretch}}
 {%
 \edef\arraystretch{#1}%
@@ -85,15 +70,12 @@ shrink=10]{microtype}
   \let\@ifnextchar\new@ifnextchar
   \array{*\c@MaxMatrixCols c}
 }%
-\makeatother
 \NewDocumentCommand\tallmatrix{}{1.5}
-
 \RequirePackage{varioref}
 \RequirePackage{longtable}
 \RequirePackage{multicol}
 \setmarginnotes{2em}{3cm}{.5cm}
-
-% Indices
+%.......Indices
 \newcommand{\NotationIndexName}{List of notation}
 \makeindex
 \makeglossary[not]
@@ -123,7 +105,6 @@ shrink=10]{microtype}
 \ifnum\value{page}<10 0\fi%
 \arabic{page}%
 }%%
-
 \newcounter{howmany@notation}
 \setcounter{howmany@notation}{0}
 \newcommand{\Notation}[3]%%
@@ -131,7 +112,6 @@ shrink=10]{microtype}
 {\glossary[not](\paddedpagenumber){\(#2\)}{#3}%
 \stepcounter{howmany@notation}%
 }
-
 \newcounter{howmany@indexentries}
 \setcounter{howmany@indexentries}{0}
 \newcommand{\SubIndex}[1]%
@@ -168,7 +148,6 @@ shrink=10]{microtype}
 }
 \newcommand{\ceilForNotationIndex}[1]{\lcl{#1}\rcl}
 \newcommand{\floorForNotationIndex}[1]{\lflr{#1}\rflr}
-
 % For the subject index:
 % Example:
 %    \define{interest rate}
@@ -184,7 +163,6 @@ shrink=10]{microtype}
 %% PDF Output
 \ifpdf
   \pdfoutput=1
-  \makeatletter
   \RequirePackage[plainpages=false,
     hyperfigures,
     pdftitle={\mckaybook@title},
@@ -196,7 +174,6 @@ shrink=10]{microtype}
     pagebackref,
     pdftex]
     {hyperref}
-  \makeatother
   \RequirePackage{memhfixc}
 % Hyperref uses very bright colours to highlight links. Change them:
   \RequirePackage[svgnames]{xcolor}
@@ -208,7 +185,6 @@ shrink=10]{microtype}
     citecolor={dark-blue}, urlcolor={medium-blue}
   }
 \fi
-
 \newcommand{\idxmark}[1]{#1\markboth{#1}{#1}}
 \newcommand{\doidxbookmark}[1]{{\def\@tempa{Symbols}\def\@tempb{#1}%
 \ifx\@tempa\@tempb %
@@ -221,10 +197,8 @@ Analphabetics
 \pdfbookmark[0]{#1}{#1-idx}%
 \fi%
 \vskip\onelineskip\par}}
-
 \newcommand\doglobookmark[1]{%
 }%
-
 %......Figures
 \newcommand{\stdFigSize}{1in}
 \newsubfloat{figure} % Memoir class, instead of subfigure class.
@@ -236,9 +210,7 @@ Analphabetics
 \captionnamefont{\scriptsize}
 \captiontitlefont{\scriptsize}
 \newcommand{\heading}{\sffamily}
-
 \newcommand{\chapterSummary}[1]{{\small{#1}}\vspace{0.5cm}\par\noindent}
-
 \makechapterstyle{bobo}{%
 \aliaspagestyle{part}{empty}
 \renewcommand{\partnamefont}{\raggedleft\normalfont\huge\heading}
@@ -256,45 +228,35 @@ Analphabetics
 \renewcommand*{\chaptitlefont}{\Large\heading}
 \renewcommand*{\printchaptertitle}[1]{%
 \centering\smallcolouredbox\chaptitlefont ##1}}
-
 \chapterstyle{bobo}
-
 \setsecheadstyle{\large\heading\raggedright}
 \setsubsecheadstyle{\heading\raggedright}
 \setsubsubsecheadstyle{\heading\raggedright}
 \setheadfoot{2\onelineskip}{3\onelineskip}
-
 \newcommand{\optionalSection}[1]%
 {%%
 \section{#1}
 {\small{This section can be omitted without loss of continuity.}}%
 \medskip\par\noindent%
 }%%
-
 %......Table of contents
 % depth of numbering of sectioning commands:
 \setsecnumdepth{chapter}
 \maxsecnumdepth{chapter}
 %% depth of table of contents:  
 \setcounter{tocdepth}{0}
-
 \RenewDocumentCommand\cftpartfont{}{\heading\small}
 \RenewDocumentCommand\cftpartpagefont{}{\normalfont\small}
-
 \RenewDocumentCommand\cftchapterfont{}{\heading\small}
 \RenewDocumentCommand\cftchapterpagefont{}{\normalfont\small}
-
 \setlength{\cftbeforechapterskip}{3pt}
 \RenewDocumentCommand\cftchapterleader{}{\quad}
 \setpnumwidth{1em}
 \RenewDocumentCommand\cftchapterafterpnum{}{\cftparfillskip}
-
 \setlength{\cftbeforepartskip}{10pt}
 \RenewDocumentCommand\cftpartleader{}{\quad}
 \setpnumwidth{1em}
 \RenewDocumentCommand\cftpartafterpnum{}{\cftparfillskip}
-
-
 %......Title page
 \pretitle{\begin{center}\HUGE}
 \posttitle{\end{center}}
@@ -302,11 +264,9 @@ Analphabetics
 \postauthor{\end{center}}
 \predate{\begin{center}}
 \postdate{\end{center}}
-
 \usepackage{tcolorbox}
 \tcbuselibrary{breakable}
 \tcbuselibrary{skins}
-
 %......Theorem Styles
 %\newtheoremstyle{RegularStyle}% name
 %  {}%      Space above, empty = `usual value'
@@ -324,9 +284,8 @@ Analphabetics
 \newtheorem{lemma}[theorem]{Lemma}
 \newtheorem{corollary}[theorem]{Corollary}
 \newtheorem{proposition}[theorem]{Proposition}
-
+%.......Colours
 \colorlet{exampleBackgroundColour}{gray!16}
-
 \newtcolorbox{example}{%
 enhanced,%
 breakable,%
@@ -364,7 +323,6 @@ before upper={\parindent15pt\noindent}%
 \begin{itemize}}%
 {\end{itemize}%
 \end{example}}
-
 % In the middle of an example, the background color is not white. If you need a white background to put an image on it, it looks best to use an imageborderinexample.
 \definecolor{image-border-color}{gray}{.975}
 \NewDocumentCommand\imageborderinexample{m}{\begin{center}\tcbox[colframe=image-border-color, colback=white]
@@ -372,8 +330,6 @@ before upper={\parindent15pt\noindent}%
 \NewDocumentCommand\includegraphicsinexample{om}%
 {\IfValueTF{#1}{\imageborderinexample{\includegraphics[#1]{#2}}}{\imageborderinexample{\includegraphics{#2}}}}
 \NewDocumentCommand\inputinexample{m}{\imageborderinexample{\input{#1}}}
-
-
 %......Problems
 % To define a new problem, use: 
 % \begin{problem}{<label>} <statement> \end{problem}
@@ -422,45 +378,37 @@ before upper={\parindent15pt\noindent}%
 % Otherwise, we get mysterious errors. We could probably
 % just make use of \protect here.
 \let\newparagraph=\par
-\makeatletter
 \NewDocumentEnvironment{@nswer}{m}{\@bsphack\IfStreamOpen{ansout}{}{\openoutputfile{\jobname.ans}{ansout}}
 \addtostream{ansout}{\smallskip\newparagraph\noindent\textbf{\protect\ref{problem:#1}.}}}{\@esphack}
 \newcounter{howmany@answers}
 \setcounter{howmany@answers}{0}
 \NewDocumentEnvironment{answer}{m}%
 {\stepcounter{howmany@answers}\@bsphack\@nswer{#1}\writeverbatim{ansout}}{\par\endwriteverbatim\end@nswer\@esphack}
-\makeatother
-
 % Colour for the rulings in tables:
 \RequirePackage{colortbl}
 \newcommand{\defaultArrayRuleColor}{gray!30}
 \arrayrulecolor{\defaultArrayRuleColor}
-\makeatletter
     \def\rulecolor#1#{\CT@arc{#1}}
     \def\CT@arc#1#2{%
       \ifdim\baselineskip=\z@\noalign\fi
       {\gdef\CT@arc@{\color#1{#2}}}}
     \let\CT@arc@\relax
 \rulecolor{gray!30}
-\makeatother
-
 \RequirePackage{enumitem}
 \setlist[enumerate,1]{label=\emph{\alph*.}}
 \setlist[enumerate,2]{label=\arabic*.,
 ref=\theenumi.\emph{\alph*}}
 \setlist[enumerate,3]{label=\roman*), ref=\theenumii.\roman*}
-
-\makeatletter
 \NewDocumentCommand\writetitlepage{}
 {%
-    \ifx\mckaybook@title\emptystring
+    \ifx\mckaybook@title\@empty
     \else
     		\begingroup
     		\raggedleft
     		\vspace*{\baselineskip}
     		{\Large \mckaybook@author
     		}\\[0.167\textheight]
-    		\ifx\mckaybook@subtitle\emptystring%
+    		\ifx\mckaybook@subtitle\@empty%
 			\Huge\heading\mckaybook@title\\[\baselineskip]%
 		\else%
 			\Huge\heading\mckaybook@title\\[\baselineskip]%
@@ -473,8 +421,6 @@ ref=\theenumi.\emph{\alph*}}
     		\endgroup
     \fi
 }%
-\makeatother
-
 %% \newclr generates a colour based on the current chapter number, so we execute it every time we create a new chapter. It saves that colour in a global color variable called chpclr. This colour is used to highlight the chapter name at the beginning of the chapter and in all of the headings at the top of each page.
 \newcommand*{\newcolr}%%
 {%%
@@ -508,35 +454,28 @@ ref=\theenumi.\emph{\alph*}}
 \settoheight{\smallboxh}{l}
 \settodepth{\smallboxd}{l}
 \newcommand*{\blanksp}{\phantom{\rule[\smallboxd]{\smallboxw}{\smallboxh}}}
-
 \newif\ifchaptercolours
 \chaptercoloursfalse
-
 \NewDocumentCommand\smallcolouredbox{}%
 {%%
 \ifchaptercolours\,{\colorbox{chpclr}{\blanksp}}\,\else\fi
 }%%
 \RenewDocumentCommand\chapnamefont{m}{\newcolr\large\centering#1}
-
 \definecolor{colorAAA}{rgb}{.75,1,1}
 \definecolor{colorBBB}{rgb}{1,.75,1}
 \definecolor{colorCCC}{rgb}{1,1,.75}
-
-
-
-\makeatletter
 \AtBeginDocument%
 {%%
 \frontmatter
 % Title page
-\ifx\mckaybook@title\emptystring
+\ifx\mckaybook@title\@empty
 \else
-    \ifx\mckaybook@subtitle\emptystring%
+    \ifx\mckaybook@subtitle\@empty%
         \title{\MakeUppercase{\mckaybook@title}}
 	\else
         \title{\MakeUppercase{\mckaybook@title} \\ \MakeUppercase{\mckaybook@subtitle}}
     \fi
-    \ifx\mckaybook@author\emptystring%
+    \ifx\mckaybook@author\@empty%
     \else
 		\author
 		{%
@@ -547,7 +486,6 @@ ref=\theenumi.\emph{\alph*}}
 	    }%
 	\fi
 \fi
-\makeatother
 \writetitlepage
 \thispagestyle{empty}
 \pagenumbering{roman}
@@ -556,7 +494,6 @@ ref=\theenumi.\emph{\alph*}}
 {\normalfont\thepage}{}{\small\heading\leftmark\smallcolouredbox\negphantom{\smallcolouredbox}}
 \makeoddhead{companion}%
 {\small\negphantom{\smallcolouredbox}\smallcolouredbox\heading\rightmark}{}{\normalfont\thepage}
-
 \setlength{\cftchapterindent}{4cm}
 \setlength{\cftpartindent}{4cm}
 \pagestyle{empty}
@@ -564,9 +501,7 @@ ref=\theenumi.\emph{\alph*}}
 \clearpage
 \pagestyle{companion}
 }%%
-
 \NewDocumentCommand\negphantom{m}{\settowidth{\dimen0}{#1}\hspace*{-\dimen0}}
-
 \NewDocumentCommand\afterpreface{}
 {%
 \clearpage
@@ -575,11 +510,9 @@ ref=\theenumi.\emph{\alph*}}
 \chaptercolourstrue
 \pagenumbering{arabic}
 }%
-
 \NewDocumentCommand\hintsPreamble{}{}
 \AtEndDocument%
 {%%
-
 \backmatter
 \chaptercoloursfalse
 \ifnum\value{howmany@answers}>0\relax%
@@ -589,30 +522,23 @@ ref=\theenumi.\emph{\alph*}}
 \hintsPreamble%
 \printanswers%
 \fi%
-
-\makeatletter
-\ifx\mckaybook@bibliography\emptystring
+\ifx\mckaybook@bibliography\@empty
 \else
 % Bibliography
 \bibliographystyle{amsplain}
 \bibliography{\mckaybook@bibliography}
 \flushbottom
 \fi
-\makeatother
-
 % Notation Index
 \ifnum\value{howmany@notation}>0
 \indexintoc
 {\RenewDocumentCommand{\indexspace}{}{}\small{\printglossary[not]}}
 \cleardoublepage
 \fi
-
 % Index
 \ifnum\value{howmany@indexentries}>0
 \indexintoc
 \RenewDocumentCommand\indexname{}{Index}
 {\small{\printindex}}
 \fi
-
-
 }%% AtEndDocument
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.pdf b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
index b3a61d60a6..e799a3dc18 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.pdf
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.tex b/macros/latex/contrib/willowtreebook/willowtreebook.tex
index f284c8d734..96cb7d3190 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.tex
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.tex
@@ -1,5 +1,5 @@
 \documentclass{willowtreebook}
-\Title{The Willow Tree Book Class v1.0}
+\Title{The Willow Tree Book Class 1.01}
 \Author{Benjamin \scotsMc{}Kay}
 \Colophon{Released under the \LaTeX{} Public Project License 1.3c}
 \BibliographyFile{willowtreebook}
@@ -38,21 +38,25 @@ THE END
 Compile with \verb!latex! or \verb!pdflatex!.
 \chapter{Definitions, Problems and Theorems}
 \section{Definitions}
-We can define a term like \emph{hamster}\define{hamster}, or say that the term hamster appears again later\SubIndex{hamster}.
-We add notation like when we use a variable called \(\omega\), we put it in the list of notation.\Notation{omega}{\omega}{A variable called $\omega$}
+We can define a term like \emph{hamster}\define{hamster}, or say that the term hamster\SubIndex{hamster} appears again later.
 \begin{Verbatim}[frame=leftline]
 \chapter{Definitions, Problems and Theorems}
 \section{Definitions}
 We can define a term like \emph{hamster}\define{hamster}, 
-or say that the term hamster appears again later\SubIndex{hamster}.
+or say that the term hamster\SubIndex{hamster} appears again later.
 \end{Verbatim}
 Compile, for a book called \verb!filename.tex!, with
 \begin{Verbatim}[frame=leftline]
 	makeindex filename
 \end{Verbatim}
-We add notation like when we use a variable called \(\omega\), 
+We add notation like when we use a variable called \(\omega\),
 we put it in the list of notation.%
-\Notation{omega}{\omega}{A variable called $\omega$}.
+\Notation{omega}{\omega}{A variable called $\omega$}
+\begin{Verbatim}
+We add notation like when we use a variable called \(\omega\),
+we put it in the list of notation.%
+\Notation{omega}{\omega}{A variable called $\omega$}
+\end{Verbatim}
 If you use notation, compile with
 \begin{Verbatim}[frame=leftline]
 	makeindex -s notation.gst -o not.gls not.glo  
@@ -96,4 +100,25 @@ In any triangle with sides of lengths \(a,b,c\),
 side of length \(c\) is a right angle.
 \end{theorem}
 \end{Verbatim}
+I often want to present an example, and make clear where it starts and stops.
+\begin{example}
+The integral 
+\[
+\int e^{x^2}x\,dx
+\]
+is evaluated by substituting \(u=x^2\), so
+\[
+\int e^{x^2}x\,dx=\int e^u \frac{du}{2}.
+\]
+\end{example}
+\begin{Verbatim}[frame=leftline]
+The integral 
+\[
+\int e^{x^2}x\,dx
+\]
+is evaluated by substituting \(u=x^2\), so
+\[
+\int e^{x^2}x\,dx=\int e^u \frac{du}{2}.
+\]
+\end{Verbatim}
 \end{document}