summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/isodoc
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2014-03-03 01:28:16 +0000
committerNorbert Preining <preining@logic.at>2014-03-03 01:28:16 +0000
commit12d58bf20f1d0e51ef49ef952b676251137e8d4e (patch)
treeb6166c7257ad469aa33668b536a3915a3cabfb0d /Master/texmf-dist/tex/latex/isodoc
parent766d9bbc3ad2de6c916ce68496922fe993550974 (diff)
isodoc (3Mar)
git-svn-id: svn://tug.org/texlive/trunk@33075 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/isodoc')
-rw-r--r--Master/texmf-dist/tex/latex/isodoc/isodoc.cls79
1 files changed, 40 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index 870e1def5fd..60eb891b281 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
@@ -22,16 +22,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{isodoc}%
- [2014/02/01 v1.03 isodoc class for letters and invoices]
+ [2014/02/27 v1.04 isodoc class for letters and invoices]
\ifx\pdfoutput\undefined\else%
\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
\fi\fi
-
-
-
-
-
-
%% \StopEventually{}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions
@@ -49,7 +43,7 @@
\pagestyle{fancy}
\AtBeginDocument{\addtolength{\headheight}{\baselineskip}}
\definecolor{isodocpink}{rgb}{1,.7,.7}
-\def\Undefined#1{\fboxsep1pt\colorbox{isodocpink}{Undefined #1}}
+\def\Undefined#1{\fboxsep1pt\colorbox{isodocpink}{\strut Undefined #1}}
\def\@hft{\footnotesize\sffamily\color{headcolor}}
\def\@xyshift#1,#2@@@{\def\@xshift{#1}\def\@yshift{#2}}
\define@key{isodoc}{shift}{%
@@ -59,7 +53,6 @@
\define@key{isodoc}{vertical}[\verticaltrue]{\verticaltrue}
\define@key{isodoc}{novertical}[\verticaltrue]{\verticalfalse}
\newif\ifvertical\verticaltrue
-
\define@key{isodoc}{foreign}[\foreigntrue]{\foreigntrue}
\newif\ifforeign\foreignfalse
\define@key{isodoc}{cityzip}[\cityziptrue]{\cityziptrue}
@@ -120,7 +113,7 @@
\newcount\openingpos
\newcount\textskip
\define@key{isodoc}{footorder} {\def\@footorder{#1}}
- \def\@footorder{website;@phone;@cellphone;email}
+ \def\@footorder{website;phone;cellphone;email}
\define@key{isodoc}{footer} []{\footertrue}
\newif\iffooter\footerfalse
\define@key{isodoc}{nofooter}[]{\footerfalse}
@@ -130,17 +123,19 @@
\def\phoneprefix{0}
\define@key{isodoc}{phone} {\def\phone{#1}}
\def\phone{}
- \def\@phone{\Undefined{@phone}}
+ \def\@phone{\Undefined{phone}}
\define@key{isodoc}{cellphone} {\def\cellphone{#1}}
\def\cellphone{}
- \def\@cellphone{\Undefined{@cellphone}}
+ \def\@cellphone{\Undefined{cellphone}}
\define@key{isodoc}{fax} {\def\fax{#1}}
\def\fax{}
- \def\@fax{\Undefined{@fax}}
+ \def\@fax{\Undefined{fax}}
\define@key{isodoc}{website} {\def\website{#1}}
- \def\website{\Undefined{website}}
+ \def\website{}
+ \def\@website{\Undefined{website}}
\define@key{isodoc}{email} {\def\email{#1}}
- \def\email{\Undefined{email}}
+ \def\email{}
+ \def\@email{\Undefined{email}}
\define@key{isodoc}{nofold}[]{\yfold=-1mm}
\newdimen\yfold\yfold=-1mm
\define@key{isodoc}{foldleft}[]{\xfold=9mm}
@@ -167,8 +162,14 @@
\def\closing{\Undefined{closing}}
\define@key{isodoc}{closingcomma}{\def\@closingcomma{#1}}
\def\@closingcomma{,}
-\define@key{isodoc}{closingskip}{\closingskip=#1}
- \newdimen\closingskip\closingskip=2\baselineskip
+\define@key{isodoc}{closingskip}{\ClassError{isodoc}{The closingskip option has been removed
+ in version 1.04; instead set the signatureskip length,
+ preferably in a style file}}
+ \newdimen\closingskip\closingskip=\baselineskip
+ \newdimen\signatureskip\signatureskip=2\baselineskip
+ \newdimen\copytoskip\copytoskip=\baselineskip
+ \newdimen\enclosureskip\enclosureskip=\baselineskip
+ \newif\ifencldown\encldownfalse
\define@key{isodoc}{autograph}[2]{\def\autographversion{#1}}
\def\autographversion{0}
\define@key{isodoc}{signature}{\def\signature{#1}}
@@ -446,6 +447,8 @@
\ifx\phone \empty\else\def\@phone {\isodoc@lead\phone} \fi
\ifx\cellphone\empty\else\def\@cellphone{\isodoc@lead\cellphone}\fi
\ifx\fax \empty\else\def\@fax {\isodoc@lead\fax} \fi
+ \ifx\website \empty\else\def\@website {\website} \fi
+ \ifx\email \empty\else\def\@email {\email} \fi
\ifx\yourlettertext\undefined%
\ClassWarning{isodoc}{You did not use the language option; using the default: en-GB}
\isodoc@enGB%
@@ -523,11 +526,11 @@
\footcount=35
\iffooter
\ForEachX{;}{%
- \setbox0=\hbox{\csname\thislevelitem\endcsname}
+ \setbox0=\hbox{\csname @\thislevelitem\endcsname}
\ifdim\wd0=0pt\else
\Tbox{\footcount}{\footerpos}{35}{\noindent
{\@hft\csname\thislevelitem text\endcsname}\\
- \csname\thislevelitem\endcsname
+ \csname @\thislevelitem\endcsname
}
\fi
\advance\footcount35
@@ -543,12 +546,12 @@
\vspace{\textskip mm}
\thispagestyle{empty}
\noindent\ignorespaces#2
- \ifclosing
- \par\noindent\begin{minipage}[t]{\hsize}
- \parindent=0pt\parskip=\baselineskip
+ \ifclosing{\\[\closingskip]
+ \parindent=0pt\parskip=\baselineskip\noindent
+ \begin{minipage}[t]{\hsize}
\ifcase\autographversion
\par\closing\@closingcomma\\\signature % 0: closing on the next line
- \or\par\closing\@closingcomma\\[\closingskip]\signature % 1: whiteskip
+ \or\par\closing\@closingcomma\\[\signatureskip]\signature % 1: whiteskip
\or\autographA
\or\autographB
\or\autographC
@@ -561,25 +564,23 @@
\par\Undefined{autograph: \autographversion}\\
\fi
\end{minipage}
- \fi
- \ifx\enclosures\empty\else
- \par\noindent\begin{minipage}[t]{\hsize}
- \parindent=0pt\parskip=\baselineskip
- \vfill
+ }\fi
+ \ifencldown\vspace*{\fill}\fi
+ \ifx\enclosures\empty\else{\\[\enclosureskip]
+ \noindent
+ \begin{minipage}[t]{\hsize}
\setbox1=\vbox{\enclosures}%
- \textbf{\ifdim\ht1>\baselineskip\enclosurestext\else\enclosuretext\fi}%
- \\\enclosures
+ \textbf{\ifdim\ht1>\baselineskip\enclosurestext\else\enclosuretext\fi}\\
+ \enclosures
\end{minipage}
- \fi
- \ifx\copyto\empty\else
- \par\noindent\begin{minipage}[t]{\hsize}
- \parindent=0pt\parskip=\baselineskip
- \ifx\enclosures\empty\vfill\else\\[2ex]\fi
- \setbox1=\vbox{\copyto}%
- \textbf{\copytotext}%
- \\\copyto
+ }\fi
+ \ifx\copyto\empty\else{\\[\copytoskip]
+ \noindent
+ \begin{minipage}[t]{\hsize}
+ \textbf{\copytotext}\\
+ \copyto
\end{minipage}
- \fi
+ }\fi
\label{LastPageOf\thelettercount}
}}
\def\Cbox#1#2#3#4{%