ntgclass (22feb20)

git-svn-id: svn://tug.org/texlive/trunk@53870 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 157 insertions, 134 deletions

diff --git a/Master/texmf-dist/source/latex/ntgclass/brief.dtx b/Master/texmf-dist/source/latex/ntgclass/brief.dtx
index 96a1525bf08..fcc32e4e844 100644
--- a/Master/texmf-dist/source/latex/ntgclass/brief.dtx
+++ b/Master/texmf-dist/source/latex/ntgclass/brief.dtx
@@ -1,69 +1,44 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% % 
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% % 
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% %   http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% % 
-% % This work has the LPPL maintenance status "maintained".
-% % 
-% % The Current Maintainer of this work is Johannes Braams.
-% % 
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% % 
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
-% \CheckSum{2200}
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
+% \iffalse
+%
+% Copyright (C) 1994 -- 2020 by Nederlandstalige TeX Gebruikersgroep.
+% Based on letter.dtx version 1.3a
+%
+% Copyright (C) 1994 LaTeX3 project, Frank Mittelbach
+% and Rainer Sch\"opf, all rights reserved.
+%
+% This file is part of the NTG document classes distribution
+% ----------------------------------------------------------
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work is Johannes Braams.
 %
+% The list of all files belonging to the NTG document classes
+% distribution is given in the file `manifest.txt.
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
+% extension .ins) which are part of the distribution.
+%
+% \fi
+% \CheckSum{2213}
 % \iffalse
-%% Copyright (C) 1994 -- 1999 by Victor Eijkhout \and Johannes Braams
-%% Based on letter.dtx version 1.2i
-%% Copyright (C) 1994 LaTeX3 project, Frank Mittelbach
-%% and Rainer Sch\"opf, all rights reserved.
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt; either
-%% version 1 of the License, or any later version.
-%%
-% \section{Identification}
 %
+% \section{Identification}
 %
 %    This document class can only be used with \LaTeXe, so we make
 %    sure that an appropriate message is displayed when another \TeX{}
 %    format is used.
 %    \begin{macrocode}
-%<+brief>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+%<+brief>\NeedsTeXFormat{LaTeX2e}[1995/12/01]
 %    \end{macrocode}
 %
 %    Announce the Class name and its version.
@@ -72,7 +47,7 @@
 %<*driver>
 \ProvidesFile{brief.drv}
 %</driver>
-              [1999/03/03 v2.0r
+              [2020/02/18 v2.0s
 %<+brief>               NTG LaTeX document class]
 %    \end{macrocode}
 %
@@ -124,6 +99,13 @@
 \DoNotIndex{\trivlist,\typeout,\tw@}
 \DoNotIndex{\vskip,\vspace,\year,\z@}
 %    \end{macrocode}
+%    We do want an index, using linenumbers.
+% \changes{v2.0s}{2020/02/18}{Added \cs{CodelineIndex} to make sure a
+%    \texttt{.idx} file is produced}
+%    \begin{macrocode}
+\EnableCrossrefs
+\CodelineIndex
+%    \end{macrocode}
 %    Produce a listing of the changes.
 %    \begin{macrocode}
 \RecordChanges
@@ -142,12 +124,12 @@
 %    \end{macrocode}
 %    Some commonly used abbreviations
 %    \begin{macrocode}
-\newcommand*{\Lopt}[1]{\textsf{#1}}
-\newcommand*{\Lenv}[1]{\textsf{#1}}
-\newcommand*{\file}[1]{\texttt{#1}}
-\newcommand*{\cls}[1]{\texttt{#1}}
-\newcommand*{\Lcount}[1]{\textsl{\small#1}}
-\newcommand*{\pstyle}[1]{\textsl{#1}}
+\newcommand*\Lopt[1]{\textsf{#1}}
+\newcommand*\Lenv[1]{\textsf{#1}}
+\newcommand*\file[1]{\texttt{#1}}
+\newcommand*\cls[1]{\texttt{#1}}
+\newcommand*\Lcount[1]{\textsl{\small#1}}
+\newcommand*\pstyle[1]{\textsl{#1}}
 %    \end{macrocode}
 %    We also want the full details.
 % \changes{v2.0c}{1994/06/15}{Removed another remnant of
@@ -156,6 +138,7 @@
 \begin{document}
 \DocInput{brief.dtx}
 \PrintIndex
+\PrintChanges
 \end{document}
 %</driver>
 %    \end{macrocode}
@@ -166,6 +149,8 @@
 % \changes{v2.0l}{1995/08/10}{Use \cs{hb@xt@} instead of \cs{hbox}
 %    \texttt{to}}
 % \changes{v2.0q}{1997/09/09}{Added a few more synonimes for commands}
+% \changes{v2.0s}{2020/02/18}{Synchronised with the standard document
+%    classes} 
 %    
 %
 % \author{Victor Eijkhout \and Johannes Braams}
@@ -468,29 +453,41 @@
 %    \begin{macrocode}
 \normalsize
 %    \end{macrocode}
+%    We use |\MakeRobust| instead of |\DeclareRobustCommand| above to
+%    avoid a log entry for the redefinition.
+%    But if we are running in a rollback situation
+%    (prior to 2015) we don't touch it.
+% \changes{v2.0s}{2020/02/18}{Roll back handling (gh/201)}
+%    \begin{macrocode}
+\ifx\MakeRobust\@undefined \else
+    \MakeRobust\normalsize
+\fi
+%    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
 %
 %  \begin{macro}{\small}
 %    
 %    This is similar to |\normalsize|.
+% \changes{v2.0s}{2020/02/18}{Use \cs{DeclareRobustCommand} instead of
+%    \cs{newcommand*}}
 %    \begin{macrocode}
 \ifcase\@ptsize
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@ixpt{11}%
     \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus2\p@
     \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@xpt\@xiipt
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
     \abovedisplayshortskip \z@ \@plus3\p@
     \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@xipt{13.6}%
     \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
     \abovedisplayshortskip \z@ \@plus3\p@
@@ -505,21 +502,21 @@
 %    This is similar to |\normalsize|.
 %    \begin{macrocode}
 \ifcase\@ptsize
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@viiipt{9.5}%
     \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus\p@
     \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@ixpt{11}%
     \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus\p@
     \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@xpt\@xiipt
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
     \abovedisplayshortskip \z@ \@plus3\p@
@@ -541,28 +538,28 @@
 %    lists alone.
 %    \begin{macrocode}
 \ifcase\@ptsize
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-  \newcommand*\tiny{\@setfontsize\tiny\@vpt\@vipt}
-  \newcommand*\large{\@setfontsize\large\@xiipt{14}}
-  \newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-  \newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-  \newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vpt\@vipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+  \DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \or
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-  \newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-  \newcommand*\large{\@setfontsize\large\@xiipt{14}}
-  \newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-  \newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-  \newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+  \DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \or
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-  \newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-  \newcommand*\large{\@setfontsize\large\@xivpt{18}}
-  \newcommand*\Large{\@setfontsize\Large\@xviipt{22}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xxpt{25}}
-  \newcommand*\huge{\@setfontsize\huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xivpt{18}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xviipt{22}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xxpt{25}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxvpt{30}}
   \let\Huge=\huge
 \fi
 %    \end{macrocode}
@@ -1073,7 +1070,7 @@
 % \begin{macro}{\name}
 % \begin{macro}{\fromname}
 %    \begin{macrocode}
-\def\name#1{\def\fromname{#1}}
+\newcommand*\name[1]{\def\fromname{#1}}
 \def\fromname{}
 %    \end{macrocode}
 % \end{macro}
@@ -1103,7 +1100,7 @@
 % \begin{macro}{\location}
 % \begin{macro}{\fromlocation}
 %    \begin{macrocode}
-\newcommand*{\location}[1]{\def\fromlocation{#1}}
+\newcommand*\location[1]{\def\fromlocation{#1}}
 \def\fromlocation{}
 %    \end{macrocode}
 % \end{macro}
@@ -1111,7 +1108,7 @@
 % \begin{macro}{\telephone}
 % \begin{macro}{\telephonenum}
 %    \begin{macrocode}
-\newcommand*{\telephone}[1]{\def\telephonenum{#1}}
+\newcommand*\telephone[1]{\def\telephonenum{#1}}
 \def\telephonenum{}
 %    \end{macrocode}
 % \end{macro}
@@ -1120,7 +1117,7 @@
 % \begin{macro}{\makelabels}
 %     The |\makelabels| declaration causes mailing labels to be made.
 %    \begin{macrocode}
-\newcommand*{\makelabels}{%
+\newcommand*\makelabels{%
 %    \end{macrocode}
 %    At the beginning of the document, we need to activate the
 %    |\@mlabel| and |\@startlabels| commands, as well as  write
@@ -1278,7 +1275,7 @@
 %  \begin{macro}{\adresveld}
 %    This command formats the address window.
 %    \begin{macrocode}
-\newcommand*{\adresveld}{%
+\newcommand*\adresveld{%
   \hbox{}\kern-\topskip
   \kern\@vensterskip
   \begingroup
@@ -1612,20 +1609,28 @@
 %
 % \begin{macro}{\stopbreaks}
 %    \begin{macrocode}
-\def\stopbreaks{\interlinepenalty \@M
+\newcommand*\stopbreaks{\interlinepenalty \@M
    \def\par{\@@par\nobreak}\let\\=\@nobreakcr
    \let\vspace\@nobreakvspace}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\nobreakvspace}
-% \begin{macro}{\nobreakvspacex}
-% \begin{macro}{\nobreakcr}
+% \begin{macro}{\@nobreakvspace}
+% \changes{v2.0s}{2020/02/18}{Made robust (\LaTeX{} pr/2049)}
+% \begin{macro}{\@nobreakvspacex}
+% \begin{macro}{\@nobreakcr}
+%    \begin{macrocode}
+\DeclareRobustCommand\@nobreakvspace
+   {\@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
-\def\@nobreakvspace{\@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
-
-\def\@nobreakvspacex#1{\ifvmode\nobreak\vskip #1\relax\else
-               \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi}
+\def\@nobreakvspacex#1{%
+  \ifvmode
+    \nobreak\vskip #1\relax
+  \else
+    \@bsphack\vadjust{\nobreak\vskip #1}\@esphack
+  \fi}
 %    \end{macrocode}
 %    
 % \changes{v2.0p}{1997/03/02}{Added setting of \cs{reserved@e} and
@@ -1812,11 +1817,11 @@
 % \changes{v2.0l}{1995/08/10}{replace \cs{reset@font} with
 %    \cs{normalfont}; remove \cs{rm}}
 %    \begin{macrocode}
-\newcommand*{\bijlage}[1]{%
+\newcommand*\bijlage[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{\@hangfrom{\normalfont\bijlagetekst\ }%
     \ignorespaces #1\strut}\par}
-\newcommand*{\bijlagen}[1]{%
+\newcommand*\bijlagen[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{\@hangfrom{\normalfont\bijlagentekst\ }%
     \ignorespaces #1\strut}\par}
@@ -1830,7 +1835,7 @@
 %    The only thing |\ps| needs to do is call |\startbreaks|,
 %        which allows page breaking again.
 %    \begin{macrocode}
-\def\ps{\par\startbreaks}
+\newcommand*\ps{\par\startbreaks}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1855,7 +1860,7 @@
 %       |\protect\standardreturnaddress|.
 %    \end{itemize}
 %    \begin{macrocode}
-\def\stopletter{}
+\newcommand*\stopletter{}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1877,7 +1882,7 @@
 %
 % \begin{macro}{\returnaddress}
 %    \begin{macrocode}
-\def\returnaddress{}
+\newcommand*\returnaddress{}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1894,7 +1899,7 @@
 %    labels. 
 % \changes{v2.0l}{1995/08/10}{changed value of \cs{columnsep} by 1pt}
 %    \begin{macrocode}
-\newcommand*{\startlabels}{\labelcount\z@
+\newcommand*\startlabels{\labelcount\z@
   \pagestyle{empty}%
   \let\@texttop\relax
   \topmargin -50\p@
@@ -1916,7 +1921,7 @@
   \lineskip \z@
   \boxmaxdepth \z@
   \parindent \z@
-  \twocolumn\relax}
+    \twocolumn\relax}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1943,7 +1948,7 @@
 % \changes{v2.0l}{1995/08/10}{changed width of the labels slightly to
 %    prevent \LaTeX\ stuffing two on each line}
 %    \begin{macrocode}
-\newcommand*{\mlabel}[2]{%
+\newcommand*\mlabel[2]{%
   \parbox[b][2in][c]{262\p@}{\strut\ignorespaces #2}%
   }
 %    \end{macrocode}
@@ -2136,10 +2141,10 @@
 %    (\file{ltlists.dtx}), but their representation is changed here.
 %
 %    \begin{macrocode}
-\renewcommand*{\theenumi}{\@arabic\c@enumi}
-\renewcommand*{\theenumii}{\@alph\c@enumii}
-\renewcommand*{\theenumiii}{\@roman\c@enumiii}
-\renewcommand*{\theenumiv}{\@Alph\c@enumiv}
+\renewcommand*\theenumi  {\@arabic\c@enumi}
+\renewcommand*\theenumii {\@alph\c@enumii}
+\renewcommand*\theenumiii{\@roman\c@enumiii}
+\renewcommand*\theenumiv {\@Alph\c@enumiv}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2153,10 +2158,10 @@
 %    The label for each item is generated by the commands
 %    |\labelenumi| ... |\labelenumiv|.
 %    \begin{macrocode}
-\newcommand*{\labelenumi}{\theenumi.}
-\newcommand*{\labelenumii}{(\theenumii)}
-\newcommand*{\labelenumiii}{\theenumiii.}
-\newcommand*{\labelenumiv}{\theenumiv.}
+\newcommand*\labelenumi  {\theenumi.}
+\newcommand*\labelenumii {(\theenumii)}
+\newcommand*\labelenumiii{\theenumiii.}
+\newcommand*\labelenumiv {\theenumiv.}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2170,9 +2175,9 @@
 %    |\ref| command when referencing an item of the Nth level of an
 %    enumerated list.
 %    \begin{macrocode}
-\renewcommand*{\p@enumii}{\theenumi}
-\renewcommand*{\p@enumiii}{\theenumi(\theenumii)}
-\renewcommand*{\p@enumiv}{\p@enumiii\theenumiii}
+\renewcommand*\p@enumii {\theenumi}
+\renewcommand*\p@enumiii{\theenumi(\theenumii)}
+\renewcommand*\p@enumiv {\p@enumiii\theenumiii}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2197,11 +2202,29 @@
 %    dot.}
 % \changes{v2.0p}{1997/03/02}{Now also \cs{textasteriskcentered}}
 %    \begin{macrocode}
-\newcommand*{\labelitemi}{\textbullet}
-\newcommand*{\labelitemii}{\normalfont\bfseries \textendash}
-\newcommand*{\labelitemiii}{\textasteriskcentered}
-\newcommand*{\labelitemiv}{\textperiodcentered}
+\newcommand*\labelitemi  {\labelitemfont \textbullet}
+\newcommand*\labelitemii {\labelitemfont \bfseries \textendash}
+\newcommand*\labelitemiii{\labelitemfont \textasteriskcentered}
+\newcommand*\labelitemiv {\labelitemfont \textperiodcentered}
 %    \end{macrocode}
+%
+% \begin{macro}{\labelitemfont}
+%    The default definition for \cs{labelitemfont} is to reset the
+%    font to \cs{normalfont} so that always the same symbol is
+%    produced regardless of surrounding conditions.
+%
+% \changes{v2.0s}{2020/02/18}{Normalize label fonts}
+%    A possible alternative would be
+%\begin{verbatim}
+%\renewcommand\labelitemfont{%
+%   \fontseries\seriesdefault
+%   \fontshape\shapedefault\selectfont}
+%\end{verbatim}
+%    which resets series and shape doesn't touch the family.
+%    \begin{macrocode}
+\newcommand\labelitemfont{\normalfont}
+%    \end{macrocode}
+% \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -2376,7 +2399,7 @@
 % \begin{macro}{\theequation}
 %    The equation counter will be typeset using arabic numbers.
 %    \begin{macrocode}
-\renewcommand*{\theequation}{\@arabic\c@equation}
+\renewcommand*\theequation{\@arabic\c@equation}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2475,7 +2498,7 @@
 %    a little negative vertical skip, then we put the rule and make
 %    sure we end up at the same point where we begun this operation.
 %    \begin{macrocode}
-\renewcommand*{\footnoterule}{%
+\renewcommand*\footnoterule{%
   \kern-\p@
   \hrule \@width .4\columnwidth
   \kern .6\p@}
@@ -2552,7 +2575,7 @@
 %  \begin{macro}{\dutchbrief}
 %    This stores dutch strings.
 %    \begin{macrocode}
-\newcommand*{\dutchbrief}{%
+\newcommand*\dutchbrief{%
   \def\uwbrieftekst{Uw brief van}
   \def\uwkenmerktekst{Uw kenmerk}
   \def\onskenmerktekst{Ons kenmerk}
@@ -2575,7 +2598,7 @@
 %    This stores English strings.
 % \changes{v2.0i}{1994/12/30}{Repaired typo}
 %    \begin{macrocode}
-\newcommand*{\englishbrief}{%
+\newcommand*\englishbrief{%
   \def\uwbrieftekst{Your letter of}
   \def\uwkenmerktekst{Your reference}
   \def\onskenmerktekst{Our reference}
@@ -2604,7 +2627,7 @@
 %  \begin{macro}{\americanbrief}
 %    This stores American english strings
 %    \begin{macrocode}
-\newcommand*{\americanbrief}{%
+\newcommand*\americanbrief{%
   \def\uwbrieftekst{Your letter of}
   \def\uwkenmerktekst{Your reference}
   \def\onskenmerktekst{Our reference}
@@ -2626,7 +2649,7 @@
 %  \begin{macro}{\germanbrief}
 %    This stores the German versions of the strings.
 %    \begin{macrocode}
-\newcommand*{\germanbrief}{%
+\newcommand*\germanbrief{%
    \def\uwbrieftekst{Ihr Brief vom}
    \def\uwkenmerktekst{Ihr Zeichen}
    \def\onskenmerktekst{Unser Zeichen}
@@ -2648,7 +2671,7 @@
 %  \begin{macro}{\frenchbrief}
 %    And finally to store the french strings
 %    \begin{macrocode}
-\newcommand*{\frenchbrief}{%
+\newcommand*\frenchbrief{%
    \def\uwbrieftekst{Votre lettre du}
    \def\uwkenmerktekst{Vos r\'ef\'erences:}
    \def\onskenmerktekst{Nos r\'ef\'erences:}