summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-15 23:21:20 +0000
committerKarl Berry <karl@freefriends.org>2015-06-15 23:21:20 +0000
commitf4d0afdee42507adc04408c96795d46b1075306f (patch)
treef478ba928672362e7593adac369ad779c55dc691 /Master/texmf-dist/tex/latex/isodoc/isodoc.cls
parentcf42134e440c3c49b1222d85301251e312f85fa5 (diff)
isodoc (15jun15)
git-svn-id: svn://tug.org/texlive/trunk@37549 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.cls33
1 files changed, 21 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index 32aaa8e4e20..efd23c85a8a 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{isodoc}%
- [2014/07/24 v1.06 isodoc class for letters and invoices]
+ [2015/01/14 v1.07 isodoc class for letters and invoices]
\ifx\pdfoutput\undefined\else%
\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
\fi\fi
@@ -30,7 +30,7 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions
\LoadClass{article}
-\RequirePackage{ctable,color,tabularx,graphicx,xstring,calc}
+\RequirePackage{ctable,xcolor,tabularx,graphicx,xstring,calc}
\RequirePackage{forarray,longtable}
\RequirePackage[head=\baselineskip,foot=\f@size pt]{geometry}
\RequirePackage[absolute,overlay]{textpos}
@@ -63,6 +63,13 @@
\define@key{isodoc}{american}[]{\isodoc@enUS\ClassWarning{isodoc}{the option american is obsolete: use language=en-US}}
\define@key{isodoc}{french} []{\isodoc@frFR\ClassWarning{isodoc}{the option french is obsolete: use language=fr-FR}}
\define@key{isodoc}{language}{\StrSubstitute{#1}{-}{}[\@iso]\csname isodoc@\@iso\endcsname}
+\define@key{isodoc}{ordinalss}[\@isodocordinalsstrue]{%
+ \ifx\yourlettertext\undefined%
+ \@isodocordinalsstrue
+ \else
+ \ClassError{isodoc}{You must use the ordinalss option before any language option}
+ \fi}
+ \newif\if@isodocordinalss\@isodocordinalssfalse
\define@key{isodoc}{fill} []{\rightskip=1\rightskip}
\define@key{isodoc}{nofill}[]{\rightskip=0mm plus 35mm}
\rightskip=0mm plus 35mm
@@ -209,12 +216,12 @@
\def\acceptreference{\Undefined{ref}}
\def\xacceptdescription{105}\def\yacceptdescription{200}\def\wacceptdescription{100} %T
\def\xacceptref{7} \def\yacceptref{212} \def\wacceptref{30} %T
-\def\xaccepteuros{60} \def\yaccepteuros{216} \def\waccepteuros{32} %C
-\def\xacceptcents{89} \def\yacceptcents{216} \def\wacceptcents{13} %C
-\def\xacceptreference{125} \def\yacceptreference{216} \def\wacceptreference{55} %C
-\def\xaccepteur{14.4} \def\yaccepteur{228.5} \def\waccepteur{21} %C
-\def\xacceptct{32} \def\yacceptct{228.5} \def\wacceptct{9} %C
-\def\xacceptaccount{75} \def\yacceptaccount{228.5} \def\wacceptaccount{65} %C
+\def\xaccepteuros{60} \def\yaccepteuros{219} \def\waccepteuros{32} %C
+\def\xacceptcents{89} \def\yacceptcents{219} \def\wacceptcents{13} %C
+\def\xacceptreference{125} \def\yacceptreference{219} \def\wacceptreference{55} %C
+\def\xaccepteur{14.4} \def\yaccepteur{231.5} \def\waccepteur{21} %C
+\def\xacceptct{32} \def\yacceptct{231.5} \def\wacceptct{9} %C
+\def\xacceptaccount{75} \def\yacceptaccount{231.5} \def\wacceptaccount{65} %C
\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
@@ -317,13 +324,13 @@
\ifnum\year=0\Undefined{date}\else\@isodate\fi
\else\@forcedate\fi
}
-\def\accountdata{
- \textbf{\accountdatatext:}\\
+\def\paymentdata{
+ \textbf{\paymentdatatext:}\\
\begin{tabular}{@{}rl@{}}
\ifx\term\empty\else
\termtext: & \term\ \daystext\\
\fi
- \ifx\accounto\undefined\else
+ \ifx\accountno\undefined\else
\accountnotext: & \accountno\\
\fi
\ifx\iban\undefined\else
@@ -346,6 +353,8 @@
\fi
\end{tabular}
}
+\let\accountdata\paymentdata
+\let\accountdatatext\paymentdatatext
\def\@isodocmp#1{\begin{minipage}[t]{\hsize}\mbox{}#1\\[-1.8ex]\mbox{}\end{minipage}}
\def\@isodocun#1{\ifx#1\undefined (undefined, so not shown)\else#1\fi}
\def\showkeys{%
@@ -434,7 +443,7 @@
\newcommand{\invoice}[2][]{%
\closingfalse
\letter[#1,
- opening={\bfseries\scshape\Large\invoicetext},
+ opening={\scshape\Large\invoicetext},
openingcomma={},
closing={},
signature={}]{\Tbox{35}{127}{140}{\ignorespaces#2}}