From a979a969ee8a924408ebeb767035b9e4f48f7efa Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 1 Feb 2021 13:14:30 +0900
Subject: acrotex (2021-02-01)

---
 texmf-dist/source/latex/acrotex/web.dtx | 3920 +++++++++++++++----------------
 1 file changed, 1911 insertions(+), 2009 deletions(-)

(limited to 'texmf-dist/source/latex/acrotex/web.dtx')

diff --git a/texmf-dist/source/latex/acrotex/web.dtx b/texmf-dist/source/latex/acrotex/web.dtx
index 473c39cc..0704cade 100644
--- a/texmf-dist/source/latex/acrotex/web.dtx
+++ b/texmf-dist/source/latex/acrotex/web.dtx
@@ -25,8 +25,19 @@
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[colorlinks,hyperindex=false]{hyperref}
-%\def\texorpdfstring#1#2{#1}
-%\pdfstringdefDisableCommands{\let\\\textbackslash}
+\usepackage{fancyvrb}
+\gdef\darg#1{\texttt{\char123\relax#1\char125\relax}}
+\def\CMD#1{\textbackslash#1}
+\let\pkg\textsf
+\let\opt\texttt
+\let\env\texttt
+\let\app\textsf
+\let\uif\textsf
+\def\nmpsep#1{\hskip-\marginparsep\texttt{#1}}
+\def\visispace{\symbol{32}}
+\def\ameta#1{\ensuremath{\langle\textit{\texttt{#1}}\rangle}}
+\def\meta#1{\textsl{\texttt{#1}}}
+\def\SUB#1{\ensuremath{{}_{\mbox{\scriptsize\ttfamily#1}}}}
 \OnlyDescription  % comment out for implementation details
 \EnableCrossrefs
 \CodelineIndex
@@ -35,9 +46,6 @@
     {\def\IndexOpt{\DescribeMacro}\def\IndexKey{\DescribeMacro}\let\setupFullwidth\relax
      \PackageInfo{web}{aebdocfmt.def cannot be found}}
 \begin{document}
-\def\CMD#1{\textbackslash#1}
-\let\pkg\textsf
-\let\opt\texttt
 \addtolength{\marginparwidth}{3pt}
   \GetFileInfo{web.sty}
   \title{Web: A Screen Design Package}
@@ -85,8 +93,8 @@
 % \subsection{Drivers Supported}
 %    \begin{macrocode}
 \IfFileExists{xcolor.sty}{%
-    \def\eq@ColorPackage{xcolor}%
-    \PassOptionsToPackage{xcolor}{table,hyperref}%
+  \def\eq@ColorPackage{xcolor}%
+  \PassOptionsToPackage{xcolor}{table,hyperref}%
 }{\def\eq@ColorPackage{color}}
 %    \end{macrocode}
 %    Force package to use \textsf{color}.\IndexOpt{noxcolor}
@@ -106,20 +114,21 @@
 \let\i@web@ddtoHyOpts\@empty
 \let\eq@driver@name\@empty
 \let\web@YES=y \let\web@NO=n
+\let\web@One=1 \let\web@Zero=0
 %    \end{macrocode}
-% \textsf{dvipsone}\IndexOpt{dvipsone}\space is the dvi-to-ps driver of the YandY system that I still
+% \leavevmode\IndexOpt{dvipsone}\textsf{dvipsone} is the dvi-to-ps driver of the YandY system that I still
 % use, I hate to give it up. Even I have not used the \IndexOpt{dviwindo}\texttt{dviwindo} option
 % for many years, and is obsolete.
 %    \begin{macrocode}
 \DeclareOptionX{dvipsone}{%
-    \def\eq@drivernum{0}\def\eq@driver@name{dvipsone}%
+  \def\eq@drivernum{0}\def\eq@driver@name{dvipsone}%
 %    \end{macrocode}
 % Below is the original definition of \cs{web@set@paper}, this has now
 % changed with \texttt{v4.2j} to accommodate \cs{addtoWebHeight} and
 % \cs{addtoWebWidth}.
 %\begin{verbatim}
-%    \def\web@set@paper{%
-%        \special{papersize=\the\paperwidth,\the\paperheight}}%
+%   \def\web@set@paper{%
+%     \special{papersize=\the\paperwidth,\the\paperheight}}%
 %\end{verbatim}
 % \changes{v4.2j}{2012/05/11}{In support of \string\cs{addtoWebHeight}, we introduce
 % the pagesize special at the beginning of the document. Changes are in the
@@ -127,48 +136,45 @@
 % The revised definition of \cs{web@set@paper}, we now set the papersize
 % at the beginning of the document.
 %    \begin{macrocode}
-    \let\web@set@paper\@empty
-    \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument{%
-        \special{papersize=\the\paperwidth,\the\paperheight}}}%
+  \let\web@set@paper\@empty
+  \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument
+    {\special{papersize=\the\paperwidth,\the\paperheight}}}%
 }
 \DeclareOptionX{dviwindo}{%
-    \def\eq@drivernum{4}\def\eq@driver@name{dviwindo}%
-    \@namedef{papersize@for@\eq@driver@name}{\def\web@set@paper{%
-        \special{papersize=\the\paperwidth,\the\paperheight}}}%
+  \def\eq@drivernum{4}\def\eq@driver@name{dviwindo}%
+  \@namedef{papersize@for@\eq@driver@name}{\def\web@set@paper
+    {\special{papersize=\the\paperwidth,\the\paperheight}}}%
 }
 %    \end{macrocode}
 % Various extensions of \textsf{dvipdfm}, the dvi-to-pdf driver.\IndexOpt{dvipdfm}\IndexOpt{dvipdfmx}\IndexOpt{xetex}
 %    \begin{macrocode}
 \DeclareOptionX{dvipdfm}{%
-    \def\eq@drivernum{2}\def\eq@driver@name{dvipdfm}%
-    \web@opts@xdvipdfmx
+  \def\eq@drivernum{2}\def\eq@driver@name{dvipdfm}\web@opts@xdvipdfmx
 }
 %    \end{macrocode}
 %\changes{v4.3}{2012/06/20}{Added \string\texttt{dvipdfmx} and \string\texttt{xetex} options}
 %    \begin{macrocode}
 \DeclareOptionX{dvipdfmx}{%
-   \def\eq@drivernum{2}\def\eq@driver@name{dvipdfmx}%
-   \web@opts@xdvipdfmx
+ \def\eq@drivernum{2}\def\eq@driver@name{dvipdfmx}\web@opts@xdvipdfmx
 }
 %    \end{macrocode}
 %    \begin{macrocode}
 \DeclareOptionX{xetex}{%
-   \def\eq@drivernum{2}\def\eq@driver@name{xetex}%
-   \web@opts@xdvipdfmx
+ \def\eq@drivernum{2}\def\eq@driver@name{xetex}\web@opts@xdvipdfmx
 }
 %    \end{macrocode}
 %    \begin{macrocode}
 \newcommand{\web@opts@xdvipdfmx}{%
-    \@namedef{papersize@for@\eq@driver@name}%
-        {\def\web@set@paper{\AtBeginDvi{%
-        \special{papersize=\the\paperwidth,\the\paperheight}}}}%
+  \@namedef{papersize@for@\eq@driver@name}%
+    {\def\web@set@paper{\AtBeginDvi
+    {\special{papersize=\the\paperwidth,\the\paperheight}}}}%
 }
 %    \end{macrocode}
 % \texttt{dvips}\IndexOpt{dvips} is the dvi-to-ps driver.
 %    \begin{macrocode}
 \DeclareOptionX{dvips}{%
-    \def\eq@drivernum{0}\def\eq@driver@name{dvips}%
-    \def\i@web@ddtoHyOpts{setpagesize=false}%
+  \def\eq@drivernum{0}\def\eq@driver@name{dvips}%
+  \def\i@web@ddtoHyOpts{setpagesize=false}%
 %    \end{macrocode}
 % The old definition of \cs{web@set@paper}
 %\begin{verbatim}
@@ -177,9 +183,9 @@
 %\end{verbatim}
 % New definitions (\texttt{v4.2j}). See comments for the \texttt{dvipsone} option.
 %    \begin{macrocode}
-    \let\web@set@paper\@empty
-    \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument{%
-        \special{papersize=\the\paperwidth,\the\paperheight}}}%
+  \let\web@set@paper\@empty
+  \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument
+    {\special{papersize=\the\paperwidth,\the\paperheight}}}%
 }
 %    \end{macrocode}
 % \texttt{pdftex}\IndexOpt{pdftex} is for users of \textsf{pdflatex}.
@@ -201,19 +207,17 @@
 % The `\texttt{textures}\IndexOpt{textures}' option was contributed by Ross Moore.  {(2003/3/6)}
 %    \begin{macrocode}
 \DeclareOptionX{textures}{%
-    \def\eq@drivernum{3}\def\eq@driver@name{textures}%
-    \@namedef{papersize@for@\eq@driver@name}%
-        {\def\web@set@paper{\bgroup
-        \dimen2=\origpaperheight \advance\dimen2 by -\topmargin
-        \dimen0\dimen2 \advance\dimen0-\paperheight
-        \xdef\@pdfpagescrop{0 \strip@pt\dimen0 \space
-        \strip@pt\paperwidth\space \strip@pt\dimen2}%
-        \egroup}%
-        \AtEndOfPackage{%
-            \edef\origpaperwidth{\the\paperwidth}%
-            \edef\origpaperheight{\the\paperheight}%
-        }%
-    }%
+  \def\eq@drivernum{3}\def\eq@driver@name{textures}%
+  \@namedef{papersize@for@\eq@driver@name}%
+    {\def\web@set@paper{\bgroup
+    \dimen2=\origpaperheight \advance\dimen2 by -\topmargin
+    \dimen0\dimen2 \advance\dimen0-\paperheight
+    \xdef\@pdfpagescrop{0 \strip@pt\dimen0 \space
+    \strip@pt\paperwidth\space \strip@pt\dimen2}%
+    \egroup}\AtEndOfPackage
+      {\edef\origpaperwidth{\the\paperwidth}%
+      \edef\origpaperheight{\the\paperheight}}%
+  }%
 }
 %    \end{macrocode}
 %\subsection{Paper Option}
@@ -240,15 +244,15 @@
 % \IndexOpt{nobullets}^^A
 %    \begin{macrocode}
 \DeclareOptionX{latexlayout}{%
-    \let\web@layout\web@NO\ExecuteOptionsX{forcolorpaper}}
+  \let\web@layout\web@NO\ExecuteOptionsX{forcolorpaper}}
 \DeclareOptionX{uselatexsectioning}{%
-    \web@sectioningfalse
+  \web@sectioningfalse
 }
 \newif\ifweb@sectioning \web@sectioningtrue
 \DeclareOptionX{weblikeclass}{%
-    \ExecuteOptionsX{latexlayout}%
-    \ExecuteOptionsX{nobullets}%
-    \ExecuteOptionsX{uselatexsectioning}%
+  \ExecuteOptionsX{latexlayout}%
+  \ExecuteOptionsX{nobullets}%
+  \ExecuteOptionsX{uselatexsectioning}%
 }
 \DeclareOptionX{nodirectory}{\let\web@directory@option\web@NO}
 \DeclareOptionX{usedirectory}{\let\web@directory@option\web@YES}
@@ -266,48 +270,46 @@
 % of parameters).
 %    \begin{macrocode}
 \def\web@MargScrDimOpts#1#2#3#4#5#6{%
-    \margins{#1}{#2}{#3}{#4} % left,right,top, bottom
-    \screensize{#5}{#6}      % height, width
+  \margins{#1}{#2}{#3}{#4} % left,right,top, bottom
+  \screensize{#5}{#6}      % height, width
 %    \end{macrocode}
 % We save the current settings, then change \cs{margins} and \cs{screensize}
 % to gobble their arguments up if used again.
 %    \begin{macrocode}
-%    \let\margins@web@save\margins
-%    \let\screensize@web@save\screensize
-    \let\margins\@@margins\let\screensize\@gobbletwo
+  \let\margins\@@margins\let\screensize\@gobbletwo
 }
 %    \end{macrocode}
 % The original design concept for various dimensions.\IndexOpt{designi...designvix}
 %    \begin{macrocode}
 \DeclareOptionX{designi}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}}}
 \DeclareOptionX{designii}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}}}
 \DeclareOptionX{designiii}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}}}
 \DeclareOptionX{designiv}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4in}{5in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4in}{5in}}}
 \DeclareOptionX{designv}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{6in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{6in}}}
 \DeclareOptionX{designvi}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.17in}{4.67in}}}
+  \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.17in}{4.67in}}}
 \DeclareOptionX{designvii}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}}}
+  \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}}}
 \DeclareOptionX{designviii}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}}}
+  \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}}}
 \DeclareOptionX{designix}{\AtEndOfPackage{%
-    \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}}}
+  \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}}}
 %    \end{macrocode}
 % The \texttt{usesf}\IndexOpt{usesf} option makes the default font sans serif.
 % Popular for presentations.
 %    \begin{macrocode}
 \DeclareOptionX{usesf}{%
-    \def\aeb@defaultfamily{\sffamily}
-    \def\itdefault{sl}
-    \renewcommand{\familydefault}{\sfdefault}
-    \selectfont
-    \renewcommand\labelitemi{\textrm{\textbullet}}
-    \AtEndOfPackage{\def\web@copyright@symbol{\textrm{\copyright}}}
+  \def\aeb@defaultfamily{\sffamily}
+  \def\itdefault{sl}
+  \renewcommand{\familydefault}{\sfdefault}
+  \selectfont
+  \renewcommand\labelitemi{\textrm{\textbullet}}
+  \AtEndOfPackage{\def\web@copyright@symbol{\textrm{\copyright}}}
 }
 \def\aeb@defaultfamily{\rmfamily}
 %    \end{macrocode}
@@ -339,19 +341,19 @@
 %    \changes{v6.0m}{2016/08/19}{Added \string\texttt{addtoHyOpts*} option}
 %    \begin{macrocode}
 \define@choicekey+{webHyOpts}{pdfencoding}[\val\nr]%
-    {auto,pdfdoc,unicode}[pdfdoc]{\edef\web@Hypdfencoding{\val}}
-    {\PackageWarning{web}{Bad choice for pdfencoding,
-    permissible values\MessageBreak
-    are auto, pdfdoc, and unicode.\MessageBreak Try again}}
+  {auto,pdfdoc,unicode}[pdfdoc]{\edef\web@Hypdfencoding{\val}}
+  {\PackageWarning{web}{Bad choice for pdfencoding,
+  permissible values\MessageBreak
+  are auto, pdfdoc, and unicode.\MessageBreak Try again}}
 \let\web@Hypdfencoding\@empty
 \let\u@web@ddtoHyOpts\@empty
 \let\u@web@ddtoHySetup\@empty
 \def\web@addtoHyOpts#1{\g@addto@macro\u@web@ddtoHyOpts{#1}}
 \def\web@addtoHySetup#1{\g@addto@macro\u@web@ddtoHySetup{#1}}
 \define@key{web.sty}{addtoHyOpts}[]{%
-    \setkeys*{webHyOpts}{#1}\web@addtoHyOpts{#1}}
+  \setkeys*{webHyOpts}{#1}\web@addtoHyOpts{#1}}
 \define@key{web.sty}{addtoHyOpts*}[]{%
-    \setkeys*{webHyOpts}{#1}\web@addtoHySetup{#1}}
+  \setkeys*{webHyOpts}{#1}\web@addtoHySetup{#1}}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -388,7 +390,6 @@
 \let\webpro@loaded\web@NO
 \def\loadwebpro{\InputIfFileExists{webpro.def}{}{}}
 %    \end{macrocode}
-%
 % When you take the \texttt{draft}\IndexOpt{draft} option, graphic overlays are not allowed.  This is useful
 % when you rely heavily on graphic overlays, but during the development phase,
 % don't need to read and re-read your overlays. The defined background colors
@@ -407,9 +408,9 @@
 %    \begin{macrocode}
 \DeclareOptionX{usetemplates}{\def\@usetemplates{1}}
 \DeclareOptionX{leftpanel}%
-    {\def\@panelconfig{1}\def\@usetemplates{1}}
+  {\def\@panelconfig{1}\def\@usetemplates{1}}
 \DeclareOptionX{rightpanel}%
-    {\def\@panelconfig{2}\def\@usetemplates{1}}
+  {\def\@panelconfig{2}\def\@usetemplates{1}}
 %    \end{macrocode}
 % Normally, the templates feature is removed
 % when the \texttt{forpaper} or \texttt{forcolorpaper} open is used. There may be
@@ -418,24 +419,21 @@
 %    \begin{macrocode}
 \newif\iftemplatesforpaper \templatesforpaperfalse
 \DeclareOptionX{templatesforpaper}{\templatesforpapertrue
-    \ExecuteOptionsX{forcolorpaper}}
+  \ExecuteOptionsX{forcolorpaper}}
 %    \end{macrocode}
 % Here we come to a couple of options, \IndexOpt{rightpanelprt}\IndexOpt{leftpanelprt}
 % \texttt{rightpanelprt} and \texttt{leftpanelprt}, I remember nothing about.
 % apparently, these are \texttt{rightpanel} and \texttt{leftpanel} options for screen mode only.
 %    \begin{macrocode}
-\DeclareOptionX{rightpanelprt}{%
-    \ifeqforpaper\else\ExecuteOptionsX{rightpanel}\fi
-}
-\DeclareOptionX{leftpanelprt}{%
-    \ifeqforpaper\else\ExecuteOptionsX{leftpanel}\fi
-}
+\DeclareOptionX{rightpanelprt}{\ifeqforpaper\else
+  \ExecuteOptionsX{rightpanel}\fi}
+\DeclareOptionX{leftpanelprt}{\ifeqforpaper\else
+  \ExecuteOptionsX{leftpanel}\fi}
 %    \end{macrocode}
 % \DescribeMacro{\templatedefaults} sets the defaults for the template code.
 %    \begin{macrocode}
 \def\templatedefaults{\def\@panelsep{0pt}\def\@usetemplates{0}%
-    \def\@panelconfig{0}\def\@textX{0}\def\@panelX{0}%
-}
+  \def\@panelconfig{0}\def\@textX{0}\def\@panelX{0}}
 \templatedefaults
 %    \end{macrocode}
 % \subsection{Miscellaneous Options}
@@ -462,10 +460,10 @@
 % definitions are used.
 %    \begin{macrocode}
 \DeclareOptionX{uselatexparts}{%
-    \AtEndOfPackage{\@ifundefined{part}{}{\let\part\web@save@part}}}
+  \AtEndOfPackage{\@ifundefined{part}{}{\let\part\web@save@part}}}
 \DeclareOptionX{uselatexchapters}{%
-    \AtEndOfPackage{\@ifundefined{chapter}{}
-        {\let\chapter\web@save@chapter}}}
+  \AtEndOfPackage{\@ifundefined{chapter}{}
+    {\let\chapter\web@save@chapter}}}
 %    \end{macrocode}
 % \subsection{Language Options}
 % The \texttt{french}\IndexOpt{french} option
@@ -515,8 +513,7 @@
 %    \end{macrocode}
 % The \texttt{norsk}\IndexOpt{norsk} option
 %    \begin{macrocode}
-\DeclareOptionX{norsk}{%
-  \AtEndOfPackage{%
+\DeclareOptionX{norsk}{\AtEndOfPackage{%
   \def\today{\ifcase\month\or Januar
     \or Februar \or Mars \or April
     \or Mai \or Juni  \or Juli  \or August
@@ -537,68 +534,65 @@
 %    \end{macrocode}
 % The \texttt{dutch}\IndexOpt{dutch} option
 %    \begin{macrocode}
-\DeclareOptionX{dutch}{%
-  \AtEndOfPackage{%
+\DeclareOptionX{dutch}{\AtEndOfPackage{%
   \def\today{\the\day~\ifcase\month\or januari
-        \or februari \or maart \or april
-        \or mei \or juni  \or juli  \or augustus
-        \or september  \or oktober  \or november
-        \or december \fi \space \the\year}
-    \def\web@versionlabel{Versie}
-    \def\web@toc{Inhoudsopgave}
-    \def\web@continued{vervolg}
-    \def\web@article{Begin \hyperlink{\web@Start.1}{Artikel}}
-    \def\web@directory{Overzicht}
-    \def\web@revision{Laatste wijziging:}
-    \def\web@copyright{Copyright}
-    \def\web@section{Sectie}
-    \def\web@back{Terug}
-    \def\web@doc{Doc}}
+    \or februari \or maart \or april
+    \or mei \or juni  \or juli  \or augustus
+    \or september  \or oktober  \or november
+    \or december \fi \space \the\year}
+  \def\web@versionlabel{Versie}
+  \def\web@toc{Inhoudsopgave}
+  \def\web@continued{vervolg}
+  \def\web@article{Begin \hyperlink{\web@Start.1}{Artikel}}
+  \def\web@directory{Overzicht}
+  \def\web@revision{Laatste wijziging:}
+  \def\web@copyright{Copyright}
+  \def\web@section{Sectie}
+  \def\web@back{Terug}
+  \def\web@doc{Doc}}
   \PassOptionsToPackage{dutch}{exerquiz}
 }
 %    \end{macrocode}
 % The \texttt{spanish}\IndexOpt{spanish} option
 %    \begin{macrocode}
-\DeclareOptionX{spanish}{%
-  \AtEndOfPackage{%
-    \def\today{\the\day\ de \ifcase\month\or Enero
-        \or Febrero \or Marzo \or Abril
-        \or Mayo \or Junio  \or Julio  \or Agosto
-        \or Septiembre  \or Octubre  \or Noviembre
-        \or Deciembre \fi de \the\year}
-    \renewcommand\web@versionlabel{Versi\noexpand\'{o}n}
-    \renewcommand\web@toc{Tabla de Contenido}
-    \renewcommand\web@continued{cont.}
-    \renewcommand\web@article{Inicio
-    \hyperlink{\web@Start.1}{Art\'{\i}culo}}
-    \renewcommand\web@directory{Directorio}
-    \renewcommand\web@revision{Actualizado el:}
-    \renewcommand\web@copyright{Copyright}
-    \renewcommand\web@section{Secci\'on}
-    \renewcommand\web@back{Volver}
-    \renewcommand\web@doc{Doc}}
+\DeclareOptionX{spanish}{\AtEndOfPackage{%
+  \def\today{\the\day\ de \ifcase\month\or Enero
+    \or Febrero \or Marzo \or Abril
+    \or Mayo \or Junio  \or Julio  \or Agosto
+    \or Septiembre  \or Octubre  \or Noviembre
+    \or Deciembre \fi de \the\year}
+  \renewcommand\web@versionlabel{Versi\noexpand\'{o}n}
+  \renewcommand\web@toc{Tabla de Contenido}
+  \renewcommand\web@continued{cont.}
+  \renewcommand\web@article{Inicio
+  \hyperlink{\web@Start.1}{Art\'{\i}culo}}
+  \renewcommand\web@directory{Directorio}
+  \renewcommand\web@revision{Actualizado el:}
+  \renewcommand\web@copyright{Copyright}
+  \renewcommand\web@section{Secci\'on}
+  \renewcommand\web@back{Volver}
+  \renewcommand\web@doc{Doc}}
   \PassOptionsToPackage{spanish}{exerquiz}
 }
 %    \end{macrocode}
 % The \texttt{italian}\IndexOpt{italian} option
 %    \begin{macrocode}
-\DeclareOptionX{italian}{%
-  \AtEndOfPackage{%
-    \def\today{\ifcase\month\or Gennaio
-        \or Febbraio \or Marzo \or Aprile
-        \or Maggio \or Giugno  \or Luglio  \or Agosto
-        \or Settembre  \or Ottobre  \or Novembre
-        \or Dicembre \fi \the\day,  \the\year}
-    \renewcommand\web@versionlabel{Versione}
-    \renewcommand\web@toc{Indice}
-    \renewcommand\web@continued{cont.}
-    \renewcommand\web@article{Inizio \hyperlink{\web@Start.1}{Articolo}}
-    \renewcommand\web@directory{Directory}
-    \renewcommand\web@revision{Data Ultima Revisione:}
-    \renewcommand\web@copyright{Copyright}
-    \renewcommand\web@section{Sezione}
-    \renewcommand\web@back{Back}
-    \renewcommand\web@doc{Doc}}
+\DeclareOptionX{italian}{\AtEndOfPackage{%
+  \def\today{\ifcase\month\or Gennaio
+    \or Febbraio \or Marzo \or Aprile
+    \or Maggio \or Giugno  \or Luglio  \or Agosto
+    \or Settembre  \or Ottobre  \or Novembre
+    \or Dicembre \fi \the\day,  \the\year}
+  \renewcommand\web@versionlabel{Versione}
+  \renewcommand\web@toc{Indice}
+  \renewcommand\web@continued{cont.}
+  \renewcommand\web@article{Inizio \hyperlink{\web@Start.1}{Articolo}}
+  \renewcommand\web@directory{Directory}
+  \renewcommand\web@revision{Data Ultima Revisione:}
+  \renewcommand\web@copyright{Copyright}
+  \renewcommand\web@section{Sezione}
+  \renewcommand\web@back{Back}
+  \renewcommand\web@doc{Doc}}
   \PassOptionsToPackage{italian}{exerquiz}
 }
 %    \end{macrocode}
@@ -613,28 +607,27 @@
 % \CYRN,\cyra,\cyrch,\cyra,\cyrl,\cyro,\CYRS,\CYRP,\CYRV,\CYRN,\CYRCH,
 % \cyrp,\cyrz,\cyrz,\cyrzh,\CYRK,\cyrishrt,\cyrsftsn}
 %    \begin{macrocode}
-\DeclareOptionX{russian}{%
-  \ExecuteOptionsX{unicode}%
+\DeclareOptionX{russian}{\ExecuteOptionsX{unicode}%
   \AtEndOfPackage{%
   \def\today{\the\day\ \ifcase\month
-        \or \cyrya\cyrn\cyrv\cyra\cyrr\cyrya
-        \or \cyrf\cyre\cyrv\cyrr\cyra\cyrl\cyrya
-        \or \cyrm\cyra\cyrr\cyrt\cyra
-        \or \cyra\cyrp\cyrr\cyre\cyrl\cyrya
-        \or \cyrm\cyra\cyrya
-        \or \cyri\cyryu\cyrn\cyrya
-        \or \cyri\cyryu\cyrl\cyrya
-        \or \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra
-        \or \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya
-        \or \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya
-        \or \cyrn\cyro\cyrya\cyrb\cyrr\cyrya
-        \or \cyrd\cyre\cyrk\cyrya\cyrb\cyrr\cyrya \fi{ }%
-        \the\year\ \cyrg.}
+    \or \cyrya\cyrn\cyrv\cyra\cyrr\cyrya
+    \or \cyrf\cyre\cyrv\cyrr\cyra\cyrl\cyrya
+    \or \cyrm\cyra\cyrr\cyrt\cyra
+    \or \cyra\cyrp\cyrr\cyre\cyrl\cyrya
+    \or \cyrm\cyra\cyrya
+    \or \cyri\cyryu\cyrn\cyrya
+    \or \cyri\cyryu\cyrl\cyrya
+    \or \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra
+    \or \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya
+    \or \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya
+    \or \cyrn\cyro\cyrya\cyrb\cyrr\cyrya
+    \or \cyrd\cyre\cyrk\cyrya\cyrb\cyrr\cyrya \fi{ }%
+    \the\year\ \cyrg.}
   \gdef\eq@protected##1##2{{\ifhmode ##2\else
-        \ifvmode ##2\else\ifinner##2\else\noexpand ##1\fi\fi\fi}}%
+    \ifvmode ##2\else\ifinner##2\else\noexpand ##1\fi\fi\fi}}%
   \def\cyrCommand##1##2{\def##1{\eq@protected##1{##2}}}%
     \cyrCommand\web@toc{\CYRO\cyrg\cyrl\cyra\cyrv\cyrl\cyre\cyrn%
-        \cyri\cyre}
+    \cyri\cyre}
   \cyrCommand\web@continued{\cyrp\cyrr\cyro\cyrd\cyro\cyrl%
     \cyrzh\cyre\cyrn\cyri\cyre}
   \cyrCommand\web@article{\CYRN\cyra\cyrch\cyra\cyrl\cyro{ }%
@@ -645,8 +638,6 @@
   \cyrCommand\web@revision{\CYRP\cyro\cyrs\cyrl\cyre\cyrd\cyrn%
     \cyrya\cyrya{ }\cyrr\cyre\cyrv\cyri\cyrz\cyri\cyrya:}
   \let\web@copyright\@gobble
-%  \cyrCommand\web@copyright{%\CYRK\cyro\cyrp\cyri\cyrr\cyra%
-%  \cyrishrt\cyrt}%In Russian publications only the symbol presents
   \cyrCommand\web@versionlabel{\CYRV\cyre\cyrr\cyrs\cyri\cyrya}
   \cyrCommand\web@back{\CYRN\cyra\cyrz\cyra\cyrd}
   \cyrCommand\web@section{\CYRCH\cyra\cyrs\cyrt\cyrsftsn}}
@@ -655,8 +646,7 @@
 %    \end{macrocode}
 % The \texttt{dansk}\IndexOpt{dansk} option
 %    \begin{macrocode}
-\DeclareOptionX{dansk}{%
-  \AtEndOfPackage{%
+\DeclareOptionX{dansk}{\AtEndOfPackage{%
   \def\today{\ifcase\month\or Januar
     \or Februar \or Marts \or April
     \or Maj \or Juni  \or Juli  \or August
@@ -678,33 +668,31 @@
 %    \end{macrocode}
 % The \texttt{polish}\IndexOpt{polish} option
 %    \begin{macrocode}
-\DeclareOptionX{polish}{%
-    \AtEndOfPackage{%
-    \def\today{\ifcase\month\or {Stycze\'{n}}
-        \or Luty \or Marzec \or {Kwiecie\'{n}}
-        \or Maj \or Czerwiec  \or Lipiec  \or {\'{S}ierpie\'{n}}
-        \or {Wrzesie\'{n}}  \or {Pa\'{z}dziernik}  \or Listopad
-        \or {Grudzie\'{n}} \fi \the\day,  \the\year}
-    \renewcommand\web@versionlabel{Wersja}
-    \renewcommand\web@toc{Spis Tre\'{s}ci}
-    \renewcommand\web@continued{verte}
-    \renewcommand\web@article{Pocz\k{a}tek do
-        \hyperlink{\web@Start.1}{Tekstu}}
-    \renewcommand\web@directory{Zawarto\'{s}\'{c}}
-    \renewcommand\web@revision{Ostatnia zmiana:}
-    \renewcommand\web@copyright{Copyright}
-    \renewcommand\web@section{Cze\'{s}\'{c}}
-    % Label Navibar
-    \renewcommand\web@back{Wstecz}
-    \renewcommand\web@doc{Dok}}   % restricted to three characters
-    \PassOptionsToPackage{polish}{exerquiz}
+\DeclareOptionX{polish}{\AtEndOfPackage{%
+  \def\today{\ifcase\month\or {Stycze\'{n}}
+    \or Luty \or Marzec \or {Kwiecie\'{n}}
+    \or Maj \or Czerwiec  \or Lipiec  \or {\'{S}ierpie\'{n}}
+    \or {Wrzesie\'{n}}  \or {Pa\'{z}dziernik}  \or Listopad
+    \or {Grudzie\'{n}} \fi \the\day,  \the\year}
+  \renewcommand\web@versionlabel{Wersja}
+  \renewcommand\web@toc{Spis Tre\'{s}ci}
+  \renewcommand\web@continued{verte}
+  \renewcommand\web@article{Pocz\k{a}tek do
+    \hyperlink{\web@Start.1}{Tekstu}}
+  \renewcommand\web@directory{Zawarto\'{s}\'{c}}
+  \renewcommand\web@revision{Ostatnia zmiana:}
+  \renewcommand\web@copyright{Copyright}
+  \renewcommand\web@section{Cze\'{s}\'{c}}
+% Label Navibar
+  \renewcommand\web@back{Wstecz}
+  \renewcommand\web@doc{Dok}}% restricted to three characters
+  \PassOptionsToPackage{polish}{exerquiz}
 }
 %    \end{macrocode}
 % The \texttt{finnish}\IndexOpt{finnish} option
 %    \begin{macrocode}
-\DeclareOptionX{finnish}{%
-  \AtEndOfPackage{%
-  % Recouvrement de \today
+\DeclareOptionX{finnish}{\AtEndOfPackage{%
+% Recouvrement de \today
   \def\today{\the\day\ \ifcase\month\or Tammikuu
     \or Helmikuu \or Maaliskuu  \or Huhtikuu
     \or Toukokuu \or Kes\"{a}kuu  \or Hein\"{a}kuu  \or Elokuu
@@ -724,30 +712,28 @@
 %    \end{macrocode}
 % The \texttt{catalan}\IndexOpt{catalan} option
 %    \begin{macrocode}
-\DeclareOptionX{catalan}{%
-   \AtEndOfPackage{%
-     \def\today{\the\day\ de \ifcase\month\or Gener
-        \or Febrer \or Mar\c{c} \or Abril
-        \or Maig \or Juny  \or Juliol  \or Agost
-        \or Setembre  \or Octubre  \or Novembre
-        \or Desembre \fi de \the\year}
-     \renewcommand\web@versionlabel{Versi\noexpand\'{o}}
-     \renewcommand\web@toc{Taula de Contingut}
-     \renewcommand\web@continued{cont.}
-     \renewcommand\web@article{Inici \hyperlink{\web@Start.1}{Article}}
-     \renewcommand\web@directory{Directori}
-     \renewcommand\web@revision{Actualizat el:}
-     \renewcommand\web@copyright{Copyright}
-     \renewcommand\web@section{Secci\'o}
-     \renewcommand\web@back{Tornar}
-     \renewcommand\web@doc{Doc}}
-   \PassOptionsToPackage{catalan}{exerquiz}
+\DeclareOptionX{catalan}{\AtEndOfPackage{%
+  \def\today{\the\day\ de \ifcase\month\or Gener
+    \or Febrer \or Mar\c{c} \or Abril
+    \or Maig \or Juny  \or Juliol  \or Agost
+    \or Setembre  \or Octubre  \or Novembre
+    \or Desembre \fi de \the\year}
+  \renewcommand\web@versionlabel{Versi\noexpand\'{o}}
+  \renewcommand\web@toc{Taula de Contingut}
+  \renewcommand\web@continued{cont.}
+  \renewcommand\web@article{Inici \hyperlink{\web@Start.1}{Article}}
+  \renewcommand\web@directory{Directori}
+  \renewcommand\web@revision{Actualizat el:}
+  \renewcommand\web@copyright{Copyright}
+  \renewcommand\web@section{Secci\'o}
+  \renewcommand\web@back{Tornar}
+  \renewcommand\web@doc{Doc}}
+  \PassOptionsToPackage{catalan}{exerquiz}
 }
 %    \end{macrocode}
 % The \texttt{czech}\IndexOpt{czech} option
 %    \begin{macrocode}
-\DeclareOptionX{czech}{%
-  \AtEndOfPackage{%
+\DeclareOptionX{czech}{\AtEndOfPackage{%
   \def\today{\number\day. \ifcase\month\or ledna\or \'unora\or
     b\v{r}ezna\or dubna\or kv\v{e}tna\or \v{c}ervna\or \v{c}ervence\or
     srpna\or z\'a\v{r}\'\i\or \v{r}\'{\i}jna\or listopadu\or prosince\fi
@@ -767,31 +753,29 @@
 %    \end{macrocode}
 % The \texttt{brazil}\IndexOpt{brazil} option
 %    \begin{macrocode}
-\DeclareOptionX{brazil}{%
-  \AtEndOfPackage{%
-    \def\today{\the\day\ de \ifcase\month\or janeiro
-            \or fevereiro \or mar\c{c}o \or abril
-            \or maio \or junho  \or julho  \or agosto
-            \or setembro  \or outubro  \or novembro
-            \or dezembro \fi de \the\year}
-    \renewcommand\web@versionlabel{Vers\~{a}o}
-    \renewcommand\web@toc{Tabela de Conte\'{u}do}
-    \renewcommand\web@continued{cont.}
-    \renewcommand\web@article{Inicie o
-    \hyperlink{\web@Start.1}{Artigo}}
-    \renewcommand\web@directory{Diret\'{o}rio}
-    \renewcommand\web@revision{Atualizado em:}
-    \renewcommand\web@copyright{Copyright}
-    \renewcommand\web@section{Se\c{c}\noexpand\~{a}o}
-    \renewcommand\web@back{Voltar}
-    \renewcommand\web@doc{Doc}}
+\DeclareOptionX{brazil}{\AtEndOfPackage{%
+  \def\today{\the\day\ de \ifcase\month\or janeiro
+    \or fevereiro \or mar\c{c}o \or abril
+    \or maio \or junho  \or julho  \or agosto
+    \or setembro  \or outubro  \or novembro
+    \or dezembro \fi de \the\year}
+  \renewcommand\web@versionlabel{Vers\~{a}o}
+  \renewcommand\web@toc{Tabela de Conte\'{u}do}
+  \renewcommand\web@continued{cont.}
+  \renewcommand\web@article{Inicie o
+  \hyperlink{\web@Start.1}{Artigo}}
+  \renewcommand\web@directory{Diret\'{o}rio}
+  \renewcommand\web@revision{Atualizado em:}
+  \renewcommand\web@copyright{Copyright}
+  \renewcommand\web@section{Se\c{c}\noexpand\~{a}o}
+  \renewcommand\web@back{Voltar}
+  \renewcommand\web@doc{Doc}}
   \PassOptionsToPackage{brazil}{exerquiz}
 }
 %    \end{macrocode}
 % The \texttt{turkish}\IndexOpt{turkish} option
 %    \begin{macrocode}
-\DeclareOptionX{turkish}{%
-  \ExecuteOptionsX{unicode}%
+\DeclareOptionX{turkish}{\ExecuteOptionsX{unicode}%
   \AtEndOfPackage{%
 %======> Modification : Mahmut Ko\c{c}ak
   \def\today{\the\day\ \ifcase\month\or Ocak
@@ -816,23 +800,20 @@
 % Unknown options are passed to the color package
 %    \begin{macrocode}
 \DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}
-    {\eq@ColorPackage}}
+  {\eq@ColorPackage}}
 %    \end{macrocode}
 % We use \textsf{xcolor} if available.
 %    \begin{macrocode}
-\@ifpackageloaded{xcolor}%
-{%
-    \@ifpackagelater{xcolor}{2004/07/04}{}
-    {%
-    \PackageError{web}{%
-    *************************************************\MessageBreak
-    * Your Version of `xcolor.sty' is too old!\MessageBreak
-    * You need the version from 2004/07/04 or newer\MessageBreak
-    * or use: \string\usepackage[noxcolor]{web}\MessageBreak
-    * or \string\documentclass[noxcolor]{article}\MessageBreak
-    *************************************************}{}%
-    }%
-}{}
+\@ifpackageloaded{xcolor}{%
+  \@ifpackagelater{xcolor}{2004/07/04}{}{%
+  \PackageError{web}{%
+  *************************************************\MessageBreak
+  * Your Version of `xcolor.sty' is too old!\MessageBreak
+  * You need the version from 2004/07/04 or newer\MessageBreak
+  * or use: \string\usepackage[noxcolor]{web}\MessageBreak
+  * or \string\documentclass[noxcolor]{article}\MessageBreak
+  *************************************************}{}%
+}}{}
 %    \end{macrocode}
 % \section{Main Code}
 % \subsection{Switches}
@@ -862,11 +843,10 @@
 % a bullet. This is only obeyed when the \texttt{pro} option is in effect.
 %    \begin{macrocode}
 \newif\if@defaultsubsubding \@defaultsubsubdingtrue
-\def\forceSubSubNumbers{%
-    \ifx\web@latextoc\web@YES\else
-    \PackageWarning{webpro}{\string\forSubSubNumbers\space
-    requested,\MessageBreak I'm adding the option of latextoc}\fi
-    \let\web@latextoc\web@YES\@defaultsubsubdingfalse
+\def\forceSubSubNumbers{\ifx\web@latextoc\web@YES\else
+  \PackageWarning{webpro}{\string\forSubSubNumbers\space
+  requested,\MessageBreak I'm adding the option of latextoc}\fi
+  \let\web@latextoc\web@YES\@defaultsubsubdingfalse
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -962,7 +942,7 @@
 %    then ignore the \texttt{unicode} option.
 %    \begin{macrocode}
 \ifx\web@Hypdfencoding\@empty\else
-    \let\aeb@useunicode\@gobble\fi
+  \let\aeb@useunicode\@gobble\fi
 %    \end{macrocode}
 % We use a utility command, taken and renamed from the \texttt{comment} package.
 %    \begin{macrocode}
@@ -1008,20 +988,20 @@
 % (2016/07/22) We do not pass the driver to \pkg{hyperref} in the cases the driver
 % is \texttt{pdftex} or \texttt{xetex}.
 %    \begin{macrocode}
-    \ifpdf\else\ifxetex\else\eq@driver@name,\fi\fi
-    bookmarks,bookmarksnumbered,bookmarksopen,%
-    colorlinks,\aeb@useunicode,linkcolor=webgreen,%
-    filecolor=webbrown,citecolor=webgreen,%
-    urlcolor=webbrown,pagebackref,pdfpagemode=UseNone,%
-    pdfstartview=Fit,pdfpagelayout=SinglePage%
+  \ifpdf\else\ifxetex\else\eq@driver@name,\fi\fi
+  bookmarks,bookmarksnumbered,bookmarksopen,%
+  colorlinks,\aeb@useunicode,linkcolor=webgreen,%
+  filecolor=webbrown,citecolor=webgreen,%
+  urlcolor=webbrown,pagebackref,pdfpagemode=UseNone,%
+  pdfstartview=Fit,pdfpagelayout=SinglePage%
 %    \end{macrocode}
 %    (2016/08/19) Moved the following code to the end of the option list so these options can override
 %    earlier options in the list.
 %    \changes{v6.0m}{2016/08/19}{Moved user and internal options for \string\pkg{hyperref} to end of option list so they
 %    can override earlier options.}
 %    \begin{macrocode}
-    \ifx\u@web@ddtoHyOpts\@empty\else,\u@web@ddtoHyOpts\fi
-    \ifx\i@web@ddtoHyOpts\@empty\else,\i@web@ddtoHyOpts\fi]{hyperref}%
+  \ifx\u@web@ddtoHyOpts\@empty\else,\u@web@ddtoHyOpts\fi
+  \ifx\i@web@ddtoHyOpts\@empty\else,\i@web@ddtoHyOpts\fi]{hyperref}%
 }
 %    \end{macrocode}
 % If the option \texttt{xhyperref} is taken, \textsf{hyperref} is not input by this
@@ -1030,10 +1010,10 @@
 %    and its placement in \string\cs{w@isHyLoaded}.}
 %    \begin{macrocode}
 \def\w@isHyLoaded{\@ifpackageloaded{hyperref}{}{\PackageError{web}
-    {The xhyperref option used, but hyperref is not\MessageBreak
-    already loaded. Will load hyperref with the options\MessageBreak
-    chosen by web}{Remove xhyperref or load hyperref prior to the web
-    package.}\web@RequireHyperref}%
+  {The xhyperref option used, but hyperref is not\MessageBreak
+  already loaded. Will load hyperref with the options\MessageBreak
+  chosen by web}{Remove xhyperref or load hyperref prior to the web
+  package.}\web@RequireHyperref}%
 }
 %    \end{macrocode}
 %    Now if the \opt{xhyperref} option \emph{is not taken}, we load \pkg{hyperref}; otherwise, if \pkg{hyperref}
@@ -1041,10 +1021,10 @@
 %    options.
 %    \begin{macrocode}
 \if@web@hyperref\expandafter\web@RequireHyperref\else
-    \expandafter\w@isHyLoaded\fi
+  \expandafter\w@isHyLoaded\fi
 \ifx\u@web@ddtoHySetup\@empty\else\edef\x{\noexpand\hypersetup
     {\u@web@ddtoHySetup}}\expandafter\x\fi
-%    \end{macrocode}
+%   \end{macrocode}
 %    We declare that `The AcroTeX eDucation Bundle' is the pdf creator.
 %    \begin{macrocode}
 \def\@pdfcreator{The AcroTeX eDucation Bundle}
@@ -1062,14 +1042,14 @@
 % If the user specifies the use of templates, we assume they are going
 % to do some graphical work, so we include \textsf{graphicx}.
 %    \begin{macrocode}
-\ifnum\@usetemplates=1\relax
+\ifnum\@usetemplates=\@ne\relax
     \def\x{\RequirePackage{graphicx}}\expandafter\x\fi
 %    \end{macrocode}
 % If the user specifies an option requiring templates, then we better
 % load \textsf{eso-pic}, which itself requires \textsf{everyshi} or \textsf{atbegshi}.
 %    \begin{macrocode}
-\ifnum\@usetemplates=1\relax
-    \RequirePackage{eso-pic}
+\ifnum\@usetemplates=\@ne
+  \RequirePackage{eso-pic}
 %    \end{macrocode}
 % Here is a fix for \textsf{dvipdfm}.  If using templates, then we need to
 % redefine the way we set the page size using \textsf{eso-pic}. We also need
@@ -1078,28 +1058,24 @@
 % size special will be in the \cs{ESO@HookII} macro, it needs to
 % execute (once) before \cs{ESO@HookI} is executed.
 %    \begin{macrocode}
-    \ifnum\eq@drivernum=2\relax
-        \def\web@set@paper{\AddToShipoutPicture*{%
-            \special{papersize=\the\paperwidth,\the\paperheight}}}%
+  \ifnum\eq@drivernum=\tw@
+    \def\web@set@paper{\AddToShipoutPicture*{%
+      \special{papersize=\the\paperwidth,\the\paperheight}}}%
 %    \end{macrocode}
 % We use some code from \textsf{hyperref} to set the page size.
 %    \begin{macrocode}
-        \AtBeginShipoutFirst{%
-            \begingroup
-              \@ifundefined{stockwidth}{%
-                \ifx\special@paper\@empty
-                  \special{papersize=\the\paperwidth,\the\paperheight}%
-                \else
-                  \special{papersize=\special@paper}%
-                \fi
-              }{%
-                \ifdim\stockwidth=\z@
-                \else
-                  \special{papersize=\the\stockwidth,\the\stockheight}%
-                \fi
-              }%
-            \endgroup
+    \AtBeginShipoutFirst{%
+      \begingroup
+        \@ifundefined{stockwidth}{%
+          \ifx\special@paper\@empty
+            \special{papersize=\the\paperwidth,\the\paperheight}\else
+            \special{papersize=\special@paper}\fi
+        }{%
+          \ifdim\stockwidth=\z@\else
+            \special{papersize=\the\stockwidth,\the\stockheight}\fi
         }%
+     \endgroup
+    }%
 %    \end{macrocode}
 % \changes{v4.2d}{2009/11/22}{Modifications to use
 %   new \string\textsf{eso-pic}}
@@ -1109,38 +1085,38 @@
 % The new version of \textsf{eso-pic} does not define \cs{@ShipoutPicture}.
 % If \cs{@Ship\-out\-Pic\-ture} defined, so we use some of the old code.
 %    \begin{macrocode}
-            \renewcommand{\@ShipoutPicture}{%
-            \bgroup
-                \@tempswafalse%
-                \ifx\ESO@HookI\@empty\else\@tempswatrue\fi%
-                \ifx\ESO@HookII\@empty\else\@tempswatrue\fi%
-                \if@tempswa%
-                \@tempdima=1in\@tempdimb=-\@tempdima%
-                \advance\@tempdimb\paperheight
-                \@ifundefined{stockwidth}{}{%
-                    \advance\@tempdima+\trimedge%
-                    \advance\@tempdima+\paperwidth%
-                    \advance\@tempdima-\stockwidth%
-                    \if@twoside\ifodd\c@page\else%
-                    \advance\@tempdima-2\trimedge%
-                    \advance\@tempdima-\paperwidth%
-                    \advance\@tempdima+\stockwidth%
-                    \fi\fi%
-                    \advance\@tempdimb+\trimtop}%
-                \unitlength=1pt%
-                \global\setbox\@cclv\vbox{%
-                    \vbox{\let\protect\relax
-                    \pictur@(0,0)%
-                    (\strip@pt\@tempdima,\strip@pt\@tempdimb)%
-                    \ESO@HookII\ESO@HookI\global\let\ESO@HookII\@empty%
-                    \endpicture}%
-                    \box\@cclv%
-                }%
-                \fi
-            \egroup
-        }%
-    }%
-    \fi
+      \renewcommand{\@ShipoutPicture}{%
+        \bgroup
+          \@tempswafalse%
+          \ifx\ESO@HookI\@empty\else\@tempswatrue\fi%
+          \ifx\ESO@HookII\@empty\else\@tempswatrue\fi%
+          \if@tempswa%
+          \@tempdima=1in\@tempdimb=-\@tempdima%
+          \advance\@tempdimb\paperheight
+          \@ifundefined{stockwidth}{}{%
+            \advance\@tempdima+\trimedge%
+            \advance\@tempdima+\paperwidth%
+            \advance\@tempdima-\stockwidth%
+            \if@twoside\ifodd\c@page\else%
+            \advance\@tempdima-2\trimedge%
+            \advance\@tempdima-\paperwidth%
+            \advance\@tempdima+\stockwidth%
+            \fi\fi\advance\@tempdimb+\trimtop
+          }%
+          \unitlength=1pt%
+          \global\setbox\@cclv\vbox{%
+            \vbox{\let\protect\relax
+            \pictur@(0,0)%
+            (\strip@pt\@tempdima,\strip@pt\@tempdimb)%
+            \ESO@HookII\ESO@HookI\global\let\ESO@HookII\@empty%
+            \endpicture}%
+            \box\@cclv%
+          }%
+        \fi
+        \egroup
+      }% shipout
+    }% ifundefined shipout
+  \fi
 \fi
 %    \end{macrocode}
 % A useful command for separating two arguments. Use in \texttt{webpro} section, and by \texttt{aeb\_pro} as well.
@@ -1196,24 +1172,20 @@
 %    \end{macrocode}
 % Modified version of the \cs{InitLayout} macro from pdfscreen.
 %    \begin{macrocode}
-\def\InitLayout
-{%
-    \ifeqforpaper\else
-      \setlength\headheight{\websetheadheight}
-      \hoffset=0pt \voffset=0pt
-    \fi
-    \ifeqforpaper\else
+\def\InitLayout{%
+  \ifeqforpaper\else
+    \setlength\headheight{\websetheadheight}
+    \hoffset=0pt \voffset=0pt
     {\@tempdima=\paperwidth
-    \addtolength{\@tempdima}{-\@Leftmargin}%
-    \addtolength{\@tempdima}{-\@Rightmargin}%
-    \xdef\fullscreenwidth{\the\@tempdima}}%
-    \fi
-    \ifx\web@layout\web@YES\else\templatedefaults\fi
-    \ifeqforpaper\else
-        \setlength{\textwidth}{\paperwidth}
-        \setlength{\textheight}{\paperheight}
-        \addtolength{\textheight}{-\@Topmargin}
-        \addtolength{\textheight}{-\@Bottommargin}
+      \addtolength{\@tempdima}{-\@Leftmargin}%
+      \addtolength{\@tempdima}{-\@Rightmargin}%
+      \xdef\fullscreenwidth{\the\@tempdima}}\fi
+  \ifx\web@layout\web@YES\else\templatedefaults\fi
+  \ifeqforpaper\else
+    \setlength{\textwidth}{\paperwidth}
+    \setlength{\textheight}{\paperheight}
+    \addtolength{\textheight}{-\@Topmargin}
+    \addtolength{\textheight}{-\@Bottommargin}
 %    \end{macrocode}
 %\begin{verbatim}
 %\topmargin = \web@Topmargin - 1in
@@ -1221,57 +1193,57 @@
 % so \headsep = \@Topmargin - \headheight - \web@Topmargin (\topmargin)
 %\end{verbatim}
 %    \begin{macrocode}
-        \setlength{\headsep}{\@Topmargin}
-        \addtolength\headsep{-\headheight}
-        \setlength{\topmargin}{\web@Topmargin}
-        \addtolength\headsep{-\topmargin}
-        \addtolength\headsep{\web@additionalheadsep}
-        \addtolength{\topmargin}{-1in}
-        \setlength\footskip{\@Bottommargin}
-        \addtolength{\footskip}{-\web@footskip} % depth of navibar
-        \ifcase\@panelconfig
-            \setlength{\oddsidemargin}{\@Leftmargin}
-            \setlength{\evensidemargin}{\@Leftmargin}
-        \or
-            \setlength{\oddsidemargin}{\@panelwidth}
-            \setlength{\evensidemargin}{\@panelwidth}
-        \or
-            \setlength{\oddsidemargin}{\@Leftmargin}
-            \setlength{\evensidemargin}{\@Leftmargin}
-        \fi
-        \addtolength{\evensidemargin}{-1in}
-        \addtolength{\oddsidemargin}{-1in}
+    \setlength{\headsep}{\@Topmargin}
+    \addtolength\headsep{-\headheight}
+    \setlength{\topmargin}{\web@Topmargin}
+    \addtolength\headsep{-\topmargin}
+    \addtolength\headsep{\web@additionalheadsep}
+    \addtolength{\topmargin}{-1in}
+    \setlength\footskip{\@Bottommargin}
+    \addtolength{\footskip}{-\web@footskip} % depth of navibar
+    \ifcase\@panelconfig
+      \setlength{\oddsidemargin}{\@Leftmargin}
+      \setlength{\evensidemargin}{\@Leftmargin}
+    \or
+      \setlength{\oddsidemargin}{\@panelwidth}
+      \setlength{\evensidemargin}{\@panelwidth}
+    \or
+      \setlength{\oddsidemargin}{\@Leftmargin}
+      \setlength{\evensidemargin}{\@Leftmargin}
+    \fi
+    \addtolength{\evensidemargin}{-1in}
+    \addtolength{\oddsidemargin}{-1in}
     \fi
     \ifx\web@layout\web@YES
-        \ifcase\@panelconfig
-            \addtolength{\textwidth}{-\@Leftmargin}
-            \addtolength{\textwidth}{-\@Rightmargin}
-        \or % leftpanel
-            \addtolength{\textwidth}{-\@panelwidth}
-            \addtolength{\textwidth}{-\@Rightmargin}
-        \or % rightpanel
-            \addtolength{\textwidth}{-\@panelwidth}
-            \addtolength{\textwidth}{-\@Leftmargin}
+      \ifcase\@panelconfig
+        \addtolength{\textwidth}{-\@Leftmargin}
+        \addtolength{\textwidth}{-\@Rightmargin}
+      \or % leftpanel
+        \addtolength{\textwidth}{-\@panelwidth}
+        \addtolength{\textwidth}{-\@Rightmargin}
+      \or % rightpanel
+        \addtolength{\textwidth}{-\@panelwidth}
+        \addtolength{\textwidth}{-\@Leftmargin}
+      \fi
+      \ifnum\@usetemplates=\@ne
+        \setlength{\textscreenwidth}{\paperwidth}
+        \def\@textX{0}
+        \ifnum\@panelconfig=\@ne % leftpanel
+          \addtolength{\textwidth}{-\@panelsep}
+          \addtolength{\oddsidemargin}{\@panelsep}
+          \addtolength{\evensidemargin}{\@panelsep}
+          \addtolength{\textscreenwidth}{-\@panelwidth}
+          \def\@textX{\strip@pt\@panelwidth}
+          \def\@panelX{0}
         \fi
-        \ifnum\@usetemplates=1\relax
-            \setlength{\textscreenwidth}{\paperwidth}
-            \def\@textX{0}
-            \ifnum\@panelconfig=1 % leftpanel
-                \addtolength{\textwidth}{-\@panelsep}
-                \addtolength{\oddsidemargin}{\@panelsep}
-                \addtolength{\evensidemargin}{\@panelsep}
-                \addtolength{\textscreenwidth}{-\@panelwidth}
-                \def\@textX{\strip@pt\@panelwidth}
-                \def\@panelX{0}
-            \fi
-            \ifnum\@panelconfig=2 % rightpanel
-                \addtolength{\textwidth}{-\@panelsep}
-                \addtolength{\textscreenwidth}{-\@panelwidth}
-                \def\@textX{0}
-                \def\@panelX{\strip@pt\textscreenwidth}
-            \fi
-            \calculatefullwidth
+        \ifnum\@panelconfig=\tw@ % rightpanel
+          \addtolength{\textwidth}{-\@panelsep}
+          \addtolength{\textscreenwidth}{-\@panelwidth}
+          \def\@textX{0}
+          \def\@panelX{\strip@pt\textscreenwidth}
         \fi
+        \calculatefullwidth
+      \fi
     \fi
 }
 %    \end{macrocode}
@@ -1300,30 +1272,26 @@
 %
 % The commands seems only effect with the \textsf{dvipsone} driver.
 %    \begin{macrocode}
-\def\@convLtoP#1#2{%
-  \afterassignment\@convLtoP@i\dimen@#2bp\relax{#1}{#2}}
+\def\@convLtoP#1#2{\afterassignment
+  \@convLtoP@i\dimen@#2bp\relax{#1}{#2}}
 \def\@convLtoP@i#1\relax#2#3{%
-   \if!#1!%
-     \def#2{#3}%
-    \else
-      \dimen@.99626\dimen@
-      \edef#2{\strip@pt\dimen@}%
-    \fi}
+ \if!#1!\def#2{#3}\else
+    \dimen@.99626\dimen@\edef#2{\strip@pt\dimen@}\fi}
 \providecommand\setPageDevice[3][600]{\bgroup
-    \@convLtoP{\width}{#2}\@convLtoP{\height}{#3}
-    \ifpdfmarkup\headerps@out{<< /HWResolution [#1 #1] %
-      /PageSize [\width\space\height] >> setpagedevice}\else
-    \PackageWarning{web}{This is a distiller only command,\MessageBreak
+  \@convLtoP{\width}{#2}\@convLtoP{\height}{#3}
+  \ifpdfmarkup\headerps@out{<< /HWResolution [#1 #1] %
+    /PageSize [\width\space\height] >> setpagedevice}\else
+  \PackageWarning{web}{This is a distiller only command,\MessageBreak
     ignoring \string\setPageDevice}\fi\egroup}
 %    \end{macrocode}
 %\DescribeMacro\allowTransparency sets the \textbf{AllowTransparency} key of
 % the distiller to \textbf{true}. We do this with \texttt{setdistillerparams}.
 %    \begin{macrocode}
 \providecommand\allowTransparency{\bgroup
-    \ifpdfmarkup\headerps@out{<< %
-    /AllowTransparency true >> setdistillerparams}\else
-    \PackageWarning{web}{This is a distiller only command,\MessageBreak
-    ignoring \string\allowTransparency}\fi\egroup}
+  \ifpdfmarkup\headerps@out{<< %
+  /AllowTransparency true >> setdistillerparams}\else
+  \PackageWarning{web}{This is a distiller only command,\MessageBreak
+  ignoring \string\allowTransparency}\fi\egroup}
 \@onlypreamble\setPageDevice
 \@onlypreamble\allowTransparency
 %    \end{macrocode}
@@ -1342,29 +1310,27 @@
 %\end{verbatim}
 %    \begin{macrocode}
 \def\screensize#1#2{%
-    \def\webSaveSSDim{{#1}{#2}}%
-    \begingroup
+  \def\webSaveSSDim{{#1}{#2}}%
+  \begingroup
     \ifeqforpaper
-        \ifx\web@layout\web@YES
-            \setlength{\@tempdima}{#2}%
-            \global\textwidth\@tempdima
-            \addtolength{\@tempdima}{-\@Leftmargin}%
-            \addtolength{\@tempdima}{-\@Rightmargin}%
-            \xdef\fullscreenwidth{\the\@tempdima}%
-        \else
-            \xdef\fullscreenwidth{\the\textwidth}%
-        \fi
+      \ifx\web@layout\web@YES
+        \setlength{\@tempdima}{#2}\global
+        \textwidth\@tempdima
+        \addtolength{\@tempdima}{-\@Leftmargin}%
+        \addtolength{\@tempdima}{-\@Rightmargin}%
+        \xdef\fullscreenwidth{\the\@tempdima}\else
+        \xdef\fullscreenwidth{\the\textwidth}\fi
     \else
-        \setlength{\@tempdima}{#1}%
-        \global\paperheight\@tempdima
-        \setlength{\@tempdima}{#2}%
-        \global\paperwidth\@tempdima
+      \setlength{\@tempdima}{#1}\global
+      \paperheight\@tempdima
+      \setlength{\@tempdima}{#2}\global
+      \paperwidth\@tempdima
     \fi
-    \endgroup
-        \web@papersize@settrue
-        \web@set@paper  % dps modified
-        \let\screensize\@gobbletwo
-    \InitLayout
+  \endgroup
+  \web@papersize@settrue
+  \web@set@paper
+  \let\screensize\@gobbletwo
+  \InitLayout
 }
 %    \end{macrocode}
 % Save a secret copy of screensize for use by APB
@@ -1403,9 +1369,9 @@
 % }
 %    \begin{macrocode}
 \newcommand{\setScreensizeFromGraphic}[2][]{%
-    \getDimsFromGraphic[#1]{#2}%
+  \getDimsFromGraphic[#1]{#2}%
     {\web@graphicScreenWidth}{\web@graphicScreenHeight}%
-    \screensize{\web@graphicScreenHeight}{\web@graphicScreenWidth}%
+  \screensize{\web@graphicScreenHeight}{\web@graphicScreenWidth}%
 }
 \@onlypreamble\setScreensizeFromGraphic
 %    \end{macrocode}
@@ -1414,7 +1380,7 @@
 % This command uses the graphicx package. It loads a graphic
 % into a box and measures its dimensions.
 % \changes{v4.1a}{2008/07/06}
-% {
+% {%
 %   Added the command \string\cs{getDimsFromGraphic} as a helper command for
 %   \string\cs{setScreensizeFromGraphic}, but also useful as
 %   stand alone as well.
@@ -1422,17 +1388,17 @@
 %
 %\medskip\noindent The parameters are:
 %\begin{enumerate}
-%   \item[]\texttt{[\#1]}: Optional argument that is passed to \cs{graphicx} package
+%   \item[]\texttt{[\#1]}: Optional argument that is passed to \cs{includegraphics} command
 %   \item[]\texttt{\#2}: The path to the graph to be read
 %   \item[]\texttt{\#3}: A control sequence to be used to hold the width
 %   \item[]\texttt{\#4}: A control sequence to be used to hold the height
 %\end{enumerate}
 %    \begin{macrocode}
-\newcommand{\getDimsFromGraphic}[4][]{{%
-    \setbox0=\hbox{\includegraphics[draft,#1]{#2}}%
-    \dimen@=\dp0 \advance\dimen@\ht0
-    \xdef#3{\the\wd0 }\xdef#4{\the\dimen@}%
-}}
+\newcommand{\getDimsFromGraphic}[4][]{\bgroup
+  \setbox\z@=\hbox{\includegraphics[draft,#1]{#2}}%
+  \dimen@=\dp\z@ \advance\dimen@\ht\z@
+  \xdef#3{\the\wd\z@ }\xdef#4{\the\dimen@}\egroup
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\addtoWebHeight}
@@ -1446,34 +1412,34 @@
 %    \begin{macrocode}
 \def\web@getSSDims#1#2{\edef\web@@height{#1}\edef\web@@width{#2}}
 \def\addToWebHWError{\PackageError{web}{%
-    You must declare screen size first by using\MessageBreak
-    the \string\screensize\space command, or by declaring \MessageBreak
-    a design in the web option list}%
-    {Do as is suggested in error message!}}
+  You must declare screen size first by using\MessageBreak
+  the \string\screensize\space command, or by declaring \MessageBreak
+  a design in the web option list}%
+  {Do as is suggested in error message!}}
 \newcommand{\addtoWebHeight}[1]{%
 %    \end{macrocode}
 %    If the \cmd{\screensize} has already been set, it has been
 %    \cmd{\let} to \cmd{\@gobbletwo}. We use this to detect the error
 %    of not already declaring page dimensions.
 %    \begin{macrocode}
-    \ifx\screensize\@gobbletwo
-    \expandafter\web@getSSDims\webSaveSSDim
+  \ifx\screensize\@gobbletwo
+  \expandafter\web@getSSDims\webSaveSSDim
 %    \end{macrocode}
 %    Even though \cmd{\screensize} has already been expanded and is now
 %    \cs{let} to \cs{@gobbletwo}, we can use our saved version of
 %    \cs{screensize} that no one knows about.
 %    \begin{macrocode}
-    \screensize@web@save{\web@@height+#1}{\web@@width}%
-    \else\addToWebHWError\fi
+  \screensize@web@save{\web@@height+#1}{\web@@width}%
+  \else\addToWebHWError\fi
 }
 %    \end{macrocode}
 % \cs{addtoWebWidth} works the same way as \cmd{\addtoWebHeight}.
 %    \begin{macrocode}
 \newcommand{\addtoWebWidth}[1]{%
-    \ifx\screensize\@gobbletwo
-    \expandafter\web@getSSDims\webSaveSSDim
-    \screensize@web@save{\web@@height}{\web@@width+#1}%
-    \else\addToWebHWError\fi
+  \ifx\screensize\@gobbletwo
+  \expandafter\web@getSSDims\webSaveSSDim
+  \screensize@web@save{\web@@height}{\web@@width+#1}%
+  \else\addToWebHWError\fi
 }
 %    \end{macrocode}
 % Expand in preamble only.
@@ -1496,18 +1462,17 @@
 %   #5 = bottom margin
 %\end{verbatim}
 %    \begin{macrocode}
-\newcommand{\@margins}[5][\web@minpanelwidth]
-{%
-    \def\webSaveMargDim{[#1]{#2}{#3}{#4}{#5}}%
-    \setlength{\@panelwidth}{#1}%
-    \ifdim\@panelwidth<\web@minpanelwidth
-        \setlength{\@panelwidth}{\web@minpanelwidth}\fi
-    \setlength{\@Leftmargin}{#2}%
-    \setlength{\@Rightmargin}{#3}%
-    \setlength{\@Topmargin}{#4}%
-    \setlength{\@Bottommargin}{#5}%
-    \web@margins@settrue
-    \InitLayout
+\newcommand{\@margins}[5][\web@minpanelwidth]{%
+  \def\webSaveMargDim{[#1]{#2}{#3}{#4}{#5}}%
+  \setlength{\@panelwidth}{#1}%
+  \ifdim\@panelwidth<\web@minpanelwidth
+    \setlength{\@panelwidth}{\web@minpanelwidth}\fi
+  \setlength{\@Leftmargin}{#2}%
+  \setlength{\@Rightmargin}{#3}%
+  \setlength{\@Topmargin}{#4}%
+  \setlength{\@Bottommargin}{#5}%
+  \web@margins@settrue
+  \InitLayout
 }
 \let\margins\@margins
 \let\margins@web@save\margins
@@ -1528,40 +1493,40 @@
 % This line adds .25in to each of the side margins.
 %    \begin{macrocode}
 \newcommand\get@MargDim[5][]{%
-    \def\currPanelWidth{#1}%
-    \def\currLeftMarg{#2}\def\currRightMarg{#3}%
-    \def\currTopMarg{#4}\def\currBottomMarg{#5}}
+  \def\currPanelWidth{#1}%
+  \def\currLeftMarg{#2}\def\currRightMarg{#3}%
+  \def\currTopMarg{#4}\def\currBottomMarg{#5}}
 \newcommand{\resetmargins}[5][\web@minpanelwidth]{%
-    \expandafter\get@MargDim\webSaveMargDim
-    \begingroup
-        \let\incby\currPanelWidth
-        \def\web@arg{#1}\ifx\web@arg\@empty
-        \setlength{\@tempdima}{\currPanelWidth}\else
-        \setlength{\@tempdima}{#1}\fi
-        \xdef\newPanelWidth{\the\@tempdima}%
-        \let\incby\currLeftMarg
-        \def\web@arg{#2}\ifx\web@arg\@empty
-        \setlength{\@tempdima}{\currLeftMarg}\else
-        \setlength{\@tempdima}{#2}\fi
-        \xdef\newLeftMarg{\the\@tempdima}%
-        \let\incby\currRightMarg
-        \def\web@arg{#3}\ifx\web@arg\@empty
-        \setlength{\@tempdima}{\currRightMarg}\else
-        \setlength{\@tempdima}{#3}\fi
-        \xdef\newRightMarg{\the\@tempdima}%
-        \let\incby\currTopMarg
-        \def\web@arg{#4}\ifx\web@arg\@empty
-        \setlength{\@tempdima}{\currTopMarg}\else
-        \setlength{\@tempdima}{#4}\fi
-        \xdef\newTopMarg{\the\@tempdima}%
-        \let\incby\currBottomMarg
-        \def\web@arg{#4}\ifx\web@arg\@empty
-        \setlength{\@tempdima}{\currBottomMarg}\else
-        \setlength{\@tempdima}{#5}\fi
-        \xdef\newBottomMarg{\the\@tempdima}%
-    \endgroup
-    \margins@web@save[\newPanelWidth]{\newLeftMarg}{\newRightMarg}
-        {\newTopMarg}{\newBottomMarg}
+  \expandafter\get@MargDim\webSaveMargDim
+  \begingroup
+    \let\incby\currPanelWidth
+    \def\web@arg{#1}\ifx\web@arg\@empty
+    \setlength{\@tempdima}{\currPanelWidth}\else
+    \setlength{\@tempdima}{#1}\fi
+    \xdef\newPanelWidth{\the\@tempdima}%
+    \let\incby\currLeftMarg
+    \def\web@arg{#2}\ifx\web@arg\@empty
+    \setlength{\@tempdima}{\currLeftMarg}\else
+    \setlength{\@tempdima}{#2}\fi
+    \xdef\newLeftMarg{\the\@tempdima}%
+    \let\incby\currRightMarg
+    \def\web@arg{#3}\ifx\web@arg\@empty
+    \setlength{\@tempdima}{\currRightMarg}\else
+    \setlength{\@tempdima}{#3}\fi
+    \xdef\newRightMarg{\the\@tempdima}%
+    \let\incby\currTopMarg
+    \def\web@arg{#4}\ifx\web@arg\@empty
+    \setlength{\@tempdima}{\currTopMarg}\else
+    \setlength{\@tempdima}{#4}\fi
+    \xdef\newTopMarg{\the\@tempdima}%
+    \let\incby\currBottomMarg
+    \def\web@arg{#4}\ifx\web@arg\@empty
+    \setlength{\@tempdima}{\currBottomMarg}\else
+    \setlength{\@tempdima}{#5}\fi
+    \xdef\newBottomMarg{\the\@tempdima}%
+  \endgroup
+  \margins@web@save[\newPanelWidth]{\newLeftMarg}{\newRightMarg}
+    {\newTopMarg}{\newBottomMarg}%
 }
 \@onlypreamble\resetscreensize
 %    \end{macrocode}
@@ -1574,7 +1539,6 @@
 % \cs{maketitle} and ends up in the doc info section of the PDF file.
 %    \begin{macrocode}
 \let\web@save@title\title
-%\def\title{\@ifnextchar[{\@title}{\@title[]}}
 \def\title{\@ifnextchar[{\@web@title}{\@web@title[]}}
 %    \end{macrocode}
 %    \begin{macro}{\webtitle}
@@ -1584,8 +1548,8 @@
 %    \begin{macrocode}
 %\def\@title[#1]#2{\gdef\webtitle{#2}\hypersetup{pdftitle={#2}}%
 \def\@web@title[#1]#2{\gdef\webtitle{#2}\hypersetup{pdftitle={#2}}%
-    \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebtitle{#2}\else
-    \gdef\shortwebtitle{#1}\fi\web@save@title{#2}}
+  \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebtitle{#2}\else
+  \gdef\shortwebtitle{#1}\fi\web@save@title{#2}}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -1595,7 +1559,6 @@
 % doc info of the PDF file.
 %    \begin{macrocode}
 \let\web@saved@author\author
-%\def\author#1{\gdef\webauthor{#1}\hypersetup{pdfauthor={#1}}}
 \def\author#1{\gdef\webauthor{#1}\hypersetup{pdfauthor={#1}}%
     \web@saved@author{#1}}
 %    \end{macrocode}
@@ -1606,9 +1569,9 @@
 %    \begin{macrocode}
 \def\subject{\@ifnextchar[{\@subject}{\@subject[]}}
 \def\@subject[#1]#2{%
-    \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebsubject{#2}\else
-    \gdef\shortwebsubject{#1}\fi\gdef\websubject{#2}%
-    \hypersetup{pdfsubject={#2}}}
+  \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebsubject{#2}\else
+  \gdef\shortwebsubject{#1}\fi\gdef\websubject{#2}%
+  \hypersetup{pdfsubject={#2}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\email}
@@ -1639,9 +1602,9 @@
 % A version or revision number.
 %    \begin{macrocode}
 \def\version#1{\gdef\web@version@value{#1}%
-    \edef\webversion{\ifx\web@version@value\@empty\else
-        \noexpand\web@versionlabel\noexpand\
-        \noexpand\web@version@value\fi}%
+  \edef\webversion{\ifx\web@version@value\@empty\else
+    \noexpand\web@versionlabel\noexpand\
+    \noexpand\web@version@value\fi}%
 }
 \let\web@version@value\@empty
 \def\versionLabel#1{\def\web@versionlabel{#1}}
@@ -1729,16 +1692,16 @@
 \providecommand\FALSEACTIONii{\aftergroup\SETTEMPBOXi}
 \providecommand\FALSEACTIONiia{\aftergroup\SHOWTEMPBOXi}
 \providecommand\SETTEMPBOXi{\IF@AorBswitch\else
-    \afterassignment\TRUEACTIONia\fi
-    \setbox\webtempboxi=\hbox}
+  \afterassignment\TRUEACTIONia\fi
+  \setbox\webtempboxi=\hbox}
 \providecommand\SETTEMPBOXii{\IF@AorBswitch
-    \afterassignment\FALSEACTIONiia\fi
-    \setbox\webtempboxii=\hbox}
+  \afterassignment\FALSEACTIONiia\fi
+  \setbox\webtempboxii=\hbox}
 \def\prtscrV{\let\IF@AorBswitch\ifeqforpaper
-        \ifeqforpaper
-        \def\web@next{\afterassignment\TRUEACTIONi\SETTEMPBOXi}\else
-        \def\web@next{\afterassignment\FALSEACTIONii\SETTEMPBOXii}\fi
-    \web@next}
+  \ifeqforpaper
+    \def\web@next{\afterassignment\TRUEACTIONi\SETTEMPBOXi}\else
+    \def\web@next{\afterassignment\FALSEACTIONii\SETTEMPBOXii}\fi
+  \web@next}
 %    \end{macrocode}
 %    \end{macro}
 %\subsubsection{\texorpdfstring{\protect\cs{optionalPageMatter}}{\CMD{optionalPageMatter}}}
@@ -1754,8 +1717,7 @@
 \newcommand{\web@aboveOptPgMatDef}{\minimumskip\vspace{\stretch{1}}}
 \newcommand{\aboveOPMvspace}{\web@aboveOptPgMatDef}
 \newcommand{\optionalPageMatter}[2][\web@aboveOptPgMatDef]{%
-    \def\aboveOPMvspace{#1}\def\optionalpagematter{#2}%
-}
+  \def\aboveOPMvspace{#1}\def\optionalpagematter{#2}}
 \def\optionalpagematter{}
 %    \end{macrocode}
 %    \end{macro}
@@ -1765,7 +1727,7 @@
 % to adjust the hyperlink target appropriately.
 %    \begin{macrocode}
 \@ifundefined{thechapter}
-    {\def\web@Start{section}}{\def\web@Start{chapter}}
+  {\def\web@Start{section}}{\def\web@Start{chapter}}
 %    \end{macrocode}
 % \subsubsection{\texorpdfstring{\protect\cs{maketitle}}{\CMD{maketitle}} and the Directory}
 % In this section we define \cs{maketitle}. You can \cs{renewcommand} this
@@ -1806,15 +1768,14 @@
 %    \begin{macrocode}
 \newcommand{\trailerFontSize}{\footnotesize}
 \def\maketitle@trailer@ul{\web@copyright\ \web@copyright@symbol\
-    \webcopyrightyears}
+  \webcopyrightyears}
 \def\maketitle@trailer@ll{\web@revision\ \@date}
 \def\maketitle@trailer@ur{\thewebemail}
 \def\maketitle@trailer@lr{\webversion}
-\newcommand{\titlepageTrailer}
-{%
-    \makebox[\linewidth]{\parbox{\linewidth}{%
-        \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\
-        \maketitle@trailer@ll\hfill\maketitle@trailer@lr}}%
+\newcommand{\titlepageTrailer}{%
+  \makebox[\linewidth]{\parbox{\linewidth}{%
+    \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\
+    \maketitle@trailer@ll\hfill\maketitle@trailer@lr}}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -1832,21 +1793,21 @@
 %    \begin{macro}{\afterDirMatter}
 % The code that places the directory on the title page.
 %    \begin{macrocode}
-\newcommand{\webdirectory}{%
-    \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}%
-    \web@priorDirMatter
-    \begin{flushleft}{\web@formatWordDirectory\web@directory}%
-    \web@priorDirList
-    \vspace{\vspaceAfterDirName}%
-    \begin{itemize}\setlength{\itemsep}{-3pt}\web@formatDirectoryItems
-        \ifx\web@removeDirTOC\web@YES\else\item\relax\dirTOCItem\fi
-        \ifx\web@removeDirArticle\web@YES\else
-            \item\relax\dirArticleItem\fi
-        \web@addtoDirList
-    \end{itemize}
-    \web@afterDirList
-    \end{flushleft}
-    \web@afterDirMatter
+\newcommand{\webdirectory}{\par
+  \ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}%
+  \web@priorDirMatter
+  \begin{flushleft}{\web@formatWordDirectory\web@directory}%
+  \web@priorDirList
+  \vspace{\vspaceAfterDirName}%
+  \begin{itemize}\setlength{\itemsep}{-3pt}\web@formatDirectoryItems
+    \ifx\web@removeDirTOC\web@YES\else\item\relax\dirTOCItem\fi
+    \ifx\web@removeDirArticle\web@YES\else
+      \item\relax\dirArticleItem\fi
+    \web@addtoDirList
+  \end{itemize}
+  \web@afterDirList
+  \end{flushleft}
+  \web@afterDirMatter
 }
 %    \end{macrocode}
 % (02/10/2009) We include some additional commands to give control over the
@@ -1921,32 +1882,33 @@
 %    \begin{macro}{\topTitlePage}
 % The top of the title page. This command lays out the university, the title and the author.
 %    \begin{macrocode}
-\newcommand{\topTitlePage}
-{%
+\newcommand{\topTitlePage}{%
 %    \end{macrocode}
 % Have \cs{webuniversity} centered across the top of the title page.
 %    \begin{macrocode}
-    \vglue\web@aboveTopTitleSkip
-    \noindent\makebox[\linewidth]{%
-        \parbox{\hproportionwebuniversity\linewidth}%
-    {\bfseries\color{\webuniversity@color}\ifeqforpaper\large\fi
-    \centering\webuniversity}}\par\ifeqforpaper\else\minimumskip\fi
-    \vspace{\stretch{1}}%
+  \vglue\web@aboveTopTitleSkip
+  \noindent\makebox[\linewidth]{%
+    \parbox{\hproportionwebuniversity\linewidth}%
+  {\bfseries\color{\webuniversity@color}\ifeqforpaper\large\fi
+  \centering\webuniversity}}\par\ifeqforpaper\else\minimumskip\fi
+  \vspace{\stretch{1}}\noindent
 %    \end{macrocode}
 % Now place the title (\cs{webtitle})
 %    \begin{macrocode}
-    \noindent\makebox[\linewidth]{%
-        \parbox{\hproportionwebtitle\linewidth}%
-        {\bfseries\color{\webtitle@color}\ifeqforpaper\Large\else
-        \large\fi\centering\webtitle}}\par\ifeqforpaper
-        \vspace{2\baselineskip}\else\minimumskip\vspace{\stretch{1}}\fi
+  \makebox[\linewidth]{%
+    \parbox{\hproportionwebtitle\linewidth}%
+    {\bfseries\color{\webtitle@color}\ifeqforpaper\Large\else
+    \large\fi\centering\webtitle}}\par
+  \ifeqforpaper
+    \vspace{2\baselineskip}\else\minimumskip\vspace{\stretch{1}}\fi
+  \noindent
 %    \end{macrocode}
 % Now place the author (\cs{webauthor})
 %    \begin{macrocode}
-    \noindent\makebox[\linewidth]{%
-        \parbox{\hproportionwebauthor\linewidth}%
-        {\bfseries\color{\webauthor@color}\ifeqforpaper
-        \large\fi\centering\webauthor}}
+  \makebox[\linewidth]{%
+    \parbox{\hproportionwebauthor\linewidth}%
+    {\bfseries\color{\webauthor@color}\ifeqforpaper
+    \large\fi\centering\webauthor}}
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -1958,39 +1920,36 @@
 \newcommand{\allowHeadingsTitlePage}{\let\web@titlepagestyle\@gobble}
 \def\web@titlepagestyle#1{#1}
 \newcommand{\coverpagemargin}{1in}
-\newcommand{\maketitlepreamble}
-{%
-    \web@titlepagestyle{\thispagestyle{empty}}%
-    \ifeqforpaper\if@centertitlepage
-        \begingroup
+\newcommand{\maketitlepreamble}{%
+  \web@titlepagestyle{\thispagestyle{empty}}%
+  \ifeqforpaper\if@centertitlepage
+    \begingroup % closes in \maketitlepostamble
 %    \end{macrocode}
 % We center the content on the title page, much better than before.
 % \changes{v4.4}{2012/08/26}{No code to center the cover page content.}
 %    \begin{macrocode}
-        \if@centertitlepagefull
-            \@tempdima=\coverpagemargin
-        \else
-            \@tempdima\paperwidth
-            \advance\@tempdima-\textwidth
-            \@tempdima=.5\@tempdima
-            \edef\coverpagemargin{\the\@tempdima}%
-        \fi
-        \@tempdimb\paperwidth
-        \addtolength{\@tempdimb}{-2\@tempdima}%
-        \edef\fullscreenwidth{\the\@tempdimb}%
-        \linewidth\fullscreenwidth
-        \textwidth\fullscreenwidth
-        \hfuzz\linewidth
-        \setlength{\oddsidemargin}{\coverpagemargin-1in}%
-        \setlength{\evensidemargin}{\oddsidemargin}%
-        \marginparsep=0pt
-        \marginparwidth=0pt
-        \parindent0pt
+      \if@centertitlepagefull
+        \@tempdima=\coverpagemargin
+      \else
+        \@tempdima\paperwidth
+        \advance\@tempdima-\textwidth
+        \@tempdima=.5\@tempdima
+        \edef\coverpagemargin{\the\@tempdima}%
+      \fi
+      \@tempdimb\paperwidth
+      \addtolength{\@tempdimb}{-2\@tempdima}%
+      \edef\fullscreenwidth{\the\@tempdimb}%
+      \linewidth\fullscreenwidth
+      \textwidth\fullscreenwidth
+      \hfuzz\linewidth
+      \setlength{\oddsidemargin}{\coverpagemargin-1in}%
+      \setlength{\evensidemargin}{\oddsidemargin}%
+      \marginparsep=0pt
+      \marginparwidth=0pt
+      \parindent0pt
     \fi\fi
 }
-\newcommand{\maketitlepostamble}
-{%
-    \newpage
+\newcommand{\maketitlepostamble}{\newpage
     \ifeqforpaper\if@centertitlepage\endgroup\fi\fi
 }
 %    \end{macrocode}
@@ -2000,40 +1959,39 @@
 % Redefining \LaTeX's \cs{maketitle}. Looks a little complicated, but this is only because
 % we have the forpaper design as well as the screen design defined here.
 %    \begin{macrocode}
-\newcommand{\web@maketitle}
-{%
-    \maketitlepreamble
-    \ifeqforpaper\vspace*{2\baselineskip}\else
+\newcommand{\web@maketitle}{%
+  \maketitlepreamble
+  \ifeqforpaper\vspace*{2\baselineskip}\else
 %    \end{macrocode}
 % If not for paper, restrict title and author to \cs{titleauthorproportion} of the page
 %    \begin{macrocode}
-    \vbox to\titleauthorproportion\textheight\bgroup\fi
+  \vbox to\titleauthorproportion\textheight\bgroup\fi
 %    \end{macrocode}
 %    \begin{macrocode}
-    \topTitlePage
+  \topTitlePage
 %    \end{macrocode}
 %    \begin{macrocode}
-    \ifeqforpaper\else\egroup\fi % end of \vbox for title and author
+  \ifeqforpaper\else\egroup\fi % end of \vbox for title and author
 %    \end{macrocode}
 % Now place the \cs{optionalpagematter}
 %    \begin{macrocode}
-    \ifx\optionalpagematter\@empty\par\else
-    \begingroup\par
-    \aboveOPMvspace
-    \noindent\parbox{\linewidth}{\optionalpagematter}%
-    \par\endgroup\fi
-    \vspace{\stretch{1}}
+  \ifx\optionalpagematter\@empty\par\else
+  \begingroup\par
+  \aboveOPMvspace
+  \noindent\parbox{\linewidth}{\optionalpagematter}%
+  \par\endgroup\fi
+  \vspace{\stretch{1}}
 %    \end{macrocode}
 % Insert the directory, as desired.
 %    \begin{macrocode}
-    \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi
-    \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}
+  \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi
+  \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}
 %    \end{macrocode}
 % Insert the ``bottom matter''.
 %    \begin{macrocode}
-    \vfill\noindent\begingroup
-    \trailerFontSize\titlepageTrailer\par\endgroup
-    \maketitlepostamble
+  \vfill\noindent\begingroup
+  \trailerFontSize\titlepageTrailer\par\endgroup
+  \maketitlepostamble
 }
 \let\web@save@maketitle\maketitle
 \let\maketitle\web@maketitle
@@ -2046,28 +2004,26 @@
 %    A convenience command for making a simple in line title.
 %}
 %    \begin{macrocode}
-\newcommand{\makeinlinetitle}
-{%
-    \noindent\makebox[\linewidth][c]{%
-    \bfseries\color{\webtitle@color}\webtitle}
-    \makebox[\linewidth]{%
-        \shortstack[l]{\strut\\
-            \makebox[0pt][l]{\webuniversity}\\
-            \makebox[0pt][l]{%
-                \@ifundefined{aeb@prepared}
-                    {\@date}{\aeb@prepared}%
-            }%
-        }\hfill
-        \shortstack[c]{\strut\webauthor\\\strut}\hfill
-        \shortstack[r]{\strut\makebox[0pt][r]{\thewebemail}\\
-            \makebox[0pt][r]{%
-                \@ifundefined{aeb@talksite}{\webversion}
-                {\ifx\aeb@talksite\@empty\webversion
-                  \else\aeb@talksite\fi}%
-            }%
-        }%
+\newcommand{\makeinlinetitle}{\noindent
+  \makebox[\linewidth][c]{%
+  \bfseries\color{\webtitle@color}\webtitle}
+  \makebox[\linewidth]{%
+    \shortstack[l]{\strut\\
+      \makebox[0pt][l]{\webuniversity}\\
+      \makebox[0pt][l]{\@ifundefined{aeb@prepared}
+        {\@date}{\aeb@prepared}%
+      }%
+    }\hfill
+    \shortstack[c]{\strut\webauthor\\\strut}\hfill
+    \shortstack[r]{\strut\makebox[0pt][r]{\thewebemail}\\
+      \makebox[0pt][r]{%
+        \@ifundefined{aeb@talksite}{\webversion}
+          {\ifx\aeb@talksite\@empty\webversion
+           \else\aeb@talksite\fi}%
+      }%
     }%
-    \bigskip
+  }%
+  \bigskip
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2079,9 +2035,7 @@
 % Try to squeeze a little more in per page.
 %    \begin{macrocode}
 \ifeqforpaper\else
-    \clubpenalty=50
-    \widowpenalty=50
-\fi
+  \clubpenalty=50 \widowpenalty=50 \fi
 %    \end{macrocode}
 % \subsection{Tight Settings}
 %
@@ -2103,142 +2057,142 @@
 \def\w@ppp#1#2#3{#1\p@ \@plus#2\p@ \@minus#3\p@}
 \def\w@zpp#1#2{\z@ \@plus#1\p@ \@minus#2\p@}
 \def\tightsettings@z{%
-    \setlength\partopsep{\w@ppp{2}{}{}} % unchanged
-    \def\web@listi{\leftmargin\leftmargini
-    \parsep \w@ppp{2}{2}{}% 4+2-1
-    \topsep \w@ppp{2}{1}{}% 8+2-4
-    \itemsep\w@ppp{2}{1}{}}% 4+2-1
-    \let\@listi\web@listi
-    \let\@listI\@listi
-    \@listi
-    \def\web@listii {\leftmargin\leftmarginii
-       \labelwidth\leftmarginii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@zpp{}{}% 4+2-1
-       \parsep    \w@zpp{}{}% 2+1-1
-       \itemsep   \parsep}% unchanged
-    \def\web@listiii{\leftmargin\leftmarginiii
-       \labelwidth\leftmarginiii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@zpp{}{}% 2+1-1
+  \setlength\partopsep{\w@ppp{2}{}{}} % unchanged
+  \def\web@listi{\leftmargin\leftmargini
+  \parsep \w@ppp{2}{2}{}% 4+2-1
+  \topsep \w@ppp{2}{1}{}% 8+2-4
+  \itemsep\w@ppp{2}{1}{}}% 4+2-1
+  \let\@listi\web@listi
+  \let\@listI\@listi
+  \@listi
+  \def\web@listii {\leftmargin\leftmarginii
+    \labelwidth\leftmarginii
+    \advance\labelwidth-\labelsep
+    \topsep    \w@zpp{}{}% 4+2-1
+    \parsep    \w@zpp{}{}% 2+1-1
+    \itemsep   \parsep}% unchanged
+  \def\web@listiii{\leftmargin\leftmarginiii
+     \labelwidth\leftmarginiii
+     \advance\labelwidth-\labelsep
+     \topsep \w@zpp{}{}% 2+1-1
 %    \end{macrocode}
 %    Uncommented text now commented out.
 %    \changes{v6.0o}{2017/01/20}{Uncommented text, now commented out}
 %    \begin{macrocode}
-       \parsep    \z@         % unchanged
-       \partopsep \w@ppp{}{}{}% unchanged
-       \itemsep   \topsep}% unchanged
-    \let\@listii\web@listii
-    \let\@listiii\web@listiii
-    \renewcommand\web@normalsize{%
-       \@setfontsize\normalsize\@xpt\@xiipt
-       \abovedisplayskip \w@ppp{5}{3}{}% 10+2-5
-       \abovedisplayshortskip \w@zpp{3}{0}% unchanged
-       \belowdisplayshortskip \w@ppp{3}{2}{2}% 6+3-3
-       \belowdisplayskip \abovedisplayskip
-       \let\@listi\@listI}%
-    \let\normalsize\web@normalsize
-    \normalsize
+     \parsep    \z@         % unchanged
+     \partopsep \w@ppp{}{}{}% unchanged
+     \itemsep   \topsep
+  }% unchanged
+  \let\@listii\web@listii
+  \let\@listiii\web@listiii
+  \renewcommand\web@normalsize{%
+     \@setfontsize\normalsize\@xpt\@xiipt
+     \abovedisplayskip \w@ppp{5}{3}{}% 10+2-5
+     \abovedisplayshortskip \w@zpp{3}{0}% unchanged
+     \belowdisplayshortskip \w@ppp{3}{2}{2}% 6+3-3
+     \belowdisplayskip \abovedisplayskip
+     \let\@listi\@listI}%
+  \let\normalsize\web@normalsize
+  \normalsize
 }
 %    \end{macrocode}
 %    \paragraph*{Tight settings for \texttt{11pt}}
 %    \begin{macrocode}
 \def\tightsettings@i{%
-    \setlength\partopsep{\w@ppp{2}{}{}}% 3+1-1
-    \def\web@listi{\leftmargin\leftmargini
-    \parsep \w@ppp{2.5}{2}{}% 4.5+2-1
-    \topsep \w@ppp{4.5}{1.5}{2.5}% 9+3-5
-    \itemsep \w@ppp{2.5}{}{}}% 4.5+2-1
-    \let\@listi\web@listi
-    \let\@listI\@listi
-    \@listi
-    \def\web@listii {\leftmargin\leftmarginii
-       \labelwidth\leftmarginii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@ppp{}{}{}% 4.5+2-1
-       \parsep    \w@ppp{}{}{}% 2+1-1
-       \itemsep   \parsep}% unchanged
-    \def\web@listiii{\leftmargin\leftmarginiii
-       \labelwidth\leftmarginiii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@ppp{}{}{}% 2+1-1
-       \parsep    \z@         % unchanged
-       \partopsep \w@ppp{}{}{}% unchanged
-       \itemsep   \topsep}% unchanged
-    \let\@listii\web@listii
-    \let\@listiii\web@listiii
-    \renewcommand\web@normalsize{%
-       \@setfontsize\normalsize\@xipt{13.6}%
-       \abovedisplayskip \w@ppp{5.5}{3}{3}% 11+3-6
-       \abovedisplayshortskip \w@zpp{}{0}% unchanged
-       \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3
-       \belowdisplayskip \abovedisplayskip
-       \let\@listi\@listI}%
-    \let\normalsize\web@normalsize
-    \normalsize
+  \setlength\partopsep{\w@ppp{2}{}{}}% 3+1-1
+  \def\web@listi{\leftmargin\leftmargini
+  \parsep \w@ppp{2.5}{2}{}% 4.5+2-1
+  \topsep \w@ppp{4.5}{1.5}{2.5}% 9+3-5
+  \itemsep \w@ppp{2.5}{}{}}% 4.5+2-1
+  \let\@listi\web@listi
+  \let\@listI\@listi
+  \@listi
+  \def\web@listii {\leftmargin\leftmarginii
+     \labelwidth\leftmarginii
+     \advance\labelwidth-\labelsep
+     \topsep    \w@ppp{}{}{}% 4.5+2-1
+     \parsep    \w@ppp{}{}{}% 2+1-1
+     \itemsep   \parsep}% unchanged
+  \def\web@listiii{\leftmargin\leftmarginiii
+     \labelwidth\leftmarginiii
+     \advance\labelwidth-\labelsep
+     \topsep    \w@ppp{}{}{}% 2+1-1
+     \parsep    \z@         % unchanged
+     \partopsep \w@ppp{}{}{}% unchanged
+     \itemsep   \topsep}% unchanged
+  \let\@listii\web@listii
+  \let\@listiii\web@listiii
+  \renewcommand\web@normalsize{%
+     \@setfontsize\normalsize\@xipt{13.6}%
+     \abovedisplayskip \w@ppp{5.5}{3}{3}% 11+3-6
+     \abovedisplayshortskip \w@zpp{}{0}% unchanged
+     \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3
+     \belowdisplayskip \abovedisplayskip
+     \let\@listi\@listI}%
+  \let\normalsize\web@normalsize
+  \normalsize
 }
 %    \end{macrocode}
 %    \paragraph*{Tight settings for \texttt{12pt}}
 %    \begin{macrocode}
 \def\tightsettings@ii{%
-    \setlength\partopsep{\w@ppp{3}{2}{2}}% unchanged
-    \def\web@listi{\leftmargin\leftmargini
-    \parsep \w@ppp{3}{2}{}% 5+2.5-1
-    \topsep \w@ppp{5}{2}{3}% 10+4-6
-    \itemsep\w@ppp{2.5}{}{}}% 5+2.5-1
-    \let\@listi\web@listi
-    \let\@listI\@listi
-    \@listi
-    \def\web@listii {\leftmargin\leftmarginii
-       \labelwidth\leftmarginii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@ppp{2.5}{}{}% 5+2.5-1
-       \parsep    \w@ppp{2}{}{}% 2.5+1-1
-       \itemsep   \parsep}% unchanged
-    \def\web@listiii{\leftmargin\leftmarginiii
-       \labelwidth\leftmarginiii
-       \advance\labelwidth-\labelsep
-       \topsep    \w@ppp{1.5}{}{}% 2.5+1-1
-       \parsep    \z@            % unchanged
-       \partopsep \w@ppp{}{}{}% unchanged
-       \itemsep   \topsep}% unchanged
-    \let\@listii\web@listii
-    \let\@listiii\web@listiii
-    \renewcommand\web@normalsize{%
-       \@setfontsize\normalsize\@xiipt{14.5}%
-       \abovedisplayskip \w@ppp{6}{1.5}{3.5}% 12+3-7
-       \abovedisplayshortskip \w@zpp{3}{0}% unchanged
-       \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3
-       \belowdisplayskip \abovedisplayskip
-       \let\@listi\@listI}%
-    \let\normalsize\web@normalsize
-    \normalsize
+  \setlength\partopsep{\w@ppp{3}{2}{2}}% unchanged
+  \def\web@listi{\leftmargin\leftmargini
+  \parsep \w@ppp{3}{2}{}% 5+2.5-1
+  \topsep \w@ppp{5}{2}{3}% 10+4-6
+  \itemsep\w@ppp{2.5}{}{}}% 5+2.5-1
+  \let\@listi\web@listi
+  \let\@listI\@listi
+  \@listi
+  \def\web@listii {\leftmargin\leftmarginii
+     \labelwidth\leftmarginii
+     \advance\labelwidth-\labelsep
+     \topsep    \w@ppp{2.5}{}{}% 5+2.5-1
+     \parsep    \w@ppp{2}{}{}% 2.5+1-1
+     \itemsep   \parsep}% unchanged
+  \def\web@listiii{\leftmargin\leftmarginiii
+     \labelwidth\leftmarginiii
+     \advance\labelwidth-\labelsep
+     \topsep    \w@ppp{1.5}{}{}% 2.5+1-1
+     \parsep    \z@            % unchanged
+     \partopsep \w@ppp{}{}{}% unchanged
+     \itemsep   \topsep}% unchanged
+  \let\@listii\web@listii
+  \let\@listiii\web@listiii
+  \renewcommand\web@normalsize{%
+     \@setfontsize\normalsize\@xiipt{14.5}%
+     \abovedisplayskip \w@ppp{6}{1.5}{3.5}% 12+3-7
+     \abovedisplayshortskip \w@zpp{3}{0}% unchanged
+     \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3
+     \belowdisplayskip \abovedisplayskip
+     \let\@listi\@listI}%
+  \let\normalsize\web@normalsize
+  \normalsize
 }
 %    \end{macrocode}
 %    Select \DescribeMacro{\tightsettings}\cs{tightsettings} according to point size
 %    \begin{macrocode}
 \def\tightsettings{\@ifstar{\ifeqforpaper\else\tightsettings@cont\fi}
-    {\tightsettings@cont}}
+  {\tightsettings@cont}}
 \def\tightsettings@cont{\let\web@tight\web@YES
-    \ifcase\@ptsize
-        \tightsettings@z\or
-        \tightsettings@i\or
-        \tightsettings@ii
-   \fi
+  \ifcase\@ptsize
+    \tightsettings@z\or
+    \tightsettings@i\or
+    \tightsettings@ii\fi
 }
 %    \end{macrocode}
 %    Restore to normal document class settings using
 %    \DescribeMacro{\restorenormalsettings}\cs{restorenormalsettings}.
 %    \begin{macrocode}
 \def\restorenormalsettings{\let\web@tight\web@NO
-    \let\@listi\web@save@listi
-    \let\@listii\web@save@listii
-    \let\@listiii\web@save@listiii
-    \let\normalsize\web@save@normalsize
-    \let\partopsep\web@save@partopsep
-    \let\@listI\@listi
-    \@listi
-    \normalsize
+  \let\@listi\web@save@listi
+  \let\@listii\web@save@listii
+  \let\@listiii\web@save@listiii
+  \let\normalsize\web@save@normalsize
+  \let\partopsep\web@save@partopsep
+  \let\@listI\@listi
+  \@listi
+  \normalsize
 }
 %    \end{macrocode}
 % \subsection{Navgation Aids}
@@ -2259,15 +2213,14 @@
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macrocode}
-\newcommand{\newNaviIcon}[1][\@empty]
-{%
-    \ifx#1m\let\web@next\@newNaviIconMenu
-    \else\ifx#1j\let\web@next\@newNaviIconJS
-    \else\ifx#1l\let\web@next\@newNaviIconLink
-    \else\ifx#1\@empty\let\web@next\@newNaviIconLink
-    \else\let\web@next\relax
-    \PackageWarning{web}{\string\newNaviIcon: unknown first parameter}
-    \fi\fi\fi\fi\web@next
+\newcommand{\newNaviIcon}[1][\@empty]{%
+  \ifx#1m\let\web@next\@newNaviIconMenu
+  \else\ifx#1j\let\web@next\@newNaviIconJS
+  \else\ifx#1l\let\web@next\@newNaviIconLink
+  \else\ifx#1\@empty\let\web@next\@newNaviIconLink
+  \else\let\web@next\relax
+  \PackageWarning{web}{\string\newNaviIcon: unknown first parameter}
+  \fi\fi\fi\fi\web@next
 }
 %    \end{macrocode}
 %    \begin{macro}{\@newNaviIconMenu}
@@ -2287,15 +2240,14 @@
 % is determined by \cs{@menuBgColor}.
 %    \begin{macrocode}
 \def\web@colorbox@w@transparency#1{%
-    \ifx#1\@empty\setlength{\fboxrule}{0pt}\let\aeb@next\fbox\else
-    \def\aeb@next{\colorbox{#1}}\fi\aeb@next}
-\newcommand{\@newNaviIconMenu}[6][I]
-{%
-    \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}%
-        \Acrobatmenu{#6}{\web@colorbox@w@transparency{\@menuBgColor}{%
-            \parbox[c][#4][c]{#3}%
-            {\normalsize\centering\color{\@menucolor}#5}}}%
-        }}%
+  \ifx#1\@empty\setlength{\fboxrule}{0pt}\let\aeb@next\fbox\else
+  \def\aeb@next{\colorbox{#1}}\fi\aeb@next}
+\newcommand{\@newNaviIconMenu}[6][I]{%
+  \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}%
+    \Acrobatmenu{#6}{\web@colorbox@w@transparency{\@menuBgColor}{%
+      \parbox[c][#4][c]{#3}%
+      {\normalsize\centering\color{\@menucolor}#5}}}%
+  }}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2314,44 +2266,43 @@
 % The color of the text is controlled by \cs{navibarTextColor}, and the background color
 % is determined by \cs{@menuBgColor}.
 %    \begin{macrocode}
-\newcommand{\@newNaviIconJS}[6][I]
-{%
-    \ifcase\eq@drivernum
-        \def#2{{\setlength{\fboxsep}{0pt}%
-            \pdf@rect{\web@colorbox@w@transparency{\@menuBgColor}%
-                {\parbox[c][#4][c]{#3}%
-                {\normalsize\centering\color{\@menucolor}#5}}}%
-            \literalps@out{%
-            [ /Rect [pdf@llx pdf@lly pdf@urx pdf@ury]
-            /Border [ 0 0 0 ]/H/#1\space
-            /Action <</S/JavaScript/JS (#6) >>
-            /Subtype/Link
-            /ANN pdfmark}%
-        }}%
-    \or
-        \def#2{{\setlength{\fboxsep}{0pt}%
-            \leavevmode\pdfstartlink
-                attr {/Border [0 0 0 ] /H/#1}%
-                user{ /Subtype /Link
-                /A << /S/JavaScript/JS (#6) >>}%
-                \web@colorbox@w@transparency{\@menuBgColor}%
-                {\parbox[c][#4][c]{#3}%
-                {\normalsize\centering\color{\@menucolor}#5}}%
-            \pdfendlink
-        }}%
-    \or
-        \def#2{{\setlength{\fboxsep}{0pt}%
-            \@pdfm@mark{bann
-                <<
-                    /Border [0 0 0 ] /H/#1\space
-                    /Subtype /Link
-                    /A << /S/JavaScript/JS (#6) >>
-                >>}\web@colorbox@w@transparency{\@menuBgColor}%
-                    {\parbox[c][#4][c]{#3}%
-                    {\normalsize\centering\color{\@menucolor}#5}}%
-            \@pdfm@mark{eann}%
-        }}%
-    \fi
+\newcommand{\@newNaviIconJS}[6][I]{%
+  \ifcase\eq@drivernum
+    \def#2{{\setlength{\fboxsep}{0pt}%
+        \pdf@rect{\web@colorbox@w@transparency{\@menuBgColor}%
+          {\parbox[c][#4][c]{#3}%
+          {\normalsize\centering\color{\@menucolor}#5}}}%
+        \literalps@out{%
+        [ /Rect [pdf@llx pdf@lly pdf@urx pdf@ury]
+        /Border [ 0 0 0 ]/H/#1\space
+        /Action <</S/JavaScript/JS (#6) >>
+        /Subtype/Link
+        /ANN pdfmark}%
+    }}%
+  \or
+    \def#2{{\setlength{\fboxsep}{0pt}%
+      \leavevmode\pdfstartlink
+          attr {/Border [0 0 0 ] /H/#1}%
+          user{ /Subtype /Link
+          /A << /S/JavaScript/JS (#6) >>}%
+          \web@colorbox@w@transparency{\@menuBgColor}%
+          {\parbox[c][#4][c]{#3}%
+          {\normalsize\centering\color{\@menucolor}#5}}%
+      \pdfendlink
+    }}%
+  \or
+    \def#2{{\setlength{\fboxsep}{0pt}%
+        \@pdfm@mark{bann
+          <<
+            /Border [0 0 0 ] /H/#1\space
+            /Subtype /Link
+            /A << /S/JavaScript/JS (#6) >>
+          >>}\web@colorbox@w@transparency{\@menuBgColor}%
+        {\parbox[c][#4][c]{#3}%
+        {\normalsize\centering\color{\@menucolor}#5}}%
+      \@pdfm@mark{eann}%
+    }}%
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2374,13 +2325,12 @@
 % The color of the text is controlled by \cs{navibarTextColor}, and the background color
 % is determined by \cs{@menuBgColor}.
 %    \begin{macrocode}
-\newcommand{\@newNaviIconLink}[6][I]
-{%
-    \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}%
-        #6{\web@colorbox@w@transparency{\@menuBgColor}%
-        {\parbox[c][#4][c]{#3}%
-        {\normalsize\centering\color{\@menucolor}#5}}}%
-    }}%
+\newcommand{\@newNaviIconLink}[6][I]{%
+  \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}%
+    #6{\web@colorbox@w@transparency{\@menuBgColor}%
+    {\parbox[c][#4][c]{#3}%
+    {\normalsize\centering\color{\@menucolor}#5}}}%
+  }}%
 }
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2388,7 +2338,7 @@
 \def\insert@webtoc{\web@TOC\ }
 \def\web@TocText{Toc}
 \newNaviIcon[l]{\web@TOC}{\web@nb@width}{\web@nb@height}
-    {\footnotesize\web@TocText}{\hyperlink{webtoc}}
+  {\footnotesize\web@TocText}{\hyperlink{webtoc}}
 %    \end{macrocode}
 % Some icon definitions that are used in the navigation bar that appears at the bottom of the page.
 %    \begin{macrocode}
@@ -2396,80 +2346,81 @@
 \newcommand\navibariconHeight[1]{\def\web@nb@height{#1}}
 \navibariconWidth{34pt}\navibariconHeight{10pt}
 \@newNaviIconMenu{\web@FirstPage}{\web@nb@width}{\web@nb@height}
-    {\web@FirstPageText}{FirstPage}
+  {\web@FirstPageText}{FirstPage}
 \def\web@FirstPageText{$\blacktriangleleft\blacktriangleleft$}
 \@newNaviIconMenu{\web@LastPage}{\web@nb@width}{\web@nb@height}
-    {\web@LastPageText}{LastPage}
+  {\web@LastPageText}{LastPage}
 \def\web@LastPageText{$\blacktriangleright\blacktriangleright$}
 \@newNaviIconMenu{\web@PrevPage}{\web@nb@width}{\web@nb@height}
-    {\web@PrevPageText}{PrevPage}
+  {\web@PrevPageText}{PrevPage}
 \def\web@PrevPageText{$\blacktriangleleft$}
 \@newNaviIconMenu{\web@NextPage}{\web@nb@width}{\web@nb@height}
-    {\web@NextPageText}{NextPage}
+  {\web@NextPageText}{NextPage}
 \def\web@NextPageText{$\blacktriangleright$}
 \@newNaviIconMenu{\web@GoBack}{\web@nb@width}{\web@nb@height}
-    {\footnotesize\web@back}{GoBack}
+  {\footnotesize\web@back}{GoBack}
 \@newNaviIconMenu{\web@GoBackDoc}{\web@nb@width}{\web@nb@height}
-    {$\blacktriangleleft$\ \footnotesize\web@doc}{GoBackDoc}
+  {$\blacktriangleleft$\ \footnotesize\web@doc}{GoBackDoc}
 \@newNaviIconMenu{\web@GoForwardDoc}{\web@nb@width}{\web@nb@height}
-    {\footnotesize\web@doc\ \normalsize$\blacktriangleright$}
-    {GoForwardDoc}
+  {\footnotesize\web@doc\ \normalsize$\blacktriangleright$}
+  {GoForwardDoc}
 \@newNaviIconMenu{\web@FS}{\web@nb@width}{\web@nb@height}
-    {\footnotesize\web@FSText}{FullScreen}
+  {\footnotesize\web@FSText}{FullScreen}
 \def\web@FSText{FS}
 \@newNaviIconMenu{\web@GoToPage}{\web@nb@width}{\web@nb@height}
-    {\footnotesize\web@GoToPageText}{GoToPage}
+  {\footnotesize\web@GoToPageText}{GoToPage}
 \def\web@GoToPageText{Page...}
 %    \end{macrocode}
 %    \begin{macro}{\web@navigationbar}
 % The navigation bar, this can be redefined.
 %    \begin{macrocode}
 \newcommand\web@navigationbar{%
-\hfil\bfseries\footnotesize
-\insertwebtoc
-\web@FirstPage\
-\web@LastPage\
-\web@PrevPage\
-\web@NextPage\
-\web@GoBack
-%\web@GoBackDoc\
-%\web@GoForwardDoc
-\hfil}
+  \hfil\bfseries\footnotesize
+  \insertwebtoc
+  \web@FirstPage\
+  \web@LastPage\
+  \web@PrevPage\
+  \web@NextPage\
+  \web@GoBack
+  %\web@GoBackDoc\
+  %\web@GoForwardDoc
+  \hfil
+}
 %    \end{macrocode}
 %    \end{macro}
 % Here are some icon buttons for the panel, if a panel is desired.
 %    \begin{macrocode}
-\newcommand{\panelgroupWidth}[1]{%
-    \global\let\chkpanelgroup\web@chkpanelgroup
-    \def\web@pg@width{#1}}
-\newcommand{\panelgroupHeight}[1]{%
-    \global\let\chkpanelgroup\web@chkpanelgroup
-    \def\web@pg@height{#1}}
-\newcommand{\panelgroupSep}[1]{%
-    \global\let\chkpanelgroup\web@chkpanelgroup
-    \def\web@pg@sep{#1}}
+\newcommand{\panelgroupWidth}[1]{\global
+  \let\chkpanelgroup\web@chkpanelgroup
+  \def\web@pg@width{#1}}
+\newcommand{\panelgroupHeight}[1]{\global
+  \let\chkpanelgroup\web@chkpanelgroup
+  \def\web@pg@height{#1}}
+\newcommand{\panelgroupSep}[1]{\global
+  \let\chkpanelgroup\web@chkpanelgroup
+  \def\web@pg@sep{#1}}
 \@newNaviIconMenu{\panel@FirstPage}{\web@pg@width}{\web@pg@height}
-    {\web@FirstPageText}{FirstPage}
+  {\web@FirstPageText}{FirstPage}
 \@newNaviIconMenu{\panel@LastPage}{\web@pg@width}{\web@pg@height}
-    {\web@LastPageText}{LastPage}
+  {\web@LastPageText}{LastPage}
 \@newNaviIconMenu{\panel@PrevPage}{\web@pg@width}{\web@pg@height}
-    {\web@PrevPageText}{PrevPage}
+  {\web@PrevPageText}{PrevPage}
 \@newNaviIconMenu{\panel@NextPage}{\web@pg@width}{\web@pg@height}
-    {\web@NextPageText}{NextPage}
+  {\web@NextPageText}{NextPage}
 \@newNaviIconMenu{\panel@GoBack}{\web@pg@width}{\web@pg@height}
-    {\footnotesize\web@back}{GoBack}
+  {\footnotesize\web@back}{GoBack}
 \@newNaviIconMenu{\panel@GoBackDoc}{\web@pg@width}{\web@pg@height}
-    {$\blacktriangleleft$\,\footnotesize\web@doc}{GoBackDoc}
+  {$\blacktriangleleft$\,\footnotesize\web@doc}{GoBackDoc}
 \@newNaviIconMenu{\panel@GoForwardDoc}{\web@pg@width}{\web@pg@height}
-    {\footnotesize\web@doc\,\normalsize$\blacktriangleright$}
-    {GoForwardDoc}
+  {\footnotesize\web@doc\,\normalsize$\blacktriangleright$}
+  {GoForwardDoc}
 \@newNaviIconMenu{\panel@Close}{\web@pg@width}{\web@pg@height}
-    {\footnotesize Close}{Close}
+  {\footnotesize Close}{Close}
 \def\web@CloseText{Close}
 \@newNaviIconMenu{\panel@FS}{\web@pg@width}{\web@pg@height}
-    {\footnotesize\web@FSText}{FullScreen}
+  {\footnotesize\web@FSText}{FullScreen}
 \@newNaviIconMenu{\panel@GoToPage}{\web@pg@width}{\web@pg@height}
-    {\footnotesize\web@GoToPageText}{GoToPage}
+  {\footnotesize\web@GoToPageText}{GoToPage}
 %    \end{macrocode}
 % A check to see if the panel group is too wide.
 %    \begin{macrocode}
@@ -2478,7 +2429,8 @@
     \ifdim\@tempdima>\@panelwidth\PackageError{web}{Width of
     \string\panelNaviGroup\space is wider than the panel}{}\else
     \xdef\panelNavigroupWidth{\the\@tempdima}\fi
-    \egroup\global\let\chkpanelgroup\@empty
+  \egroup
+  \global\let\chkpanelgroup\@empty
 }
 \panelgroupWidth{28pt}\panelgroupHeight{15pt}
 \panelgroupSep{2pt}
@@ -2487,15 +2439,13 @@
 % Standard navigation group for a panel.
 %    \begin{macrocode}
 \newcommand\panelNaviGroup{\chkpanelgroup
-    \parbox[c]{\panelNavigroupWidth}{%
-        \offinterlineskip
-        \panelIconGroup
-    }%
-}
+  \parbox[c]{\panelNavigroupWidth}{%
+    \offinterlineskip
+    \panelIconGroup}}
 \newcommand{\panelIconGroup}{%
-    \panel@FirstPage\hfill\panel@LastPage\\[\panelrowsep]
-    \panel@PrevPage\hfill\panel@NextPage\\[\panelrowsep]
-    \panel@GoBack\hfill\panel@Close
+  \panel@FirstPage\hfill\panel@LastPage\\[\panelrowsep]
+  \panel@PrevPage\hfill\panel@NextPage\\[\panelrowsep]
+  \panel@GoBack\hfill\panel@Close
 }
 %    \end{macrocode}
 %    \begin{macro}{\insNaviBar}
@@ -2524,37 +2474,37 @@
 %    \begin{macrocode}
 \def\web@ifOnThisPage#1#2{\ifnum\c@page=\@thispage\relax
     #1\else#2\fi}
-\newcommand{\insertnaviiconhere}[1]
-{%
-    \xdef\@thispage{\the\c@page}%
-    \def\web@insToRight{%
-    \ifeqforpaper\makebox[0pt][l]{\ifdim\marginparsep>0pt\relax
-    \hspace{\marginparsep}\else\ \fi#1}\else
-        \makebox[0pt][l]{%
-        \ifnum\@panelconfig=2\relax
-            \hspace{\@panelsep}\else
-            \hspace{\@Rightmargin}\fi
-        \makebox[0pt][r]{#1}}\fi
-    }\expandafter\rheader\expandafter
-        {\expandafter\web@ifOnThisPage
-        \expandafter{\web@rightheader\web@insToRight}%
-        {\web@defaultrightheader}}%
+\newcommand{\insertnaviiconhere}[1]{%
+  \xdef\@thispage{\the\c@page}%
+  \def\web@insToRight{%
+  \ifeqforpaper
+    \makebox[0pt][l]{\ifdim\marginparsep>\z@
+      \hspace{\marginparsep}\else\ \fi#1}\else
+    \makebox[0pt][l]{%
+      \ifnum\@panelconfig=\tw@
+        \hspace{\@panelsep}\else
+        \hspace{\@Rightmargin}\fi
+    \makebox[0pt][r]{#1}}\fi
+  }\expandafter\rheader\expandafter
+    {\expandafter\web@ifOnThisPage
+    \expandafter{\web@rightheader\web@insToRight}%
+    {\web@defaultrightheader}}%
 }
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\insertnaviiconhereafter}
 % Inserts a direction icon on the current page, and every page thereafter.
 %    \begin{macrocode}
-%\def\insertnaviiconhereafter#1{\lheader{#1}}
 \def\insertnaviiconhereafter#1{\def\web@insToLeft{%
-    \ifeqforpaper\makebox[0pt][r]{#1\ifdim\marginparsep>0pt\relax
-        \hspace{\marginparsep}\else\ \fi}\else
+  \ifeqforpaper
+    \makebox[0pt][r]{#1\ifdim\marginparsep>\z@
+      \hspace{\marginparsep}\else\ \fi}\else
     \makebox[0pt][r]{\makebox[0pt][l]{#1}%
-        \ifnum\@panelconfig=1\relax
-            \hspace{\@panelsep}\else
-            \hspace{\@Leftmargin}\fi}\fi
-    }\expandafter\lheader\expandafter
-        {\expandafter\web@insToLeft\web@lhead}}
+      \ifnum\@panelconfig=\@ne
+        \hspace{\@panelsep}\else
+        \hspace{\@Leftmargin}\fi}\fi
+  }\expandafter\lheader\expandafter
+    {\expandafter\web@insToLeft\web@lhead}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\removehereaftericon}
@@ -2571,23 +2521,21 @@
 %\insertnaviiconhere{\ArrowUp{\href{http://www.adobe.com/}}}
 %\end{verbatim}
 %    \begin{macrocode}
-\newcommand\ArrowUp[1]
-{%
-    \normalsize\ifeqforpaper
-    \setlength{\fboxsep}{6pt}\else
-    \setlength{\fboxsep}{4pt}\fi
-    \raisebox{\depth-\fboxsep}[0pt][0pt]{%
-    #1{\web@colorbox@w@transparency{\web@directionIconBgColor}%
-    {\textcolor{\web@directionIconTextColor}{$\bigl\Uparrow$}}}}%
-}
-\newcommand\ArrowDown[1]
-{%
-    \normalsize\ifeqforpaper
-    \setlength{\fboxsep}{6pt}\else
-    \setlength{\fboxsep}{4pt}\fi
-    \raisebox{\depth-\fboxsep}[0pt][0pt]{%
-    #1{\web@colorbox@w@transparency{\web@directionIconBgColor}%
-    {\textcolor{\web@directionIconTextColor}{$\bigl\Downarrow$}}}}%
+\newcommand\ArrowUp[1]{%
+  \normalsize\ifeqforpaper
+  \setlength{\fboxsep}{6pt}\else
+  \setlength{\fboxsep}{4pt}\fi
+  \raisebox{\depth-\fboxsep}[0pt][0pt]{%
+  #1{\web@colorbox@w@transparency{\web@directionIconBgColor}%
+  {\textcolor{\web@directionIconTextColor}{$\bigl\Uparrow$}}}}%
+}
+\newcommand\ArrowDown[1]{%
+  \normalsize\ifeqforpaper
+  \setlength{\fboxsep}{6pt}\else
+  \setlength{\fboxsep}{4pt}\fi
+  \raisebox{\depth-\fboxsep}[0pt][0pt]{%
+  #1{\web@colorbox@w@transparency{\web@directionIconBgColor}%
+  {\textcolor{\web@directionIconTextColor}{$\bigl\Downarrow$}}}}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2657,25 +2605,25 @@
 % Here we offer a simple mechanism for saving and restoring running headers.
 %    \begin{macrocode}
 \newcommand{\clearHeaders}{%
-    \let\web@lhead@save\web@lhead
-    \let\web@chead@save\web@chead
-    \let\web@rightheader@save\web@rightheader
-    \let\web@lhead\@empty\let\web@chead\@empty
-    \let\web@rightheader\@empty}
+  \let\web@lhead@save\web@lhead
+  \let\web@chead@save\web@chead
+  \let\web@rightheader@save\web@rightheader
+  \let\web@lhead\@empty\let\web@chead\@empty
+  \let\web@rightheader\@empty}
 \newcommand{\restoreHeaders}{%
-    \let\web@lhead\web@lhead@save
-    \let\web@chead\web@chead@save
-    \let\web@rightheader\web@rightheader@save}
+  \let\web@lhead\web@lhead@save
+  \let\web@chead\web@chead@save
+  \let\web@rightheader\web@rightheader@save}
 \newcommand{\clearFooters}{%
-    \let\web@lfoot@save\web@lfoot
-    \let\web@cfoot@save\web@cfoot
-    \let\web@rfoot@save\web@lfoot
-    \let\web@lfoot\@empty\let\web@cfoot\@empty
-    \let\web@rfoot\@empty}
+  \let\web@lfoot@save\web@lfoot
+  \let\web@cfoot@save\web@cfoot
+  \let\web@rfoot@save\web@lfoot
+  \let\web@lfoot\@empty\let\web@cfoot\@empty
+  \let\web@rfoot\@empty}
 \newcommand{\restoreFooters}{%
-    \let\web@lfoot\web@lfoot@save
-    \let\web@cfoot\web@cfoot@save
-    \let\web@rfoot\web@rfoot@save}
+  \let\web@lfoot\web@lfoot@save
+  \let\web@cfoot\web@cfoot@save
+  \let\web@rfoot\web@rfoot@save}
 %    \end{macrocode}
 % You can use this command to insert additional formatting into the running header.
 % For example, \verb!\headerformat{\bfseries\color{red}}!.
@@ -2700,18 +2648,17 @@
 \let\webfootwrapper\@empty
 \newcommand{\headWrapper}[1]{\def\webheadwrapper##1{#1}}
 \newcommand{\footWrapper}[1]{\def\webfootwrapper##1{#1}}
-\newcommand{\ps@webheadings}
-{%
-    \renewcommand{\@oddhead}{\webheadwrapper{%
-        \normalfont\ifeqforpaper\else\footnotesize\fi
-        \web@headerprivate\web@headerhook\web@lhead\hfil\web@chead\hfil
-        \web@rightheader}}
-    \renewcommand{\@evenhead}{\@oddhead}
-    \renewcommand{\@oddfoot}{\webfootwrapper{%
-        \normalfont\ifeqforpaper\else\footnotesize\fi
-        \web@footerprivate\web@footerhook\web@lfoot\hfil
-        \web@cfoot\hfil\web@rfoot}}
-    \renewcommand{\@evenfoot}{\@oddfoot}
+\newcommand{\ps@webheadings}{%
+  \renewcommand{\@oddhead}{\webheadwrapper{%
+    \normalfont\ifeqforpaper\else\footnotesize\fi
+    \web@headerprivate\web@headerhook\web@lhead\hfil\web@chead\hfil
+    \web@rightheader}}
+  \renewcommand{\@evenhead}{\@oddhead}
+  \renewcommand{\@oddfoot}{\webfootwrapper{%
+    \normalfont\ifeqforpaper\else\footnotesize\fi
+    \web@footerprivate\web@footerhook\web@lfoot\hfil
+    \web@cfoot\hfil\web@rfoot}}
+  \renewcommand{\@evenfoot}{\@oddfoot}
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2719,7 +2666,7 @@
 % header
 %    \begin{macrocode}
 \renewcommand{\sectionmark}[1]{%
-    \markboth{}{\web@section\ \thesection: #1}}
+  \markboth{}{\web@section\ \thesection: #1}}
 %    \end{macrocode}
 %    \begin{macro}{\noHeadersOnSectionPage}
 %    \begin{macro}{\headersOnSectionPage}
@@ -2739,18 +2686,18 @@
 % on the same page as the beginning of a section.
 %    \begin{macrocode}
 \newcommand{\noHeadersOnSectionPage}{%
-    \gdef\web@headerpolicy{%
-        \expandafter\aeb@gettopmark\topmark{}{}%
-        \expandafter\aeb@getbotmark\botmark{}{}%
-        \ifx\aeb@topmark\aeb@botmark\rightmark\fi
-    }%
+  \gdef\web@headerpolicy{%
+    \expandafter\aeb@gettopmark\topmark{}{}%
+    \expandafter\aeb@getbotmark\botmark{}{}%
+    \ifx\aeb@topmark\aeb@botmark\rightmark\fi
+  }%
 }
 %    \end{macrocode}
 % The default is to show no headers on a page with a section in it.
 %    \begin{macrocode}
 \noHeadersOnSectionPage
 \newcommand{\headersOnSectionPage}{%
-    \gdef\web@headerpolicy{\rightmark}%
+  \gdef\web@headerpolicy{\rightmark}%
 }
 \def\aeb@gettopmark#1#2{\def\aeb@topmark{#2}}
 \def\aeb@getbotmark#1#2{\def\aeb@botmark{#2}}
@@ -2768,10 +2715,10 @@
 % \changes{v4.4a}{2012/08/31}{Introduce \string\cs{ifweb@sectioning} switch}
 %    \begin{macrocode}
 \newcommand{\sectionColor}[1]{\def\web@sectionsColorOld{#1}
-    \def\aeb@sectioncolor{#1}}
+  \def\aeb@sectioncolor{#1}}
 \sectionColor{blue}
 \def\web@inputsectiondefs{\InputIfFileExists{websec.def}{}
-    {\PackageError{web}{Cannot find the file websec.def}{}}
+  {\PackageError{web}{Cannot find the file websec.def}{}}
 }
 \ifweb@sectioning\expandafter\web@inputsectiondefs\fi
 %</package>
@@ -2780,26 +2727,26 @@
 \renewcommand*\thesubsection{\thesection.\arabic{subsection}}
 \renewcommand*{\thesubsubsection}{\textbullet}
 \renewcommand{\section}{\renewcommand{\@seccntformat}[1]{%
-   \@nameuse{the##1}\web@finalDot\enspace}%
-   \@startsection{section}{1}{\z@}%
-   {-3ex\@plus -1ex \@minus-.2ex}%
-   {1ex\@plus .2ex}% 6pt
-   {\noindent\normalfont\normalsize\bfseries
-    \color{\web@sectionsColorOld}}}%
+ \@nameuse{the##1}\web@finalDot\enspace}%
+ \@startsection{section}{1}{\z@}%
+ {-3ex\@plus -1ex \@minus-.2ex}%
+ {1ex\@plus .2ex}% 6pt
+ {\noindent\normalfont\normalsize\bfseries
+  \color{\web@sectionsColorOld}}}%
 \renewcommand{\subsection}{\renewcommand{\@seccntformat}[1]{%
-   \@nameuse{the##1}\web@finalDot\enspace}%
-   \@startsection{subsection}{2}{\z@}%
-   {-2.5ex\@plus -1ex \@minus -.2ex}%
-   {1ex\@plus .2ex}%
-   {\noindent\normalfont\normalsize\bfseries
-    \color{\web@sectionsColorOld}}}
+ \@nameuse{the##1}\web@finalDot\enspace}%
+ \@startsection{subsection}{2}{\z@}%
+ {-2.5ex\@plus -1ex \@minus -.2ex}%
+ {1ex\@plus .2ex}%
+ {\noindent\normalfont\normalsize\bfseries
+  \color{\web@sectionsColorOld}}}
 \renewcommand{\subsubsection}{%
-   \renewcommand{\@seccntformat}[1]{\color{\web@sectionsColorOld}\large
-   $\bullet$\enspace}%
-   \@startsection{subsubsection}{3}{\z@}%
-     {-2ex\@plus -1ex \@minus -.2ex}%
-     {.5ex\@plus .2ex}%
-     {\noindent\normalfont\normalsize\bfseries}}
+ \renewcommand{\@seccntformat}[1]{\color{\web@sectionsColorOld}\large
+ $\bullet$\enspace}%
+ \@startsection{subsubsection}{3}{\z@}%
+   {-2ex\@plus -1ex \@minus -.2ex}%
+   {.5ex\@plus .2ex}%
+   {\noindent\normalfont\normalsize\bfseries}}
 %    \end{macrocode}
 % We define our own \cs{part} command, and reserve it as \cs{@webpart}.
 % Commands for handing the \cs{part} format. The formatting of
@@ -2808,8 +2755,7 @@
 \def\tocPartTitle#1{\def\web@tocPartTitle##1{#1}}
 \tocPartTitle{\thepart\hspace{1em}#1}
 \newcommand\@webpart{\secdef\web@@part\web@@spart}
-\def\web@@part[#1]#2{%
-    \newpage
+\def\web@@part[#1]#2{\newpage
   \def\@currentlabelname{#1}%
   \ifnum\Hy@secnum@part>\c@secnumdepth
     \phantomsection
@@ -2826,14 +2772,13 @@
     \@afterheading
 }
 \def\web@@spart#1{%
-    \Hy@GlobalStepCount\Hy@linkcounter
-    \xdef\@currentHref{part*.\the\Hy@linkcounter}%
-    \Hy@raisedlink{%
-        \hyper@anchorstart{\@currentHref}\hyper@anchorend
-    }{\web@makesparthead{#1}}%
-    \nobreak
-    \vskip 1ex
-    \@afterheading
+  \Hy@GlobalStepCount\Hy@linkcounter
+  \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+  \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend
+  }{\web@makesparthead{#1}}%
+  \nobreak
+  \vskip 1ex
+  \@afterheading
 }
 \let\web@save@part\part
 \let\part\@webpart
@@ -2846,29 +2791,28 @@
 % looks in the document.
 %    \begin{macrocode}
 \newcommand{\formatPartTitle}[1]{%
-    \def\web@formatPartTitle##1{#1}}
-\def\web@defaultFormatPartTitle#1{%
-    \large\bfseries
-     \ifnum \c@secnumdepth >\m@ne
-       \partname~\thepart:\space
-    \fi#1}
+  \def\web@formatPartTitle##1{#1}}
+\def\web@defaultFormatPartTitle#1{\large\bfseries
+   \ifnum \c@secnumdepth >\m@ne
+     \partname~\thepart:\space
+  \fi#1}
 \let\web@formatPartTitle\web@defaultFormatPartTitle
 \newcommand{\restorePartTitleFormat}{%
-    \let\web@formatPartTitle\web@defaultFormatPartTitle}
+  \let\web@formatPartTitle\web@defaultFormatPartTitle}
 \def\noPartNumbers{\formatPartTitle{\large\bfseries##1}%
-    \tocPartTitle{##1}}
+  \tocPartTitle{##1}}
 \def\web@makeparthead#1{%
-    \parindent\z@\raggedright
-    \interlinepenalty \@M
-    \normalfont
-    \web@formatPartTitle{#1}%
-    \markboth{}{}\par
+  \parindent\z@\raggedright
+  \interlinepenalty \@M
+  \normalfont
+  \web@formatPartTitle{#1}%
+  \markboth{}{}\par
 }
 \def\web@makesparthead#1{%
-    \parindent\z@\raggedright
-    \interlinepenalty \@M
-    \normalfont
-    \large\bfseries #1\par
+  \parindent\z@\raggedright
+  \interlinepenalty \@M
+  \normalfont
+  \large\bfseries #1\par
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -2878,94 +2822,91 @@
 % Here's the same thing for \cs{chapter}.
 %    \begin{macrocode}
 \@ifundefined{chapter}{}{%
-    \newcommand\@webchapter{%
-        \global\@topnum\z@
-        \@afterindentfalse
-        \secdef\web@@chapter\web@@schapter
-    }
-    \let\web@save@chapter\chapter
-    \let\chapter\@webchapter
-    \def\web@@chapter[#1]#2{%
-        \def\@currentlabelname{#1}%
-        \def\Hy@next{%
-          \Hy@GlobalStepCount\Hy@linkcounter
-          \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
-          \Hy@raisedlink{%
-            \hyper@anchorstart{\@currentHref}\hyper@anchorend
-          }%
-        }%
-        \ifnum\c@secnumdepth>\m@ne
-          \@ifundefined{if@mainmatter}%
-          \iftrue{\@nameuse{if@mainmatter}}%
-            \let\Hy@next\relax
-          \fi
-        \fi
-        \Hy@next
-        \ifnum \c@secnumdepth >\m@ne
-        \if@mainmatter
-            \refstepcounter{chapter}%
-            \typeout{\@chapapp\space\thechapter.}%
-            \addcontentsline{toc}{chapter}%
-                {\protect\numberline{\thechapter}#1}%
-        \else
-            \addcontentsline{toc}{chapter}{{}{}#1}%
-        \fi
-        \else
-            \addcontentsline{toc}{chapter}{{}{}#1}%
-        \fi
-        \chaptermark{#1}%
-        \addtocontents{lof}{\protect\addvspace{10\p@}}%
-        \addtocontents{lot}{\protect\addvspace{10\p@}}%
-        \if@twocolumn
-            \@topnewpage[\web@makechapterhead{#2}]%
-        \else
-            \web@makechapterhead{#2}%
-            \@afterheading
-        \fi
-    }
-    \def\web@@schapter#1{%
-        \if@twocolumn
-        \@topnewpage[\@makeschapterhead{#1}]%
-        \else
-        \web@makeschapterhead{#1}%
-        \@afterheading
-        \fi
-    }
+  \newcommand\@webchapter{%
+      \global\@topnum\z@
+      \@afterindentfalse
+      \secdef\web@@chapter\web@@schapter
+  }
+  \let\web@save@chapter\chapter
+  \let\chapter\@webchapter
+  \def\web@@chapter[#1]#2{%
+    \def\@currentlabelname{#1}%
+    \def\Hy@next{%
+      \Hy@GlobalStepCount\Hy@linkcounter
+      \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+      \Hy@raisedlink{%
+        \hyper@anchorstart{\@currentHref}\hyper@anchorend
+      }%
+    }%
+    \ifnum\c@secnumdepth>\m@ne
+      \@ifundefined{if@mainmatter}%
+      \iftrue{\@nameuse{if@mainmatter}}%
+        \let\Hy@next\relax
+      \fi
+    \fi
+    \Hy@next
+    \ifnum \c@secnumdepth >\m@ne
+      \if@mainmatter
+        \refstepcounter{chapter}%
+        \typeout{\@chapapp\space\thechapter.}%
+        \addcontentsline{toc}{chapter}%
+          {\protect\numberline{\thechapter}#1}%
+      \else
+        \addcontentsline{toc}{chapter}{{}{}#1}%
+      \fi
+    \else
+      \addcontentsline{toc}{chapter}{{}{}#1}%
+    \fi
+    \chaptermark{#1}%
+    \addtocontents{lof}{\protect\addvspace{10\p@}}%
+    \addtocontents{lot}{\protect\addvspace{10\p@}}%
+    \if@twocolumn
+      \@topnewpage[\web@makechapterhead{#2}]%
+    \else
+      \web@makechapterhead{#2}%
+      \@afterheading
+    \fi
+  }
+  \def\web@@schapter#1{%
+    \if@twocolumn
+    \@topnewpage[\@makeschapterhead{#1}]%
+    \else
+    \web@makeschapterhead{#1}%
+    \@afterheading
+    \fi
+  }
 %    \end{macrocode}
 %    \begin{macro}{\web@makechapterhead}
 %    \begin{macro}{\web@makeschapterhead}
 % These commands can be redefined to format who the part text
 % looks in the document.
 %    \begin{macrocode}
-    \long\def\formatChapterNumber#1{\def\web@formatChapterNumber{#1}}
-    \formatChapterNumber{\large\bfseries
-        \@chapapp\space\thechapter\par\nobreak}
-    \long\def\formatChapterTitle#1{\def\web@formatChapterTitle##1{#1}}
-    \formatChapterTitle{%
-        \interlinepenalty\@M
-        \noindent\hspace{1em}\large\bfseries#1\par\nobreak
-    }
-    \def\web@makechapterhead#1{%
-        \vspace{3\p@}{%
-            \parindent\z@ \raggedright \normalfont
-            \ifnum \c@secnumdepth >\m@ne
-                \if@mainmatter
-                    \web@formatChapterNumber
-                \fi
-            \fi
-            \web@formatChapterTitle{#1}%
-            \vskip 12\p@
-        }%
-    }
-    \def\web@makeschapterhead#1{%
-        \vspace{3\p@}{%
-            \parindent\z@\raggedright
-            \normalfont
-            \interlinepenalty\@M
-            \large\bfseries #1\par\nobreak
-            \vskip 12\p@
-        }%
-    }
+  \long\def\formatChapterNumber#1{\def\web@formatChapterNumber{#1}}
+  \formatChapterNumber{\large\bfseries
+    \@chapapp\space\thechapter\par\nobreak}
+  \long\def\formatChapterTitle#1{\def\web@formatChapterTitle##1{#1}}
+  \formatChapterTitle{%
+    \interlinepenalty\@M
+    \noindent\hspace{1em}\large\bfseries#1\par\nobreak
+  }
+  \def\web@makechapterhead#1{%
+    \vspace{3\p@}{%
+      \parindent\z@ \raggedright \normalfont
+      \ifnum \c@secnumdepth >\m@ne
+        \if@mainmatter\web@formatChapterNumber\fi
+      \fi
+      \web@formatChapterTitle{#1}\vskip 12\p@
+    }%
+  }
+  \def\web@makeschapterhead#1{%
+    \vspace{3\p@}{%
+      \parindent\z@\raggedright
+      \normalfont
+      \interlinepenalty\@M
+      \large\bfseries #1\par\nobreak
+      \vskip 12\p@
+    }%
+  }
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -2976,16 +2917,14 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\aebwritelastpage{%
-    \immediate\write\@auxout{%
-%    \string\expandafter\string\gdef
-%    \string\csname\space aebLastPage\string\endcsname{\arabic{page}}}%
-    \string\w@csarg\string\gdef{aebLastPage}{\arabic{page}}}%
+  \immediate\write\@auxout{%
+  \string\w@csarg\string\gdef{aebLastPage}{\arabic{page}}}%
 }
 %    \end{macrocode}
 %    \begin{macrocode}
 \AtEndDocument{%
-    \clearpage\addtocounter{page}{-1}\aebwritelastpage
-    \addtocounter{page}{1}}
+  \clearpage\addtocounter{page}{-1}\aebwritelastpage
+  \addtocounter{page}{1}}
 %    \end{macrocode}
 % \subsection{\texorpdfstring{\protect\cs{useFullWidthForPaper}}{\CMD{useFullWidthForPaper}}}
 %
@@ -3011,12 +2950,12 @@
 \def\useFullWidthForPaper{\ifeqforpaper
     \setlength{\textwidth}{\paperwidth-2in}
     \setlength{\textheight}
-        {\paperheight-2in-\footskip-\topmargin-\headheight-\headsep}
+      {\paperheight-2in-\footskip-\topmargin-\headheight-\headsep}
     \oddsidemargin=0pt
     \evensidemargin=0pt
     \marginparsep=0pt
     \marginparwidth=0pt
-    \fi
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3025,23 +2964,24 @@
 % option is used, and the \texttt{templatesforpaper} option is not taken.
 %    \begin{macrocode}
 \def\maxtextscreentext{%
-    \iftemplatesforpaper\else\ifeqforpaper
-        \ifnum\@usetemplates=1
-            \ifnum\@panelconfig=1 % left panel
-                \setlength{\oddsidemargin}%
-                    {\@panelwidth+\@panelsep-1in}%
-                \setlength{\textwidth}%
-                    {\paperwidth-\@panelwidth-\@panelsep-%
-                    \marginparwidth-\marginparsep}%
-            \else\ifnum\@panelconfig=2 % right panel
-                \setlength{\oddsidemargin}{0in}%
-                \setlength{\textwidth}%
-                    {\paperwidth-\@panelwidth-\@panelsep-%
-                    \oddsidemargin-\marginparwidth-\marginparsep}%
-            \else
-                \useFullWidthForPaper
-            \fi\fi\fi
-    \fi\fi
+  \iftemplatesforpaper\else\ifeqforpaper
+    \ifnum\@usetemplates=\@ne
+      \ifnum\@panelconfig=\@ne % left panel
+        \setlength{\oddsidemargin}%
+          {\@panelwidth+\@panelsep-1in}%
+        \setlength{\textwidth}%
+          {\paperwidth-\@panelwidth-\@panelsep-%
+          \marginparwidth-\marginparsep}%
+      \else
+        \ifnum\@panelconfig=\tw@ % right panel
+          \setlength{\oddsidemargin}{0in}%
+          \setlength{\textwidth}%
+            {\paperwidth-\@panelwidth-\@panelsep-%
+            \oddsidemargin-\marginparwidth-\marginparsep}%
+      \else
+        \useFullWidthForPaper
+      \fi\fi\fi
+  \fi\fi
 }
 %    \end{macrocode}
 %
@@ -3053,11 +2993,11 @@
 % \changes{v4.4}{2012/08/26}{Added the command \string\cs{centertextonpage}}
 %    \begin{macrocode}
 \newcommand{\centertextonpage}{%
-    \ifeqforpaper\AtBeginDocument{\web@centertextonpage}\fi}
+  \ifeqforpaper\AtBeginDocument{\web@centertextonpage}\fi}
 \def\web@centertextonpage{%
-    \setlength{\oddsidemargin}{\paperwidth-\textwidth-2in}%
-    \oddsidemargin=.5\oddsidemargin
-    \evensidemargin=\oddsidemargin
+  \setlength{\oddsidemargin}{\paperwidth-\textwidth-2in}%
+  \oddsidemargin=.5\oddsidemargin
+  \evensidemargin=\oddsidemargin
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3098,13 +3038,15 @@
 % If the user asks for the \texttt{latextoc} option, but wants bullets, we
 % adjust things so the bullets look good.
 %    \begin{macrocode}
-\ifx\web@latextoc\web@YES\ifx\web@bullets\web@YES%
+\ifx\web@latextoc\web@YES
+  \ifx\web@bullets\web@YES
     \@ifundefined{chapter} {%
-        \renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{1.2em}}
+      \renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{1.2em}}
     }{%
-        \renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{1.2em}}
+      \renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{1.2em}}
     }%
-\fi\fi
+  \fi
+\fi
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\tocColor#1{\def\web@tocColor{#1}\def\aeb@toccolor{#1}}
@@ -3122,59 +3064,58 @@
 \def\web@Tocpagestyle#1{#1}
 \let\web@latextoc@save\tableofcontents
 \ifx\web@bullets\web@YES
-\def\tableofcontents
-{%
-    \global\let\insertwebtoc\insert@webtoc
+  \def\tableofcontents{\global
+    \let\insertwebtoc\insert@webtoc
     \def\contentsname{\web@toc}%
     \pdfbookmark[1]{\web@toc}{toc}%
-        \web@Tocpagestyle{\thispagestyle{empty}}%
-        \markright{{\normalfont\small \web@toc\ (\web@continued)}}%
-        \@ifundefined{sectionToc}{%
-            \begin{center}\hypertarget{webtoc}{}%
-            \normalfont\bfseries\Large\color{\web@tocColor}%
-            \contentsname
-            \end{center}
-        }{\sectionToc{\web@toc}}\par
+    \web@Tocpagestyle{\thispagestyle{empty}}%
+    \markright{{\normalfont\small \web@toc\ (\web@continued)}}%
+    \@ifundefined{sectionToc}{%
+      \begin{center}\hypertarget{webtoc}{}%
+      \normalfont\bfseries\Large\color{\web@tocColor}%
+      \contentsname
+      \end{center}
+    }{\sectionToc{\web@toc}}\par
     \ifx\web@latextoc\web@YES
-        \@starttoc{toc}%  LaTeX toc listing with page numbers
+      \@starttoc{toc}%  LaTeX toc listing with page numbers
     \else
-        \noindent\webtableofcontents
+      \noindent\webtableofcontents
     \fi
     \newpage
-}
+  }
 \else
-    \PackageInfo{web}{No Bullets Requested}
-    \def\tableofcontents{%
-        \begingroup
-        \def\contentsname{\web@toc}%
-        \let\web@save@mkboth\@mkboth
-        \def\@mkboth{\protect\hypertarget{webtoc}{}\web@save@mkboth}%
-        \ifx\web@finalDot\@empty\else
-        \def\numberline##1{\hb@xt@\@tempdima{##1.\hfil}}\fi
-        \web@latextoc@save
-        \endgroup\newpage
-    }
-    \renewcommand\subsubsection{\renewcommand{\@seccntformat}[1]{%
-        \@nameuse{the##1}\web@finalDot\enspace}
-        \@startsection{subsubsection}{3}{\z@}%
-            {-2ex\@plus -1ex \@minus -.2ex}{.5ex \@plus .2ex}%
-            {\noindent\normalfont\normalsize\bfseries}}
-    \renewcommand*{\thesubsubsection}
-        {\thesubsection.\arabic{subsubsection}}
+  \PackageInfo{web}{No Bullets Requested}
+  \def\tableofcontents{%
+    \begingroup
+      \def\contentsname{\web@toc}%
+      \let\web@save@mkboth\@mkboth
+      \def\@mkboth{\protect\hypertarget{webtoc}{}\web@save@mkboth}%
+      \ifx\web@finalDot\@empty\else
+      \def\numberline##1{\hb@xt@\@tempdima{##1.\hfil}}\fi
+      \web@latextoc@save
+    \endgroup
+    \newpage
+  }
+  \renewcommand\subsubsection{\renewcommand{\@seccntformat}[1]{%
+    \@nameuse{the##1}\web@finalDot\enspace}
+    \@startsection{subsubsection}{3}{\z@}%
+      {-2ex\@plus -1ex \@minus -.2ex}{.5ex \@plus .2ex}%
+      {\noindent\normalfont\normalsize\bfseries}}
+  \renewcommand*{\thesubsubsection}
+    {\thesubsection.\arabic{subsubsection}}
 \fi
 %    \end{macrocode}
 % \DescribeMacro{\widestNumber}\DescribeMacro{\tocIndent}
 % \DescribeMacro{\tocIndentByNumber} These are used for
 % setting the amount of indentation for the \cs{webtableofcontents}
 %    \begin{macrocode}
-\def\widestNumber#1{%
-    \def\widest@Number{#1\ }}
+\def\widestNumber#1{\def\widest@Number{#1\ }}
 \widestNumber{0.0.}
 \newcommand{\tocIndent}[1]{\def\toc@indent{#1}}
 \tocIndent{20pt}
 \def\tocIndentByNumber#1{{%
-    \settowidth{\@tempdima}{\normalfont\textbf{#1\ }}%
-    \xdef\toc@indent{\the\@tempdima}%
+  \settowidth{\@tempdima}{\normalfont\textbf{#1\ }}%
+  \xdef\toc@indent{\the\@tempdima}%
 }}
 \tocIndentByNumber{00.}
 %    \end{macrocode}
@@ -3186,21 +3127,20 @@
 % \DescribeMacro{\webtableofcontents} is the table of contents for
 % the \texttt{web} package.
 %    \begin{macrocode}
-\def\webtableofcontents
-{%
-    \begingroup
+\def\webtableofcontents{%
+  \begingroup
 %    \end{macrocode}
 % Sample line from .aux
 %\begin{verbatim}
-%   \contentsline {section}{\numberline {1}Introduction}{4}{section.1}
-%   \contentsline {section}{\numberline {}References}{56}{section*.1}
+%  \contentsline {section}{\numberline {1}Introduction}{4}{section.1}
+%  \contentsline {section}{\numberline {}References}{56}{section*.1}
 %                                #1                   #2     #3
 %\end{verbatim}
 %    \begin{macrocode}
     \global\let\isChapter\web@NO
     \parskip0pt\parindent\toc@indent\relax
     \settowidth{\@tempdima}{\normalfont
-        \textbf{\widest@Number}}%
+      \textbf{\widest@Number}}%
     \@tempdimb\@tempdima
     \advance\@tempdimb by\parindent
     \edef\web@subsubSecIndent{\the\@tempdimb}%
@@ -3208,19 +3148,20 @@
     \let\numberline\web@numberline
     \let\contentsline\web@contentsline
     \def\web@section##1##2##3{\web@parse##1\\%
-        \web@toc@section{##1}{##2}{##3}}%
+      \web@toc@section{##1}{##2}{##3}}%
     \def\web@subsection##1##2##3{\web@parse##1\\%
-        \web@toc@subsection{##1}{##2}{##3}}%
+      \web@toc@subsection{##1}{##2}{##3}}%
     \def\web@subsubsection##1##2##3{\web@parse##1\\%
-        \web@toc@subsubsection{##1}{##2}{##3}}%
+      \web@toc@subsubsection{##1}{##2}{##3}}%
     \def\web@part##1##2##3{\web@toc@part{##1}{##2}{##3}}%
     \def\web@chapter##1##2##3{\web@parse##1\\%
-        \web@toc@chapter{##1}{##2}{##3}}%
+      \web@toc@chapter{##1}{##2}{##3}}%
     \@starttoc{toc}%
     \setlength{\@tempdimb}{\ifx\isChapter\web@YES
-        \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}%
+      \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}%
     \leftskip\@tempdimb
-    \par\endgroup
+    \par
+  \endgroup
 }
 %    \end{macrocode}
 %    \begin{macro}{\web@toc@part}
@@ -3234,85 +3175,72 @@
 %    \begin{macrocode}
 \def\web@numberline#1{\makebox[0pt]{#1\enspace}}%
 \def\web@contentsline#1#2#3#4{%
-    \@nameuse{web@#1}{#2}{#3}{#4}}%
+  \@nameuse{web@#1}{#2}{#3}{#4}}%
 \def\web@parse#1#2#3\\{%
-    \def\web@title{#3}\def\numberline{#2}}%
+  \def\web@title{#3}\def\numberline{#2}}%
 \def\web@toc@part#1#2#3{\par\noindent
-    {\bfseries\hyperlink{#3}{#1}}\par\smallskip}
+  {\bfseries\hyperlink{#3}{#1}}\par\smallskip}
 \def\web@toc@chapter#1#2#3{\global\let\isChapter\web@YES
-    \par\mbox{}{\bfseries
-        \ifx\numberline\@empty
-            \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}
-            {%
-                \ifx\d@DingToc\@empty
-                    \hyperlink{#3}{\web@title}%
-                \else
-                    \if\aeb@use@section@numbers0\relax
-                       \makebox[0pt][r]{\color{\d@DingTocColor}%
-                       \d@DingToc\space}\hyperlink{#3}{\web@title}%
-                    \else
-                        \hyperlink{#3}{\web@title}%
-                    \fi
-                \fi
-            }%
+  \par\mbox{}{\bfseries
+    \ifx\numberline\@empty
+      \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}{%
+        \ifx\d@DingToc\@empty
+          \hyperlink{#3}{\web@title}%
         \else
-            \makebox[0pt][r]{\hyperlink{#3}{%
-                \numberline\web@finalDot}\space}\web@title
-        \fi}\par\smallskip
+          \if\aeb@use@section@numbers\web@Zero
+            \makebox[0pt][r]{\color{\d@DingTocColor}%
+              \d@DingToc\space}\hyperlink{#3}{\web@title}\else
+            \hyperlink{#3}{\web@title}\fi
+        \fi
+      }%
+  \else
+    \makebox[0pt][r]{\hyperlink{#3}{%
+      \numberline\web@finalDot}\space}\web@title
+  \fi}\par\smallskip
 }
-%\def\web@toc@chapter#1#2#3{\global\let\isChapter\web@YES
-%    \par\mbox{}{\bfseries\makebox[0pt][r]{\hyperlink{#3}%
-%        {\numberline\web@finalDot}\space}\web@title}\par\smallskip
-%}
 \def\web@toc@section#1#2#3{\penalty-500\par
-        \hspace*{\if\isChapter y\parindent\else0pt\fi}\mbox{}{\bfseries
-        \ifx\numberline\@empty
-            \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}
-            {%
-                \ifx\d@DingToc\@empty
-                    \hyperlink{#3}{\web@title}%
-                \else
-                    \if\aeb@use@section@numbers0\relax
-                       \makebox[0pt][r]{\color{\d@DingTocColor}%
-                       \d@DingToc\space}\hyperlink{#3}{\web@title}%
-                    \else
-                        \hyperlink{#3}{\web@title}%
-                    \fi
-                \fi
-            }%
-        \else
-            \makebox[0pt][r]{\hyperlink{#3}{%
-                \numberline\web@finalDot}\space}\web@title
-        \fi}\endgraf
+  \hspace*{\if\isChapter y\parindent\else0pt\fi}\mbox{}{\bfseries
+  \ifx\numberline\@empty
+    \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}{%
+      \ifx\d@DingToc\@empty
+        \hyperlink{#3}{\web@title}%
+      \else
+        \if\aeb@use@section@numbers\web@Zero
+          \makebox[0pt][r]{\color{\d@DingTocColor}%
+            \d@DingToc\space}\hyperlink{#3}{\web@title}\else
+          \hyperlink{#3}{\web@title}\fi
+      \fi
+    }%
+  \else
+    \makebox[0pt][r]{\hyperlink{#3}{%
+      \numberline\web@finalDot}\space}\web@title
+  \fi}\endgraf
 }%
 \def\web@toc@subsection#1#2#3{\par
-    \setlength{\@tempdimb}{\ifx\isChapter\web@YES
-        \parindent+\@tempdima\else\@tempdima\fi}%
-    \penalty-50 \hspace*{\@tempdimb}\mbox{}{\bfseries
-    \ifx\numberline\@empty
-        \@ifundefined{dd@DingToc}{\hyperlink{#3}{\web@title}}
-        {%
-            \ifx\dd@DingToc\@empty
-                \hyperlink{#3}{\web@title}%
-            \else
-                \makebox[0pt][r]{\color{\dd@DingTocColor}%
-                \dd@DingToc\space}\hyperlink{#3}{\web@title}%
-            \fi
-        }%
-    \else
-        \makebox[0pt][r]{\makebox[\@tempdima][l]%
-        {\hyperlink{#3}{\numberline\web@finalDot}}}\web@title
-    \fi}\endgraf
-}%
+  \setlength{\@tempdimb}{\ifx\isChapter\web@YES
+      \parindent+\@tempdima\else\@tempdima\fi}%
+  \penalty-50 \hspace*{\@tempdimb}\mbox{}{\bfseries
+  \ifx\numberline\@empty
+    \@ifundefined{dd@DingToc}{\hyperlink{#3}{\web@title}}{%
+      \ifx\dd@DingToc\@empty
+        \hyperlink{#3}{\web@title}\else
+        \makebox[0pt][r]{\color{\dd@DingTocColor}%
+          \dd@DingToc\space}\hyperlink{#3}{\web@title}\fi
+    }%
+  \else
+    \makebox[0pt][r]{\makebox[\@tempdima][l]%
+    {\hyperlink{#3}{\numberline\web@finalDot}}}\web@title
+  \fi}\endgraf
+}
 \def\web@toc@subsubsection#1#2#3{%
-    \def\numberline{\strut$\bullet$}%
-    \setlength{\@tempdimb}{\ifx\isChapter\web@YES
-        \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}%
-    \leftskip\@tempdimb\noindent\unskip\mbox{}\penalty-50
-    \@ifundefined{ddd@DingToc}{}{%
-    \if\aeb@use@section@numbers0\relax\ifx\ddd@DingToc\@empty\else
+  \def\numberline{\strut$\bullet$}%
+  \setlength{\@tempdimb}{\ifx\isChapter\web@YES
+      \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}%
+  \leftskip\@tempdimb\noindent\unskip\mbox{}\penalty-50
+  \@ifundefined{ddd@DingToc}{}{%
+  \if\aeb@use@section@numbers\web@Zero\ifx\ddd@DingToc\@empty\else
     \def\numberline{\color{\ddd@DingTocColor}\strut\ddd@DingToc}%
-\fi\fi}\hyperlink{#3}{\numberline}~\web@title\
+  \fi\fi}\hyperlink{#3}{\numberline}~\web@title\
 }%
 %    \end{macrocode}
 %    \end{macro}
@@ -3362,14 +3290,12 @@
 % background. The command \cs{template} defines \cs{web@template}, which is a text macro
 % that actually holds the name of the current graphic.
 %    \begin{macrocode}
-\newcommand{\template}[2][]
-{%
-    \ifweb@allowtemplates
-        \def\web@argi{#1}\ifx\web@argi\@empty
-        \xdef\web@template@opt@args{\web@addtotemplateArgs}%
-        \else\xdef\web@template@opt@args{\web@addtotemplateArgs,#1}%
-        \fi\gdef\web@template{#2}%
-    \fi
+\newcommand{\template}[2][]{%
+  \ifweb@allowtemplates
+    \def\web@argi{#1}\ifx\web@argi\@empty
+    \xdef\web@template@opt@args{\web@addtotemplateArgs}\else
+    \xdef\web@template@opt@args{\web@addtotemplateArgs,#1}\fi
+    \gdef\web@template{#2}\fi
 }
 %    \end{macrocode}
 % The text macro \cs{web@template} holds the name of the current graphic.  It starts off as
@@ -3408,36 +3334,34 @@
 % background.
 %    \begin{macrocode}
 \let\listAddToTemplates\@empty
-\newcommand{\AddToTemplate}[1]
-{%
-    \global\w@csarg\let{eqTmpl#1}\web@YES
-    {\toks@=\expandafter{\listAddToTemplates}%
-    \xdef\listAddToTemplates{\the\toks@\noexpand\\{#1}}}%
-    \ifweb@allowtemplates
-    \@AddToTextTemplate{%
+\newcommand{\AddToTemplate}[1]{%
+  \global\w@csarg\let{eqTmpl#1}\web@YES
+  {\toks@=\expandafter{\listAddToTemplates}%
+  \xdef\listAddToTemplates{\the\toks@\noexpand\\{#1}}}%
+  \ifweb@allowtemplates
+  \@AddToTextTemplate{%
+    \w@csarg\ifx{eqTmpl#1}\web@YES
+      \fboxsep=0pt\setlength{\unitlength}{1pt}%
+      \put(\@textX,0){\@nameuse{#1}}%
+    \fi
+  }%
+  \else
+    \w@csarg\ifx{#1}\BGColorAndGraphic
+      \@AddToTextTemplate{%
         \w@csarg\ifx{eqTmpl#1}\web@YES
-            \fboxsep=0pt\setlength{\unitlength}{1pt}%
-            \put(\@textX,0){\@nameuse{#1}}%
-        \fi
-    }%
-    \else
-        \w@csarg\ifx{#1}\BGColorAndGraphic
-            \@AddToTextTemplate{%
-                \w@csarg\ifx{eqTmpl#1}\web@YES
-                    \fboxsep=0pt\setlength{\unitlength}{1pt}%
-                    \put(\@textX,0){\@nameuse{#1}}%
-                \fi
-            }%
-        \fi
-        \w@csarg\ifx{#1}\BGColorAndGraphicFullWidth
-            \@AddToTextTemplate{%
-                \w@csarg\ifx{eqTmpl#1}\web@YES
-                    \fboxsep=0pt\setlength{\unitlength}{1pt}%
-                    \put(\@textX,0){\@nameuse{#1}}%
-                \fi
-            }%
+          \fboxsep=0pt\setlength{\unitlength}{1pt}%
+          \put(\@textX,0){\@nameuse{#1}}%
         \fi
+      }%
     \fi
+    \w@csarg\ifx{#1}\BGColorAndGraphicFullWidth
+      \@AddToTextTemplate{%
+        \w@csarg\ifx{eqTmpl#1}\web@YES
+          \fboxsep=0pt\setlength{\unitlength}{1pt}%
+          \put(\@textX,0){\@nameuse{#1}}\fi
+      }%
+    \fi
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3454,15 +3378,15 @@
 % passing the empty argument (\verb~{}~) yields the default for \cs{xBld}.
 %    \begin{macrocode}
 \newcommand\placeTemplateInLayer[2][webTextBG]{%
-    \@ifpackageloaded{aeb_pro}
-        {\@ifundefined{xBld}{\PackageWarning{web}
-            {The uselayers option
-                of aeb_pro is\MessageBreak required with
-                \string\placeTemplateInLayer}}
-            {\def\b@webTextLayer{\xBld[#2]{#1}}%
-             \def\e@webTextLayer{\eBld}}}%
-        {\PackageWarning{web}{\string\placeTemplateInLayer\space
-            requires the\MessageBreak aeb_pro package}}%
+  \@ifpackageloaded{aeb_pro}
+    {\@ifundefined{xBld}{\PackageWarning{web}
+      {The uselayers option
+        of aeb_pro is\MessageBreak required with
+        \string\placeTemplateInLayer}}
+      {\def\b@webTextLayer{\xBld[#2]{#1}}%
+       \def\e@webTextLayer{\eBld}}}%
+    {\PackageWarning{web}{\string\placeTemplateInLayer\space
+      requires the\MessageBreak aeb_pro package}}%
 }
 \let\b@webTextLayer\@empty \let\e@webTextLayer\@empty
 \newcommand{\BGColorAndGraphic}{%
@@ -3471,20 +3395,20 @@
 % up the first argument of the \cs{colorbox}, which is the color. This is what \cs{gobblembox}
 % does, it gobbles up the next token, and inserts a \cs{mbox}.
 %    \begin{macrocode}
-    \b@webTextLayer\web@colorbox@w@transparency{\web@textBgColor}%
+  \b@webTextLayer\web@colorbox@w@transparency{\web@textBgColor}%
+  {%
+    \parbox[b][\paperheight]{\textscreenwidth}%
     {%
-        \parbox[b][\paperheight]{\textscreenwidth}%
-        {%
-            \ifx\web@template\@empty
-                \hfill\vfill
-            \else
-                \hfuzz=1pt\vfuzz=1pt\expandafter
-                \includegraphics\expandafter[\web@template@opt@args,%
-                width=\textscreenwidth,height=\paperheight]%
-                {\web@template}
-            \fi
-        }%
-    }\e@webTextLayer
+      \ifx\web@template\@empty
+        \hfill\vfill
+      \else
+        \hfuzz=1pt\vfuzz=1pt\expandafter
+        \includegraphics\expandafter[\web@template@opt@args,%
+        width=\textscreenwidth,height=\paperheight]%
+        {\web@template}
+      \fi
+    }%
+  }\e@webTextLayer
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3509,33 +3433,32 @@
 % background.
 %    \begin{macrocode}
 \let\listAddToPanelTemplates=\@empty
-\newcommand{\AddToPanelTemplate}[1]
-{%
-    \global\w@csarg\let{eqPanTmpl#1}\web@YES
-    {\toks@=\expandafter{\listAddToPanelTemplates}%
-    \xdef\listAddToPanelTemplates{\the\toks@\noexpand\\{#1}}}%
-    \ifweb@allowtemplates
+\newcommand{\AddToPanelTemplate}[1]{%
+  \global\w@csarg\let{eqPanTmpl#1}\web@YES
+  {\toks@=\expandafter{\listAddToPanelTemplates}%
+  \xdef\listAddToPanelTemplates{\the\toks@\noexpand\\{#1}}}%
+  \ifweb@allowtemplates
     \@AddToPanelTemplate{%
         \w@csarg\ifx{eqPanTmpl#1}\web@YES
         \fboxsep=0pt\setlength{\unitlength}{1pt}%
         \put(\@panelX,0){\@nameuse{#1}}\fi
     }%
-    \else
-        \w@csarg\ifx{#1}\stdPanelBG
-            \@AddToPanelTemplate{%
-                \w@csarg\ifx{eqPanTmpl#1}\web@YES
-                \fboxsep=0pt\setlength{\unitlength}{1pt}%
-                \put(\@panelX,0){\@nameuse{#1}}\fi
-            }%
-        \fi
-        \w@csarg\ifx{#1}\stdbldpanel
-            \@AddToPanelTemplate{%
-                \w@csarg\ifx{eqPanTmpl#1}\web@YES
-                \fboxsep=0pt\setlength{\unitlength}{1pt}%
-                \put(\@panelX,0){\@nameuse{#1}}\fi
-            }%
-        \fi
+  \else
+    \w@csarg\ifx{#1}\stdPanelBG
+      \@AddToPanelTemplate{%
+        \w@csarg\ifx{eqPanTmpl#1}\web@YES
+        \fboxsep=0pt\setlength{\unitlength}{1pt}%
+        \put(\@panelX,0){\@nameuse{#1}}\fi
+      }%
+  \fi
+    \w@csarg\ifx{#1}\stdbldpanel
+      \@AddToPanelTemplate{%
+        \w@csarg\ifx{eqPanTmpl#1}\web@YES
+        \fboxsep=0pt\setlength{\unitlength}{1pt}%
+        \put(\@panelX,0){\@nameuse{#1}}\fi
+      }%
     \fi
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3545,17 +3468,15 @@
 % case, we use \texttt{natwidth} and \texttt{natheight} as the width and height parameters
 % in \cs{includegraphics}.
 %    \begin{macrocode}
-\newcommand{\paneltemplate}[2][]
-{%
-    \ifweb@allowtemplates\def\web@argi{#1}%
-        \ifx\web@argi\@empty
-            \edef\web@paneltemplate@opt@args{%
-                \web@addtopaneltemplateArgs}%
-        \else
-            \edef\web@paneltemplate@opt@args{%
-                \web@addtopaneltemplateArgs,#1}%
-        \fi\gdef\web@paneltemplate{#2}%
-    \fi
+\newcommand{\paneltemplate}[2][]{%
+  \ifweb@allowtemplates\def\web@argi{#1}%
+    \ifx\web@argi\@empty
+      \edef\web@paneltemplate@opt@args
+        {\web@addtopaneltemplateArgs}\else
+      \edef\web@paneltemplate@opt@args
+        {\web@addtopaneltemplateArgs,#1}\fi
+    \gdef\web@paneltemplate{#2}%
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3570,7 +3491,7 @@
 %    \begin{macrocode}
 \def\addtopaneltemplateArgs#1{\gdef\web@addtopaneltemplateArgs{#1}}
 \def\clearpaneltemplateArgs{%
-    \global\let\web@addtopaneltemplateArgs=\@empty}
+  \global\let\web@addtopaneltemplateArgs=\@empty}
 \let\web@addtopaneltemplateArgs=\@empty
 \let\panel@scaletype\@empty
 %    \end{macrocode}
@@ -3581,9 +3502,8 @@
 % Use this command to override the default.
 %    \begin{macrocode}
 \newcommand\panelsep[1]{\bgroup
-    \setlength\@tempdima{#1}%
-    \xdef\@panelsep{\the\@tempdima}\egroup}
-%\def\@panelsep{10bp}
+  \setlength\@tempdima{#1}%
+  \xdef\@panelsep{\the\@tempdima}\egroup}
 \panelsep{10bp}
 \def\panelSep{\@panelsep}
 %    \end{macrocode}
@@ -3595,44 +3515,44 @@
 % |\panelwidth{1in}|
 %    \begin{macrocode}
 \newcommand{\panelwidth}[1]{%
-    \let\web@next\relax
-    \iftemplatesforpaper\else\ifnum\@panelconfig>0
+  \let\web@next\relax
+  \iftemplatesforpaper\else\ifnum\@panelconfig>\z@
 %    \end{macrocode}
 % (2013/09/13) This command only has effect if there is a panel option and if the \cs{templates\-for\-paper}
 % option is not in effect.
 %    \begin{macrocode}
-        \ifnum\@panelconfig=1 % left panel
+    \ifnum\@panelconfig=\@ne % left panel
 %    \end{macrocode}
 % (2013/09/13) One of the problems that I've just overcome it with the \cs{panelwidth} command.
 % there was always problems about changing the widths of the panel. The solutions is to
 % reverse the current effects of the last \cs{InitLayout} before calling \cs{InitLayout}
 % with the new panel width. Seems to work. We do this for the left panel and the right panel.
 %    \begin{macrocode}
-            \ifx\web@layout\web@YES
-                \addtolength{\textwidth}{\@panelwidth}%
-                \addtolength{\textwidth}{\@Rightmargin}%
-            \fi
-            \addtolength{\textwidth}{\@panelsep}%
-            \addtolength{\oddsidemargin}{-\@panelsep}%
-            \addtolength{\evensidemargin}{-\@panelsep}%
-            \addtolength{\textscreenwidth}{\@panelwidth}%
-        \fi
-        \ifnum\@panelconfig=2 % panel right
-            \ifx\web@layout\web@YES
-                \addtolength{\textwidth}{\@panelwidth}%
-                \addtolength{\textwidth}{\@Leftmargin}%
-            \fi
-            \addtolength{\textwidth}{\@panelsep}%
-            \addtolength{\textscreenwidth}{\@panelwidth}%
-        \fi
+      \ifx\web@layout\web@YES
+        \addtolength{\textwidth}{\@panelwidth}%
+        \addtolength{\textwidth}{\@Rightmargin}%
+      \fi
+      \addtolength{\textwidth}{\@panelsep}%
+      \addtolength{\oddsidemargin}{-\@panelsep}%
+      \addtolength{\evensidemargin}{-\@panelsep}%
+      \addtolength{\textscreenwidth}{\@panelwidth}%
+    \fi
+    \ifnum\@panelconfig=\tw@ % panel right
+      \ifx\web@layout\web@YES
+        \addtolength{\textwidth}{\@panelwidth}%
+        \addtolength{\textwidth}{\@Leftmargin}%
+      \fi
+      \addtolength{\textwidth}{\@panelsep}%
+      \addtolength{\textscreenwidth}{\@panelwidth}%
+    \fi
 %    \end{macrocode}
 % Now record the new panel width and call \cs{InitLayout}
 %    \begin{macrocode}
-        \setlength{\@panelwidth}{#1}%
-        \ifdim\@panelwidth<\web@minpanelwidth
-        \setlength{\@panelwidth}{\web@minpanelwidth}\fi
-        \def\web@next{\InitLayout}%
-    \fi\fi\web@next
+    \setlength{\@panelwidth}{#1}%
+    \ifdim\@panelwidth<\web@minpanelwidth
+    \setlength{\@panelwidth}{\web@minpanelwidth}\fi
+    \def\web@next{\InitLayout}%
+  \fi\fi\web@next
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3647,26 +3567,25 @@
 % need for a background color.
 %    \begin{macrocode}
 \newcommand\placePanelTemplateInLayer[2][webPanelBG]{%
-    \@ifpackageloaded{aeb_pro}
-        {\@ifundefined{xBld}{\PackageWarning{web}
-            {The uselayers option
-                of aeb_pro is\MessageBreak required with
-                \string\placePanelTemplateInLayer}}
-            {\def\b@webPanelLayer{\xBld[#2]{#1}}%
-             \def\e@webPanelLayer{\eBld}}}%
-        {\PackageWarning{web}{\string\placePanelTemplateInLayer\space
-            requires the\MessageBreak aeb_pro package}}%
+  \@ifpackageloaded{aeb_pro}
+    {\@ifundefined{xBld}{\PackageWarning{web}
+      {The uselayers option
+          of aeb_pro is\MessageBreak required with
+          \string\placePanelTemplateInLayer}}
+      {\def\b@webPanelLayer{\xBld[#2]{#1}}%
+       \def\e@webPanelLayer{\eBld}}}%
+    {\PackageWarning{web}{\string\placePanelTemplateInLayer\space
+      requires the\MessageBreak aeb_pro package}}%
 }
 \let\b@webPanelLayer\@empty \let\e@webPanelLayer\@empty
-\newcommand\stdPanelBG
-{%
-    \b@webPanelLayer\web@colorbox@w@transparency{\web@panelBgColor}%
-    {\parbox[b][\paperheight]{\@panelwidth}%
-    {\ifx\web@paneltemplate\@empty\hfill\vfill\else
-    \hfuzz=1pt\vfuzz=1pt\expandafter
-    \includegraphics\expandafter[\web@paneltemplate@opt@args,%
-    width=\@panelwidth,height=\paperheight]%
-    {\web@paneltemplate}\fi}}\e@webPanelLayer
+\newcommand\stdPanelBG{%
+  \b@webPanelLayer\web@colorbox@w@transparency{\web@panelBgColor}%
+  {\parbox[b][\paperheight]{\@panelwidth}%
+  {\ifx\web@paneltemplate\@empty\hfill\vfill\else
+  \hfuzz=1pt\vfuzz=1pt\expandafter
+  \includegraphics\expandafter[\web@paneltemplate@opt@args,%
+  width=\@panelwidth,height=\paperheight]%
+  {\web@paneltemplate}\fi}}\e@webPanelLayer
 }
 %    \end{macrocode}
 % Enter \cs{stdPanelBG} into the panel template stack.  Any
@@ -3683,19 +3602,16 @@
 % The \cs{stdbldpanel} is the macro that actually builds the objects on top of the
 % background.
 %    \begin{macrocode}
-\newcommand{\buildpanel}[1]
-{%
-    \gdef\stdbldpanel
-    {%
-        \parbox[b][\paperheight]{\@panelwidth}%
-        {%
-            \normalsfcodes\normalfont\normalsize
-            \spaceskip=0pt\xspaceskip=0pt
-            \par\medskip\vfil
-            \centering#1%
-            \par\medskip\vfil
-        }%
+\newcommand{\buildpanel}[1]{%
+  \gdef\stdbldpanel{%
+    \parbox[b][\paperheight]{\@panelwidth}{%
+      \normalsfcodes\normalfont\normalsize
+      \spaceskip=0pt\xspaceskip=0pt
+      \par\medskip\vfil
+      \centering#1%
+      \par\medskip\vfil
     }%
+  }%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3711,13 +3627,13 @@
 % top (for logo); middle (for other content); bottom (for navigation panel)
 %    \begin{macrocode}
 \newcommand{\useStandardPanel}{%
-    \buildpanel{%
-        \web@panel@top
-        \par\vspace{\stretch{1}}%
-        \web@panel@middle
-        \par\vspace{\stretch{1}}%
-        \web@panel@bottom
-    }%
+  \buildpanel{%
+    \web@panel@top
+    \par\vspace{\stretch{1}}%
+    \web@panel@middle
+    \par\vspace{\stretch{1}}%
+    \web@panel@bottom
+  }%
 }
 \newcommand{\panelTop}[1]{\def\web@panel@top{#1}}
 \panelTop{}
@@ -3730,20 +3646,18 @@
 %    \begin{macro}{\ClearTextTemplate}
 % Clear the text template
 %    \begin{macrocode}
-\newcommand{\ClearTextTemplate}
-{%
-    \global\let\web@textBgColor\@empty
-    \global\let\web@template\@empty
+\newcommand{\ClearTextTemplate}{%
+  \global\let\web@textBgColor\@empty
+  \global\let\web@template\@empty
 }
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\ClearPanelTemplate}
 % Clear the panel template
 %    \begin{macrocode}
-\newcommand{\ClearPanelTemplate}
-{%
-    \global\let\web@panelBgColor\@empty
-    \global\let\web@paneltemplate\@empty
+\newcommand{\ClearPanelTemplate}{%
+  \global\let\web@panelBgColor\@empty
+  \global\let\web@paneltemplate\@empty
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3751,25 +3665,24 @@
 % Clear the panel template
 %    \begin{macrocode}
 \newcommand{\ClearBuildPanel}
-    {\global\let\stdbldpanel\@empty}
+  {\global\let\stdbldpanel\@empty}
 %    \end{macrocode}
 %    \end{macro}
 
 %    \begin{macro}{\ClearAllTemplates}
 % Clear both text and panel templates
 %    \begin{macrocode}
-\newcommand{\ClearAllTemplates}
-{%
-    \ClearTextTemplate
-    \ClearPanelTemplate
+\newcommand{\ClearAllTemplates}{%
+  \ClearTextTemplate
+  \ClearPanelTemplate
 }
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macrocode}
 \newcommand{\ClearTextTemplateBuffer}
-    {\global\let\web@textTemplate\@empty}
+  {\global\let\web@textTemplate\@empty}
 \newcommand{\ClearPanelTemplateBuffer}
-    {\global\let\web@panelTemplate\@empty}
+  {\global\let\web@panelTemplate\@empty}
 %    \end{macrocode}
 % (06/15/05)  The following two commands save and clears all design elements, and enables
 % the restoring of the design state.
@@ -3781,30 +3694,29 @@
 % respectively. The twist here is that even though these basic elements have been redefined,
 % there original ones can be restored using \cs{restoreElements}.
 %    \begin{macrocode}
-\newcommand{\saveElements}[1]
-{%
-    \begingroup
-        \global\w@csarg\let{web@SaveTmpls#1}\@empty
-        \toks@={}%
-        \def\web@addtoSaveToks##1{%
-            \edef\web@let{\global\expandafter
-                \let\expandafter\noexpand\csname#1##1\endcsname=%
-                \expandafter\noexpand\csname##1\endcsname}%
-            \web@let
-            \edef\web@SaveTmpls{\the\toks@\noexpand\\{##1}%
-                \expandafter\noexpand\csname#1##1\endcsname}%
-                \toks@=\expandafter{\web@SaveTmpls}%
-        }%
-        \web@addtoSaveToks{web@textBgColor}%
-        \web@addtoSaveToks{web@template}%
-        \web@addtoSaveToks{stdbldpanel}%
-        \web@addtoSaveToks{web@panelBgColor}%
-        \web@addtoSaveToks{web@paneltemplate}%
-        \w@csarg\xdef{web@SaveTmpls#1}{\the\toks@}%
-    \endgroup
+\newcommand{\saveElements}[1]{%
+  \begingroup
+    \global\w@csarg\let{web@SaveTmpls#1}\@empty
+    \toks@={}%
+    \def\web@addtoSaveToks##1{%
+      \edef\web@let{\global\expandafter
+        \let\expandafter\noexpand\csname#1##1\endcsname=%
+        \expandafter\noexpand\csname##1\endcsname}%
+      \web@let
+      \edef\web@SaveTmpls{\the\toks@\noexpand\\{##1}%
+        \expandafter\noexpand\csname#1##1\endcsname}%
+        \toks@=\expandafter{\web@SaveTmpls}%
+    }%
+    \web@addtoSaveToks{web@textBgColor}%
+    \web@addtoSaveToks{web@template}%
+    \web@addtoSaveToks{stdbldpanel}%
+    \web@addtoSaveToks{web@panelBgColor}%
+    \web@addtoSaveToks{web@paneltemplate}%
+    \w@csarg\xdef{web@SaveTmpls#1}{\the\toks@}%
+  \endgroup
 }
 \newcommand{\saveClearElements}[1]{%
-    \saveElements{#1}\ClearAllTemplates\ClearBuildPanel
+  \saveElements{#1}\ClearAllTemplates\ClearBuildPanel
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3814,11 +3726,11 @@
 % a name.
 %    \begin{macrocode}
 \newcommand{\restoreElements}[1]{%
-    \ClearAllTemplates\ClearBuildPanel
-    \begingroup
-        \toks@=\expandafter{\csname web@SaveTmpls#1\endcsname}%
-        \def\\##1##2{\global\w@csarg\let{##1}=##2}\the\toks@
-    \endgroup
+  \ClearAllTemplates\ClearBuildPanel
+  \begingroup
+    \toks@=\expandafter{\csname web@SaveTmpls#1\endcsname}%
+    \def\\##1##2{\global\w@csarg\let{##1}=##2}\the\toks@
+  \endgroup
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3828,18 +3740,17 @@
 % only those templates added in by \cs{AddToTemplate}.
 % \changes{v6.0k}{2016/06/14}{Fixed error in def of \string\cs{\string\cs{}}}
 %    \begin{macrocode}
-\newcommand{\disableScreens}[1]
-{%
-    \begingroup
+\newcommand{\disableScreens}[1]{%
+  \begingroup
     \toks@=\expandafter{\listAddToTemplates}%
     \toks2={}%
     \def\\##1{\w@csarg\ifx{eqTmpl##1}\web@YES
-        \disableTemplate{##1}%
-        \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}%
-        \toks2=\expandafter{\web@saveAddTo}\fi}%
+      \disableTemplate{##1}%
+      \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}%
+      \toks2=\expandafter{\web@saveAddTo}\fi}%
     \the\toks@
-    \endgroup
-    \w@csarg\let{web@DisabledTmpls#1}\web@saveAddTo
+  \endgroup
+  \w@csarg\let{web@DisabledTmpls#1}\web@saveAddTo
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3848,12 +3759,11 @@
 % under a name, the required argument. Includes
 % only those templates added in by \cs{AddToTemplate}.
 %    \begin{macrocode}
-\newcommand{\restoreScreens}[1]
-{%
-    \begingroup
-        \toks@=\expandafter{\csname web@DisabledTmpls#1\endcsname}%
-        \def\\##1{\enableTemplate{##1}}\the\toks@
-    \endgroup
+\newcommand{\restoreScreens}[1]{%
+  \begingroup
+    \toks@=\expandafter{\csname web@DisabledTmpls#1\endcsname}%
+    \def\\##1{\enableTemplate{##1}}\the\toks@
+  \endgroup
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3862,18 +3772,17 @@
 % saves the list under a name, the required argument. Includes
 % only those templates added in by \cs{AddToPanelTemplate}.
 %    \begin{macrocode}
-\newcommand{\disablePanels}[1]
-{%
-    \begingroup
+\newcommand{\disablePanels}[1]{%
+  \begingroup
     \toks@ = \expandafter{\listAddToPanelTemplates}%
     \toks2 = {}%
     \def\\##1{\w@csarg\ifx{eqPanTmpl##1}\web@YES
-        \disablePanelTemplate{##1}%
-        \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}%
-        \toks2 =\expandafter{\web@saveAddTo}\fi}%
+      \disablePanelTemplate{##1}%
+      \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}%
+      \toks2 =\expandafter{\web@saveAddTo}\fi}%
     \the\toks@
-    \endgroup
-    \global\w@csarg\let{web@DisabledPanelTmpls#1}\web@saveAddTo
+  \endgroup
+  \global\w@csarg\let{web@DisabledPanelTmpls#1}\web@saveAddTo
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3882,24 +3791,23 @@
 % under a name, the required argument. Includes
 % only those templates added in by \cs{AddToPanelTemplate}.
 %    \begin{macrocode}
-\newcommand{\restorePanels}[1]
-{%
-    \begingroup
-        \toks@=\expandafter{\csname web@DisabledPanelTmpls#1\endcsname}%
-        \def\\##1{\enablePanelTemplate{##1}}\the\toks@
-    \endgroup
+\newcommand{\restorePanels}[1]{%
+  \begingroup
+    \toks@=\expandafter{\csname web@DisabledPanelTmpls#1\endcsname}%
+    \def\\##1{\enablePanelTemplate{##1}}\the\toks@
+  \endgroup
 }
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macrocode}
 \newcommand{\disableTemplate}[1]{{%
-    \global\w@csarg\let{eqTmpl#1}\web@NO}}
+  \global\w@csarg\let{eqTmpl#1}\web@NO}}
 \newcommand{\enableTemplate}[1]{{%
-    \global\w@csarg\let{eqTmpl#1}\web@YES}}
+  \global\w@csarg\let{eqTmpl#1}\web@YES}}
 \newcommand{\disablePanelTemplate}[1]{{%
-    \global\w@csarg\let{eqPanTmpl#1}\web@NO}}
+  \global\w@csarg\let{eqPanTmpl#1}\web@NO}}
 \newcommand{\enablePanelTemplate}[1]{{%
-    \global\w@csarg\let{eqPanTmpl#1}\web@YES}}
+  \global\w@csarg\let{eqPanTmpl#1}\web@YES}}
 %    \end{macrocode}
 % \subsubsection{Support for full-width pages}
 % (2013/01/10) When one of the panel options is taken the with of the text screen is reduced.
@@ -3912,19 +3820,19 @@
 % We calculate some adjustment values that depend on whether we are left or right panel.
 %    \begin{macrocode}
 \def\calculatefullwidth{%
-    \ifeqforpaper
-        \let\fullscreenwidthadj\@empty
-    \else
-        \ifnum\@panelconfig=1\relax % leftpanel
-        \bgroup
+  \ifeqforpaper
+      \let\fullscreenwidthadj\@empty
+  \else
+    \ifnum\@panelconfig=\@ne % leftpanel
+      \bgroup
         \setlength{\@tempdima}{-\@panelwidth-\@panelsep+\@Leftmargin}%
         \xdef\web@leftMargAdj{\the\@tempdima}%
         \setlength{\@tempdima}{-\@panelwidth-\@panelsep+\@Rightmargin}%
         \xdef\web@rightMargAdj{\the\@tempdima}%
-        \egroup
-        \def\fullscreenwidthadj{\hspace{\web@leftMargAdj}}%
-        \fi
+      \egroup
+      \def\fullscreenwidthadj{\hspace{\web@leftMargAdj}}%
     \fi
+  \fi
 }
 %    \end{macrocode}
 % \DescribeMacro{\makeFullwidthhead}
@@ -3933,19 +3841,19 @@
 % \cs{fullscreenwidthadj}.
 %    \begin{macrocode}
 \newcommand{\makeFullwidthhead}{%
-    \global\let\web@save@oddhead\@oddhead
-    \renewcommand{\@oddhead}{\fullscreenwidthadj
-        \hbox to\fullscreenwidth{\normalfont\footnotesize
-        \web@headerhook\web@lhead\hfil\web@chead\hfil
-        \web@rightheader}\hss}%
+  \global\let\web@save@oddhead\@oddhead
+  \renewcommand{\@oddhead}{\fullscreenwidthadj
+    \hbox to\fullscreenwidth{\normalfont\footnotesize
+    \web@headerhook\web@lhead\hfil\web@chead\hfil
+    \web@rightheader}\hss}%
 }
 %    \end{macrocode}
 % \DescribeMacro{\restoreSavedHead} restores previously saved header
 % (saved by \cs{makeFullwidthhead}.
 %    \begin{macrocode}
 \newcommand{\restoreSavedHead}{%
-    \global\let\@oddhead\web@save@oddhead
-    \let\web@save@oddhead\@empty
+  \global\let\@oddhead\web@save@oddhead
+  \let\web@save@oddhead\@empty
 }
 %    \end{macrocode}
 %    \begin{environment}{Fullwidthtext}
@@ -3955,31 +3863,32 @@
 % in the \textsf{eqexam} package.
 %    \begin{macrocode}
 \def\webNotPaneledWarning{%
-    The Fullwidthtext environment is valid only\MessageBreak
-    for a paneled document, ignoring this\MessageBreak
-    environment}
+  The Fullwidthtext environment is valid only\MessageBreak
+  for a paneled document, ignoring this\MessageBreak
+  environment}
 \newenvironment{Fullwidthtext}{%
-    \ifnum\@panelconfig=0\relax
-        \PackageWarning{web}{\webNotPaneledWarning}%
-        \let\web@next\relax
-    \else
-        \def\web@next{%
-        \enableTemplate{BGColorAndGraphicFullWidth}%
-        \list{}{%
-            \setlength{\textwidth}{\fullscreenwidth}%
-            \setlength{\linewidth}{\fullscreenwidth}%
-            \setlength{\itemindent}{0pt}\setlength{\itemsep}{0pt}%
-            \setlength{\topsep}{0pt}\setlength{\parsep}{0pt}%
-            \setlength{\listparindent}{\parindent}%
-            \setlength{\leftmargin}{\web@leftMargAdj}%
-            \setlength{\rightmargin}{-\web@rightMargAdj}%
-        }\item\relax}%
-    \fi\web@next
+  \ifnum\@panelconfig=\@ne
+    \PackageWarning{web}{\webNotPaneledWarning}%
+    \let\web@next\relax
+  \else
+    \def\web@next{%
+    \enableTemplate{BGColorAndGraphicFullWidth}%
+    \list{}{%
+      \setlength{\textwidth}{\fullscreenwidth}%
+      \setlength{\linewidth}{\fullscreenwidth}%
+      \setlength{\itemindent}{0pt}\setlength{\itemsep}{0pt}%
+      \setlength{\topsep}{0pt}\setlength{\parsep}{0pt}%
+      \setlength{\listparindent}{\parindent}%
+      \setlength{\leftmargin}{\web@leftMargAdj}%
+      \setlength{\rightmargin}{-\web@rightMargAdj}%
+    }\item\relax}%
+  \fi\web@next
 }{%
-    \ifnum\@panelconfig=0\relax\let\web@next\relax\else
-        \def\web@next{\endlist\newpage
-        \disableTemplate{BGColorAndGraphicFullWidth}}%
-    \fi\web@next
+  \ifnum\@panelconfig=\z@
+    \let\web@next\relax\else
+    \def\web@next{\endlist\newpage
+    \disableTemplate{BGColorAndGraphicFullWidth}}%
+  \fi\web@next
 }
 %    \end{macrocode}
 %    \end{environment}
@@ -3987,24 +3896,24 @@
 % ``full page mode.''
 %    \begin{macrocode}
 \newcommand{\pushToFullWidthPage}{%
-    \ifnum\@panelconfig>0\relax
-        \disableScreens{gofullwidth}%
-        \disablePanels{gofullwidth}%
-        \makeFullwidthhead
-        \let\web@save@footwrapper\webfootwrapper
-        \def\webfootwrapper{\fullscreenwidthadj
-            \makebox[\fullscreenwidth]}%
-    \fi
-    \begin{Fullwidthtext}
+  \ifnum\@panelconfig>\z@
+    \disableScreens{gofullwidth}%
+    \disablePanels{gofullwidth}%
+    \makeFullwidthhead
+    \let\web@save@footwrapper\webfootwrapper
+    \def\webfootwrapper{\fullscreenwidthadj
+      \makebox[\fullscreenwidth]}%
+  \fi
+  \begin{Fullwidthtext}
 }
 \newcommand{\popFromFullWidthPage}{%
-    \end{Fullwidthtext}
-    \ifnum\@panelconfig>0\relax
-        \restoreScreens{gofullwidth}%
-        \restorePanels{gofullwidth}%
-        \restoreSavedHead
-        \let\webfootwrapper\web@save@footwrapper
-    \fi
+  \end{Fullwidthtext}
+  \ifnum\@panelconfig>\z@
+    \restoreScreens{gofullwidth}%
+    \restorePanels{gofullwidth}%
+    \restoreSavedHead
+    \let\webfootwrapper\web@save@footwrapper
+  \fi
 }
 %    \end{macrocode}
 % \DescribeMacro{\addtofullwidthtemplateArgs}\DescribeMacro{\clearfullwidthtemplateArgs}
@@ -4024,41 +3933,39 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 \let\web@fullwidthtemplate\@empty
-\newcommand{\fullwidthtemplate}[2][]
-{%
-    \ifweb@allowtemplates
-        \def\web@arg{#1}\ifx\web@argi\@empty
-        \xdef\web@fullwidthtemplate@opt@args
-            {\web@addtofullwidthtemplateArgs}%
-        \else
-            \xdef\web@fullwidthtemplate@opt@args
-                {\web@addtofullwidthtemplateArgs,#1}%
-        \fi\gdef\web@fullwidthtemplate{#2}%
-    \fi
+\newcommand{\fullwidthtemplate}[2][]{%
+  \ifweb@allowtemplates
+    \def\web@arg{#1}\ifx\web@argi\@empty
+    \xdef\web@fullwidthtemplate@opt@args
+      {\web@addtofullwidthtemplateArgs}%
+    \else
+      \xdef\web@fullwidthtemplate@opt@args
+        {\web@addtofullwidthtemplateArgs,#1}%
+    \fi\gdef\web@fullwidthtemplate{#2}%
+  \fi
 }
 %    \end{macrocode}
 % \DescribeMacro{\B{GColorAndGraphicFullWidth}} handles the full-width page
 % when left or right panels are in effect.
 %    \begin{macrocode}
-\newcommand\BGColorAndGraphicFullWidth
-{%
-    \put(-\@textX,0){%
-        \web@colorbox@w@transparency{\web@fullwidthBgColor}%
-        {%
-            \parbox[b][\paperheight]{\paperwidth}%
-            {%
-                \ifx\web@fullwidthtemplate\@empty
-                    \hfill\vfill
-                \else
-                    \hfuzz=1pt\vfuzz=1pt
-                    \expandafter\includegraphics\expandafter
-                    [\web@fullwidthtemplate@opt@args,%
-                    width=\paperwidth,height=\paperheight]%
-                    {\web@fullwidthtemplate}%
-                \fi
-            }%
-        }%
+\newcommand\BGColorAndGraphicFullWidth{%
+  \put(-\@textX,0){%
+    \web@colorbox@w@transparency{\web@fullwidthBgColor}%
+    {%
+      \parbox[b][\paperheight]{\paperwidth}%
+      {%
+        \ifx\web@fullwidthtemplate\@empty
+          \hfill\vfill
+        \else
+          \hfuzz=1pt\vfuzz=1pt
+          \expandafter\includegraphics\expandafter
+          [\web@fullwidthtemplate@opt@args,%
+          width=\paperwidth,height=\paperheight]%
+          {\web@fullwidthtemplate}%
+        \fi
+      }%
     }%
+  }%
 }
 %    \end{macrocode}
 % Here we ``register'' this template with the ``template handler'', and then
@@ -4070,19 +3977,19 @@
 %    \end{macrocode}
 % \subsubsection{\texorpdfstring{\protect\cs{AddToShipoutPicture}}{\CMD{AddToShipoutPicture}}}
 %    \begin{macrocode}
-\ifnum\@usetemplates>0
-    \ifnum\@panelconfig>0
+\ifnum\@usetemplates>\z@
+  \ifnum\@panelconfig>\z@
 %    \end{macrocode}
 % If the user calls for a left or right panel, then we issue separate templates.
 %    \begin{macrocode}
-        \AtBeginDocument{%
-            \AddToShipoutPicture{\web@textTemplate\web@panelTemplate}}
-    \else
+    \AtBeginDocument{%
+      \AddToShipoutPicture{\web@textTemplate\web@panelTemplate}}
+  \else
 %    \end{macrocode}
 % otherwise, we use only the \cs{web@textTemplate}
 %    \begin{macrocode}
-        \AtBeginDocument{\AddToShipoutPicture{\web@textTemplate}}
-    \fi
+    \AtBeginDocument{\AddToShipoutPicture{\web@textTemplate}}
+  \fi
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -4118,7 +4025,7 @@
 %\end{verbatim}
 %    \begin{macrocode}
 \newcommand{\DeclareDocInfo}[1]{\setkeys{aebDocInfo}{#1}%
-    \ifx\web@talkdate@value\@empty\else\let\webversion\webtalkdate\fi}
+  \ifx\web@talkdate@value\@empty\else\let\webversion\webtalkdate\fi}
 \@onlypreamble\DeclareDocInfo
 %    \end{macrocode}
 %    \end{macro}
@@ -4171,27 +4078,27 @@
 % \changes{v4.2h}{2012/01/13}{Added new keys for this set}
 %    \begin{macrocode}
 \define@key{aebDocInfo}{Title}[]%
-    {\@ifpackageloaded{aebxmp}{\Title{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\Title{#1}}{}}
 \define@key{aebDocInfo}{authors}[]%
-    {\@ifpackageloaded{aebxmp}{\Authors{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\Authors{#1}}{}}
 \define@key{aebDocInfo}{Subject}[]%
-    {\@ifpackageloaded{aebxmp}{\Subject{#1}}{\subject{#1}}}
+  {\@ifpackageloaded{aebxmp}{\Subject{#1}}{\subject{#1}}}
 \define@key{aebDocInfo}{Keywords}[]%
-    {\@ifpackageloaded{aebxmp}{\Keywords{#1}}{\keywords{#1}}}
+  {\@ifpackageloaded{aebxmp}{\Keywords{#1}}{\keywords{#1}}}
 \define@key{aebDocInfo}{lang}[]%
-    {\@ifpackageloaded{aebxmp}{\metaLang{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\metaLang{#1}}{}}
 \define@key{aebDocInfo}{copyrightStatus}[]%
-    {\@ifpackageloaded{aebxmp}{\copyrightStatus{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\copyrightStatus{#1}}{}}
 \define@key{aebDocInfo}{copyrightNotice}[]%
-    {\@ifpackageloaded{aebxmp}{\copyrightNotice{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\copyrightNotice{#1}}{}}
 \define@key{aebDocInfo}{copyrightInfoURL}[]%
-    {\@ifpackageloaded{aebxmp}{\copyrightInfoURL{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\copyrightInfoURL{#1}}{}}
 \define@key{aebDocInfo}{authortitle}[]%
-    {\@ifpackageloaded{aebxmp}{\authortitle{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\authortitle{#1}}{}}
 \define@key{aebDocInfo}{descriptionwriter}[]%
-    {\@ifpackageloaded{aebxmp}{\descriptionwriter{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\descriptionwriter{#1}}{}}
 \define@key{aebDocInfo}{customProperties}[]%
-    {\@ifpackageloaded{aebxmp}{\customProperties{#1}}{}}
+  {\@ifpackageloaded{aebxmp}{\customProperties{#1}}{}}
 %    \end{macrocode}
 %
 % \subsection{\texorpdfstring{\protect\cs{DeclarePageLayout}}{\CMD{DeclarePageLayout}}}
@@ -4221,39 +4128,35 @@
 % footer.
 %    \begin{macrocode}
 \newcommand{\DeclarePageLayout}[1]{\save@prtscr
-    \setkeys{web@pl}{topmargin,headheight,marginparsep,%
-        marginparwidth,marginparpush,webfootskip}%
-%    \setkeys{web@pl}{#1}%
-    \protected@edef\web@temp{\noexpand\setkeys{web@pl}{#1}}%
-    \web@temp\save@prtscr
-%    \setkeys{web@pl}{#1}%
-    \ifx\web@pl@screensize\@empty\else
-    \expandafter\screensize\web@pl@screensize\fi
-    \ifx\web@pl@margins\@empty\else
-    \expandafter\margins\web@pl@margins\fi
-    \ifeqforpaper\else
-        \ifdim\@Leftmargin<\@Rightmargin
-            \ifdim\marginparwidth>\@Leftmargin
-                \setlength{\marginparwidth}
-                    {\@Leftmargin-2\marginparsep}%
-            \fi
-        \else
-            \ifdim\marginparwidth>\@Rightmargin
-                \setlength{\marginparwidth}
-                    {\@Rightmargin-2\marginparsep}%
-            \fi
-        \fi
-    \fi
-    \ifeqforpaper\else
-        \ifdim\@Bottommargin<\web@footskip\relax\PackageError{web}{%
-            Error in the value of the webfootskip key\MessageBreak
-            of the \string\DeclarePageLayout\space command.\MessageBreak
-            The bottom margin must be larger then\MessageBreak
-            the value of webfootskip}{%
-            Increase the size of the bottom margin,\MessageBreak
-            or decrease the value of webfootskip.}\else
-        \fi
+  \setkeys{web@pl}{topmargin,headheight,marginparsep,%
+    marginparwidth,marginparpush,webfootskip}%
+  \protected@edef\web@temp{\noexpand\setkeys{web@pl}{#1}}%
+  \web@temp\save@prtscr
+  \ifx\web@pl@screensize\@empty\else
+  \expandafter\screensize\web@pl@screensize\fi
+  \ifx\web@pl@margins\@empty\else
+  \expandafter\margins\web@pl@margins\fi
+  \ifeqforpaper\else
+    \ifdim\@Leftmargin<\@Rightmargin
+      \ifdim\marginparwidth>\@Leftmargin
+        \setlength{\marginparwidth}
+          {\@Leftmargin-2\marginparsep}\fi
+    \else
+      \ifdim\marginparwidth>\@Rightmargin
+        \setlength{\marginparwidth}
+          {\@Rightmargin-2\marginparsep}\fi
     \fi
+  \fi
+  \ifeqforpaper\else
+    \ifdim\@Bottommargin<\web@footskip\relax\PackageError{web}{%
+      Error in the value of the webfootskip key\MessageBreak
+      of the \string\DeclarePageLayout\space command.\MessageBreak
+      The bottom margin must be larger then\MessageBreak
+      the value of webfootskip}{%
+      Increase the size of the bottom margin,\MessageBreak
+      or decrease the value of webfootskip.}\fi
+  \fi
+  \InitLayout
 }
 \@onlypreamble\DeclarePageLayout
 %    \end{macrocode}
@@ -4270,8 +4173,8 @@
 \define@key{web@pl}{margins}[]{\def\web@pl@margins{#1}}
 \let\web@pl@margins\@empty
 \define@choicekey+{web@pl}{design}[\val\nr]{designi,designii,%
-    designiii,designiv,designv,designvi,designvii,designviii,designix}{%
-    \ifcase\nr\relax
+  designiii,designiv,designv,designvi,designvii,designviii,designix}{%
+  \ifcase\nr\relax
     \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}\or
     \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}\or
     \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}\or
@@ -4281,22 +4184,22 @@
     \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}\or
     \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}\or
     \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}\fi
-    }{\PackageWarning{webpro}{%
-    Bad choice for design, use designi--designvix. Try again}}
+  }{\PackageWarning{webpro}{%
+  Bad choice for design, use designi--designvix. Try again}}
 \define@choicekey+{web@pl}{screensizeOf}[\val\nr]{designi,designii,%
-    designiii,designiv,designv,designvi,designvii,designviii,designix}{%
-    \ifcase\nr\relax
-        \screensize{3.736in}{4.67in}\or
-        \screensize{4.5in}{5in}\or
-        \screensize{5in}{6in}\or
-        \screensize{4in}{5in}\or
-        \screensize{4.5in}{6in}\or
-        \screensize{4.17in}{4.67in}\or
-        \screensize{7.5in}{10in}\or
-        \screensize{3.75in}{6.67in}\or
-        \screensize{3.75in}{6in}\fi
-    }{\PackageWarning{webpro}{%
-    Bad choice for screensizeOf, use designi--designvix. Try again}}
+  designiii,designiv,designv,designvi,designvii,designviii,designix}{%
+  \ifcase\nr\relax
+    \screensize{3.736in}{4.67in}\or
+    \screensize{4.5in}{5in}\or
+    \screensize{5in}{6in}\or
+    \screensize{4in}{5in}\or
+    \screensize{4.5in}{6in}\or
+    \screensize{4.17in}{4.67in}\or
+    \screensize{7.5in}{10in}\or
+    \screensize{3.75in}{6.67in}\or
+    \screensize{3.75in}{6in}\fi
+  }{\PackageWarning{webpro}{%
+  Bad choice for screensizeOf, use designi--designvix. Try again}}
 \define@key{web@pl}{headheight}[8pt]{\def\websetheadheight{#1}}
 %    \end{macrocode}
 %Key-values of \cs{DeclarePageLayout} continues.
@@ -4307,20 +4210,18 @@
 %\IndexKey{evensidemargin}
 %    \begin{macrocode}
 \define@key{web@pl}{topmargin}[\prtscr{\the\topmargin}{8pt}]{%
-    \edef\web@argi{#1}\ifx\web@argi\@empty
-    \edef\web@argi{\prtscr{\the\topmargin}{8pt}}\fi
-    \ifeqforpaper
-        \setlength{\topmargin}{\web@argi}%
-    \else
-        \setlength{\web@Topmargin}{\web@argi}%
-    \fi}
+  \edef\web@argi{#1}\ifx\web@argi\@empty
+  \edef\web@argi{\prtscr{\the\topmargin}{8pt}}\fi
+  \ifeqforpaper
+    \setlength{\topmargin}{\web@argi}\else
+    \setlength{\web@Topmargin}{\web@argi}\fi}
 \define@key{web@pl}{textwidth}[345pt]{\setlength{\textwidth}{#1}}
 \define@key{web@pl}{textheight}[43\baselineskip]%
-    {\setlength{\textheight}{#1}}
+  {\setlength{\textheight}{#1}}
 \define@key{web@pl}{oddsidemargin}[63pt]%
-    {\setlength{\oddsidemargin}{#1}}
+  {\setlength{\oddsidemargin}{#1}}
 \define@key{web@pl}{evensidemargin}[63pt]%
-    {\setlength{\evensidemargin}{#1}}
+  {\setlength{\evensidemargin}{#1}}
 %    \end{macrocode}
 % More key-values of \cs{DeclarePageLayout}.
 %\IndexKey{marginparsep}
@@ -4333,23 +4234,23 @@
 %\IndexKey{additionalheadsep}
 %    \begin{macrocode}
 \define@key{web@pl}{marginparsep}[\prtscr{\the\marginparsep}{11pt}]{%
-    \edef\web@argi{#1}\ifx\web@argi\@empty
-    \edef\web@argi{\prtscr{\the\marginparsep}{11pt}}\fi
-    \setlength{\marginparsep}{\web@argi}}
+  \edef\web@argi{#1}\ifx\web@argi\@empty
+  \edef\web@argi{\prtscr{\the\marginparsep}{11pt}}\fi
+  \setlength{\marginparsep}{\web@argi}}
 \define@key{web@pl}{marginparwidth}%
-    [\prtscr{\the\marginparwidth}{.25in}]{%
-    \edef\web@argi{#1}\ifx\web@argi\@empty
-    \edef\web@argi{\prtscr{\the\marginparwidth}{.25in}}\fi
-    \setlength{\marginparwidth}{\web@argi}}
+  [\prtscr{\the\marginparwidth}{.25in}]{%
+  \edef\web@argi{#1}\ifx\web@argi\@empty
+  \edef\web@argi{\prtscr{\the\marginparwidth}{.25in}}\fi
+  \setlength{\marginparwidth}{\web@argi}}
 \define@key{web@pl}{marginparpush}[5pt]{%
-    \setlength{\marginparpush}{#1}}
+  \setlength{\marginparpush}{#1}}
 \define@key{web@pl}{webfootskip}[4pt]{%
-    \def\web@footskip{#1}}
+  \def\web@footskip{#1}}
 \define@key{web@pl}{footskip}[30pt]{\setlength{\footskip}{#1}}
 \define@key{web@pl}{panelwidth}[1in]{\panelwidth{#1}}
 \define@key{web@pl}{panelsep}[10pt]{\panelsep{#1}}
 \define@key{web@pl}{additionalheadsep}[0pt]%
-    {\def\web@additionalheadsep{#1}}
+  {\def\web@additionalheadsep{#1}}
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -4369,32 +4270,32 @@
 % default. The alignment is set by \cs{halignuniversity}. The UI for this
 % value is the \texttt{xhalign} key of \cs{universityLayout}.
 %    \begin{macrocode}
-    \vglue\web@aboveTopTitleSkip
-    \noindent\makebox[\linewidth][\halignuniversity]{\parbox{%
-        \hproportionwebuniversity\linewidth}%
-    {\sectionUniversity{\webuniversity}}}%
-    \par\ifeqforpaper\else\minimumskip\fi
-        \vspace{\stretch{1}}%
+  \vglue\web@aboveTopTitleSkip\noindent
+  \makebox[\linewidth][\halignuniversity]{\parbox{%
+    \hproportionwebuniversity\linewidth}%
+    {\sectionUniversity{\webuniversity}}}\par
+  \ifeqforpaper\else\minimumskip\fi
+  \vspace{\stretch{1}}\noindent
 %    \end{macrocode}
 % Have \cs{webtitle} centered across the top of the title page, by
 % default. The alignment is set by \cs{haligntitle}. The UI for this
 % value is the \texttt{xhalign} key of \cs{titleLayout}.
 %    \begin{macrocode}
-    \noindent\makebox[\linewidth][\haligntitle]%
-        {\parbox{\hproportionwebtitle\linewidth}%
-        {\sectionTitle{\webtitle}}}%
-        \par\ifeqforpaper\vspace{2\baselineskip}\else
-        \minimumskip\vspace{\stretch{1}}\fi
+  \makebox[\linewidth][\haligntitle]%
+    {\parbox{\hproportionwebtitle\linewidth}%
+    {\sectionTitle{\webtitle}}}%
+    \par\ifeqforpaper\vspace{2\baselineskip}\else
+    \minimumskip\vspace{\stretch{1}}\fi\noindent
 %    \end{macrocode}
 % Have \cs{webauthor} centered across the top of the title page, by
 % default. The alignment is set by \cs{halignauthor}. The UI for this
 % value is the \texttt{xhalign} key of \cs{authorLayout}.
 %    \begin{macrocode}
-    \noindent\makebox[\linewidth][\halignauthor]%
-        {\parbox{\hproportionwebauthor\linewidth}%
-        {\sectionAuthor{\webauthor}}}
-        \par\ifeqforpaper\vspace{2\baselineskip}\else
-        \minimumskip\vspace{\stretch{1}}\fi
+  \makebox[\linewidth][\halignauthor]%
+    {\parbox{\hproportionwebauthor\linewidth}%
+    {\sectionAuthor{\webauthor}}}
+    \par\ifeqforpaper\vspace{2\baselineskip}\else
+    \minimumskip\vspace{\stretch{1}}\fi
 }
 \newcommand{\topTitlePageProportion}[1]{\def\titleauthorproportion{#1}}
 %    \end{macrocode}
@@ -4408,13 +4309,13 @@
 %    \begin{macrocode}
 \renewcommand{\titlepageTrailer}
 {%
-    \webtpTrailerWrapper{\makebox[\web@tp@linewidth]{%
-        \parbox{\web@tp@linewidth}{%
-        \ifx\tpTrailer@textcolor\@empty\else
-        \color{\tpTrailer@textcolor}\fi\web@tpTrailer@formatting
-        \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\
-        \maketitle@trailer@ll\hfill\maketitle@trailer@lr
-    }}}%
+  \webtpTrailerWrapper{\makebox[\web@tp@linewidth]{%
+    \parbox{\web@tp@linewidth}{%
+    \ifx\tpTrailer@textcolor\@empty\else
+    \color{\tpTrailer@textcolor}\fi\web@tpTrailer@formatting
+    \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\
+    \maketitle@trailer@ll\hfill\maketitle@trailer@lr
+  }}}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -4423,7 +4324,7 @@
 % the default.
 %    \begin{macrocode}
 \def\maketitle@trailer@ul{\web@copyright\ \web@copyright@symbol\
-    \webcopyrightyears\ \thewebemail}
+  \webcopyrightyears\ \thewebemail}
 \def\maketitle@trailer@ll{\aeb@Prepared}
 \def\maketitle@trailer@ur{\aeb@talksite}
 \def\maketitle@trailer@lr{\webversion}
@@ -4438,12 +4339,12 @@
 \def\web@tp@linewidth{\linewidth}
 %    \end{macrocode}
 % Key-values of \cmd{\DesignTitlePageTrailer}
-% \IndexKey{ul}
-% \IndexKey{ll}
-% \IndexKey{ur}
-% \IndexKey{lr}
-% \IndexKey{textColor}
-% \IndexKey{bgColor}
+% \IndexKey{ul}^^A
+% \IndexKey{ll}^^A
+% \IndexKey{ur}^^A
+% \IndexKey{lr}^^A
+% \IndexKey{textColor}^^A
+% \IndexKey{bgColor}^^A
 %    \begin{macrocode}
 \define@key{tpTrailer}{ul}{\def\maketitle@trailer@ul{#1}}
 \define@key{tpTrailer}{ll}{\def\maketitle@trailer@ll{#1}}
@@ -4452,12 +4353,12 @@
 \define@key{tpTrailer}{textColor}{\def\tpTrailer@textcolor{#1}}
 \define@key{tpTrailer}{bgColor}{\def\web@tpTrailerBgColor{#1}}
 %    \end{macrocode}
-% Key-values of \cmd{\DesignTitlePageTrailer}
-% \IndexKey{borderColor}
-% \IndexKey{fboxsep}
-% \IndexKey{fboxrule}
-% \IndexKey{graphic}
-% \IndexKey{namedgraphic}
+% More key-values of \cmd{\DesignTitlePageTrailer}
+% \IndexKey{borderColor}^^A
+% \IndexKey{fboxsep}^^A
+% \IndexKey{fboxrule}^^A
+% \IndexKey{graphic}^^A
+% \IndexKey{namedgraphic}^^A
 %    \begin{macrocode}
 \define@key{tpTrailer}{borderColor}{\def\web@tpTrailerBorderColor{#1}}
 \define@key{tpTrailer}{fboxsep}{\def\web@tpTrailerfboxsep{#1}}
@@ -4466,71 +4367,71 @@
 \define@key{tpTrailer}{namedgraphic}{%
     \def\web@tpTrailer@namedgraphic{#1}}
 %    \end{macrocode}
-% Key-values of \cmd{\DesignTitlePageTrailer}
-% \IndexKey{fontSize}
+% Key-values of \cmd{\DesignTitlePageTrailer}, continued.
+% \IndexKey{fontSize}^^A
 % \IndexKey{formatting}
-% \IndexKey{raise}
+% \IndexKey{raise}^^A
 %    \begin{macrocode}
 \define@key{tpTrailer}{fontSize}{\renewcommand{\trailerFontSize}{#1}}
 \define@key{tpTrailer}{formatting}{\def\web@tpTrailer@formatting{#1}}
 \define@key{tpTrailer}{raise}{\def\web@tpTrailer@raise{#1}}
 \newcommand{\DesignTitlePageTrailer}[1]
 {%
-    \setkeys{tpTrailer}{fboxsep=3pt,fboxrule=.4pt}%
-    \setkeys{tpTrailer}{#1}%
-    \setlength{\fboxsep}{\web@tpTrailerfboxsep}%
-    \setlength{\fboxrule}{\web@tpTrailerfboxrule}%
-    \let\web@tp@graphic\web@NO
-    \ifx\web@tpTrailer@graphic\@empty
-        \ifx\web@tpTrailer@namedgraphic\@empty\else
-            \let\web@tp@graphic\web@YES\fi
-    \else\let\web@tp@graphic\web@YES\fi
-    \ifx\web@tp@graphic\web@NO\relax
-        \ifx\web@tpTrailerBgColor\@empty
-            \def\grfbox@spec##1{##1}%
-        \else
-            \ifx\web@tpTrailerBorderColor\@empty
-                \def\web@tp@linewidth{\linewidth-2\fboxsep}%
-                \def\grfbox@spec{\colorbox{\web@tpTrailerBgColor}}%
-            \else
-                \def\web@tp@linewidth{%
-                    \linewidth-2\fboxsep-2\fboxrule}%
-                \def\grfbox@spec{\fcolorbox{\web@tpTrailerBorderColor}%
-                        {\web@tpTrailerBgColor}}%
-            \fi
-        \fi
-        \def\webtpTrailerWrapper##1{\smash{\raisebox
-            {\web@tpTrailer@raise}{\grfbox@spec{##1}}}}%
+  \setkeys{tpTrailer}{fboxsep=3pt,fboxrule=.4pt}%
+  \setkeys{tpTrailer}{#1}%
+  \setlength{\fboxsep}{\web@tpTrailerfboxsep}%
+  \setlength{\fboxrule}{\web@tpTrailerfboxrule}%
+  \let\web@tp@graphic\web@NO
+  \ifx\web@tpTrailer@graphic\@empty
+    \ifx\web@tpTrailer@namedgraphic\@empty\else
+      \let\web@tp@graphic\web@YES\fi
+  \else\let\web@tp@graphic\web@YES\fi
+  \ifx\web@tp@graphic\web@NO\relax
+    \ifx\web@tpTrailerBgColor\@empty
+      \def\grfbox@spec##1{##1}%
     \else
-        \@ifundefined{graphicxbox}{\begingroup
-        \gdef\webtpTrailerWrapper##1{%
-        \edef\web@tmp@opt{\ifx\web@tpTrailer@namedgraphic\@empty\else
-            name=\web@tpTrailer@namedgraphic,\fi}%
-            \def\web@tp@linewidth{\linewidth-2\fboxsep}%
-            \setbox0=\hbox{##1}%
-            \noindent\makebox[0pt][l]{%
-                \smash{\raisebox{-\dp0-\fboxsep+\web@tpTrailer@raise}{%
-                \expandafter\includegraphics\expandafter[\web@tmp@opt
-                 width=\wd0+2\fboxsep,%
-                 height=\dp0+\ht0+2\fboxsep]{\web@tpTrailer@graphic}}%
-            }}\kern\fboxsep\smash{%
-                \raisebox{\web@tpTrailer@raise}{\unhbox0\relax}}%
-        }%
-        \endgroup}{%
-        \xdef\grfbox@spec{%
-            \ifx\web@tpTrailerBorderColor\@empty
-                \noexpand\graphicxbox\else
-            \noexpand\fgraphicxbox{\web@tpTrailerBorderColor}\fi
-            \ifx\web@tpTrailer@namedgraphic\@empty\else
-                [name=\web@tpTrailer@namedgraphic]\fi}%
-        \gdef\webtpTrailerWrapper##1{%
-            \edef\web@tp@linewidth{%
-            \linewidth-2\fboxsep\ifx\web@tpTrailerBorderColor\@empty
-                \else-2\fboxrule\fi}%
-            \smash{\raisebox{\web@tpTrailer@raise}{%
-                \grfbox@spec{\web@tpTrailer@graphic}{##1}}}}%
-        }%
+      \ifx\web@tpTrailerBorderColor\@empty
+        \def\web@tp@linewidth{\linewidth-2\fboxsep}%
+        \def\grfbox@spec{\colorbox{\web@tpTrailerBgColor}}%
+      \else
+        \def\web@tp@linewidth{%
+          \linewidth-2\fboxsep-2\fboxrule}%
+        \def\grfbox@spec{\fcolorbox{\web@tpTrailerBorderColor}%
+          {\web@tpTrailerBgColor}}%
+      \fi
     \fi
+    \def\webtpTrailerWrapper##1{\smash{\raisebox
+      {\web@tpTrailer@raise}{\grfbox@spec{##1}}}}%
+  \else
+    \@ifundefined{graphicxbox}{\begingroup
+      \gdef\webtpTrailerWrapper##1{%
+      \edef\web@tmp@opt{\ifx\web@tpTrailer@namedgraphic\@empty\else
+        name=\web@tpTrailer@namedgraphic,\fi}%
+        \def\web@tp@linewidth{\linewidth-2\fboxsep}%
+        \setbox0=\hbox{##1}%
+        \noindent\makebox[0pt][l]{%
+            \smash{\raisebox{-\dp0-\fboxsep+\web@tpTrailer@raise}{%
+            \expandafter\includegraphics\expandafter[\web@tmp@opt
+             width=\wd0+2\fboxsep,%
+             height=\dp0+\ht0+2\fboxsep]{\web@tpTrailer@graphic}}%
+        }}\kern\fboxsep\smash{%
+          \raisebox{\web@tpTrailer@raise}{\unhbox0\relax}}%
+      }%
+    \endgroup}{%
+      \xdef\grfbox@spec{%
+        \ifx\web@tpTrailerBorderColor\@empty
+          \noexpand\graphicxbox\else
+        \noexpand\fgraphicxbox{\web@tpTrailerBorderColor}\fi
+        \ifx\web@tpTrailer@namedgraphic\@empty\else
+          [name=\web@tpTrailer@namedgraphic]\fi}%
+      \gdef\webtpTrailerWrapper##1{%
+        \edef\web@tp@linewidth{%
+        \linewidth-2\fboxsep\ifx\web@tpTrailerBorderColor\@empty
+          \else-2\fboxrule\fi}%
+        \smash{\raisebox{\web@tpTrailer@raise}{%
+          \grfbox@spec{\web@tpTrailer@graphic}{##1}}}}%
+    }%
+  \fi
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -4547,36 +4448,36 @@
 % This value can be set by direct definition, or through the helper command
 % \cs{topTitlePageProportion}.
 %    \begin{macrocode}
-    \maketitlepreamble
+  \maketitlepreamble
 %    \end{macrocode}
 %    \begin{macrocode}
-    \ifeqforpaper\vspace*{2\baselineskip}\else
+  \ifeqforpaper\vspace*{2\baselineskip}\else
     \vbox to\titleauthorproportion\textheight\bgroup\fi
 %    \end{macrocode}
 %    \begin{macrocode}
-    \topTitlePage
+  \topTitlePage
 %    \end{macrocode}
 %    \begin{macrocode}
-    \ifeqforpaper\else\egroup\fi % end of \vbox for title and author
+  \ifeqforpaper\else\egroup\fi % end of \vbox for title and author
 %    \end{macrocode}
 % Now place the \cs{optionalpagematter}
 %    \begin{macrocode}
-    \begingroup\par
-    \aboveOPMvspace
-    \noindent\parbox{\linewidth}{\optionalpagematter}%
-    \par\endgroup
-    \par\vspace{\stretch{1}}
+  \begingroup\par
+    \aboveOPMvspace\noindent
+      \parbox{\linewidth}{\optionalpagematter}\par
+    \endgroup
+  \par\vspace{\stretch{1}}
 %    \end{macrocode}
 % Insert the directory, as desired.
 %    \begin{macrocode}
-    \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi
-    \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}
+  \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi
+    \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}%
 %    \end{macrocode}
 % Insert the ``bottom matter''.
 %    \begin{macrocode}
-    \vfill\noindent\begingroup\trailerFontSize\titlepageTrailer
-    \par\endgroup
-    \maketitlepostamble
+  \vfill\noindent\begingroup\trailerFontSize\titlepageTrailer
+  \par\endgroup
+  \maketitlepostamble
 }
 \let\web@maketitle@save\maketitle
 \let\maketitle\web@maketitle
@@ -4601,7 +4502,7 @@
 % to describe where this talk occurred.
 %    \begin{macrocode}
 \def\talkdate#1{\gdef\web@talkdate@value{#1}%
-    \edef\webtalkdate{\ifx\web@talkdate@value\@empty
+  \edef\webtalkdate{\ifx\web@talkdate@value\@empty
    \else\noexpand\web@talkdatelabel\ #1\fi}}
 \let\web@talkdate@value\@empty
 %\def\talkdateLabel#1{\def\web@versionlabel{#1}}
@@ -4618,48 +4519,50 @@
 % \IndexKey{reset}
 %    \begin{macrocode}
 \define@choicekey+{aebsection}{reset}[\val\nr]{font,all}{%
-    \ifcase\nr\relax
-        \aeb@reset@section@fonts\or
-        \aeb@reset@section@all\fi
+  \ifcase\nr\relax
+    \aeb@reset@section@fonts\or
+    \aeb@reset@section@all
+  \fi
 }{\PackageWarning{webpro}{Bad choice for reset, permissible values
    are font and all. Try again}}
 %    \end{macrocode}
 % Section headings
-% \IndexKey{type}
-% \IndexKey{special}
+% \IndexKey{type}^^A
+% \IndexKey{special}^^A
 %    \begin{macrocode}
 \define@choicekey+{aebsection}{type}[\val\nr]{section,subsection,%
-    subsubsection,university,title,author,toc}%
+  subsubsection,university,title,author,toc}%
 {%
-    \edef\aeb@section@type{#1}%
-    \edef\aeb@section@typeIndex{\nr}%
+  \edef\aeb@section@type{#1}%
+  \edef\aeb@section@typeIndex{\nr}%
 }{}{}
 \define@key{aebsection}{special}{%
-    \edef\aeb@temp@expand{%
-        \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}%
-    \aeb@temp@expand{shadow,framebox,colorbox,fcolorbox,frameboxfit,%
-    colorboxfit,fcolorboxfit,colorboxfitrule,custom,default}%
+  \edef\aeb@temp@expand{%
+    \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}%
+  \aeb@temp@expand{shadow,framebox,colorbox,fcolorbox,frameboxfit,%
+  colorboxfit,fcolorboxfit,colorboxfitrule,custom,default}%
 {%
   \ifcase\nr\relax
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@shadowHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@fcolorboxHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxfitHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxfitHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}
-        \aeb@fcolorboxfitHead\or
-     \w@csarg\let{aeb@\aeb@section@type @special}
-        \aeb@colorboxfitruleHead\or
-     \edef\aeb@temp{\noexpand\def\expandafter\noexpand
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@shadowHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@fcolorboxHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxfitHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxfitHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}
+    \aeb@fcolorboxfitHead\or
+    \w@csarg\let{aeb@\aeb@section@type @special}
+    \aeb@colorboxfitruleHead\or
+    \edef\aeb@temp{\noexpand\def\expandafter\noexpand
     \csname aeb@\aeb@section@type @special\endcsname{\expandafter
-        \noexpand\csname aeb@\aeb@section@type @customHead\endcsname}}%
-        \aeb@temp\or
-     \w@csarg\let{aeb@\aeb@section@type @special}\@empty\fi
+      \noexpand\csname aeb@\aeb@section@type @customHead\endcsname}}%
+      \aeb@temp\or
+    \w@csarg\let{aeb@\aeb@section@type @special}\@empty
+  \fi
 }{%
-   \PackageWarning{webpro}{Bad choice for special, permissible values
-   are shadow, framebox, colorbox, fcolorbox, custom and default.
-   Try again}}%
+ \PackageWarning{webpro}{Bad choice for special, permissible values
+ are shadow, framebox, colorbox, fcolorbox, custom and default.
+ Try again}}%
 }
 \@tfor\@@tmp:={section}{subsection}{subsubsection}%
 {university}{title}{author}{toc}\do{%
@@ -4693,86 +4596,87 @@
 % The command\DescribeMacro{\aeb@frameboxHead} for \texttt{special=framebox}.
 %    \begin{macrocode}
 \def\aeb@frameboxHead#1{%
-    \begingroup
+  \begingroup
     \@tempdima=\linewidth
     \advance\@tempdima-2\fboxsep
     \advance\@tempdima-2\fboxrule
     \edef\@@aeb@sectionframecolor
-        {\@nameuse{aeb@\aeb@section@type framecolor}}%
+      {\@nameuse{aeb@\aeb@section@type framecolor}}%
     \edef\@@aeb@sectioncolor
-        {\@nameuse{aeb@\aeb@section@type color}}%
-    \setbox0\vbox{\hsize=\@tempdima#1}\color{\@@aeb@sectionframecolor}%
-    \framebox{\color{\@@aeb@sectioncolor}\copy0}%
-    \endgroup
+      {\@nameuse{aeb@\aeb@section@type color}}%
+    \setbox\z@\vbox{\hsize=\@tempdima#1}%
+    \color{\@@aeb@sectionframecolor}%
+    \framebox{\color{\@@aeb@sectioncolor}\copy\z@}%
+  \endgroup
 }
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@colorboxHead} for \texttt{special=colorbox}.
 %    \begin{macrocode}
 \def\aeb@colorboxHead#1{%
-    \begingroup
+  \begingroup
     \@tempdima=\linewidth
     \advance\@tempdima-2\fboxsep
-    \setbox0\vbox{\hsize=\@tempdima#1}%
+    \setbox\z@\vbox{\hsize=\@tempdima#1}%
     \edef\@@aeb@sectionbgcolor
         {\@nameuse{aeb@\aeb@section@type bgcolor}}%
-    \colorbox{\@@aeb@sectionbgcolor}{\copy0}%
-    \endgroup
+    \colorbox{\@@aeb@sectionbgcolor}{\copy\z@}%
+  \endgroup
 }
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@fcolorboxHead} for \texttt{special=fcolorbox}.
 %    \begin{macrocode}
 \def\aeb@fcolorboxHead#1{%
-    \begingroup
-    \@tempdima=\linewidth
+  \begingroup
+  \@tempdima=\linewidth
     \advance\@tempdima-2\fboxsep
     \advance\@tempdima-2\fboxrule
-    \setbox0\vbox{\hsize=\@tempdima#1}%
+    \setbox\z@\vbox{\hsize=\@tempdima#1}%
     \edef\@@aeb@sectionbgcolor
-        {\@nameuse{aeb@\aeb@section@type bgcolor}}%
+      {\@nameuse{aeb@\aeb@section@type bgcolor}}%
     \fcolorbox{\aeb@sectionframecolor}%
-    {\@@aeb@sectionbgcolor}{\copy0}
-    \endgroup
+    {\@@aeb@sectionbgcolor}{\copy\z@}
+  \endgroup
 }
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@frameboxfitHead} for \texttt{special=frameboxfit}.
 %    \begin{macrocode}
 \def\aeb@frameboxfitHead#1{%
-    \begingroup
+  \begingroup
     \edef\@@aeb@sectionframecolor
-        {\@nameuse{aeb@\aeb@section@type framecolor}}%
+      {\@nameuse{aeb@\aeb@section@type framecolor}}%
     \edef\@@aeb@sectioncolor
-        {\@nameuse{aeb@\aeb@section@type color}}%
+      {\@nameuse{aeb@\aeb@section@type color}}%
     \vbox{\color{\@@aeb@sectionframecolor}%
     \framebox{\color{\@@aeb@sectioncolor}#1}}%
-    \endgroup
+  \endgroup
 }
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@colorboxfitHead} for \texttt{special=colorboxfit}.
 %    \begin{macrocode}
 \def\aeb@colorboxfitHead#1{%
-    \begingroup
+  \begingroup
     \edef\@@aeb@sectioncolor
-        {\@nameuse{aeb@\aeb@section@type color}}%
+      {\@nameuse{aeb@\aeb@section@type color}}%
     \edef\@@aeb@sectionbgcolor
-        {\@nameuse{aeb@\aeb@section@type bgcolor}}%
+      {\@nameuse{aeb@\aeb@section@type bgcolor}}%
     \vbox{\colorbox{\@@aeb@sectionbgcolor}%
-    {\color{\@@aeb@sectioncolor}#1}}%
-    \endgroup
+      {\color{\@@aeb@sectioncolor}#1}}%
+  \endgroup
 }
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@fcolorboxfitHead} for \texttt{special=fcolorboxfit}.
 %    \begin{macrocode}
 \def\aeb@fcolorboxfitHead#1{%
-    \begingroup
+  \begingroup
     \edef\@@aeb@sectioncolor
-        {\@nameuse{aeb@\aeb@section@type color}}%
+      {\@nameuse{aeb@\aeb@section@type color}}%
     \edef\@@aeb@sectionbgcolor
-        {\@nameuse{aeb@\aeb@section@type bgcolor}}%
+      {\@nameuse{aeb@\aeb@section@type bgcolor}}%
     \edef\@@aeb@sectionframecolor
-        {\@nameuse{aeb@\aeb@section@type framecolor}}%
+      {\@nameuse{aeb@\aeb@section@type framecolor}}%
     \vbox{\fcolorbox{\@@aeb@sectionframecolor}{\@@aeb@sectionbgcolor}%
-    {\color{\@@aeb@sectioncolor}#1}}%
-    \endgroup
+      {\color{\@@aeb@sectioncolor}#1}}%
+  \endgroup
 }
 %    \end{macrocode}
 % Here we define \DescribeMacro{\shadowhoffset}\cs{shadowhoffset} and
@@ -4786,95 +4690,95 @@
 %    \end{macrocode}
 % The command\DescribeMacro{\aeb@shadowHead} for \texttt{special=shadow}.
 %    \begin{macrocode}
-\def\aeb@shadowHead#1{% dps1
-    \begingroup
+\def\aeb@shadowHead#1{%
+  \begingroup
     \edef\@@aeb@sectionshadowcolor
-        {\@nameuse{aeb@\aeb@section@type shadowcolor}}%
+      {\@nameuse{aeb@\aeb@section@type shadowcolor}}%
     \edef\@@aeb@sectioncolor
-        {\@nameuse{aeb@\aeb@section@type color}}%
-    \setbox0\vbox{\Shadowtrue\hsize=\linewidth #1}%
-    \wd0\z@\dp0\z@\relax\raisebox{\aeb@shadowvoffset}%
+      {\@nameuse{aeb@\aeb@section@type color}}%
+    \setbox\z@\vbox{\Shadowtrue\hsize=\linewidth #1}%
+    \wd\z@\z@\dp\z@\z@\raisebox{\aeb@shadowvoffset}%
     {\hbox to\z@{\kern\aeb@shadowhoffset%
     \Shadowtrue\color{\@@aeb@sectionshadowcolor}
-    \box0\hss}}%
-    \setbox0\vbox{\Shadowfalse\hsize=\linewidth #1}\box0
-    \endgroup
+    \box\z@\hss}}\setbox\z@
+      \vbox{\Shadowfalse\hsize=\linewidth #1}\box\z@
+  \endgroup
 }
 %    \end{macrocode}
 % \texttt{usefont}\IndexKey{usefont} allows for a custom shift in font for the title.
 % it takes four argument, each of which are enclosed in braces:
-%\begin{verbatim}
-%   {<fontencoding>}{<fontfamily>}{<fontseries>}{<fontshape>}
-%       {{<fontsize>}{<skip>}}
-%\end{verbatim}
+%\begin{Verbatim}[xleftmargin=\parindent,fontsize=\small,
+%commandchars={!()},codes={\catcode`\%=9}]
+%   {!ameta(fontencoding)}{!ameta(fontfamily)}{!ameta(fontseries)}{!ameta(fontshape)}
+%       {{!ameta(fontsize)}{!ameta(skip)}}
+%\end{Verbatim}
 %    \begin{macrocode}
 \define@key{aebsection}{usefont}{%
-    \w@csarg\def{aeb@\aeb@section@type @usefont}{\aeb@usefont#1}}
+  \w@csarg\def{aeb@\aeb@section@type @usefont}{\aeb@usefont#1}}
 \@tfor\@@tmp:={section}{subsection}{subsubsection}
-{university}{title}{author}{toc}\do{%
+  {university}{title}{author}{toc}\do{%
     \w@csarg\let{aeb@\@@tmp @usefont}\@empty}
 \def\aeb@usefont#1#2#3#4#5{\def\aeb@usefontargv{#5}%
-    \ifx\aeb@usefontargv\@empty
+  \ifx\aeb@usefontargv\@empty
 %    \end{macrocode}
 % If the fifth parameter is empty, no font size is specified, we'll
 % use the default sizes. We gobble up the next three tokens in the
 % definition of \cs{section}, excluding the token that sets size.
 %    \begin{macrocode}
-        \def\aeb@next{\expandafter\@gobble\@gobbletwo}%
-    \else
+    \def\aeb@next{\expandafter\@gobble\@gobbletwo}%
+  \else
 %    \end{macrocode}
 % If the fifth parameter is not empty, font size is specified,
 % we'll gobble up the next four tokens in the
 % definition of \cs{section}, including the token that sets size.
 %    \begin{macrocode}
-        \def\aeb@next{\expandafter\@gobbletwo\@gobbletwo}%
-    \fi
-    \fontencoding{#1}\fontfamily{#2}%
-    \fontseries{#3}\fontshape{#4}\ifx\aeb@usefontargv\@empty\else
-    \fontsize#5\fi\selectfont\aeb@next
+    \def\aeb@next{\expandafter\@gobbletwo\@gobbletwo}%
+  \fi
+  \fontencoding{#1}\fontfamily{#2}%
+  \fontseries{#3}\fontshape{#4}\ifx\aeb@usefontargv\@empty\else
+  \fontsize#5\fi\selectfont\aeb@next
 }
 %    \end{macrocode}
 % Font related keys.\IndexKey{fontfamily}\IndexKey{fontseries}\IndexKey{fontshape}
 %    \begin{macrocode}
 \define@key{aebsection}{fontfamily}{%
-    \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
-    \aeb@temp@expand{rmfamily,sffamily,ttfamily}{%
-    \w@csarg\def{aeb@\aeb@section@type @fontfamily}{\@nameuse{#1}}%
+  \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
+  \aeb@temp@expand{rmfamily,sffamily,ttfamily}{%
+  \w@csarg\def{aeb@\aeb@section@type @fontfamily}{\@nameuse{#1}}%
 }{\PackageWarning{webpro}{Bad choice for fontfamily, permissible values
-   are rmfamily, sffamily and ttfamily. Try again}}%
-}
+  are rmfamily, sffamily and ttfamily. Try again}}}
 \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}%
-{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontfamily}\aeb@defaultfamily}
+  {author}{toc}\do
+  {\w@csarg\let{aeb@\@@tmp @fontfamily}\aeb@defaultfamily}
 \define@key{aebsection}{fontseries}{%
-    \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
-    \aeb@temp@expand{bfseries,mdseries}{%
-    \w@csarg\def{aeb@\aeb@section@type @fontseries}{\@nameuse{#1}}%
+  \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
+  \aeb@temp@expand{bfseries,mdseries}{%
+  \w@csarg\def{aeb@\aeb@section@type @fontseries}{\@nameuse{#1}}%
 }{\PackageWarning{webpro}{Bad choice for fontseries, permissible values
-   are bfseries and mdseries. Try again}}%
-}
+   are bfseries and mdseries. Try again}}}
 \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}%
-{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontseries}\bfseries}
+  {author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontseries}\bfseries}
 \define@key{aebsection}{fontshape}{%
-    \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
-    \aeb@temp@expand{upshape,itshape,scshape,slshape}{%
-    \w@csarg\def{aeb@\aeb@section@type @fontshape}{\@nameuse{#1}}%
+  \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
+  \aeb@temp@expand{upshape,itshape,scshape,slshape}{%
+  \w@csarg\def{aeb@\aeb@section@type @fontshape}{\@nameuse{#1}}%
 }{\PackageWarning{webpro}{Bad choice for fontshape, permissible values
    are upshape, itshape, scshape and slshape. Try again}}%
 }
 \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}%
-{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontshape}\upshape}
+  {author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontshape}\upshape}
 \define@key{aebsection}{fontsize}{%
-   \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
-    \aeb@temp@expand{tiny,scriptsize,footnotesize,%
-    small,normalsize,large,Large,LARGE,huge,Huge}{%
-    \w@csarg\def{aeb@\aeb@section@type @fontsize}{\@nameuse{#1}}%
+ \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
+  \aeb@temp@expand{tiny,scriptsize,footnotesize,%
+  small,normalsize,large,Large,LARGE,huge,Huge}{%
+  \w@csarg\def{aeb@\aeb@section@type @fontsize}{\@nameuse{#1}}%
 }{\PackageWarning{webpro}{Bad choice for fontsize, permissible values
-   are tiny, scriptsize, footnotesize, small, normalsize,
-    large, Large, LARGE, huge and Huge. Try again}}%
+  are tiny, scriptsize, footnotesize, small, normalsize,
+  large, Large, LARGE, huge and Huge. Try again}}%
 }
 \@tfor\@@tmp:={{section}{\normalsize}}{{subsection}{\normalsize}}%
-{{subsubsection}{\normalsize}}{{university}{\normalsize}}%
-{{title}{\large}}{{author}{\normalsize}}{{toc}{\small}}\do{%
+  {{subsubsection}{\normalsize}}{{university}{\normalsize}}%
+  {{title}{\large}}{{author}{\normalsize}}{{toc}{\small}}\do{%
     \expandafter\getargs\@@tmp
     \edef\aeb@temp{\global\noexpand
       \let\expandafter\noexpand\csname aeb@\aeb@argi @fontsize\endcsname
@@ -4884,23 +4788,22 @@
 % Alignment related keys\IndexKey{halign}
 %    \begin{macrocode}
 \define@key{aebsection}{halign}{%
-    \edef\aeb@temp@expand{%
-        \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}%
-    \aeb@temp@expand{l,c,r}{%
-    \ifcase\nr\relax
-        \w@csarg\let{aeb@\aeb@section@type @halign}\raggedright\or
-        \w@csarg\let{aeb@\aeb@section@type @halign}\centering\or
-        \w@csarg\let{aeb@\aeb@section@type @halign}\raggedleft\fi
+  \edef\aeb@temp@expand{\noexpand
+    \XKV@cc+[\noexpand\val\noexpand\nr]{#1}}%
+  \aeb@temp@expand{l,c,r}{%
+  \ifcase\nr\relax
+    \w@csarg\let{aeb@\aeb@section@type @halign}\raggedright\or
+    \w@csarg\let{aeb@\aeb@section@type @halign}\centering\or
+    \w@csarg\let{aeb@\aeb@section@type @halign}\raggedleft\fi
 }{\PackageWarning{webpro}{Bad choice for halign, permissible values
    are l, c and r. Try again}}%
 }
 \@tfor\@@tmp:={\aeb@section@halign\raggedright}
-{\aeb@subsection@halign\raggedright}
-{\aeb@subsubsection@halign\raggedright}
-{\aeb@university@halign\centering}
-{\aeb@title@halign\centering}{\aeb@author@halign\centering}%
-{\aeb@toc@halign\centering}\do
-{%
+  {\aeb@subsection@halign\raggedright}
+  {\aeb@subsubsection@halign\raggedright}
+  {\aeb@university@halign\centering}
+  {\aeb@title@halign\centering}{\aeb@author@halign\centering}%
+  {\aeb@toc@halign\centering}\do{%
     \expandafter\getargs\@@tmp
     \edef\aeb@temp{\noexpand\let\expandafter\noexpand\aeb@argi
     \expandafter\noexpand\aeb@argii}\aeb@temp
@@ -4909,20 +4812,20 @@
 % Color, rule, and ding related keys\IndexKey{ding}\IndexKey{color}\IndexKey{ruleheight}%
 % \IndexKey{ruleheigtht}\IndexKey{numdingcolor}
 %    \begin{macrocode}
-\define@key{aebsection}{ding}{\if\aeb@use@section@numbers0
-    \webtoksi=\expandafter{\expandafter\protect
-    \expandafter\web@sel@sec@col\expandafter{\aeb@section@type}#1\ }%
-    \w@csarg\edef{aeb@\aeb@section@type Num}##1{\the\webtoksi}%
-    \else\PackageWarning{webpro}{The ding key is not available with a
-        section numbering system,\MessageBreak
-        ignoring request for a ding.}\fi
+\define@key{aebsection}{ding}{\if\aeb@use@section@numbers\web@Zero
+  \webtoksi=\expandafter{\expandafter\protect
+  \expandafter\web@sel@sec@col\expandafter{\aeb@section@type}#1\ }%
+  \w@csarg\edef{aeb@\aeb@section@type Num}##1{\the\webtoksi}%
+  \else\PackageWarning{webpro}{The ding key is not available with a
+    section numbering system,\MessageBreak
+    ignoring request for a ding.}\fi
 }
 \define@key{aebsection}{color}{%
-    \w@csarg\def{aeb@\aeb@section@type color}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type color}{#1}}
 \define@key{aebsection}{ruleheight}{%
-    \w@csarg\def{aeb@\aeb@section@type ruleheight}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type ruleheight}{#1}}
 \define@key{aebsection}{numdingcolor}{%
-    \w@csarg\def{aeb@\aeb@section@type numdingcolor}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type numdingcolor}{#1}}
 %    \end{macrocode}
 % Section color defaults
 %    \begin{macrocode}
@@ -4966,7 +4869,7 @@
 \def\aeb@authorframecolor{blue}
 \def\aeb@tocframecolor{blue}
 \define@key{aebsection}{bgcolor}{%
-    \w@csarg\def{aeb@\aeb@section@type bgcolor}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type bgcolor}{#1}}
 \def\aeb@sectionbgcolor{cornsilk}
 \def\aeb@subsectionbgcolor{cornsilk}
 \def\aeb@subsubsectionbgcolor{cornsilk}
@@ -4975,7 +4878,7 @@
 \def\aeb@authorbgcolor{cornsilk}
 \def\aeb@tocbgcolor{cornsilk}
 \define@key{aebsection}{shadowcolor}{%
-    \w@csarg\def{aeb@\aeb@section@type shadowcolor}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type shadowcolor}{#1}}
 \def\aeb@sectionshadowcolor{black}
 \def\aeb@subsectionshadowcolor{black}
 \def\aeb@subsubsectionshadowcolor{black}
@@ -4987,9 +4890,9 @@
 % Indent\IndexKey{indent}
 %    \begin{macrocode}
 \define@key{aebsection}{indent}[0pt]{%
-    \edef\web@argi{#1}\ifx\web@argi\@empty
-    \def\web@argi{0pt}\fi
-    \w@csarg\edef{aeb@\aeb@section@type @indent}{\web@argi}}
+  \edef\web@argi{#1}\ifx\web@argi\@empty
+  \def\web@argi{0pt}\fi
+  \w@csarg\edef{aeb@\aeb@section@type @indent}{\web@argi}}
 \def\aeb@section@indent{\z@}
 \def\aeb@subsection@indent{\z@}
 \def\aeb@subsubsection@indent{\z@}
@@ -5001,7 +4904,7 @@
 %Other keys\IndexKey{beforeskip}\IndexKey{afterskip}
 %    \begin{macrocode}
 \define@key{aebsection}{beforeskip}{%
-    \w@csarg\def{aeb@\aeb@section@type @beforeskip}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type @beforeskip}{#1}}
 \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex}
 \def\aeb@subsection@beforeskip{-2.5ex\@plus -1ex \@minus -.2ex}
 \def\aeb@subsubsection@beforeskip{-2ex\@plus -1ex \@minus -.2ex}
@@ -5010,7 +4913,7 @@
 \def\aeb@author@beforeskip{-1ex\@plus -1ex \@minus-.2ex}
 \def\aeb@toc@beforeskip{-3ex\@plus -1ex \@minus-.2ex}
 \define@key{aebsection}{afterskip}{%
-    \w@csarg\def{aeb@\aeb@section@type @afterskip}{#1}}
+  \w@csarg\def{aeb@\aeb@section@type @afterskip}{#1}}
 \def\aeb@section@afterskip{1ex\@plus .2ex}
 \def\aeb@subsection@afterskip{1ex\@plus .2ex}
 \def\aeb@subsubsection@afterskip{.5ex\@plus .2ex}
@@ -5032,9 +4935,9 @@
 % the title or author. This alignment will be across the width of the text region.
 %    \begin{macrocode}
 \define@key{aebsection}{xhalign}{%
-    \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
-    \aeb@temp@expand{l,c,r}{%
-        \w@csarg\def{halign\aeb@section@type}{#1}%
+  \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}%
+  \aeb@temp@expand{l,c,r}{%
+    \w@csarg\def{halign\aeb@section@type}{#1}%
 }{\PackageWarning{webpro}{Bad choice for xhalign, permissible values
    are l, c and r. Try again}}%
 }
@@ -5053,58 +4956,56 @@
 %    \end{macrocode}
 % Commands that hold the reset values.
 %    \begin{macrocode}
-\def\aeb@reset@section@fonts{%
-        \normalfont\normalsize
-    \ifcase\aeb@section@typeIndex\relax
-        \let\aeb@section@usefont\@empty
-        \let\aeb@section@fontfamily\aeb@defaultfamily
-        \let\aeb@section@fontseries\bfseries
-        \let\aeb@section@fontshape\upshape
-        \let\aeb@section@fontsize\Large
-    \or
-        \let\aeb@subsection@usefont\@empty
-        \let\aeb@subsection@fontfamily\aeb@defaultfamily
-        \let\aeb@subsection@fontseries\bfseries
-        \let\aeb@subsection@fontshape\upshape
-        \let\aeb@subsection@fontsize\large
-    \or
-        \let\aeb@subsubsection@usefont\@empty
-        \let\aeb@subsubsection@fontfamily\aeb@defaultfamily
-        \let\aeb@subsubsection@fontseries\bfseries
-        \let\aeb@subsubsection@fontshape\upshape
-        \let\aeb@subsubsection@fontsize\normalsize
-    \fi
+\def\aeb@reset@section@fonts{\normalfont\normalsize
+  \ifcase\aeb@section@typeIndex\relax
+    \let\aeb@section@usefont\@empty
+    \let\aeb@section@fontfamily\aeb@defaultfamily
+    \let\aeb@section@fontseries\bfseries
+    \let\aeb@section@fontshape\upshape
+    \let\aeb@section@fontsize\Large
+  \or
+    \let\aeb@subsection@usefont\@empty
+    \let\aeb@subsection@fontfamily\aeb@defaultfamily
+    \let\aeb@subsection@fontseries\bfseries
+    \let\aeb@subsection@fontshape\upshape
+    \let\aeb@subsection@fontsize\large
+  \or
+    \let\aeb@subsubsection@usefont\@empty
+    \let\aeb@subsubsection@fontfamily\aeb@defaultfamily
+    \let\aeb@subsubsection@fontseries\bfseries
+    \let\aeb@subsubsection@fontshape\upshape
+    \let\aeb@subsubsection@fontsize\normalsize
+  \fi
 }
-\def\aeb@reset@section@all{%
-    \aeb@reset@section@fonts
-    \ifcase\aeb@section@typeIndex\relax
-        \let\aeb@section@halign\raggedright
-        \def\aeb@sectioncolor{blue}%
-        \def\aeb@sectionshadowcolor{black}%
-        \let\aeb@section@special=\@empty
-        \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex}%
-        \def\aeb@section@afterskip{1ex\@plus .2ex}%
-        \def\aeb@sectionframecolor{blue}%
-        \def\aeb@sectionframecolor{cornsilk}%
-    \or
-        \let\aeb@subsection@halign\raggedright
-        \def\aeb@subsectioncolor{blue}%
-        \def\aeb@subsectionshadowcolor{black}%
-        \let\aeb@subsection@special=\@empty
-        \def\aeb@subsection@beforeskip{-2.5ex\@plus-1ex \@minus-.2ex}%
-        \def\aeb@subsection@afterskip{1ex\@plus .2ex}%
-        \def\aeb@subsectionframecolor{blue}%
-        \def\aeb@subsectionframecolor{cornsilk}%
-    \or
-        \let\aeb@subsubsection@halign\raggedright
-        \def\aeb@subsubsectioncolor{blue}%
-        \def\aeb@subsubsectionshadowcolor{black}%
-        \let\aeb@subsubsection@special=\@empty
-        \def\aeb@subsubsection@beforeskip{-2ex\@plus-1ex \@minus-.2ex}%
-        \def\aeb@subsubsection@afterskip{1ex\@plus .2ex}%
-        \def\aeb@subsubsectionframecolor{blue}%
-        \def\aeb@subsubsectionframecolor{cornsilk}%
-    \fi
+\def\aeb@reset@section@all{\aeb@reset@section@fonts
+  \ifcase\aeb@section@typeIndex\relax
+    \let\aeb@section@halign\raggedright
+    \def\aeb@sectioncolor{blue}%
+    \def\aeb@sectionshadowcolor{black}%
+    \let\aeb@section@special=\@empty
+    \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex}%
+    \def\aeb@section@afterskip{1ex\@plus .2ex}%
+    \def\aeb@sectionframecolor{blue}%
+    \def\aeb@sectionframecolor{cornsilk}%
+  \or
+    \let\aeb@subsection@halign\raggedright
+    \def\aeb@subsectioncolor{blue}%
+    \def\aeb@subsectionshadowcolor{black}%
+    \let\aeb@subsection@special=\@empty
+    \def\aeb@subsection@beforeskip{-2.5ex\@plus-1ex \@minus-.2ex}%
+    \def\aeb@subsection@afterskip{1ex\@plus .2ex}%
+    \def\aeb@subsectionframecolor{blue}%
+    \def\aeb@subsectionframecolor{cornsilk}%
+  \or
+    \let\aeb@subsubsection@halign\raggedright
+    \def\aeb@subsubsectioncolor{blue}%
+    \def\aeb@subsubsectionshadowcolor{black}%
+    \let\aeb@subsubsection@special=\@empty
+    \def\aeb@subsubsection@beforeskip{-2ex\@plus-1ex \@minus-.2ex}%
+    \def\aeb@subsubsection@afterskip{1ex\@plus .2ex}%
+    \def\aeb@subsubsectionframecolor{blue}%
+    \def\aeb@subsubsectionframecolor{cornsilk}%
+  \fi
 }
 %    \end{macrocode}
 % Here I've taken the \cs{section} command, as defined in \textsf{web},
@@ -5112,91 +5013,92 @@
 % This helps to keep track of the page of the current section; used
 % with the panel table of contents.
 %    \begin{macrocode}
-\renewcommand{\section}{% dps1
-   \renewcommand{\@seccntformat}[1]{\aeb@sectionNum{##1}}%
-   \@startsection{section}{1}{\aeb@section@indent}%
-   {\aeb@section@beforeskip}{\aeb@section@afterskip}%
-   {\noindent\xdef\aeb@sectionpage{\the\c@page}%
-   \def\aeb@section@type{section}%
-   \aeb@section@usefont\aeb@section@fontfamily\aeb@section@fontseries
-   \aeb@section@fontshape\aeb@section@fontsize\aeb@section@halign
-   \color{\aeb@sectioncolor}\aeb@section@special}}
-\renewcommand\subsection{% dps1
-   \renewcommand{\@seccntformat}[1]{\aeb@subsectionNum{##1}}%
-   \@startsection{subsection}{2}{\aeb@subsection@indent}%
-   {\aeb@subsection@beforeskip}{\aeb@subsection@afterskip}%
-   {\noindent\def\aeb@section@type{subsection}%
-   \aeb@subsection@usefont\aeb@subsection@fontfamily
-   \aeb@subsection@fontseries\aeb@subsection@fontshape
-   \aeb@subsection@fontsize\aeb@subsection@halign
-   \color{\aeb@subsectioncolor}\aeb@subsection@special}}
+\renewcommand{\section}{%
+  \renewcommand{\@seccntformat}[1]{\aeb@sectionNum{##1}}%
+  \@startsection{section}{1}{\aeb@section@indent}%
+  {\aeb@section@beforeskip}{\aeb@section@afterskip}%
+  {\noindent\xdef\aeb@sectionpage{\the\c@page}%
+  \def\aeb@section@type{section}%
+  \aeb@section@usefont\aeb@section@fontfamily\aeb@section@fontseries
+  \aeb@section@fontshape\aeb@section@fontsize\aeb@section@halign
+  \color{\aeb@sectioncolor}\aeb@section@special}}
+\renewcommand\subsection{%
+  \renewcommand{\@seccntformat}[1]{\aeb@subsectionNum{##1}}%
+  \@startsection{subsection}{2}{\aeb@subsection@indent}%
+  {\aeb@subsection@beforeskip}{\aeb@subsection@afterskip}%
+  {\noindent\def\aeb@section@type{subsection}%
+  \aeb@subsection@usefont\aeb@subsection@fontfamily
+  \aeb@subsection@fontseries\aeb@subsection@fontshape
+  \aeb@subsection@fontsize\aeb@subsection@halign
+  \color{\aeb@subsectioncolor}\aeb@subsection@special}}
 \def\subsubDefaultDing#1{\def\web@subsubDefaultDing{{#1}}}
 \subsubDefaultDing{\textrm\textbullet}
-\renewcommand\subsubsection{% dps1
-   \renewcommand{\@seccntformat}[1]{\aeb@subsubsectionNum{##1}}%
-   \@startsection{subsubsection}{3}{\aeb@subsubsection@indent}%
-   {\aeb@subsubsection@beforeskip}{\aeb@subsubsection@afterskip}%
-   {\noindent\def\aeb@section@type{subsubsection}%
-   \aeb@subsubsection@usefont\aeb@subsubsection@fontfamily
-   \aeb@subsubsection@fontseries\aeb@subsubsection@fontshape
-   \aeb@subsubsection@fontsize\aeb@subsubsection@halign
-   \color{\aeb@subsubsectioncolor}\aeb@subsubsection@special}}
+\renewcommand\subsubsection{%
+  \renewcommand{\@seccntformat}[1]{\aeb@subsubsectionNum{##1}}%
+  \@startsection{subsubsection}{3}{\aeb@subsubsection@indent}%
+  {\aeb@subsubsection@beforeskip}{\aeb@subsubsection@afterskip}%
+  {\noindent\def\aeb@section@type{subsubsection}%
+  \aeb@subsubsection@usefont\aeb@subsubsection@fontfamily
+  \aeb@subsubsection@fontseries\aeb@subsubsection@fontshape
+  \aeb@subsubsection@fontsize\aeb@subsubsection@halign
+  \color{\aeb@subsubsectioncolor}\aeb@subsubsection@special}}
 \renewcommand*\thesection{%
-    \if\aeb@use@section@numbers1\arabic{section}\fi}
+  \if\aeb@use@section@numbers\web@One\arabic{section}\fi}
 \renewcommand*\thesubsection{%
-    \if\aeb@use@section@numbers1\thesection.\arabic{subsection}\fi}
+  \if\aeb@use@section@numbers\web@One\thesection.\arabic{subsection}\fi}
 \renewcommand*{\thesubsubsection}{%
-   \if\aeb@use@section@numbers1%
-        \if@defaultsubsubding\web@subsubDefaultDing
-        \else\thesubsection.\arabic{subsubsection}\fi
-   \fi}
+  \if\aeb@use@section@numbers\web@One
+    \if@defaultsubsubding\web@subsubDefaultDing
+    \else\thesubsection.\arabic{subsubsection}\fi
+  \fi
+}
 %    \end{macrocode}
 % We attempt to format the university, title and author in the same way as
 % we do the sections
 %    \begin{macrocode}
 \newcommand{\sectionTitle}{\aeb@sectionTitle*}
 \newcommand{\aeb@sectionTitle}{%
-   \renewcommand{\@seccntformat}[1]{\aeb@titleNum{##1}}%
-   \@startsection{section}{1}{\aeb@title@indent}%
-   {\aeb@title@beforeskip}{\aeb@title@afterskip}%
-   {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{title}%
-   \aeb@title@usefont\aeb@title@fontfamily\aeb@title@fontseries
-   \aeb@title@fontshape\aeb@title@fontsize\aeb@title@halign
-   \ifx\webtitle@color\@empty\else\color{\aeb@titlecolor}\fi
-   \aeb@title@special}}
+  \renewcommand{\@seccntformat}[1]{\aeb@titleNum{##1}}%
+  \@startsection{section}{1}{\aeb@title@indent}%
+  {\aeb@title@beforeskip}{\aeb@title@afterskip}%
+  {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{title}%
+  \aeb@title@usefont\aeb@title@fontfamily\aeb@title@fontseries
+  \aeb@title@fontshape\aeb@title@fontsize\aeb@title@halign
+  \ifx\webtitle@color\@empty\else\color{\aeb@titlecolor}\fi
+  \aeb@title@special}}
 \newcommand{\sectionAuthor}{\aeb@sectionAuthor*}
 \newcommand{\aeb@sectionAuthor}{%
-   \renewcommand{\@seccntformat}[1]{\aeb@authorNum{##1}}%
-   \@startsection{section}{1}{\aeb@author@indent}%
-   {\aeb@author@beforeskip}{\aeb@author@afterskip}%
-   {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{author}%
-   \aeb@author@usefont\aeb@author@fontfamily\aeb@author@fontseries
-   \aeb@author@fontshape\aeb@author@fontsize\aeb@author@halign
-   \ifx\webauthor@color\@empty\else\color{\aeb@authorcolor}\fi
-   \aeb@author@special}}
+  \renewcommand{\@seccntformat}[1]{\aeb@authorNum{##1}}%
+  \@startsection{section}{1}{\aeb@author@indent}%
+  {\aeb@author@beforeskip}{\aeb@author@afterskip}%
+  {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{author}%
+  \aeb@author@usefont\aeb@author@fontfamily\aeb@author@fontseries
+  \aeb@author@fontshape\aeb@author@fontsize\aeb@author@halign
+  \ifx\webauthor@color\@empty\else\color{\aeb@authorcolor}\fi
+  \aeb@author@special}}
 \newcommand{\sectionUniversity}{\aeb@sectionUniversity*}
 \newcommand{\aeb@sectionUniversity}{%
-   \renewcommand{\@seccntformat}[1]{\aeb@universityNum{##1}}%
-   \@startsection{section}{1}{\aeb@university@indent}%
-   {\aeb@university@beforeskip}{\aeb@university@afterskip}%
-   {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{university}%
-   \aeb@university@usefont\aeb@university@fontfamily
-   \aeb@university@fontseries\aeb@university@fontshape
-   \aeb@university@fontsize\aeb@university@halign
-   \ifx\webuniversity@color\@empty\else
-   \color{\aeb@universitycolor}\fi\aeb@university@special}}
+  \renewcommand{\@seccntformat}[1]{\aeb@universityNum{##1}}%
+  \@startsection{section}{1}{\aeb@university@indent}%
+  {\aeb@university@beforeskip}{\aeb@university@afterskip}%
+  {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{university}%
+  \aeb@university@usefont\aeb@university@fontfamily
+  \aeb@university@fontseries\aeb@university@fontshape
+  \aeb@university@fontsize\aeb@university@halign
+  \ifx\webuniversity@color\@empty\else
+  \color{\aeb@universitycolor}\fi\aeb@university@special}}
 \newcommand{\sectionToc}{\aeb@sectionToc*}
 \newcommand{\aeb@sectionToc}{%
-   \renewcommand{\@seccntformat}[1]{\aeb@tocNum{##1}}%
-   \@startsection{section}{1}{\aeb@toc@indent}%
-   {\aeb@toc@beforeskip}{\aeb@toc@afterskip}%
-   {\hypertarget{webtoc}{}%
-   \xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{toc}%
-   \aeb@toc@usefont\aeb@toc@fontfamily
-   \aeb@toc@fontseries\aeb@toc@fontshape
-   \aeb@toc@fontsize\aeb@toc@halign
-   \ifx\aeb@toccolor\@empty\else
-   \color{\aeb@toccolor}\fi\aeb@toc@special}}
+  \renewcommand{\@seccntformat}[1]{\aeb@tocNum{##1}}%
+  \@startsection{section}{1}{\aeb@toc@indent}%
+  {\aeb@toc@beforeskip}{\aeb@toc@afterskip}%
+  {\hypertarget{webtoc}{}%
+  \xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{toc}%
+  \aeb@toc@usefont\aeb@toc@fontfamily
+  \aeb@toc@fontseries\aeb@toc@fontshape
+  \aeb@toc@fontsize\aeb@toc@halign
+  \ifx\aeb@toccolor\@empty\else
+  \color{\aeb@toccolor}\fi\aeb@toc@special}}
 %    \end{macrocode}
 %
 % \subsection{Layout Commands}\label{sectionLayout}
@@ -5213,20 +5115,20 @@
 % globally reset the values. Here we process the keys devoted to the section layout.
 %    \begin{macrocode}
 \def\save@prtscr{\global\let\prtscr@save\prtscr
-    \global\let\prtscr\prtscrA}
+  \global\let\prtscr\prtscrA}
 \def\restore@prtscr{\global\let\prtscr\prtscr@save}
 \newcommand{\sectionLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=section,color=blue,ruleheight=1pt}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=section,color=blue,ruleheight=1pt}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \newcommand{\subsectionLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=subsection,color=blue,ruleheight=1pt}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=subsection,color=blue,ruleheight=1pt}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \newcommand{\subsubsectionLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=subsubsection,color=blue,ruleheight=1pt}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=subsubsection,color=blue,ruleheight=1pt}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -5239,24 +5141,24 @@
 % title and author on the title page of the presentation.
 %    \begin{macrocode}
 \newcommand{\universityLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=university}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=university}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \universityLayout{fontsize={\prtscrA{large}{normalsize}}}
 \newcommand{\titleLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=title}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=title}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \titleLayout{fontsize={\prtscrA{Large}{normalsize}}}
 \newcommand{\authorLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=author}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=author}%
+  \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \authorLayout{fontsize={\prtscrA{large}{normalsize}}}
 \newcommand{\tocLayout}[1]{\save@prtscr
-    \setkeys{aebsection}{type=toc,color=\web@tocColor}%
-    \protected@edef\aeb@temp{\noexpand\setkeys{aebsection,aebToc}{#1}}%
-    \aeb@temp\restore@prtscr}
+  \setkeys{aebsection}{type=toc,color=\web@tocColor}%
+  \protected@edef\x{\noexpand\setkeys{aebsection,aebToc}{#1}}\x
+  \aeb@temp\restore@prtscr}
 \tocLayout{fontsize=Large}
 %    \end{macrocode}
 %    \end{macro}
@@ -5274,8 +5176,8 @@
 % below, and also in the \texttt{ding} key from the \texttt{aebsection} family.
 %    \begin{macrocode}
 \def\web@sel@sec@col#1{\ifShadow
-    \color{\@nameuse{aeb@#1shadowcolor}}\else
-    \color{\@nameuse{aeb@#1numdingcolor}}\fi}
+  \color{\@nameuse{aeb@#1shadowcolor}}\else
+  \color{\@nameuse{aeb@#1numdingcolor}}\fi}
 %    \end{macrocode}
 %    \begin{macro}{\useSectionNumbers}
 %    \begin{macro}{\noSectionNumbers}
@@ -5285,29 +5187,29 @@
 % value at no, i.e., I've executed \cs{noSectionNumbers}.
 %    \begin{macrocode}
 \newcommand{\useSectionNumbers}
-{% dps1
-    \let\aeb@use@section@numbers1\relax
-    \def\aeb@sectionNum##1{\protect\web@sel@sec@col{section}%
-    \@nameuse{the##1}\web@finalDot\ }%
-    \def\aeb@subsectionNum##1{\protect\web@sel@sec@col{subsection}%
-        \@nameuse{the##1}\web@finalDot\ }%
-    \def\aeb@subsubsectionNum##1{%
-        \protect\web@sel@sec@col{subsubsection}%
+{%
+  \let\aeb@use@section@numbers\web@One
+  \def\aeb@sectionNum##1{\protect
+  \web@sel@sec@col{section}\@nameuse{the##1}\web@finalDot\ }%
+  \def\aeb@subsectionNum##1{\protect
+    \web@sel@sec@col{subsection}\@nameuse{the##1}\web@finalDot\ }%
+  \def\aeb@subsubsectionNum##1{\protect
+    \web@sel@sec@col{subsubsection}%
     \@nameuse{the##1}\if@defaultsubsubding\else\web@finalDot\fi\ }%
     \def\sectionmark##1{\markright{##1}}%
 }
 \newcommand{\noSectionNumbers}
 {%
-    \ifx\web@latextoc\web@YES
-        \PackageInfo{web}{The nobullets or latextoc option
-        taken,\MessageBreak
-        ignoring \string\noSectionNumbers}%
-    \else
-        \let\aeb@use@section@numbers0\relax
-        \let\aeb@sectionNum\@gobble
-        \let\aeb@subsectionNum\@gobble
-        \let\aeb@subsubsectionNum\@gobble
-    \fi
+  \ifx\web@latextoc\web@YES
+    \PackageInfo{web}{The nobullets or latextoc option
+      taken,\MessageBreak
+      ignoring \string\noSectionNumbers}%
+  \else
+    \let\aeb@use@section@numbers\web@Zero
+    \let\aeb@sectionNum\@gobble
+    \let\aeb@subsectionNum\@gobble
+    \let\aeb@subsubsectionNum\@gobble
+  \fi
 }
 \useSectionNumbers
 %    \end{macrocode}
@@ -5331,11 +5233,11 @@
 % \IndexKey{urlColor}
 %    \begin{macrocode}
 \define@key{aebcolordesign}{universityColor}{\universityColor{#1}}
-    \def\aeb@universitycolor{\webuniversity@color}
+  \def\aeb@universitycolor{\webuniversity@color}
 \define@key{aebcolordesign}{titleColor}{\titleColor{#1}}
-    \def\aeb@titlecolor{\webtitle@color}
+  \def\aeb@titlecolor{\webtitle@color}
 \define@key{aebcolordesign}{authorColor}{\authorColor{#1}}
-    \def\aeb@authorcolor{\webauthor@color}
+  \def\aeb@authorcolor{\webauthor@color}
 \define@key{aebcolordesign}{textBgColor}{\textBgColor{#1}}
 \define@key{aebcolordesign}{panelBgColor}{\panelBgColor{#1}}
 \define@key{aebcolordesign}{linkColor}{\def\@linkcolor{#1}}
@@ -5391,7 +5293,7 @@
 \ddDingTocColor{blue}
 \dddDingTocColor{webgreen}
 \@tfor\@@tmp:={d@DingToc}{dd@DingToc}{ddd@DingToc}\do
-    {\w@csarg\let{\@@tmp}\@empty}
+  {\w@csarg\let{\@@tmp}\@empty}
 %    \end{macrocode}
 %    \begin{macro}{\selectTocDings}
 % This is an \textsf{xkeyval} interface to setting the dings used by
@@ -5411,9 +5313,9 @@
 % the dings there.
 %    \begin{macrocode}
 \def\@setTocDings{%
-    \ifx\d@DingToc\@empty\else\dDing{\d@DingToc}\fi
-    \ifx\dd@DingToc\@empty\else\ddDing{\dd@DingToc}\fi
-    \ifx\ddd@DingToc\@empty\else\dddDing{\ddd@DingToc}\fi
+  \ifx\d@DingToc\@empty\else\dDing{\d@DingToc}\fi
+  \ifx\dd@DingToc\@empty\else\ddDing{\dd@DingToc}\fi
+  \ifx\ddd@DingToc\@empty\else\dddDing{\ddd@DingToc}\fi
 }
 %    \end{macrocode}
 %    \end{macro}% Now, if for paper\dots
@@ -5426,9 +5328,9 @@
 % comment environments one \texttt{forpaper} and another for
 % \texttt{forscreen}.
 %    \begin{macrocode}
-    \includecomment{forpaper}\excludecomment{forscreen}
+  \includecomment{forpaper}\excludecomment{forscreen}
 \else
-    \includecomment{forscreen}\excludecomment{forpaper}
+  \includecomment{forscreen}\excludecomment{forpaper}
 \fi
 %    \end{macrocode}
 %    \end{environment}
@@ -5444,16 +5346,16 @@
 % D. P. Story
 %
 \newcommand{\setupFullwidth}{%
-    \setlength{\textwidth}{\paperwidth}%
-    \advance\textwidth-2in
-    \setlength{\linewidth}{\textwidth}%
-    \setlength{\columnseprule}{0pt}%
-    \setlength{\oddsidemargin}{0in}%
-    \setlength{\evensidemargin}{0in}%
+  \setlength{\textwidth}{\paperwidth}%
+  \advance\textwidth-2in
+  \setlength{\linewidth}{\textwidth}%
+  \setlength{\columnseprule}{0pt}%
+  \setlength{\oddsidemargin}{0in}%
+  \setlength{\evensidemargin}{0in}%
 }
 \makeatletter
 \def\clindx{\ifcodeline@index\expandafter\@firstoftwo\else
-    \expandafter\@secondoftwo\fi}
+  \expandafter\@secondoftwo\fi}
 \GlossaryPrologue{\section{Change History}}
 \IndexPrologue{\section{Index}\hfuzz\linewidth
   \parbox{\linewidth}{Numbers written in italic
-- 
cgit v1.2.3

