diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-20 23:28:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-20 23:28:03 +0000 |
commit | 015a7d6d2e968aea69870190cceb5309ee0766ca (patch) | |
tree | f61305797652a1642df2696ad5380a205d9cf73f /Master/texmf-dist/tex/latex/isodoc/isodoc.cls | |
parent | 61939b07fb6a935b4a98fd0dbc4b543b7ac0f1f8 (diff) |
isodoc (20feb12)
git-svn-id: svn://tug.org/texlive/trunk@25445 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/isodoc/isodoc.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/isodoc/isodoc.cls | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls index df869b677a1..79b376a2a2b 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Wybo Dekker <wybo@servalys.nl> +%% Copyright (C) 2006 by Wybo Dekker <wybo@dekkerdocumenten.nl> %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.2 of this license @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{isodoc}% - [2010/08/25 v0.8 isodoc class for letters and invoices] + [2012/02/19 v0.9 isodoc class for letters and invoices] \ifx\pdfoutput\undefined\else% \ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{} \fi\fi @@ -31,6 +31,7 @@ \ProcessOptions \LoadClass{article} \RequirePackage{ctable,eurosym,graphicx,stringstrings,calc} +\RequirePackage{forarray} \RequirePackage[nofoot,head=\baselineskip]{geometry} \RequirePackage[absolute,overlay]{textpos} \geometry{papersize={210mm,297mm},margin=35mm} @@ -149,8 +150,9 @@ \def\openingcomma{,} \define@key{isodoc}{openingcomma}{\def\openingcomma{#1}} \def\opening{\Undefined{opening}} -\define@key{isodoc}{closing} {\def\closing{#1,}} - \def\closing{\Undefined{closing}} % Best regards, +\define@key{isodoc}{closing} {\def\closing{#1}} + \def\closingcomma{,} + \def\closing{\Undefined{closing}} \define@key{isodoc}{closingskip}{\closingskip=#1} \newdimen\closingskip\closingskip=2\baselineskip \define@key{isodoc}{autograph}[2]{\def\autographversion{#1}} @@ -169,7 +171,7 @@ \define@key{isodoc}{chamber} {\def\chamber{#1}} \def\chamber{Undefined{chamber}} \define@key{isodoc}{currency} {\def\currency{#1}} - \def\currency{\EUR} + \def\currency{\EuroSymbol} \define@key{isodoc}{accept}[E05]{\def\accepttype{#1} \newfont\ocrb{ocrb10} } @@ -198,6 +200,7 @@ \def\xacceptdesc{7} \def\yacceptdesc{241} \def\wacceptdesc{26} %T \def\xacceptaddress{58} \def\yacceptaddress{241} \def\wacceptaddress{90} %T \newdimen\acceptreferenceskip\acceptreferenceskip=5.15mm +\RequirePackage{isodocsymbols} \newdimen\myoutdent \newdimen\signskip \newdimen\mydown @@ -341,6 +344,7 @@ chamber & \chamber\NN city & \city\NN closing & \closing\NN + closingcomma & \closingcomma\NN company & \company\NN country & \country\NN countrycode & \countrycode\NN @@ -400,7 +404,7 @@ opening={\bfseries\scshape\Large\invoicetext}, openingcomma={}, closing={}, - signature={}]{\Tbox{35}{127}{140}{#2}} + signature={}]{\Tbox{35}{127}{140}{\ignorespaces#2}} } \newcommand{\letter}[2][]{{% \newpage @@ -464,7 +468,7 @@ \else\forcedate\fi } \ifx\subject\empty\else% - \Tbox{35}{\subjectpos}{105}{\noindent + \Tbox{35}{\subjectpos}{140}{\noindent \begin{tabularx}{\hsize}{@{}l>{\raggedright}X@{}} \@hft\subjecttext&\subject \end{tabularx} @@ -475,11 +479,16 @@ \fi \footcount=35 \iffooter - \footfield{\websitetext}{}{\website} - \footfield{\phonetext}{\lead}{\phone} - \footfield{\cellphonetext}{\lead}{\cellphone} - \footfield{\faxtext}{\lead}{\fax} - \footfield{\emailtext}{}{\email} + \ForEachX{;}{% + \setbox0=\hbox{\csname\thislevelitem\endcsname} + \ifdim\wd0=0pt\else + \Tbox{\footcount}{\footerpos}{35}{\noindent + {\@hft\csname\thislevelitem text\endcsname}\\ + \csname\thislevelitem\endcsname + } + \advance\footcount35 + \fi + }{website;phone;cellphone;fax;email} % variabele/optie van maken \fi { \parskip=0pt\parindent=0pt \begin{textblock*}{3mm}(\xfold,\yfold)% @@ -490,13 +499,12 @@ \noindent\Tbox{35}{\openingpos}{140}{\opening\openingcomma} \vspace{\textskip mm} \thispagestyle{empty} - \noindent - #2 + \noindent\ignorespaces#2 {\parindent=0pt\parskip=\baselineskip \ifclosing \ifcase\autographversion - \par\closing\\\signature % 0: closing on the next line - \or\par\closing\\[\closingskip]\signature % 1: whiteskip + \par\closing\closingcomma\\\signature % 0: closing on the next line + \or\par\closing\closingcomma\\[\closingskip]\signature % 1: whiteskip \or\autographA \or\autographB \or\autographC |