newlfm update (12apr09)

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

1 files changed, 433 insertions, 331 deletions

diff --git a/Master/texmf-dist/source/latex/newlfm/newlfm.dtx b/Master/texmf-dist/source/latex/newlfm/newlfm.dtx
index b6f9be3f803..c82b6f3f7ce 100644
--- a/Master/texmf-dist/source/latex/newlfm/newlfm.dtx
+++ b/Master/texmf-dist/source/latex/newlfm/newlfm.dtx
@@ -69,13 +69,13 @@
 %<+addrset>\ProvidesPackage{addrset}
 %<+setdim>\ProvidesPackage{setdim}
 %<*driver>
-       \ProvidesFile{newlfm.drv}
+       \ProvidesFile{newlfm.drv}%
 %</driver>
-%<+package>              [2009/03/24 v9.3
+%<+package>              [2009/04/10 v9.4
 %<+package>               Letter-Fax-Memo LaTeX Document Class]
-%<+addrset>              [2009/03/24 v9.3
+%<+addrset>              [2009/04/10 v9.4
 %<+addrset>               Address macros]%
-%<+setdim>               [2009/03/24 v9.3
+%<+setdim>               [2009/04/10 v9.4
 %<+setdim>                Address macros]
 %   \end{macrocode}
 %
@@ -163,79 +163,80 @@
 %   letter material to be structured in a normal and simple manner.  Defaults for several
 %   important commands have now been added; prior to this, omitting some commands has led
 %   to crucial errors.}
+% \changes{v9.4}{2009/4/10}{Adjusted headheight to properly satisfy fancyhdr.}
 %
 % \iffalse
 %    \begin{macrocode}
 %<*driver>
-\documentclass{ltxdoc}
-\usepackage{geometry,mdwlist,layout}
-\geometry{right=1in,left=1in,top=1in,bottom=1in}
+\documentclass{ltxdoc}%
+\usepackage{geometry,mdwlist,layout}%
+\geometry{right=1in,left=1in,top=1in,bottom=1in}%
 %    \end{macrocode}
 
 %\DocInput{multicol,fancyvrb,mdwlist}
 %
 %    We don't want everything to appear in the index.
 %    \begin{macrocode}
-\DoNotIndex{\@Alph,\@alph,\@arabic,\@badmath}
-\DoNotIndex{\@centercr}
-\DoNotIndex{\@empty,\@ignoretrue}
-\DoNotIndex{\@ixpt}
-\DoNotIndex{\@M,\@minus,\@ne,\@plus}
-\DoNotIndex{\\,\addtolength}
-\DoNotIndex{\advance}
-\DoNotIndex{\ast,\begin,\begingroup,\bfseries,\bgroup,\box}
-\DoNotIndex{\bullet}
-\DoNotIndex{\cdot,\cr,\day,\DeclareOption}
-\DoNotIndex{\def,\DocInput,\documentclass}
-\DoNotIndex{\DoNotIndex,\egroup,\ifx,\else,\fi,\endtrivlist}
-\DoNotIndex{\EnableCrossrefs,\end,\end@dblfloat,\end@float,\endgroup}
-\DoNotIndex{\endlist,\everycr,\ExecuteOptions}
-\DoNotIndex{\filedate,\filename,\fileversion}
-\DoNotIndex{\global,\halign,\hangindent,\hbox,\hfil,\hfill,\hrule}
-\DoNotIndex{\hsize,\hskip,\hspace,\hss,\ifcase,\or,\fi}
-\DoNotIndex{\ifvmode,\fi,\ifnum,\fi,\input}
-\DoNotIndex{\kern,\leavevmode,\let,\leftmark}
-\DoNotIndex{\list,\llap,\long,\m@ne,\m@th,\mark}
-\DoNotIndex{\month,\newcommand,\newcounter,\newenvironment}
-\DoNotIndex{\NeedsTeXFormat,\newdimen}
-\DoNotIndex{\newpage,\nobreak,\noindent,\number}
-\DoNotIndex{\p@}
-\DoNotIndex{\pagestyle,\par}
-\DoNotIndex{\penalty,\PrintChanges,\PrintIndex,\ProcessOptions}
-\DoNotIndex{\protect,\ProvidesClass,\raggedbottom,\raggedright}
-\DoNotIndex{\refstepcounter,\relax,\renewcommand,\reset@font}
-\DoNotIndex{\rightmargin,\rlap,\rmfamily}
-\DoNotIndex{\setbox,\setcounter,\setlength}
-\DoNotIndex{\skip,\slshape,\space}
-\DoNotIndex{\trivlist,\typeout,\tw@}
-\DoNotIndex{\vskip,\vspace,\year,\z@}
-\CodelineNumbered
-\CodelineIndex
-\EnableCrossrefs
-\RecordChanges
-%    \end{macrocode}
-%    Set the \texttt{StandardModuleDepth} counter to 1.
-%    \begin{macrocode}
-\setcounter{StandardModuleDepth}{1}
-%    \end{macrocode}
-%    Some commonly used abbreviations
-%    \begin{macrocode}
-\def\Lopt#1{\textsf{#1}}
-\def\file#1{\texttt{#1}}
-\def\Lcount#1{\textsl{\small#1}}
-\def\pstyle#1{\textsl{#1}}
-%    \end{macrocode}
-%    We also want the full details.
-%    \begin{macrocode}
-\begin{document}
-\DocInput{newlfm.dtx}
-\end{document}
+\DoNotIndex{\@Alph,\@alph,\@arabic,\@badmath}%
+\DoNotIndex{\@centercr}%
+\DoNotIndex{\@empty,\@ignoretrue}%
+\DoNotIndex{\@ixpt}%
+\DoNotIndex{\@M,\@minus,\@ne,\@plus}%
+\DoNotIndex{\\,\addtolength}%
+\DoNotIndex{\advance}%
+\DoNotIndex{\ast,\begin,\begingroup,\bfseries,\bgroup,\box}%
+\DoNotIndex{\bullet}%
+\DoNotIndex{\cdot,\cr,\day,\DeclareOption}%
+\DoNotIndex{\def,\DocInput,\documentclass}%
+\DoNotIndex{\DoNotIndex,\egroup,\ifx,\else,\fi,\endtrivlist}%
+\DoNotIndex{\EnableCrossrefs,\end,\end@dblfloat,\end@float,\endgroup}%
+\DoNotIndex{\endlist,\everycr,\ExecuteOptions}%
+\DoNotIndex{\filedate,\filename,\fileversion}%
+\DoNotIndex{\global,\halign,\hangindent,\hbox,\hfil,\hfill,\hrule}%
+\DoNotIndex{\hsize,\hskip,\hspace,\hss,\ifcase,\or,\fi}%
+\DoNotIndex{\ifvmode,\fi,\ifnum,\fi,\input}%
+\DoNotIndex{\kern,\leavevmode,\let,\leftmark}%
+\DoNotIndex{\list,\llap,\long,\m@ne,\m@th,\mark}%
+\DoNotIndex{\month,\newcommand,\newcounter,\newenvironment}%
+\DoNotIndex{\NeedsTeXFormat,\newdimen}%
+\DoNotIndex{\newpage,\nobreak,\noindent,\number}%
+\DoNotIndex{\p@}%
+\DoNotIndex{\pagestyle,\par}%
+\DoNotIndex{\penalty,\PrintChanges,\PrintIndex,\ProcessOptions}%
+\DoNotIndex{\protect,\ProvidesClass,\raggedbottom,\raggedright}%
+\DoNotIndex{\refstepcounter,\relax,\renewcommand,\reset@font}%
+\DoNotIndex{\rightmargin,\rlap,\rmfamily}%
+\DoNotIndex{\setbox,\setcounter,\setlength}%
+\DoNotIndex{\skip,\slshape,\space}%
+\DoNotIndex{\trivlist,\typeout,\tw@}%
+\DoNotIndex{\vskip,\vspace,\year,\z@}%
+\CodelineNumbered%
+\CodelineIndex%
+\EnableCrossrefs%
+\RecordChanges%
+%    \end{macrocode}%
+%    Set the \texttt{StandardModuleDepth} counter to 1.%
+%    \begin{macrocode}%
+\setcounter{StandardModuleDepth}{1}%
+%    \end{macrocode}%
+%    Some commonly used abbreviations%
+%    \begin{macrocode}%
+\def\Lopt#1{\textsf{#1}}%
+\def\file#1{\texttt{#1}}%
+\def\Lcount#1{\textsl{\small#1}}%
+\def\pstyle#1{\textsl{#1}}%
+%    \end{macrocode}%
+%    We also want the full details.%
+%    \begin{macrocode}%
+\begin{document}%
+\DocInput{newlfm.dtx}%
+\end{document}%
 %</driver>
 %    \end{macrocode}
 % \fi
 %
 % \iffalse
-% Copyright (C) 1998 Paul A. Thompson, Ph.D., all rights reserved.
+% Copyright (C) 1998-2009 Paul A. Thompson, Ph.D., all rights reserved.
 % \fi
 %
 % \author{Paul A. Thompson, Ph.D. \\ Division of Biostatistics \\ Washington
@@ -1891,9 +1892,9 @@
 \RequirePackage{setspace}%
 \RequirePackage{lastpage}%
 \@ifundefined{ps@@empty}{%
-  \ClassError{newlfm}{Version of fancyhdr.sty is not current. \MessageBreak Please obtain
-    a recent copy of fancyhdr.sty (Version 1.99d or later) from CTAN.}  {Go to CTAN and
-    download the current version of fancyhdr.sty}}{}
+  \ClassError{newlfm}{Version of fancyhdr.sty is not current. \MessageBreak Please obtain%
+    a recent copy of fancyhdr.sty (Version 1.99d or later) from CTAN.}  {Go to CTAN and%
+    download the current version of fancyhdr.sty}}{}%
 \RequirePackage{calc}[1997/11/11]%
 \RequirePackage{graphicx}[1997/06/09]%
 \RequirePackage{rotating}[1997/06/09]%
@@ -2012,6 +2013,13 @@
 \newlength{\@utilc}\setlength{\@utilc}{0in}%
 \newlength{\@utild}\setlength{\@utild}{0in}%
 \newlength{\@utile}\setlength{\@utile}{0in}%
+\newlength{\@utilf}\setlength{\@utilf}{0in}%
+\newlength{\@utilg}\setlength{\@utilg}{0in}%
+\newlength{\@utilh}\setlength{\@utilh}{0in}%
+\newlength{\@utili}\setlength{\@utili}{0in}%
+\newlength{\@utilj}\setlength{\@utilj}{0in}%
+\newlength{\@utilk}\setlength{\@utilk}{0in}%
+\newlength{\@utill}\setlength{\@utill}{0in}%
 \newlength{\@xda}\setlength{\@xda}{0in}%
 \newlength{\@xdb}\setlength{\@xdb}{0in}%
 \newlength{\@xdc}\setlength{\@xdc}{0in}%
@@ -2161,8 +2169,8 @@
 \newboolean{@set@env}\setboolean{@set@env}{false}%
 \newboolean{@sig@p}%
 \newboolean{@sig@mp}%
-\newboolean{@sig@l}\setboolean{@sig@l}{true}%
-\newboolean{@sig@c}\setboolean{@sig@l}{false}%
+\newboolean{@sig@l}\setboolean{@sig@l}{false}%
+\newboolean{@sig@c}\setboolean{@sig@c}{false}%
 \newboolean{@space@d}\setboolean{@space@d}{true}%
 \newboolean{@space@s}\setboolean{@space@s}{false}%
 \newboolean{@mult@sig}\setboolean{@mult@sig}{false}%
@@ -2237,7 +2245,7 @@
 \def\PhrFAXcovp#1{\def\@fax@cover@line{#1}}%
 \def\PhrFAXpgcnt#1{\def\@fax@page@count{#1}}%
 \def\PhrEmail#1{\def\@email@phr{#1}}%
-\def\PhrFax#1{\def\@fax@phr{#1}}
+\def\PhrFax#1{\def\@fax@phr{#1}}%
 \def\PhrPager#1{\def\@pager@phr{#1}}%
 \def\PhrDocument#1{\def\@doc@phr{#1}}%
 \def\PhrPhone#1{\def\@phn@phr{#1}}%
@@ -2275,21 +2283,21 @@
 \define@key{ov}{addrf}{\def\@adr@f{#1}\setboolean{@ov@f}{true}}%       
 \def\sigtr#1{\def\@sig@b{#1}\setboolean{@ov@s}{true}}%%       
 \define@key{ov}{sigtr}{\def\@sig@b{#1}\setboolean{@ov@s}{true}}%       
-\def\MinHead#1{\setlength{\@Min@Hgt@Head}{#1}}
+\def\MinHead#1{\setlength{\@Min@Hgt@Head}{#1}}%
 \define@key{ov}{MinHead}{\setlength{\@Min@Hgt@Head}{#1}}%       
-\def\minhead#1{\setlength{\@Min@Hgt@head}{#1}}
+\def\minhead#1{\setlength{\@Min@Hgt@head}{#1}}%
 \define@key{ov}{minhead}{\setlength{\@Min@Hgt@head}{#1}}%       
-\def\MinLeft#1{\setlength{\@Min@Hgt@Left}{#1}}
+\def\MinLeft#1{\setlength{\@Min@Hgt@Left}{#1}}%
 \define@key{ov}{MinLeft}{\setlength{\@Min@Hgt@Left}{#1}}%       
-\def\minleft#1{\setlength{\@Min@Hgt@left}{#1}}
+\def\minleft#1{\setlength{\@Min@Hgt@left}{#1}}%
 \define@key{ov}{minleft}{\setlength{\@Min@Hgt@left}{#1}}%       
-\def\MinFoot#1{\setlength{\@Min@Hgt@Foot}{#1}}
+\def\MinFoot#1{\setlength{\@Min@Hgt@Foot}{#1}}%
 \define@key{ov}{MinFoot}{\setlength{\@Min@Hgt@Foot}{#1}}%       
-\def\minfoot#1{\setlength{\@Min@Hgt@foot}{#1}}
+\def\minfoot#1{\setlength{\@Min@Hgt@foot}{#1}}%
 \define@key{ov}{minfoot}{\setlength{\@Min@Hgt@foot}{#1}}%       
-\def\MinRight#1{\setlength{\@Min@Hgt@Right}{#1}}
+\def\MinRight#1{\setlength{\@Min@Hgt@Right}{#1}}%
 \define@key{ov}{MinRight}{\setlength{\@Min@Hgt@Right}{#1}}%       
-\def\minright#1{\setlength{\@Min@Hgt@right}{#1}}
+\def\minright#1{\setlength{\@Min@Hgt@right}{#1}}%
 \define@key{ov}{minright}{\setlength{\@Min@Hgt@right}{#1}}%       
 \def\@def@l{american}%
 \def\@am@phr{%
@@ -2317,7 +2325,7 @@
 \PhrRelease{For Immediate Release}%
 \PhrMore{--- more ---}%
 \PhrPRend{\# \# \#}%
-}
+}%
 \InputIfFileExists{extracd.tex}%
 {\typeout{Reading alternative macro definitions from extracd.tex}}%
 {\typeout{All language information must be in newlfm.cls}}%
@@ -2352,9 +2360,9 @@
 %    not begin with |@|).  User-optional commands are defined in the text
 %    above. 
 %    \begin{macrocode}
-\define@key{ov}{textwidthsize}{\setlength{\@text@width}{#1}}
+\define@key{ov}{textwidthsize}{\setlength{\@text@width}{#1}}%
 \def\textwidthsize#1{\setlength{\@text@width}{#1}}%
-\define@key{ov}{textheightsize}{\setlength{\@text@height}{#1}}
+\define@key{ov}{textheightsize}{\setlength{\@text@height}{#1}}%
 \def\textheightsize#1{\setlength{\@text@height}{#1}}%
 \define@key{ov}{bottommarginskip}{\setlength{\@marg@bt@a}{#1}}%
 \def\bottommarginskip#1{\setlength{\@marg@bt@a}{#1}}%
@@ -2429,24 +2437,24 @@
 \def\memoskipbefore#1{\setlength{\@pre@memo@sp}{#1}}%
 \define@key{ov}{memoskipbefore}{\setlength{\@pre@memo@sp}{#1}}%
 \def\restletter#1{\setboolean{@resta@l}{true}%
-\begin{lrbox}{\@resta@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
+\begin{lrbox}{\@resta@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
 \def\restlettera#1{\setboolean{@resta@l}{true}%
-\begin{lrbox}{\@resta@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
+\begin{lrbox}{\@resta@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
 \def\restletterb#1{\setboolean{@restb@l}{true}%
-\begin{lrbox}{\@restb@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
+\begin{lrbox}{\@restb@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
 \def\restletterc#1{\setboolean{@restc@l}{true}%
-\begin{lrbox}{\@restc@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
+\begin{lrbox}{\@restc@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
 \def\restletterd#1{\setboolean{@restd@l}{true}%
-\begin{lrbox}{\@restd@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
+\begin{lrbox}{\@restd@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
 \def\restlettere#1{\setboolean{@reste@l}{true}%
-\begin{lrbox}{\@reste@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}
-\def\unprtop#1{\setlength{\@unpr@tp}{#1}}
+\begin{lrbox}{\@reste@ltr}\begin{minipage}{\textwidth}#1\end{minipage}\end{lrbox}}%
+\def\unprtop#1{\setlength{\@unpr@tp}{#1}}%
 \define@key{ov}{unprtop}{\setlength{\@unpr@tp}{#1}}%
-\def\unprbottom#1{\setlength{\@unpr@bm}{#1}}
+\def\unprbottom#1{\setlength{\@unpr@bm}{#1}}%
 \define@key{ov}{unprbottom}{\setlength{\@unpr@bm}{#1}}%
 \def\unprright#1{\setlength{\@unpr@rt}{#1}}%
 \define@key{ov}{unprright}{\setlength{\@unpr@rt}{#1}}%
-\def\unprleft#1{\setlength{\@unpr@lt}{#1}}
+\def\unprleft#1{\setlength{\@unpr@lt}{#1}}%
 \define@key{ov}{unprleft}{\setlength{\@unpr@lt}{#1}}%
 %    \end{macrocode}
 % \end{macro}
@@ -2462,7 +2470,7 @@
 %    the code required to be processed.
 %
 %    \begin{macrocode}
-\def\@opt@stm{
+\def\@opt@stm{%
 \setboolean{@addr@fr@p}{false}%
 \setboolean{@addr@to@p}{false}%
 \setboolean{@memo@bl}{true}%
@@ -2473,7 +2481,7 @@
 \setboolean{@sig@p}{false}%
 \setboolean{@sig@mp}{true}%
 }%
-\def\@opt@stpr{
+\def\@opt@stpr{%
 \setboolean{@addr@fr@p}{false}%
 \setboolean{@addr@to@p}{false}%
 \setboolean{@memo@bl}{true}%
@@ -2484,7 +2492,7 @@
 \setboolean{@sig@p}{false}%
 \setboolean{@sig@mp}{true}%
 }%
-\def\@opt@flm{
+\def\@opt@flm{%
 \setboolean{@addr@fr@p}{false}%
 \setboolean{@addr@to@p}{false}%
 \setboolean{@memo@bl}{true}%
@@ -2545,7 +2553,7 @@
 %    Currently, there are no options.
 %
 %    \begin{macrocode}
-\def\@opt@pr{
+\def\@opt@pr{%
 \setboolean{@addr@fr@p}{true}%
 \setboolean{@addr@to@p}{false}%
 \setboolean{@pr@p}{true}%
@@ -2605,7 +2613,7 @@
 %    for ordering of sections.  There are commands for inclusion of various
 %    types of information.
 %    \begin{macrocode}
-\def\@opt@slr{
+\def\@opt@slr{%
 \setboolean{@addr@fr@l}{false}% 
 \setboolean{@addr@fr@p}{true}% 
 \setboolean{@addr@to@p}{true}% 
@@ -2618,26 +2626,28 @@
 \setboolean{@addr@to@l}{true}% 
 \setboolean{@memo@bl}{false}%
 \setboolean{@dt@l}{false}%
+\txa{In @opt@slr}%
 \setboolean{@sig@l}{false}%
 \setboolean{@sig@c}{false}%
-\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}
+\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}%
 \DeclareOption{stdletter}{\@opt@slr}%
 \define@key{ov}{stdletter}[true]{\iffixq{#1}{\@opt@slr}}%
-\def\@opt@sln{\setboolean{@addr@fr@l}{false} %
-\setboolean{@addr@fr@p}{false} %
-\setboolean{@addr@to@p}{true} %
+\def\@opt@sln{\setboolean{@addr@fr@l}{false}%
+\setboolean{@addr@fr@p}{false}%
+\setboolean{@addr@to@p}{true}%
 \setboolean{@dt@p}{true}%
 \setboolean{@dt@l}{false}%
 \setboolean{@dt@c}{false}%
 \setboolean{@greet@p}{true}%
 \setboolean{@sig@p}{true}%
 \setboolean{@sig@mp}{false}%
-\setboolean{@addr@to@l}{true} %
+\setboolean{@addr@to@l}{true}%
 \setboolean{@memo@bl}{false}%
 \setboolean{@dt@l}{false}%
+\txa{In @opt@sln}%
 \setboolean{@sig@l}{false}%
 \setboolean{@sig@c}{false}%
-\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}
+\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}%
 \DeclareOption{stdletternofrom} {\@opt@sln}%
 \define@key{ov}{stdletternofrom}[true]{\iffixq{#1}{\@opt@sln}}%
 \def\@opt@blr{\setboolean{@addr@fr@l}{true}%
@@ -2646,11 +2656,12 @@
 \setboolean{@addr@to@l}{true}%
 \setboolean{@dt@l}{true}%
 \setboolean{@dt@c}{false}%
+\txa{In @opt@blr}%
 \setboolean{@sig@l}{true}%
 \setboolean{@sig@c}{false}%
 \setboolean{@sig@p}{true}%
 \setboolean{@sig@mp}{false}%
-\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}
+\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}%
 \DeclareOption{busletter} {\@opt@blr}%
 \define@key{ov}{busletter}[true]{\iffixq{#1}{\@opt@blr}}%
 \def\@opt@bln{\setboolean{@addr@fr@l}{true}%
@@ -2659,13 +2670,14 @@
 \setboolean{@addr@to@l}{true}%
 \setboolean{@dt@l}{true}%
 \setboolean{@dt@c}{false}%
+\txa{In @opt@bln}%
 \setboolean{@sig@l}{true}%
 \setboolean{@sig@p}{true}%
 \setboolean{@sig@mp}{false}%
 \setboolean{@sig@c}{false}%
-\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}
+\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}%
 \DeclareOption{busletternofrom} {\@opt@bln}%
-\newboolean{@test@opt}\setboolean{@test@opt}{false}
+\newboolean{@test@opt}\setboolean{@test@opt}{false}%
 \define@key{ov}{busletternofrom}[true]{\iffixq{#1}{\@opt@bln}}%
 \DeclareOption{addrfromleft} {\setboolean{@addr@fr@l}{true}}%
 \define@key{ov}{addrfromleft}[true]{\iffixt{#1}{@addr@fr@l}}%
@@ -2686,14 +2698,14 @@
 \define@key{ov}{addrfromphone}[true]{\iffixt{#1}{@addr@fr@t}}%
 \DeclareOption{addrfromfax}  {\setboolean{@addr@fr@f}{true}}%
 \define@key{ov}{addrfromfax}[true]{\iffixt{#1}{@addr@fr@f}}%
-\providecommand{\boxht}{}  \providecommand{\boxwd}{} \providecommand{\btwlb}{}%
-\providecommand{\topht}{}  \providecommand{\lftwd}{}%
-\def\labpl#1{\setlength{\@lab@pl}{#1}}
-\def\boxht#1{\setlength{\@lab@bh}{#1}}
-\def\boxwd#1{\setlength{\@lab@bw}{#1}}
-\def\topht#1{\setlength{\@lab@th}{#1}}
-\def\lftwd#1{\setlength{\@lab@lm}{#1}}
-\def\btwlb#1{\setlength{\@lab@bl}{#1}}
+\providecommand{\boxht}{}\providecommand{\boxwd}{}\providecommand{\btwlb}{}%
+\providecommand{\topht}{}\providecommand{\lftwd}{}%
+\def\labpl#1{\setlength{\@lab@pl}{#1}}%
+\def\boxht#1{\setlength{\@lab@bh}{#1}}%
+\def\boxwd#1{\setlength{\@lab@bw}{#1}}%
+\def\topht#1{\setlength{\@lab@th}{#1}}%
+\def\lftwd#1{\setlength{\@lab@lm}{#1}}%
+\def\btwlb#1{\setlength{\@lab@bl}{#1}}%
 \def\@labname{nolines,dateno}%
 \def\Alaba{\def\@labname{Avery5160,nolines,dateno}%
   \setboolean{@set@env}{true}\setboolean{@use@envlab}{false} \def\@tab@just{rrr}\labpl{10.125in}%
@@ -2725,7 +2737,7 @@
 \DeclareOption{labto}{\setboolean{@lab@t}{true}}%
 \DeclareOption{labrowfrto}{\setboolean{@lab@rft}{true}\setboolean{@lab@t}{false}}%
 \DeclareOption{labcolfrto}{\setboolean{@lab@cft}{true}\setboolean{@lab@t}{false}}%
-\def\labsize#1{\def\@lab@size{#1}}
+\def\labsize#1{\def\@lab@size{#1}}%
 \define@key{ov}{Avery5160}[true]{\iffixq{#1}{\Alaba}}%
 \define@key{ov}{Avery5161}[true]{\iffixq{#1}{\Alabb}}%
 \define@key{ov}{Avery5261}[true]{\iffixq{#1}{\Alabb}}%
@@ -2740,7 +2752,7 @@
 \define@key{ov}{labcolfrto}[true]{\iffixq{#1}%
 {\setboolean{@lab@cft}{true}\setboolean{@lab@t}{false}}}%
 \DeclareOption{setuplabel}{\setboolean{@set@env}{true}\setboolean{@use@envlab}{false}}%
-\define@key{ov}{setuplabel}[true]{
+\define@key{ov}{setuplabel}[true]{%
 \iffixq{#1}{\setboolean{@set@env}{true}\setboolean{@use@envlab}{false}}}%
 \def\@dodtf{\@d@pos{1}\@t@pos{3}\@f@pos{2}\setboolean{@s@b@s}{false}}%
 \def\@dofdt{\@d@pos{2}\@t@pos{3}\@f@pos{1}\setboolean{@s@b@s}{false}}%
@@ -2786,62 +2798,61 @@
 \define@key{ov}{celloleft}{\celloleft{#1}}%
 % Print date right-justified
 \DeclareOption{dateright}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{false}}%
-\define@key{ov}{dateright}[true]%
-{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{false}}}%
+\define@key{ov}{dateright}[true]{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{false}}}%
+\def\dateright#1{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{false}}}%
 % Print date left-justified
 \DeclareOption{dateleft}{\setboolean{@dt@l}{true}\setboolean{@dt@c}{false}}%
-\define@key{ov}{dateleft}[true]%
-{\iffixq{#1}{\setboolean{@dt@l}{true}\setboolean{@dt@c}{false}}}%
+\define@key{ov}{dateleft}[true]{\iffixq{#1}{\setboolean{@dt@l}{true}\setboolean{@dt@c}{false}}}%
+\def\dateleft#1{\iffixq{#1}{\setboolean{@dt@l}{true}\setboolean{@dt@c}{false}}}%
 % Print date centered
 \DeclareOption{datecenter}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{true}}%
-\define@key{ov}{datecenter}[true]%
-{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{true}}}%
+\define@key{ov}{datecenter}[true]{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{true}}}%
+\def\datecenter#1{\iffixq{#1}{\setboolean{@dt@l}{false}\setboolean{@dt@c}{true}}}%
 % Do not print date
 \DeclareOption{dateno}{\setboolean{@dt@p}{false}}%
 \define@key{ov}{dateno}[true]{\iffixf{#1}{@dt@p}}%
+\def\dateno#1{\iffixf{#1}{@dt@p}}%
 % Print date
 \DeclareOption{dateyes}{\setboolean{@dt@p}{true}}%
 % Print signature left-justified
-\DeclareOption{signatureleft}{\setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}%
-\define@key{ov}{signatureleft}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}}%
-\DeclareOption{signleft}{\setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}%
-\define@key{ov}{sigleft}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}}%
+\def\setsigl{\setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}
+\def\setsigc{\setboolean{@sig@l}{false}\setboolean{@sig@c}{true}}
+\def\setsigr{\setboolean{@sig@l}{false}\setboolean{@sig@c}{false}}
+\DeclareOption{signatureleft}{\txa{DO fsignl}\setsigl}%
+\define@key{ov}{signatureleft}[true]{\iffixq{#1}{\txa{DK fsignl}\setsigl}}%
+\def\signatureleft#1{\txa{SO fsignl}\setsigl}%
+\DeclareOption{sigleft}{\txa{DO asignl}\setsigl}%
+\define@key{ov}{sigleft}[true]{\iffixq{#1}{\txa{DK asignl}\setsigl}}%
+\def\sigleft#1{\txa{SO asignl}\setsigl}%
 % Print signature centered
-\DeclareOption{signaturecenter}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{true}}%
-\define@key{ov}{signaturecenter}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{true}}}%
-\DeclareOption{sigcenter}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{true}}%
-\define@key{ov}{sigcenter}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{true}}}%
+\DeclareOption{signaturecenter}{\txa{DO fsignc}\setsigc}%
+\define@key{ov}{signaturecenter}[true]{\iffixq{#1}{\txa{DK fsignc}\setsigc}}%
+\def\signaturecenter#1{\txa{SO fsignc}\setsigc}%
+\DeclareOption{sigcenter}{\txa{DO asignc}\setsigc}%
+\define@key{ov}{sigcenter}[true]{\iffixq{#1}{\txa{DK asignc}\setsigc}}%
+\def\sigcenter#1{\txa{SO asignc}\setsigc}%
 % Print signature right-justified
-\DeclareOption{signatureright}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{false}}%
-\define@key{ov}{signatureright}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{false}}}%
-\DeclareOption{sigright}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{false}}%
-\define@key{ov}{sigright}[true]%
-{\iffixq{#1}{\setboolean{@sig@l}{false}\setboolean{@sig@c}{false}}}%
+\DeclareOption{signatureright}{\txa{DO fsignr}\setsigr}%
+\define@key{ov}{signatureright}[true]{\iffixq{#1}{\txa{DK fsignr}\setsigr}}%
+\def\signatureright#1{\txa{SO fsignr}\setsigr}%
+\DeclareOption{sigright}{\txa{DO asignr}\setsigr}%
+\define@key{ov}{sigright}[true]{\iffixq{#1}{\txa{DK asignr}\setsigr}}%
+\def\sigright#1{\txa{SO asignr}\setsigr}%
 % No signature
 \DeclareOption{signatureno}{\setboolean{@sig@p}{false}}%
-\define@key{ov}{signatureno}[true]{\iffixf{#1}{@sig@p}}%
+\define@key{ov}{signatureno}[true]{\iffixf{#1}{\setboolean{@sig@p}{false}}}%
+\def\signatureno#1{\setboolean{@sig@p}{false}}% 
 % Print all fr \info.
-\def\@fix@all@fr{\setboolean{@use@all@fr}{true}
-\setboolean{@addr@fr@p}{true}%
-\setboolean{@addr@fr@l}{true}%
-\setboolean{@addr@fr@f}{true}%
-\setboolean{@addr@fr@e}{true}%
-\setboolean{@addr@fr@t}{true}}%
+\def\@fix@all@fr{%
+\setboolean{@use@all@fr}{true}\setboolean{@addr@fr@p}{true}\setboolean{@addr@fr@l}{true}%
+\setboolean{@addr@fr@f}{true}\setboolean{@addr@fr@e}{true}\setboolean{@addr@fr@t}{true}}%
 % Print all fr \info.
 \DeclareOption{printallfrom}{\@fix@all@fr}%
 \define@key{ov}{printallfrom}[true]{\iffixq{#1}{\@fix@all@fr}}%
 % Print all to \info.
-\def\@fix@all@to{\setboolean{@use@all@to}{true}
-\setboolean{@addr@to@p}{true}%
-\setboolean{@addr@to@l}{true}%
-\setboolean{@addr@to@f}{true}%
-\setboolean{@addr@to@e}{true}%
-\setboolean{@addr@to@t}{true}}%
+\def\@fix@all@to{
+\setboolean{@use@all@to}{true}\setboolean{@addr@to@p}{true}\setboolean{@addr@to@l}{true}%
+\setboolean{@addr@to@f}{true}\setboolean{@addr@to@e}{true}\setboolean{@addr@to@t}{true}}%
 \DeclareOption{printallto}{\@fix@all@to}%
 \define@key{ov}{printallto}[true]{\iffixq{#1}{\@fix@all@to}}%
 % Set header components to blank
@@ -2867,46 +2878,44 @@
 \DeclareOption{Blankrightmargin}{\setboolean{@B@r}{true}}%
 \define@key{ov}{Blankrightmargin}[true]{\iffixt{#1}{@B@r}}%
 % Set all components to blank
-\DeclareOption{Blankall}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}
+\DeclareOption{Blankall}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}%
 \setboolean{@B@h}{true}\setboolean{@B@r}{true}}%
 \define@key{ov}{Blankall}[true]%
-{\iffixq{#1}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}
+{\iffixq{#1}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}%
 \setboolean{@B@h}{true}\setboolean{@B@r}{true}}}%
-\DeclareOption{blankall}{\setboolean{@b@f}{true}\setboolean{@b@l}{true}
+\DeclareOption{blankall}{\setboolean{@b@f}{true}\setboolean{@b@l}{true}%
 \setboolean{@b@h}{true}\setboolean{@b@r}{true}}%
 \define@key{ov}{blankall}[true]%
-{\iffixq{#1}{\setboolean{@b@f}{true}\setboolean{@b@l}{true}
+{\iffixq{#1}{\setboolean{@b@f}{true}\setboolean{@b@l}{true}%
 \setboolean{@b@h}{true}\setboolean{@b@r}{true}}}%
 \DeclareOption{BlankTotal}% Fixed
-{\setboolean{@B@f}{true}\setboolean{@B@l}{true}%
-\setboolean{@B@h}{true}\setboolean{@B@r}{true}%
-\setboolean{@b@f}{true}\setboolean{@b@l}{true}%
-\setboolean{@b@h}{true}\setboolean{@b@r}{true}}%
+{\setboolean{@B@f}{true}\setboolean{@B@l}{true}\setboolean{@B@h}{true}\setboolean{@B@r}{true}%
+\setboolean{@b@f}{true}\setboolean{@b@l}{true}\setboolean{@b@h}{true}\setboolean{@b@r}{true}}%
 \define@key{ov}{BlankTotal}[true]%
-{\iffixq{#1}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}%
-\setboolean{@B@h}{true}\setboolean{@B@r}{true}%
+{\iffixq{#1}{\setboolean{@B@f}{true}\setboolean{@B@l}{true}\setboolean{@B@h}{true}\setboolean{@B@r}{true}%
 \setboolean{@b@f}{true}\setboolean{@b@l}{true}%
 \setboolean{@b@h}{true}\setboolean{@b@r}{true}}}%
 \DeclareOption{useenvlab}{\setboolean{@set@env}{false}\setboolean{@use@envlab}{true}}%
-\define@key{ov}{useenvlab}[true]{
+\define@key{ov}{useenvlab}[true]{%
 \iffixq{#1}{\setboolean{@use@envlab}{true}\setboolean{@set@env}{false}}}%
 \def\@paper@type{letterpaper}%
+\def\ifta{0}
 \DeclareOption{letterpaper}{\def\@paper@type{letterpaper}}%
 \define@key{ov}{letterpaper}[true]{\iffixq{#1}{\def\@paper@type{letterpaper}}}%
-\DeclareOption{legalpaper}{\def\@paper@type{legalpaper}}
+\DeclareOption{legalpaper}{\def\@paper@type{legalpaper}}%
 \define@key{ov}{legalpaper}[true]{\iffixq{#1}{\def\@paper@type{legalpaper}}}%
-\DeclareOption{a4paper}{\def\@paper@type{a4paper}}
+\DeclareOption{a4paper}{\def\@paper@type{a4paper}}%
 \define@key{ov}{a4paper}[true]{\iffixq{#1}{\def\@paper@type{a4paper}}}%
-\DeclareOption{a3paper}{\def\@paper@type{a3paper}}
+\DeclareOption{a3paper}{\def\@paper@type{a3paper}}%
 \define@key{ov}{a3paper}[true]{\iffixq{#1}{\def\@paper@type{a3paper}}}%
-\setkeys{ov}{textwidthsize=-1pt,textheightsize=-1pt,bottommarginskip=5pt,%
+\setkeys{ov}{textwidthsize=0pt,textheightsize=0pt,bottommarginskip=5pt,%
 headermarginskip=0pt,rightmarginsize=72pt,leftmarginsize=72pt,bottommarginskipbelow=5pt,%
-leftmargintopdist=-1pt,addrtoskipafter=18pt,unprright=-1pt,labsize=\normalsize,%
+leftmargintopdist=0pt,addrtoskipafter=18pt,unprright=0pt,labsize=\normalsize,%
 leftmarginskipleft=10pt,leftmarginskipright=10pt,dateskipbefore=20pt,%
 dateskipafter=36pt,addrfromskipafter=36pt,addrfromskipbefore=0pt,%
 greettoskipafter=18pt,sigskipbefore=12pt,sigskipafter=12pt,sigsize=72pt,%
-postsigskipafter=10pt,memoskipafter=15pt,memoskipbefore=35pt,unprtop=-1pt,unprbottom=-1pt,%
-unprleft=-1pt}%
+postsigskipafter=10pt,memoskipafter=15pt,memoskipbefore=35pt,unprtop=0pt,unprbottom=0pt,%
+unprleft=0pt}%
 %    \end{macrocode}%
 % \end{macro}
 % \subsection{Executing Options}
@@ -2923,18 +2932,18 @@ unprleft=-1pt}%
 %    passed as document options to any |\usepackage| command in the
 %    document preamble.
 %    \begin{macrocode}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letter}}
-\ProcessOptions
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letter}}%
+\ProcessOptions%
 %    \end{macrocode}
 %
 % \begin{macro}{showdim}
 %    This is here for debugging only.
 %    \begin{macrocode}
 \def\showdim#1{%
-\txa{ * * * }
-\txa{*****************************************************************************}
+\txa{ * * * }%
+\txa{*****************************************************************************}%
 \txa{Dimensions: #1}%
-% \printinunitsof{in}\pagevalues
+% \printinunitsof{in}\pagevalues%
 \txa{\string\headheight:     \the\headheight,  \string\headsep:        \the\headsep}%
 \txa{\string\paperheight:    \the\paperheight, \string\paperwidth:    \the\paperwidth}%
 \txa{\string\textheight:     \the\textheight,  \string\textwidth:      \the\textwidth}
@@ -2945,8 +2954,8 @@ unprleft=-1pt}%
 \txa{\string\oddsidemargin:  \the\oddsidemargin, \string\columnsep:      \the\columnsep}%
 \txa{\string\topmargin:      \the\topmargin}%
 \txa{\string\marginparpush: \the\marginparpush, \string\marginparsep: \the\marginparsep}%
-\txa{*****************************************************************************}
-\txa{ * * * }
+\txa{*****************************************************************************}%
+\txa{ * * * }%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -2964,7 +2973,7 @@ unprleft=-1pt}%
 \RequirePackage{addrset}%
 \IfFileExists{afterpage.sty}{\RequirePackage{afterpage}}{}%
 \IfFileExists{envlab.sty}{\RequirePackage{envlab}}{}%
-\showdim{After LoadClass}
+\showdim{After LoadClass}%
 %    \end{macrocode}%
 %    Some of the page layout parameters are defined here.  Many of the values%
 %    for the page layout parameters are set in geometry below.  In setting the%
@@ -3042,9 +3051,9 @@ unprleft=-1pt}%
 \count0 = \time \divide\count0 by 60%
 \count2 = \count0 % the hour%
 \count4 = \time \multiply\count0 by 60%
-\advance\count4 by -\count0 % the minute%
-\ifnum\count4<10 \toks1 = {0}    \else \toks1 = {}\fi%
-\ifnum\count2<12 \toks0 = {A.M.} %
+\advance\count4 by -\count0% the minute%
+\ifnum\count4<10 \toks1 = {0} \else \toks1 = {}\fi%
+\ifnum\count2<12 \toks0 = {A.M.}%
 \else \toks0 = {P.M.}\advance\count2 by -12\fi%
 \ifnum\count2=0 \count2 = 12 \fi % make midnight 12%
 {\number\count2:\the\toks1 \number\count4%
@@ -3410,19 +3419,19 @@ unprleft=-1pt}%
 \newcommand{\fixphr}[2]{\strut & \parbox[t]{\the\@utilc}{#1} #2 \\}%
 \def\ifta{0}%
 \def\memosec{%
-  \def\ifta{0}\txa{Start of memosec}%
-  \noindent\ignorespaces%
-  \settowidth{\@utila}{{\bf \@hnfr@phr:\hspace*{1.25em}}}% 
-  \setlength{\@utilb}{\textwidth-\@utila-.1em}%
-  \addtolength{\@utilb}{-5pt}%   
-  \settowidth{\@utilc}{\@phn@phr:\hspace*{2em}}%
-  \settowidth{\@utild}{\@fax@phr:\hspace*{2em}}%
-  \ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
-  \settowidth{\@utild}{\@pager@phr:\hspace*{2em}}
-  \ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
-  \settowidth{\@utild}{\@email@phr:\hspace*{2em}}
-  \ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
-\txa{After length tests}
+\def\ifta{0}\txa{Start of memosec}%
+\noindent\ignorespaces%
+\settowidth{\@utila}{{\bf \@hnfr@phr:\hspace*{1.25em}}}% 
+\setlength{\@utilb}{\textwidth-\@utila-.1em}%
+\addtolength{\@utilb}{-5pt}%   
+\settowidth{\@utilc}{\@phn@phr:\hspace*{2em}}%
+\settowidth{\@utild}{\@fax@phr:\hspace*{2em}}%
+\ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
+\settowidth{\@utild}{\@pager@phr:\hspace*{2em}}%
+\ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
+\settowidth{\@utild}{\@email@phr:\hspace*{2em}}%
+\ifthenelse{\lengthtest{\@utilc<\@utild}}{\setlength{\@utilc}{\the\@utild}}{}%
+\txa{After length tests}%
 {\vspace*{-1em}\setlength{\tabcolsep}{0pt}%
 \setboolean{@memo@a}{false}%
 \vspace*{\@pre@memo@sp}\noindent\par%
@@ -3689,7 +3698,7 @@ unprleft=-1pt}%
 \ifthenelse{\boolean{@marg@Ruse}}%             Here we set up right-side marginal notes
 {\setlength{\@utile}{-\@Hgt@Head+\@marg@rt@tp@d}% Adjust column top to leftmargintopdist
 \normalmarginpar%
-\marginpar{\vspace*{\the\@utile} \hspace*{\@marg@rt@l}\hspace*{-\marginparsep} \@Rmarg}}{}
+\marginpar{\vspace*{\the\@utile} \hspace*{\@marg@rt@l}\hspace*{-\marginparsep} \@Rmarg}}{}%
 \ifthenelse{\boolean{@marg@Luse}}%             Here we set up left-side marginal notes
 {\setlength{\@utile}{-\@Hgt@Head+\@marg@lt@tp@d}% Adjust column top to leftmargintopdist
 \reversemarginpar\txa{Left margin}%
@@ -3706,7 +3715,7 @@ unprleft=-1pt}%
 \ifthenelse{\boolean{@pr@p}}%
 {\pressbegin%                                Press release processing
 \txa{here we go again - out of pressbegin}
-\setboolean{@no@spc}{true}} {}% % Press Release
+\setboolean{@no@spc}{true}}{}% % Press Release
 \sbox{\b@addr@fr}{\noindent\setlength{\tabcolsep}{0pt}% Address-from into a box
 \raggedleft\begin{tabular}{l@{}}%
 \noindent\ignorespaces\@addr@fr%
@@ -3768,10 +3777,11 @@ unprleft=-1pt}%
 %      and then have the previous page output.
 %    \end{enumerate}
 %    \begin{macrocode}
+\def\ifta{0}
 \def\@fix@one@box{%
 \settowidth{\@utila}{\setlength{\tabcolsep}{0pt}%
 \begin{tabular}{l}%
-\hspace*{1pt}
+\hspace*{1pt}%
 \vspace*{\@cls@sk@b} \\%
 \ifthenelse{\boolean{@use@close}}{{\@closeline}\\}{}%
 \vspace*{\@cls@sk@a} \\%
@@ -3847,7 +3857,10 @@ unprleft=-1pt}%
 \vspace*{\the\@sig@sk@a}%\end{flushleft}
 }%
 {% Print normal signature
+\def\ifta{0}
 \@fix@one@box\settowidth{\@utila}{\usebox{\@sig@box@b}}% Set up box, measure
+\ifthenelse{\boolean{@sig@l}}{\txa{@sig@l:true}}{\txa{@sig@l:false}}
+\ifthenelse{\boolean{@sig@c}}{\txa{@sig@c:true}}{\txa{@sig@c:false}}
 \Prnt@Chk{@sig@p}{@sig@l}{@sig@c}%
 {\parbox{\@utila}{\usebox{\@sig@box@b}}}{}{\@cls@sk@b}{\@sig@sk@a}}%
 \ifthenelse{\boolean{@resta@l}}{\newpage\usebox{\@resta@ltr}}{}%
@@ -3973,7 +3986,8 @@ unprleft=-1pt}%
 \def\sender#1{\protect\def\@sender{#1}}\sender{}%
 \def\signature#1{\protect\def\@sig@fr{#1}\setboolean{@use@sig}{true}}%
 \def\sigacross#1{\setcounter{@sig@tot}{#1}}%
-\def\siglist#1{\protect\def\@sig@list{#1}\setboolean{@mult@sig}{true}%
+\def\siglist#1{\txa{In siglist}%
+\protect\def\@sig@list{#1}\setboolean{@mult@sig}{true}%
 \setboolean{@sig@l}{true}\setboolean{@sig@c}{false}}%
 \def\signame#1{\protect\def\@sig@nm{#1}\setboolean{@use@sig@nm}{true}}% 
 \def\socsec#1{\protect\def\@socsec{#1}}\socsec{}%
@@ -3988,9 +4002,10 @@ unprleft=-1pt}%
 \def\headline#1{\protect\def\@pr@headline{#1}%
 \protect\def\@pr@shorthead{#1}}\headline{---BLANK---}%
 \def\release#1{\protect\def\@pr@release{#1}}\release{\@release@phr}%
-\def\shorthead#1{\protect\def\@pr@shorthead{#1}}\regarding{---BLANK---}% 
+\def\shorthead#1{\protect\def\@pr@shorthead{#1}}
+\regarding{---BLANK---}% 
 \setboolean{@pt@regard}{false}%
-\siglist{}%
+%\siglist{}%
 \signature{}%            
 \sigacross{1}%
 \closeline{}%
@@ -4331,23 +4346,23 @@ unprleft=-1pt}%
 % Add remaining rows, each with all columns
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \whiledo{\the@lab@cnt@row<\the@lab@tot@row}%
-{\setcounter{@lab@cnt@col}{0}
+{\setcounter{@lab@cnt@col}{0}%
 \whiledo{\the@lab@cnt@col<\the@lab@tot@col}%
 {\@env@oth{\usebox{\@x@l}}{\usebox{\@x@l}}% 
 \addtocounter{@lab@cnt@col}{1}%
 \ifthenelse{\the@lab@cnt@col<\the@lab@tot@col}{&}{\\}
-}
+}%
 \addtocounter{@lab@cnt@row}{1}%
 \ifthenelse{\the@lab@cnt@row<\the@lab@tot@row}
-{}
-{\\ \end{tabular}\end{table} \newpage 
-\showdim{At the end of the table}}
+{}%
+{\\ \end{tabular}\end{table} \newpage%
+\showdim{At the end of the table}}%
 \setboolean{@env@close}{false}%
-\setboolean{@env@open}{true}
+\setboolean{@env@open}{true}%
 }%
 }%
 {}%
-\setboolean{@use@envlab}{false}
+\setboolean{@use@envlab}{false}%
 \end{newlfm}%
 \def\ifta{0}%
 }%
@@ -4372,20 +4387,69 @@ unprleft=-1pt}%
 %    \end{enumerate}
 %    \end{enumerate}
 %    \begin{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Put together a header or footer given the left, center and
+% right text, fillers at left and right and a rule.
+% The \lap commands put the text into an hbox of zero size,
+% so overlapping text does not generate an errormessage.
+% These macros have 5 parameters:
+% 1. LEFTSIDE BEARING % This determines at which side the header will stick
+%    out. When \fancyhfoffset is used this calculates \headwidth, otherwise
+%    it is \hss or \relax (after expansion).
+% 2. \f@ncyolh, \f@ncyelh, \f@ncyolf or \f@ncyelf. This is the left component.
+% 3. \f@ncyoch, \f@ncyech, \f@ncyocf or \f@ncyecf. This is the middle comp.
+% 4. \f@ncyorh, \f@ncyerh, \f@ncyorf or \f@ncyerf. This is the right component.
+% 5. RIGHTSIDE BEARING. This is always \relax or \hss (after expansion).
+
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\@zfancyvbox}[2]{
+\gdef\@zpqutil{1pt}
+\setbox0\vbox{#2}\ifdim\ht0>#1
+\setlength{\@utill}{\the\ht0}
+\addtolength{\@utill}{-#1}
+\addtolength{\@utill}{5.0pt}
+\txa{utill:\the\@utill}
+\xdef\@zpqutil{\the\@utill}
+\txa{@zpqutil:\@zpqutil}
+\fi
+}
+\newcommand{\@zfancyhead}[5]{#1\hbox to\headwidth{\fancy@reset
+  \@zfancyvbox\headheight{\hbox
+    {\rlap{\parbox[b]{\headwidth}{\raggedright#2}}\hfill
+      \parbox[b]{\headwidth}{\centering#3}\hfill
+      \llap{\parbox[b]{\headwidth}{\raggedleft#4}}}\zheadrule}}#5}
+
+\newcommand{\@zfancyfoot}[5]{#1\hbox to\headwidth{\fancy@reset
+    \@zfancyvbox\footskip{\zfootrule
+      \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright#2}}\hfill
+        \parbox[t]{\headwidth}{\centering#3}\hfill
+        \llap{\parbox[t]{\headwidth}{\raggedleft#4}}}}}#5}
+
+\newcommand{\zheadrule}{{\if@fancyplain\let\headrulewidth\plainheadrulewidth\fi
+    \hrule\@height\headrulewidth\@width\headwidth \vskip-\headrulewidth}}
+
+\newcommand{\zfootrule}{{\if@fancyplain\let\footrulewidth\plainfootrulewidth\fi
+    \vskip-\footruleskip\vskip-\footrulewidth
+    \hrule\@width\headwidth\@height\footrulewidth\vskip\footruleskip}}
+
 \newenvironment{newlfm}{% Start of fax environment, in fax class%
 \if@read@one \global\@read@onefalse \fi%
-\def\ifta{0}\txa{Start of newlfm startup}
-\ifthenelse{\boolean{@ov@a}}{\txa{oa: t}}{\txa{oa: f}}
-\ifthenelse{\boolean{@ov@t}}{\txa{ot: t}}{\txa{ot: f}}
-\ifthenelse{\boolean{@ov@f}}{\txa{of: t}}{\txa{of: f}}
-\ifthenelse{\boolean{@ov@l}}{\txa{ol: t}}{\txa{ol: f}}
-\ifthenelse{\boolean{@ov@s}}{\txa{os: t}}{\txa{os: f}}
-\txa{nameto: \@name@to}
-\txa{namefrom: \@name@fr}
+\def\ifta{0}\txa{Start of newlfm startup}%
+\ifthenelse{\boolean{@ov@a}}{\txa{oa: t}}{\txa{oa: f}}%
+\ifthenelse{\boolean{@ov@t}}{\txa{ot: t}}{\txa{ot: f}}%
+\ifthenelse{\boolean{@ov@f}}{\txa{of: t}}{\txa{of: f}}%
+\ifthenelse{\boolean{@ov@l}}{\txa{ol: t}}{\txa{ol: f}}%
+\ifthenelse{\boolean{@ov@s}}{\txa{os: t}}{\txa{os: f}}%
+\txa{nameto: \@name@to}%
+\txa{namefrom: \@name@fr}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%% Begin with fax cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifthenelse{\boolean{@ov@a}}{\faxblocka}{}
+\ifthenelse{\boolean{@ov@a}}{\faxblocka}{}%
 \ifthenelse{\boolean{@fax@RA}}%
 {\ifthenelse{\boolean{@fax@bla}}{\Rheader{\usebox{\fba}}}{}%
 \ifthenelse{\boolean{@fax@blb}}{\Rheader{\faxblockb}}{}}{}%
@@ -4399,14 +4463,14 @@ unprleft=-1pt}%
 \ifthenelse{\boolean{@ov@f}}{\setadrfr{\expandafter\csname adr\@adr@f \endcsname}}{}%
 \ifthenelse{\boolean{@ov@s}}{\expandafter\csname sig\@sig@b \endcsname}{}%
 \@set@em@up
-}{}
+}{}%
 \txa{setting up ruh}%
 \def\ifta{0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-\txa{name@to:\@name@to}
-\ifthenelse{\boolean{@ov@t}}{\txa{oversetto:true}}{\txa{oversetto:false}}
-\txa{name@fr:\@name@fr}
-\ifthenelse{\boolean{@ov@f}}{\txa{oversetfr:true}}{\txa{oversetfr:false}}
+\txa{name@to:\@name@to}%
+\ifthenelse{\boolean{@ov@t}}{\txa{oversetto:true}}{\txa{oversetto:false}}%
+\txa{name@fr:\@name@fr}%
+\ifthenelse{\boolean{@ov@f}}{\txa{oversetfr:true}}{\txa{oversetfr:false}}%
 \retdims%
 \ifthenelse{\boolean{@fax@hdr@pg}}%
 {{\txa{FAX Page Setup}%
@@ -4422,7 +4486,7 @@ unprleft=-1pt}%
 }}{}%
 \rstdims%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-\def\ifta{0}\showdim{After fax page section closes}\gdef\npind{G}
+\def\ifta{0}\showdim{After fax page section closes}\gdef\npind{G}%
 \if@twoside \ifodd\c@page%
 \else\thispagestyle{empty}\null\newpage\fi  \fi%
 \c@page\@ne%
@@ -4452,8 +4516,8 @@ unprleft=-1pt}%
 \openlfm%
 %  }{}
 \def\ifta{0}%
-\txa{nameto:\@name@to}
-\txa{namefr:\@name@fr}
+\txa{nameto:\@name@to}%
+\txa{namefr:\@name@fr}%
 \txa{\string\@marg@rt: \the\@marg@rt, \string\@marg@rt: \the\@marg@rt}%
 \txa{\string\textwidth: \the\textwidth, \string\paperwidth: \the\paperwidth}%
 \txa{After opening}%
@@ -4466,7 +4530,7 @@ unprleft=-1pt}%
 \txa{After pagestyle}%
 \ifthenelse{\boolean{@in@makeenv}}{\txa{makeenv true}}{\txa{makeenv false}%
 \global\advance \@nlfm@addr by1%
-\txa{Count: \number\@nlfm@addr -- To: \@adr@t -- From: \@adr@f}
+\txa{Count: \number\@nlfm@addr -- To: \@adr@t -- From: \@adr@f}%
 \expandafter\xdef\csname @aadr@t\number\@nlfm@addr\endcsname{\@adr@t}%
 \expandafter\xdef\csname @aadr@f\number\@nlfm@addr\endcsname{\@adr@f}%
 \txa{Count: \number\@nlfm@addr -- To: \@adr@t -- From: \@adr@f}
@@ -4503,7 +4567,7 @@ unprleft=-1pt}%
 \@post@sig@bl{\@ppps@phr}{\@ppps@item}{---BLANK---}%
 \@post@sig@bl{\@encl@phr}{\@encl@item}{---BLANK---}%
 \@post@sig@bl{\@cc@phr}{\@cc@item}{---BLANK---}}{}%
-\ifthenelse{\boolean{@sig@mp}}{
+\ifthenelse{\boolean{@sig@mp}}{%
 \@post@sig@bl{\@ps@phr}{\@ps@item}{---BLANK---}%
 \@post@sig@bl{\@pps@phr}{\@pps@item}{---BLANK---}%
 \@post@sig@bl{\@ppps@phr}{\@ppps@item}{---BLANK---}%
@@ -4527,11 +4591,11 @@ unprleft=-1pt}%
 %
 % Only the press release uses that environment.
 %    \begin{macrocode}
-\ifthenelse{\boolean{@pr@p}}{
+\ifthenelse{\boolean{@pr@p}}{%
 \ifthenelse{\boolean{@space@d}}{\end{doublespace}}{\end{singlespace}}%
 }{}%
 }%
-\def\@make@big@env{
+\def\@make@big@env{%
 \@nlfm@util=0%
 \def\ifta{0}%
 \txa{In @make@big@env}%
@@ -4562,8 +4626,8 @@ unprleft=-1pt}%
 \repeat%
 \global\@nlfm@addr=0%
 \txa{Count at end: \number\@nlfm@addr}%
-}
-\def\@clear@box{
+}%
+\def\@clear@box{%
 \Background{}\background{}\Lfooter{}\Cfooter{}\Rfooter{}\LOfooter{}%
 \COfooter{}\ROfooter{}\lfooter{}\cfooter{}\rfooter{}\Lheader{}%
 \Cheader{}\Rheader{}\LUheader{}\CUheader{}\RUheader{}\lheader{}%
@@ -4587,7 +4651,7 @@ unprleft=-1pt}%
 % Much of this is in contravention of the philosophy of newlfm - since 
 % it displaces information that might have been placed into the blocks
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\txa{Real start}
+\txa{Real start}%
 \ifthenelse{\boolean{@pr@p}}{%
 \PhrMore{\thepage\ of \pageref{LastPage}}
 \Cfooter{\@more@phr}\cfooter{\@more@phr}%
@@ -4615,18 +4679,33 @@ unprleft=-1pt}%
 % Check the heights and depths of boxes
 % Letterhead header section
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{lrbox}{\@x@c}\begin{minipage}{\textwidth}\@Cheader\end{minipage}\end{lrbox}%
-\begin{lrbox}{\@x@l}\begin{minipage}{\textwidth}\@Lheader\end{minipage}\end{lrbox}%
-\begin{lrbox}{\@x@r}\begin{minipage}{\textwidth}\@Rheader\end{minipage}\end{lrbox}%
+\settowidth{\@utili}{\@Lheader}%
+\settowidth{\@utilj}{\@Cheader}%
+\settowidth{\@utilk}{\@Rheader}%
+\begin{lrbox}{\@x@l}\begin{minipage}{\@utili}\@Lheader\end{minipage}\end{lrbox}%
+\begin{lrbox}{\@x@c}\begin{minipage}{\@utilj}\@Cheader\end{minipage}\end{lrbox}%
+\begin{lrbox}{\@x@r}\begin{minipage}{\@utilk}\@Rheader\end{minipage}\end{lrbox}%
 \ifthenelse{\boolean{@Ch@use}}%
 {\settoheight{\@Hgt@H@C}{\strut\usebox{\@x@c}\strut}\settodepth{\@Dth@H@C}{\strut\usebox{\@x@c}\strut}%
-\addtolength{\@Hgt@H@C}{\@Dth@H@C}}{\setlength{\@Hgt@H@C}{0pt}}%
+\addtolength{\@Hgt@H@C}{\@Dth@H@C}}{\setlength{\@Hgt@H@C}{0pt}\setlength{\@Dth@H@C}{0pt}}%
 \ifthenelse{\boolean{@Rh@use}}%
 {\settoheight{\@Hgt@H@R}{\strut\usebox{\@x@r}\strut}\settodepth{\@Dth@H@R}{\strut\usebox{\@x@r}\strut}%
-\addtolength{\@Hgt@H@R}{\@Dth@H@R}}{\setlength{\@Hgt@H@R}{0pt}}%
+\addtolength{\@Hgt@H@R}{\@Dth@H@R}}{\setlength{\@Hgt@H@R}{0pt}\setlength{\@Dth@H@R}{0pt}}%
 \ifthenelse{\boolean{@Lh@use}}%
 {\settoheight{\@Hgt@H@L}{\strut\usebox{\@x@l}\strut}\settodepth{\@Dth@H@L}{\strut\usebox{\@x@l}\strut}%
-\addtolength{\@Hgt@H@L}{\@Dth@H@L}}{\setlength{\@Hgt@H@L}{0pt}}%
+\addtolength{\@Hgt@H@L}{\@Dth@H@L}}{\setlength{\@Hgt@H@L}{0pt}\setlength{\@Dth@H@L}{0pt}}%
+\settoheight{\@utilf}{
+\vbox{\llap{\hbox{\parbox{\@utili}{\raggedright\usebox{\@x@l}}\hfill
+\parbox{\@utilj}{\centering\usebox{\@x@c}}\hfill
+\rlap{\parbox{\@utilk}{\raggedleft\usebox{\@x@r}}}}}}}
+\settodepth{\@utilg}{
+\vbox{\hbox{\llap{\parbox{\@utili}{\raggedright\usebox{\@x@l}}\hfill
+\parbox{\@utilj}{\centering\usebox{\@x@c}}\hfill
+\rlap{\parbox{\@utilk}{\raggedleft\usebox{\@x@r}}}}}}}
+\addtolength{\@utilh}{\@utilf}
+\addtolength{\@utilh}{\@utilg}
+%\addtolength{\@utilf}{\@Hrw}
+%\addtolength{\@utilf}{2.0pt}
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Check the heights and depths of boxes
 % Non-letterhead header section
@@ -4638,13 +4717,13 @@ unprleft=-1pt}%
 \txa{\@rheader}%
 \ifthenelse{\boolean{@ch@use}}%
 {\settoheight{\@Hgt@h@c}{\strut\usebox{\@x@c}\strut}\settodepth{\@Dth@h@c}{\strut\usebox{\@x@c}\strut}%
-\addtolength{\@Hgt@h@c}{\@Dth@h@c}}{\setlength{\@Hgt@h@c}{0pt}}%
+\addtolength{\@Hgt@h@c}{\@Dth@h@c}}{\setlength{\@Hgt@h@c}{0pt}\setlength{\@Dth@h@c}{0pt}}%
 \ifthenelse{\boolean{@rh@use}}%
 {\settoheight\@Hgt@h@r{\strut\usebox{\@x@r}\strut}\settodepth\@Dth@h@r{\strut\usebox{\@x@r}\strut}%
-\addtolength\@Hgt@h@r{\@Dth@h@r}}{\setlength\@Hgt@h@r{0pt}}%
+\addtolength\@Hgt@h@r{\@Dth@h@r}}{\setlength\@Hgt@h@r{0pt}\setlength\@Dth@h@r{0pt}}%
 \ifthenelse{\boolean{@lh@use}}%
 {\settoheight\@Hgt@h@l{\strut\usebox{\@x@l}\strut}\settodepth\@Dth@h@l{\strut\usebox{\@x@l}\strut}%
-\addtolength\@Hgt@h@l{\@Dth@h@l}}{\setlength\@Hgt@h@l{0pt}}%
+\addtolength\@Hgt@h@l{\@Dth@h@l}}{\setlength\@Hgt@h@l{0pt}\setlength\@Dth@h@l{0pt}}%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Check the heights and depths of boxes
 % Letterhead footer section
@@ -4654,13 +4733,13 @@ unprleft=-1pt}%
 \begin{lrbox}{\@x@r}\begin{minipage}{\textwidth}\@Rfooter\end{minipage}\end{lrbox}%
 \ifthenelse{\boolean{@Cf@use}}%
 {\settoheight{\@Hgt@F@C}{\strut\usebox{\@x@c}\strut}\settodepth{\@Dth@F@C}{\strut\usebox{\@x@c}\strut}%
-\addtolength{\@Hgt@F@C}{\@Dth@F@C}}{\setlength{\@Hgt@F@C}{0pt}}%
+\addtolength{\@Hgt@F@C}{\@Dth@F@C}}{\setlength{\@Hgt@F@C}{0pt}\setlength{\@Dth@F@C}{0pt}}%
 \ifthenelse{\boolean{@Rf@use}}%
 {\settoheight{\@Hgt@F@R}{\strut\usebox{\@x@r}\strut}\settodepth{\@Dth@F@R}{\strut\usebox{\@x@r}\strut}%
-\addtolength{\@Hgt@F@R}{\@Dth@F@R}}{\setlength{\@Hgt@F@R}{0pt}}%
+\addtolength{\@Hgt@F@R}{\@Dth@F@R}}{\setlength{\@Hgt@F@R}{0pt}\setlength{\@Dth@F@R}{0pt}}%
 \ifthenelse{\boolean{@Lf@use}}%
 {\settoheight{\@Hgt@F@L}{\strut\usebox{\@x@l}\strut}\settodepth{\@Dth@F@L}{\strut\usebox{\@x@l}\strut}%
-\addtolength{\@Hgt@F@L}{\@Dth@F@L}}{\setlength{\@Hgt@F@L}{0pt}}%
+\addtolength{\@Hgt@F@L}{\@Dth@F@L}}{\setlength{\@Hgt@F@L}{0pt}\setlength{\@Dth@F@L}{0pt}}%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Check the heights and depths of boxes
 % Non-letterhead footer section
@@ -4670,13 +4749,13 @@ unprleft=-1pt}%
 \begin{lrbox}{\@x@r}\begin{minipage}{\textwidth}\@rfooter\end{minipage}\end{lrbox}%
 \ifthenelse{\boolean{@ch@use}}%
 {\settoheight{\@Hgt@f@c}{\strut\usebox{\@x@c}\strut}\settodepth{\@Dth@f@c}{\strut\usebox{\@x@c}\strut}%
-\addtolength{\@Hgt@f@c}{\@Dth@f@c}}{\setlength{\@Hgt@f@c}{0pt}}%
+\addtolength{\@Hgt@f@c}{\@Dth@f@c}}{\setlength{\@Hgt@f@c}{0pt}\setlength{\@Dth@f@c}{0pt}}%
 \ifthenelse{\boolean{@rh@use}}%
 {\settoheight{\@Hgt@f@r}{\strut\usebox{\@x@r}\strut}\settodepth{\@Dth@f@r}{\strut\usebox{\@x@r}\strut}%
-\addtolength{\@Hgt@f@r}{\@Dth@f@r}}{\setlength{\@Hgt@f@r}{0pt}}%
+\addtolength{\@Hgt@f@r}{\@Dth@f@r}}{\setlength{\@Hgt@f@r}{0pt}\setlength{\@Dth@f@r}{0pt}}%
 \ifthenelse{\boolean{@lh@use}}%
 {\settoheight{\@Hgt@f@l}{\strut\usebox{\@x@l}\strut}\settodepth{\@Dth@f@l}{\strut\usebox{\@x@l}\strut}%
-\addtolength{\@Hgt@f@l}{\@Dth@f@l}}{\setlength{\@Hgt@f@l}{0pt}}%
+\addtolength{\@Hgt@f@l}{\@Dth@f@l}}{\setlength{\@Hgt@f@l}{0pt}\setlength{\@Dth@f@l}{0pt}}%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Determine the height of the letterhead header
 % Note: the minheight will be used to set up the cello window stuff
@@ -4701,14 +4780,17 @@ unprleft=-1pt}%
 \addtolength{\@Hgt@Head}{\@marg@tp@a}%
 \txa{7) @Hgt@Head: \the\@Hgt@Head}%
 \addtolength{\@Hgt@Head}{\@Hrw}%
-\addtolength{\@Hgt@Head}{2.60005pt}%
+%\addtolength{\@Hgt@Head}{2.60005pt}%
 \addtolength{\@Hgt@Head}{\@unpr@tp}%
+%\addtolength{\@Hgt@Head}{10.0pt}%
 \ifthenelse{\lengthtest{\@Hrw<2pt}}{\addtolength{\@Hgt@Head}{2.0pt}}{}%
 \txa{8) @Hgt@Head: \the\@Hgt@Head,\the\@Hrw,\headrulewidth}%
 }%
 \txa{Left: \the\@Hgt@H@L, Center: \the\@Hgt@H@C, Right: \the\@Hgt@H@R}%
 \txa{Min: \the\@Min@Hgt@Head, Total: \the\@Hgt@Head}%
 \txa{Marg: \the\@marg@tp, Marga: \the\@marg@tp@a, Unpr: \the\@unpr@tp}%
+%\addtolength{\@utilf}{\@marg@tp}
+\txa{@Hgt@Head: \the\@Hgt@Head,@utilf:\the\@utilf,@utilg:\the\@utilg,@utilh:\the\@utilh}
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Determine the height of the non-letterhead header
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4772,13 +4854,13 @@ unprleft=-1pt}%
 \setlength{\@plg}{\paperheight-\@Hgt@head-\@Hgt@foot-\@marg@tp@b-\@marg@tp@a-%
 \@marg@bt@a-\@marg@bt@b-\@f@f-\@hrw-\@frw}%
 \ifthenelse{\lengthtest{\@text@height>.1pt}}{\setlength{\@Plg}{\@text@height}}{}%
-\ifthenelse{\boolean{@Bg@use}}
-{\ClearShipoutPicture
-\AddToShipoutPicture{\includegraphics[natheight=11in,natwidth=8.5in]{\@Backgrnd}}}
-{\ifthenelse{\boolean{@bg@use}}
-{\ClearShipoutPicture
-\AddToShipoutPicture{\includegraphics[natheight=11in,natwidth=8.5in]{\@backgrnd}}
-}{}}
+\ifthenelse{\boolean{@Bg@use}}%
+{\ClearShipoutPicture%
+\AddToShipoutPicture{\includegraphics[natheight=11in,natwidth=8.5in]{\@Backgrnd}}}%
+{\ifthenelse{\boolean{@bg@use}}%
+{\ClearShipoutPicture%
+\AddToShipoutPicture{\includegraphics[natheight=11in,natwidth=8.5in]{\@backgrnd}}%
+}{}}%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Print feedback if requested
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4884,17 +4966,37 @@ unprleft=-1pt}%
 \settodepth{\@utilb}{\@Lheader}%
 \addtolength{\@utile}{\@utilb}%
 \txa{Left: \the\@utile}%
+\txa{marg-tp-a: \the\@marg@tp@a}%
 \gdef\npind{A5}%
+\ifthenelse{\lengthtest{\@Hgt@head<10pt}}{\setlength{\@Hgt@head}{13pt}}{}%
 \setpage{\@Plg}{\@Pwd}{\@marg@rt-1in}{\@marg@lt-1in}{10pt}%
 {\@marg@tp@a-1in}{\@Hgt@Head}{\@marg@tp@b}{\@Hgt@Foot}%
-\ifthenelse{\lengthtest{\@Hgt@head<10pt}}{\setlength{\@Hgt@head}{13pt}}{}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \vspace*{\the\@marg@tp@a}
+\txa{headrulewidth:\headrulewidth}
+%\txa{@height:\the\@height}
+\@zfancyhead{\relax}{\f@ncyolh}{\f@ncyolh}{\f@ncyorh}{\relax}
+\txa{HgtHead:\the\@Hgt@Head,utill:\the\@utill,zpqutil:\@zpqutil}
+\addtolength{\@Hgt@Head}{\@utill}
+\addtolength{\@Hgt@Head}{\@zpqutil}
+\txa{HgtHead:\the\@Hgt@Head}
+\setpage{\@Plg}{\@Pwd}{\@marg@rt-1in}{\@marg@lt-1in}{10pt}%
+{\@marg@tp@a-1in}{\@Hgt@Head}{\@marg@tp@b}{\@Hgt@Foot}%
+\txa{headheight:\the\headheight}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \txa{After Setting page 1}%
 \fixhh{\@Hgt@head}%
 \fixth{\@plg}%
 \showdim{After setpage}%
 \setlength{\headwidth}{\textwidth}%
 \def\ifta{0}%
-\ifthenelse{\boolean{@cello@win}} {
+\ifthenelse{\boolean{@cello@win}} {%
 \setlength{\@utila}{\@cello@d}%
 \txa{1. \the\@utila}
 \addtolength{\@utila}{-\@Hgt@Head}%
@@ -4903,17 +5005,17 @@ unprleft=-1pt}%
 \txa{3. \the\@utila,\the\@marg@tp@a}
 \addtolength{\@utila}{-\@marg@tp@b}%
 \txa{4. \the\@utila,\the\@marg@tp@b}
-\ifthenelse{\boolean{@dt@p}}{\txa{Fixing date}
+\ifthenelse{\boolean{@dt@p}}{\txa{Fixing date}%
 \ifthenelse{\@intd@pos<\@intt@pos}{%
 \addtolength{\@utila}{-\@dt@sk@b}%
-\txa{5. \the\@utila,\the\@dt@sk@b}
+\txa{5. \the\@utila,\the\@dt@sk@b}%
 \addtolength{\@utila}{-\@dt@sk@a}%
 \txa{6. \the\@utila,\the\@dt@sk@a}
-\settoheight{\@utile}{\@xdate}
+\settoheight{\@utile}{\@xdate}%
 \addtolength{\@utila}{-\@utile}%
-\txa{7. \the\@utila,\the\@utile}
+\txa{7. \the\@utila,\the\@utile}%
 }{}}{}%
-\ifthenelse{\boolean{@addr@fr@p}}{\txa{Fixing from address}
+\ifthenelse{\boolean{@addr@fr@p}}{\txa{Fixing from address}%
 \ifthenelse{\@intf@pos<\@intt@pos}{%
 \addtolength{\@utila}{-\@addr@fr@sk@b}%
 \addtolength{\@utila}{-\@addr@fr@sk@a}%
@@ -4926,33 +5028,33 @@ unprleft=-1pt}%
 \end{tabular}}%
 \settoheight{\@utile}{\usebox{\b@addr@fr}}%
 \addtolength{\@utila}{-\@utile}%
-\txa{8. \the\@utila,\the\@utile}
+\txa{8. \the\@utila,\the\@utile}%
 }{}}{}%
-\txa{9. \the\@utila}
+\txa{9. \the\@utila}%
 \setlength{\@utilb}{\@cello@l}%
-\txa{10. Horizontal position}
-\txa{11. Start: \the\@utilb}
+\txa{10. Horizontal position}%
+\txa{11. Start: \the\@utilb}%
 \addtolength{\@utilb}{-\@marg@lt}%
-\txa{12. \the\@utilb,\the\@marg@lt}
-\txa{13. \the\@utilb}
-\ifthenelse{\lengthtest{\@utila > 0pt}}{\setboolean{@ztila}{true}}
-{\typeout{Cello window requested, but cannot be used.}
-\typeout{'To-address' cannot be placed vertically.  Suggestions:}
-\typeout{1. Make letterhead components smaller.}
-\typeout{2. Eliminate date or 'from-address' from letter.}
-\typeout{3. Move date or 'from-address' below 'to-address'.}
+\txa{12. \the\@utilb,\the\@marg@lt}%
+\txa{13. \the\@utilb}%
+\ifthenelse{\lengthtest{\@utila > 0pt}}{\setboolean{@ztila}{true}}%
+{\typeout{Cello window requested, but cannot be used.}%
+\typeout{'To-address' cannot be placed vertically.  Suggestions:}%
+\typeout{1. Make letterhead components smaller.}%
+\typeout{2. Eliminate date or 'from-address' from letter.}%
+\typeout{3. Move date or 'from-address' below 'to-address'.}%
 \setboolean{@ztila}{false}%
-}
-\ifthenelse{\lengthtest{\@utilb > 0pt}}{\setboolean{@ztilb}{true}}
-{\typeout{Cello window requested, but cannot be used.}
-\typeout{'To-address' cannot be placed horizontally.  Suggestions:}
-\typeout{1. Make left-margin width smaller.}
-\typeout{2. Eliminate margin components.}
-\setboolean{@ztilb}{false}%
-}
-\ifthenelse{\boolean{@ztila} \and \boolean{@ztilb}}{
-\setlength{\@addr@to@sk@b}{\@utila}
-\setlength{\@extr@hor}{\@utila}}{}
+}%
+\ifthenelse{\lengthtest{\@utilb > 0pt}}{\setboolean{@ztilb}{true}}%
+{\typeout{Cello window requested, but cannot be used.}%
+\typeout{'To-address' cannot be placed horizontally.  Suggestions:}%
+\typeout{1. Make left-margin width smaller.}%
+\typeout{2. Eliminate margin components.}%
+\setboolean{@ztilb}{false}%%
+}%
+\ifthenelse{\boolean{@ztila} \and \boolean{@ztilb}}{%
+\setlength{\@addr@to@sk@b}{\@utila}%
+\setlength{\@extr@hor}{\@utila}}{}%
 }{\setboolean{@cello@win}{false}\setlength{\@extr@hor}{0pt}}%
 \def\ifta{0}%
 \txa{End of @set@em@up}%
@@ -5000,56 +5102,56 @@ unprleft=-1pt}%
   \txa{npind:\npind}%
   \showdim{New page - before shipout}%
   \begingroup%           % the \endgroup is put in by \aftergroup
-    \let \protect \noexpand
-    \@resetactivechars
-    \global\let\@@if@newlist\if@newlist
-    \global\@newlistfalse
-    \@parboxrestore
-\txa{topmargin:\the\topmargin}
-\txa{Before shipout...}
-  \showdim{New page - immediately before shipout}
-    \shipout \vbox{%
-      \set@typeset@protect
-      \aftergroup \endgroup
-      \aftergroup \set@typeset@protect% correct? or just restore by ending the group
-      \if@specialpage
-        \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
-      \fi
-      \if@twoside
-        \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
-          \let\@themargin\oddsidemargin
-        \else \let\@thehead\@evenhead
-          \let\@thefoot\@evenfoot \let\@themargin\evensidemargin
-        \fi
-      \fi
-      \reset@font
-      \normalsize
-\txa{Before normalsfcodes}
-      \normalsfcodes
-      \let\label\@gobble
-      \let\index\@gobble
-      \let\glossary\@gobble
-      \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
-      \@begindvi
-      \vskip \topmargin
-    \moveright\@themargin \vbox {%
-      \setbox\@tempboxa \vbox to\headheight{%
-        \vfil
-        \color@hbox
-          \normalcolor
-          \hb@xt@\textwidth{\@thehead}%
-        \color@endbox
-        }%                        %% 22 Feb 87
-      \dp\@tempboxa \z@
-      \box\@tempboxa
-      \vskip \headsep
-      \box\@outputbox
-      \baselineskip \footskip
-      \color@hbox
-        \normalcolor
-        \hb@xt@\textwidth{\@thefoot}%
-      \color@endbox
-      }%
+    \let \protect \noexpand%
+    \@resetactivechars%
+    \global\let\@@if@newlist\if@newlist%
+    \global\@newlistfalse%
+    \@parboxrestore%
+\txa{topmargin:\the\topmargin}%
+\txa{Before shipout...}%
+  \showdim{New page - immediately before shipout}%
+    \shipout \vbox{%%
+      \set@typeset@protect%
+      \aftergroup \endgroup%
+      \aftergroup \set@typeset@protect% correct? or just restore by ending the group%
+      \if@specialpage%
+        \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%%
+      \fi%
+      \if@twoside%
+        \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot%
+          \let\@themargin\oddsidemargin%
+        \else \let\@thehead\@evenhead%
+          \let\@thefoot\@evenfoot \let\@themargin\evensidemargin%
+        \fi%
+      \fi%
+      \reset@font%
+      \normalsize%
+\txa{Before normalsfcodes}%
+      \normalsfcodes%
+      \let\label\@gobble%
+      \let\index\@gobble%
+      \let\glossary\@gobble%
+      \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@%
+      \@begindvi%
+      \vskip \topmargin%
+    \moveright\@themargin \vbox {%%
+      \setbox\@tempboxa \vbox to\headheight{%%
+        \vfil%
+        \color@hbox%
+          \normalcolor%
+          \hb@xt@\textwidth{\@thehead}%%
+        \color@endbox%
+        }%                        %% 22 Feb 87%
+      \dp\@tempboxa \z@%
+      \box\@tempboxa%
+      \vskip \headsep%
+      \box\@outputbox%
+      \baselineskip \footskip%
+      \color@hbox%
+        \normalcolor%
+        \hb@xt@\textwidth{\@thefoot}%%
+      \color@endbox%
+      }%%
     }%
 \txa{After shipout}%
 \global\let\if@newlist\@@if@newlist%