chletter update (11oct10)

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

1 files changed, 293 insertions, 179 deletions

diff --git a/Master/texmf-dist/tex/latex/chletter/chletter.cls b/Master/texmf-dist/tex/latex/chletter/chletter.cls
index 5219d245d7a..7ce0810e227 100644
--- a/Master/texmf-dist/tex/latex/chletter/chletter.cls
+++ b/Master/texmf-dist/tex/latex/chletter/chletter.cls
@@ -4,14 +4,24 @@
 %%
 %% The original source files were:
 %%
-%% chletter.dtx  (with options: `chletter')
+%% chletter.dtx  (with options: `chletter.cls')
 %% 
-%% Copyright 2008 Boris Oriet
-%% The licence is LPPL.
+%% Copyright 2008, 2009, 2010 by Boris Oriet <http://boris.oriet.net>
 %% 
-\NeedsTeXFormat{LaTeX2e}[1996/06/01]
-\ProvidesClass{chletter}[2008/07/29 v1.0 Swiss Letter document class]
-\newcommand\@ptsize{}
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3c or later is part of all distributions of LaTeX version
+%% 2008/05/04 or later.
+%% 
+%% This file has the LPPL maintenance status "author-maintained".
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{chletter}[2010/10/10 v2.0 Swiss letter document class]
 \DeclareOption{a4paper}{\paperheight297mm\paperwidth210mm}
 \DeclareOption{a5paper}{\paperheight210mm\paperwidth148mm}
 \DeclareOption{b5paper}{\paperheight250mm\paperwidth176mm}
@@ -19,187 +29,291 @@
 \DeclareOption{legalpaper}{\paperheight14in\paperwidth8.5in}
 \DeclareOption{executivepaper}{\paperheight10.5in\paperwidth7.25in}
 \DeclareOption{landscape}
- {\@tempdima\paperheight
-  \paperheight\paperwidth
-  \paperwidth\@tempdima}
-\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
-\DeclareOption{11pt}{\renewcommand\@ptsize{1}}
-\DeclareOption{12pt}{\renewcommand\@ptsize{2}}
+{\@tempdima\paperheight\paperheight\paperwidth\paperwidth\@tempdima}
+\DeclareOption{10pt}{\def\@ptsize{0}}
+\DeclareOption{11pt}{\def\@ptsize{1}}
+\DeclareOption{12pt}{\def\@ptsize{2}}
 \DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse}
 \DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue}
-\DeclareOption{draft}{\setlength\overfullrule{5\p@}}
-\DeclareOption{final}{\setlength\overfullrule{0\p@}}
+\DeclareOption{draft}{\overfullrule5\p@}
+\DeclareOption{final}{\overfullrule\z@}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
-\ExecuteOptions{a4paper,11pt,oneside,onecolumn,final}
-\ProcessOptions
+\DeclareOption{onecolumn}{\@twocolumnfalse\@leftsigfalse}
+\DeclareOption{twocolumn}{\@twocolumntrue\@leftsigtrue}
+\DeclareOption{leftwin}{\@leftwintrue}
+\DeclareOption{leftsig}{\@leftsigtrue}
+\DeclareOption{foldmark}{\@foldmarktrue}
+\DeclareOption{footfill}{\@footfilltrue}
+\newif\if@leftwin
+\newif\if@leftsig
+\newif\if@foldmark
+\newif\if@footfill
+\ExecuteOptions{a4paper,10pt}
+\ProcessOptions\relax
 \input{size1\@ptsize.clo}
-\parskip9\p@\parindent18\p@
-\newdimen\letterskip\newdimen\letterindent
-\brokenpenalty10000
-\topmargin\z@\topskip12\p@\headheight12\p@\headsep24\p@
-\footskip36\p@\footnotesep12\p@\skip\footins18\p@
-\textwidth\paperwidth\addtolength\textwidth{-180\p@}
-\textheight\paperheight\addtolength\textheight{-216\p@}
-\oddsidemargin36\p@\evensidemargin0\p@
-\marginparwidth48\p@\marginparsep12\p@\marginparpush6\p@
-\newdimen\addressmargin\addressmargin246\p@
-\newdimen\longindentation\newdimen\indentedwidth
-\newdimen\fromtop\fromtop\z@\addtolength\fromtop{-\headheight}
-\addtolength\fromtop{-\headsep}\addtolength\fromtop{-\baselineskip}
-\newdimen\fromheight\fromheight60\p@\newdimen\toheight\toheight96\p@
-\newdimen\sigspace\sigspace6\bigskipamount
-\def\ps@plain
- {\let\@oddhead\@empty
-  \def\@oddfoot
-  {\footnotesize{\hfil\pagename~\thepage}}
-  \let\@evenhead\@oddhead\let\@evenfoot\@oddfoot}
-\def\ps@headings
- {\def\@oddhead
-  {\footnotesize{\hspace*{-\oddsidemargin}\headtoname~\toname\hfil\pagename~\thepage}}
-  \def\@oddfoot
-  {\footnotesize{\hspace*{-\oddsidemargin}\leftmark\hfil\rightmark}}
-  \let\@evenhead\@oddhead\let\@evenfoot\@oddfoot}
-\def\ps@myheadings
- {\def\@oddhead
-  {\footnotesize{\hspace*{-\oddsidemargin}\leftmark\hfil\rightmark}}
-  \def\@oddfoot
-  {\footnotesize{\hfil\pagename~\thepage}}
-  \let\@evenhead\@oddhead\let\@evenfoot\@oddfoot}
-\def\ps@firstpage
- {\let\@oddhead\@empty
-  \def\@oddfoot
-  {\footnotesize{\hspace*{-\oddsidemargin}\leftmark\hfil\rightmark}}
-  \let\@evenhead\@oddhead\let\@evenfoot\@oddfoot}
-\newcommand*{\name}[1]{\def\fromname{#1}}\name{}
-\newcommand*{\signature}[1]{\def\fromsig{#1}}\signature{}
-\newcommand*{\address}[1]{\def\fromaddress{#1}}\address{}
-\newcommand*{\location}[1]{\def\fromlocation{#1}}\location{}
-\newcommand*{\telephone}[1]{\def\telephonenum{#1}}\telephone{}
-\newcommand*{\return}[1]{\def\returnaddress{#1}}\return{}
-\def\toname{}\def\toaddress{}\def\fromstreet{}\def\fromplace{}
-\newcommand*{\ccname}{cc}\newcommand*{\enclname}{encl}
-\newcommand*{\pagename}{Page}\newcommand*{\headtoname}{To}
-\newcommand*{\today}
- {\ifcase\month\or January\or February\or March\or April\or May\or June\or
-   July\or August\or September\or October\or November\or December\fi
-  \space\number\day, \number\year}
-\newcommand*{\maketitle}[1][p]
- {\vspace*{-\parskip}\ifx n#1\vspace*{\fromheight}\else\ifx r#1\vspace*{\fromheight}%
-  \else\noindent\hspace{-\oddsidemargin}\parbox[t][\fromheight]{\addressmargin}
-     {\ifx\ch@aut\@author
-      \else\leavevmode\@author\\\fi
-      \ifx\@empty\fromlocation
-      \else\fromlocation\\\fi
-      \ifx\@empty\fromaddress
-      \else\fromaddress\par\medskip\fi
-      \ifx\@empty\telephonenum
-      \else{\footnotesize\telephonenum\par\medskip}\fi}%
-      \parbox[t]{\indentedwidth}{~\\\@date}\par\vspace*{-\parskip}\fi\fi
-    \noindent\hspace{\longindentation}\parbox[t][\toheight]{\indentedwidth}
-   {\ifx p#1\else\ifx n#1\else{\footnotesize\returnaddress\par\medskip}\fi\fi
-    \leavevmode\toname\\\toaddress\\}\vspace*{-\parskip}\par}
-\newcommand{\opening}[2][n]
- {\ifx i#1\parindent\letterindent\else\parindent\z@\fi\par\noindent#2\par\medskip}
-\newcommand{\closing}[2][n]
- {\ifx i#1\parindent\letterindent\else\parindent\z@\fi\par\medskip
-  #2\par\vspace*{.5\sigspace}
-  \noindent\hspace\longindentation
-  \ifx\@empty\fromsig
-    \ifx\@empty\fromname\@author\else\fromname\fi
-  \else\fromsig\fi
-  \par\vspace*{.5\sigspace}}
-\newcommand*{\longindent}[1]
- {\par\noindent\hspace{\longindentation}\parbox[t]{\indentedwidth}{#1}\par\smallskip}
-\newcommand*{\conc}[2][r]{\ch@pul[#1]{\textbf{#2}}\par\bigskip}
-\newcommand*{\ps}[2][r]{\ch@put[#1]{#2}{\ignorespaces}}
-\newcommand*{\cc}[2][r]{\ch@put[#1]{\emph{\ccname}}{#2}\par\medskip}
-\newcommand*{\encl}[2][r]{\ch@put[#1]{\emph{\enclname}}{#2}\par\medskip}
-\newcommand*{\subsubsection}[2][r]{\par\ch@pul[#1]{\textbf{#2}}\par}
-\newcommand*{\subsection}[2][r]{\smallskip\subsubsection[#1]{#2}}
-\newcommand*{\section}[2][r]{\medskip\subsubsection[#1]{#2}}
-\newcommand*{\subparagraph}[1]{\par\textbf{#1}~}
-\newcommand*{\paragraph}[1]{\par\noindent\textbf{#1}~}
-\newcommand*{\makelabels}[1][r]{\let\ch@lab#1}
-\newenvironment*{letter}[2][p]
- {\ch@pfr{\fromaddress}\ch@pto{#2}
-  \letterindent\parindent\parindent\z@\letterskip\parskip
-  \longindentation\addressmargin\addtolength\longindentation{-\oddsidemargin}
-  \indentedwidth\textwidth\addtolength\indentedwidth{-\longindentation}
-  \newpage\c@page\@ne\c@footnote\z@\pagestyle{plain}\thispagestyle{empty}
-  \vspace*{\fromtop}\maketitle[#1]}
- {\vfil\pagebreak
-  \if f\ch@lab
-  \else\newpage\thispagestyle{empty}\vspace*{\fromtop}\maketitle[\ch@lab]\fi}
-\leftmargini\parindent\leftmargin\leftmargini
-\leftmarginii\leftmargini\leftmarginiii\leftmargini\leftmarginiv\leftmargini
-\labelsep.25\parindent\labelwidth.75\parindent
-\renewcommand\theenumi{\@arabic\c@enumi}
-\renewcommand\theenumii{\@alph\c@enumii}
-\renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv{\@Alph\c@enumiv}
-\newcommand\labelenumi{\theenumi.}
-\newcommand\labelenumii{(\theenumii)}
-\newcommand\labelenumiii{\theenumiii.}
-\newcommand\labelenumiv{\theenumiv.}
-\renewcommand\p@enumii{\theenumi}
-\renewcommand\p@enumiii{\theenumi(\theenumii)}
-\renewcommand\p@enumiv{\p@enumiii\theenumiii}
-\newcommand\labelitemi{\textbullet}
-\newcommand\labelitemii{\textendash}
-\newcommand\labelitemiii{\textasteriskcentered}
-\newcommand\labelitemiv{\textperiodcentered}
-\newenvironment{description}
- {\list{}{\labelwidth\z@\itemindent-\leftmargin
-    \let\makelabel\descriptionlabel}}{\endlist}
-\newcommand*{\descriptionlabel}[1]
- {\hspace\labelsep\textbf{#1}}
-\newenvironment{verse}
- {\let\\=\@centercr
-  \list{}{\itemsep\z@\itemindent-\parindent
-    \listparindent\itemindent\rightmargin\leftmargin
-    \addtolength\leftmargin\parindent}
-    \item[]}{\endlist}
-\newenvironment{quotation}
- {\list{}{\listparindent\parindent
-    \itemindent\listparindent\rightmargin\leftmargin}
-    \item[]}{\endlist}
-\newenvironment{quote}
- {\list{}{\rightmargin\leftmargin}
-   \item[]}{\endlist}
-\arraycolsep5\p@\tabcolsep6\p@
-\arrayrulewidth.4\p@\doublerulesep2\p@
+\newcounter{letter}
+\newdimen\titlehead
+\newdimen\titletopheight
+\newdimen\titlemidheight
+\newdimen\titlebotheight
+\newdimen\titlemargin
+\newdimen\titlewidth
+\newdimen\addressmargin
+\newdimen\addresswidth
+\newdimen\longindentation
+\newdimen\indentedwidth
+\parskip9\p@
+\parindent18\p@
+\normallineskip\z@
+\headheight12\p@
+\headsep24\p@
+\footskip36\p@
+\textwidth\paperwidth
+\advance\textwidth-9536004sp
+\titlewidth\textwidth
+\advance\textwidth-36\p@
+\textheight\paperheight
+\advance\textheight-14093310sp
+\oddsidemargin36\p@
+\evensidemargin\z@
+\marginparwidth48\p@
+\marginparsep6\p@
+\marginparpush6\p@
+\topmargin\z@
+\footnotesep12\p@
+\skip\footins12\p@
+\titlehead12\p@
+\titletopheight72\p@
+\titlemidheight72\p@
+\titlebotheight72\p@
+\addresswidth190\p@
+\def\ps@plain%
+{\let\@oddhead\@empty
+ \let\@evenhead\@empty
+ \def\@oddfoot{\footnotesize\hfil\pagename~\thepage}
+ \def\@evenfoot{\footnotesize\pagename~\thepage\hfil}}
+\def\ps@firstpage%
+{\let\@oddhead\@empty
+ \let\@evenhead\@empty
+ \def\@oddfoot{\footnotesize\leftmark\hfil\rightmark}
+ \def\@evenfoot{\footnotesize\rightmark\hfil\leftmark}}
+\def\ps@headings%
+{\def\@oddhead{\footnotesize\headtoname~\toname\hfil\pagename~\thepage}
+ \def\@evenhead{\footnotesize\pagename~\thepage\hfil}
+ \def\@oddfoot{\footnotesize\leftmark\hfil\rightmark}
+ \def\@evenfoot{\footnotesize\rightmark\hfil\leftmark}}
+\def\ps@myheadings%
+{\def\@oddhead{\footnotesize\leftmark\hfil\rightmark}
+ \def\@evenhead{\footnotesize\rightmark\hfil\leftmark}
+ \def\@oddfoot{\footnotesize\hfil\pagename~\thepage}
+ \def\@evenfoot{\footnotesize\pagename~\thepage\hfil}}
+\long\def\name#1{\def\fromname{#1}}
+\long\def\signature#1{\def\fromsig{#1}}
+\long\def\location#1{\def\fromlocation{#1}}
+\long\def\address#1{\def\fromaddress{#1}}
+\long\def\telephone#1{\def\telephonenum{\vtop{\footnotesize#1}}}
+\long\def\return#1{\def\returnaddress{\underbar{\textsuperscript{#1}}}}
+\def\makelabels%
+{\def\startlabels%
+ {\let\titletopmatter\@empty
+  \let\titlebotmatter\@empty
+  \let\foldmark\@empty}}
+\def\maketitle%
+{\ifdim\addressmargin=\z@
+  \addressmargin\titlewidth
+  \advance\addressmargin-\addresswidth
+ \else
+  \addresswidth\titlewidth
+  \advance\addresswidth-\addressmargin\fi
+ \longindentation\titlemargin
+ \advance\longindentation-\oddsidemargin
+ \clearpage
+ \if@twoside\ifodd\c@page
+ \else\thispagestyle{empty}\hb@xt@\z@{}\clearpage\fi\fi
+ \if@twocolumn\twocolumn[\@maketitle\leavevmode\vskip-\topskip]
+ \else\vbox{\@parboxrestore\@maketitle}\vskip-\parskip\fi
+ \advance\longindentation\addressmargin
+ \indentedwidth\textwidth
+ \advance\indentedwidth-\longindentation}
+\def\@maketitle%
+{\vskip-\topmargin\vskip-\baselineskip
+ \vskip\titlehead\vskip-\headheight\vskip-\headsep
+ \leftskip\longindentation\rightskip\textwidth
+ \advance\rightskip-\paperwidth
+ \advance\rightskip-\titlemargin
+ \parbox[t][\titletopheight]{\titlewidth}
+ {\hb@xt@\z@{}\titletopmatter\strut}\par
+ \parbox[t][\titlemidheight]{\titlewidth}
+ {\hb@xt@\z@{}\titlemidmatter\strut}\par
+ \parbox[t][\titlebotheight]{\titlewidth}
+ {\hb@xt@\z@{}\titlebotmatter\strut}\par
+ \leftskip-\oddsidemargin\advance\leftskip-1in
+ \parbox[b][\z@]{\paperwidth}{\foldmark}\par}
+\def\letter{\futurelet\@let@token\ch@let}\def\ch@let%
+{\ifx\@let@token[\expandafter\@letter\else\expandafter\ch@lea\fi}
+\long\def\ch@lea#1 {\@letter[n]{#1} }
+\long\def\@letter[#1]#2
+{\ifx#1n\parindent\z@\fi\ifx\@null#2\else\@processto#2\\@@@
+  \ifx\@empty\toaddress\else\@processto#2@@@\fi\fi
+ \maketitle\thispagestyle{firstpage}
+ \global\c@page\@ne\global\c@footnote\z@\global\advance\c@letter\@ne}
+\long\def\@processto#1\\#2@@@{\def\toname{#1}\def\toaddress{#2}}
+\def\endletter{\removelastskip\ifx\startlabels\undefined\else%
+ \startlabels\maketitle\thispagestyle{empty}\fi\clearpage}
+\def\stopbreaks{\interlinepenalty\@M\def\par{\@@par\nobreak}}
+\def\startbreaks{\interlinepenalty100\def\par{\@@par}}
+\def\opening{\futurelet\@let@token\ch@ope}\def\ch@ope%
+{\ifx\@let@token\bgroup\expandafter\ch@opa\else\expandafter\@opening\fi}
+\def\ch@opa#1{\ifx\@null#1\else\def\salutation{#1}\fi\@opening}
+\def\@opening{\par\salutation\par\medskip}
+\def\closing{\futurelet\@let@token\ch@clo}\def\ch@clo%
+{\ifx\@let@token\bgroup\expandafter\ch@cla\else\expandafter\@closing\fi}
+\def\ch@cla#1{\ifx\@null#1\else\def\valediction{#1}\fi\@closing}
+\def\@closing{\par\medskip\stopbreaks\valediction
+ \samepage\par\closingmatter\par\startbreaks}
+\def\object{\futurelet\@let@token\ch@obj}\def\ch@obj%
+{\ifx\@let@token\bgroup\expandafter\ch@oba\else\expandafter\@object\fi}
+\def\ch@oba#1{\ifx\@null#1\else\title{#1}\fi\@object}
+\def\@object{\noindent\@title\par\bigskip}
+\long\def\ps#1#2{\begin{list}{}{}\item[#1]#2\end{list}}
+\long\def\cc#1{\ps{\ccname}{#1}}
+\long\def\encl#1{\ps{\enclname}{#1}}
+\long\def\subparagraph#1{\par\textbf{#1}\hskip\labelsep}
+\long\def\paragraph#1{\par\noindent\textbf{#1}\hskip\labelsep}
+\long\def\subsubsection#1{\par\noindent\textbf{#1}\par\nobreak}
+\long\def\subsection#1{\smallskip\subsubsection{#1}}
+\long\def\section#1{\medskip\subsubsection{#1}}
+\def\description
+{\list{}
+ {\labelwidth\z@
+  \itemindent-\leftmargin
+  \let\makelabel\descriptionlabel}}\def\enddescription{\endlist}
+\def\descriptionlabel#1{\hskip\labelsep\textbf{#1}}
+\def\verse
+{\let\\\@centercr
+ \list{}
+ {\itemsep\z@
+  \itemindent-\parindent
+  \listparindent\itemindent
+  \rightmargin\leftmargin
+  \advance\leftmargin\parindent}
+ \item\relax}\def\endverse{\endlist}
+\def\quotation
+{\list{}
+ {\listparindent\parindent
+  \itemindent\listparindent
+  \rightmargin\leftmargin}
+ \item\relax}\def\endquotation{\endlist}
+\def\quote
+{\list{}
+ {\rightmargin\leftmargin}
+ \item\relax}\def\endquote{\endlist}
+\def\@listI{}
+\let\@listi\@listI
+\let\@listii\@listI
+\let\@listiii\@listI
+\let\@listiv\@listI
+\def\theenumi{\@arabic\c@enumi}
+\def\theenumii{\@alph\c@enumii}
+\def\theenumiii{\@roman\c@enumiii}
+\def\theenumiv{\@Alph\c@enumiv}
+\def\labelenumi{\theenumi.}
+\def\labelenumii{(\theenumii)}
+\def\labelenumiii{\theenumiii.}
+\def\labelenumiv{\theenumiv.}
+\def\p@enumii{\theenumi}
+\def\p@enumiii{\theenumi(\theenumii)}
+\def\p@enumiv{\p@enumiii\theenumiii}
+\def\labelitemi{\textbullet}
+\def\labelitemii{\textbf{\textendash}}
+\def\labelitemiii{\textasteriskcentered}
+\def\labelitemiv{\textperiodcentered}
+\labelsep6\p@\labelwidth12\p@\leftmargin18\p@
+\topsep\z@\partopsep3\p@\itemsep\z@\parsep3\p@
+\arraycolsep5\p@
+\tabcolsep6\p@
+\arrayrulewidth.4\p@
+\doublerulesep2\p@
 \tabbingsep\labelsep
 \skip\@mpfootins=\skip\footins
-\fboxsep3\p@\fboxrule.4\p@
-\renewcommand\theequation{\@arabic\c@equation}
-\renewcommand\footnoterule
- {\kern-3\p@\hrule\@width.4\columnwidth\kern2.6\p@}
-\newcommand\@makefntext[1]
- {\noindent\hb@xt@\z@{\hss\@makefnmark}#1}
-\columnsep10\p@\columnseprule0\p@
+\def\theequation{\@arabic\c@equation}
+\fboxsep3\p@
+\fboxrule.4\p@
+\long\def\@makefntext#1{\noindent\hb@xt@\z@{\hss\@makefnmark}#1}
+\def\fromname{\@author}
+\def\fromsig{\@author}
+\let\fromlocation\@empty
+\let\fromaddress\@empty
+\let\telephonenum\@empty
+\def\returnaddress{\null}
+\let\toname\@empty
+\let\toaddress\@empty
+\let\salutation\@empty
+\let\valediction\@empty
+\def\ccname{cc}
+\def\enclname{encl}
+\def\pagename{Page}
+\def\headtoname{To}
+\def\today
+{\ifcase\month\or
+ January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
+ \space\number\day, \number\year}
+\columnsep36\p@
+\pagestyle{plain}
 \pagenumbering{arabic}
-\raggedbottom\onecolumn
-\newcommand\ch@pfr[1]
- {\expandafter\ch@cut#1\\\@empty
-  \ifx\ch@sec\@empty\else\expandafter\ch@cut#1\@empty\fi
-  \let\fromstreet\ch@fir\let\fromplace\ch@sec
-  \ifx\@empty\returnaddress
-    \ifx\@empty\fromname
-      \ifx\@author\ch@aut\def\returnaddress{\fromstreet, \fromplace}
-      \else\def\returnaddress{\@author, \fromstreet, \fromplace}\fi
-    \else\def\returnaddress{\fromname, \fromstreet, \fromplace}\fi\fi}
-\newcommand\ch@pto[1]
- {\expandafter\ch@cut#1\\\@empty
-   \ifx\ch@sec\@empty\else\expandafter\ch@cut#1\@empty\fi
-   \let\toname\ch@fir\let\toaddress\ch@sec}
-\def\ch@cut#1\\#2\@empty{\def\ch@fir{#1}\def\ch@sec{#2}}
-\newcommand{\ch@put}[3][r]
- {\par\noindent\hspace{-\oddsidemargin}\makebox[\oddsidemargin][#1]{#2~}#3}
-\newcommand{\ch@pul}[2][r]
- {\noindent\ifx l#1\hspace{-\oddsidemargin}\fi#2}
-\let\ch@lab=f\let\ch@aut=\@author
-\def\@startlabels{}\let\@mlabel=\@gobbletwo
+\if@leftwin
+ \def\titletopmatter%
+ {\splitfield
+  {}{\fromlocation\par\fromname\par\fromaddress\par\telephonenum}}
+ \def\titlemidmatter%
+ {\returnaddress\par\toname\par\toaddress}
+ \def\titlebotmatter%
+ {\splitfield
+  {}{\@date}}
+\else
+ \def\titletopmatter%
+ {\splitfield
+  {\fromlocation\par\fromname\par\fromaddress\par\telephonenum}{\@date}}
+ \def\titlemidmatter%
+ {\splitfield
+  {}{\returnaddress\par\toname\par\toaddress}}
+ \def\titlebotmatter%
+ {}\fi
+\long\def\splitfield#1#2%
+{\parbox[b][\baselineskip][t]{\addressmargin}{\hb@xt@\z@{}{#1}\strut}%
+ \parbox[b][\baselineskip][t]{\addresswidth}{\hb@xt@\z@{}{#2}\strut}}
+\if@leftsig
+ \def\closingmatter%
+ {\leftmargin2\parindent
+  \vskip4\bigskipamount
+  \ps{}{\fromsig}
+  \vskip2\bigskipamount plus\footfill
+  \labelwidth3\labelwidth
+  \advance\labelwidth-\labelsep}
+\else
+ \def\closingmatter%
+ {\leftmargin\longindentation
+  \vskip4\bigskipamount
+  \ps{}{\fromsig}
+  \vskip2\bigskipamount plus\footfill
+  \leftmargin2\parindent
+  \labelwidth3\labelwidth
+  \advance\labelwidth-\labelsep}\fi
+\if@foldmark\def\foldmark{\hrule\@width6\fboxsep\@height\fboxrule}
+\else\let\foldmark\@empty\fi
+\if@footfill\def\footfill{1fill}
+\else\let\footfill\z@\fi
+\if@twocolumn\twocolumn\sloppy
+\else\onecolumn\reversemarginpar\fi
+\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\relax}
+\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\relax}
 \endinput
 %%
 %% End of file `chletter.cls'.