isodoc (15jun15)

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

14 files changed, 110 insertions, 40 deletions

diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf
index c16fe706aee..79c37fb37d3 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf
@@ -1,6 +1,6 @@
 % contributed by Cristian Peraferrer:
 \def\isodoc@caES{%
-  \gdef\accountdatatext {Dades banc\`aries}
+  \gdef\paymentdatatext {Detalls del pagament}
   \gdef\accountnametext {a nom de}
   \gdef\accountnotext   {N\'um. de compte}
   \gdef\amounttext      {Quantitat}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf
index 5d0638c72f3..866e7b30ec7 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf
@@ -1,5 +1,5 @@
 \def\isodoc@deDE{%
-  \gdef\accountdatatext {Zahlungsdaten}
+  \gdef\paymentdatatext {Zahlungsdaten}
   \gdef\accountnametext {Name}
   \gdef\accountnotext   {Konto-Nr.}
   \gdef\amounttext      {Betrag}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf
index e2864472826..2e6cc3f7b61 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf
@@ -1,5 +1,16 @@
 \def\isodoc@enGB{%
-  \gdef\accountdatatext {Banking data}
+  \if@isodocordinalss
+    \gdef\@st{\textsuperscript{st}}
+    \gdef\@nd{\textsuperscript{nd}}
+    \gdef\@rd{\textsuperscript{rd}}
+    \gdef\@th{\textsuperscript{th}}
+  \else
+    \gdef\@st{st}
+    \gdef\@nd{nd}
+    \gdef\@rd{rd}
+    \gdef\@th{th}
+  \fi
+  \gdef\paymentdatatext {Payment details}
   \gdef\accountnametext {in the name of}
   \gdef\accountnotext   {Account no.}
   \gdef\amounttext      {Amount}
@@ -21,7 +32,7 @@
   \gdef\pagetext        {Page}
   \gdef\phonetext       {telephone}
   \gdef\referencetext   {Reference}
-  \gdef\routingnotext   {Routing no}
+  \gdef\routingnotext   {Sort code}
   \gdef\subjecttext     {Subject:}
   \gdef\termtext        {term of payment}
   \gdef\totaltext       {Total}
@@ -32,13 +43,13 @@
   \gdef\yourlettertext  {Your letter of}
   \gdef\yourreftext     {Your reference}
   \gdef\@isodate        {\ifcase\day\or
-     1st\or  2nd\or  3rd\or  4th\or  5th\or
-     6th\or  7th\or  8th\or  9th\or 10th\or
-    11th\or 12th\or 13th\or 14th\or 15th\or
-    16th\or 17th\or 18th\or 19th\or 20th\or
-    21st\or 22nd\or 23rd\or 24th\or 25th\or
-    26th\or 27th\or 28th\or 29th\or 30th\or
-    31st\fi\space\ifcase\month\or
+     1\@st\or  2\@nd\or  3\@rd\or  4\@th\or  5\@th\or
+     6\@th\or  7\@th\or  8\@th\or  9\@th\or 10\@th\or
+    11\@th\or 12\@th\or 13\@th\or 14\@th\or 15\@th\or
+    16\@th\or 17\@th\or 18\@th\or 19\@th\or 20\@th\or
+    21\@st\or 22\@nd\or 23\@rd\or 24\@th\or 25\@th\or
+    26\@th\or 27\@th\or 28\@th\or 29\@th\or 30\@th\or
+    31\@st\fi\space\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\year}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf
index 1a059550fbf..5c60cd56dc2 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf
@@ -1,5 +1,5 @@
 \def\isodoc@enUS{%
-  \gdef\accountdatatext {Bank details}
+  \gdef\paymentdatatext {Payment details}
   \gdef\accountnametext {in the name of}
   \gdef\accountnotext   {Account no.}
   \gdef\amounttext      {Amount}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf
index c7adf949f80..01cda147be6 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf
@@ -1,7 +1,7 @@
 % contributed by Cristian Peraferrer:
 \def\isodoc@esES{%
   \def\openingcomma     {:}
-  \gdef\accountdatatext {Datos bancarios}
+  \gdef\paymentdatatext {Detalles de pago}
   \gdef\accountnametext {a nombre de}
   \gdef\accountnotext   {N\'um. de cuenta}
   \gdef\amounttext      {Cantidad}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf
index f6c82807b45..c3505b4c300 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf
@@ -1,5 +1,5 @@
 \def\isodoc@frFR{%
-  \gdef\accountdatatext {Donn\'ees banquaires}
+  \gdef\paymentdatatext {Détails de paiement}
   \gdef\accountnametext {au nom de}
   \gdef\accountnotext   {no. compte}
   \gdef\amounttext      {Montant}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf
index bba1c0ca56f..e70586a2de4 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf
@@ -1,6 +1,6 @@
 % contributed by Walter Giocoso:
 \def\isodoc@itIT{%
-  \gdef\accountdatatext {Coordinate bancarie}
+  \gdef\paymentdatatext {Dettagli di pagamento}
   \gdef\accountnametext {intestato a}
   \gdef\accountnotext   {n$^o$~del conto}
   \gdef\amounttext      {Prezzo}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf
index 9335445e044..a0ab6a8ad9c 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf
@@ -1,6 +1,6 @@
 % contributed by Sveinung Heggen:
 \def\isodoc@nbNO{%
-  \gdef\accountdatatext {betales til}
+  \gdef\paymentdatatext {Betalingsdetaljer}
   \gdef\accountnametext {til}
   \gdef\accountnotext   {faktura nr}
   \gdef\amounttext      {Bel\o{}p}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf
index f7b9cfca9e2..98ff475bf4b 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf
@@ -1,6 +1,6 @@
 % contributed by Serge Stroobandt:
 \def\isodoc@nlBE{%
-  \gdef\accountdatatext {Betalingsgegevens}
+  \gdef\paymentdatatext {Betaalgegevens}
   \gdef\accountnametext {op naam van}
   \gdef\accountnotext   {rekeningnummer}
   \gdef\amounttext      {Bedrag}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf
index b311f7ddd7d..9c2fe4c2d9c 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf
@@ -1,5 +1,5 @@
 \def\isodoc@nlNL{%
-  \gdef\accountdatatext {Betalingsgegevens}
+  \gdef\paymentdatatext {Betaalgegevens}
   \gdef\accountnametext {ten name van}
   \gdef\accountnotext   {rekeningnummer}
   \gdef\amounttext      {Bedrag}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf
index 8ca6417fbdf..9d31d945971 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf
@@ -1,6 +1,6 @@
 % contributed by Zoran T. Filipovic:
 \def\isodoc@srRS{%
-  \gdef\accountdatatext {Podaci o bankarskom sektoru}
+  \gdef\paymentdatatext {Podaci o bankarskom sektoru}
   \gdef\accountnametext {na ime}
   \gdef\accountnotext   {Ra\v cun br.}
   \gdef\amounttext      {Iznos}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf
new file mode 100644
index 00000000000..33eb8c9cac8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf
@@ -0,0 +1,39 @@
+% contributed by Joakim Verona:
+\def\isodoc@svSE{%
+  \gdef\paymentdatatext {Betalningsdetaljer}
+  \gdef\accountnametext {Konto\"agare}
+  \gdef\accountnotext   {Kontonummer}
+  \gdef\amounttext      {Summa}
+  \gdef\bictext         {\scshape bic}
+  \gdef\cellphonetext   {Mobil}
+  \gdef\chambertext     {ch.comm.}
+  \gdef\copytotext      {cc}
+  \gdef\datetext        {Datum}
+  \gdef\daystext        {dagar}
+  \gdef\descriptiontext {Beskrivning}
+  \gdef\emailtext       {email}
+  \gdef\enclosurestext  {Bifogat:}
+  \gdef\enclosuretext   {Bifogat:}
+  \gdef\faxtext         {telefax}
+  \gdef\ibantext        {\scshape iban}
+  \gdef\invoicetext     {Faktura}
+  \gdef\oftext          {av}
+  \gdef\ourreftext      {V\r{a}r referens}
+  \gdef\pagetext        {Sida}
+  \gdef\phonetext       {Telefon}
+  \gdef\referencetext   {Faktura}
+  \gdef\routingnotext   {Routing no}
+  \gdef\subjecttext     {\"Arende:}
+  \gdef\termtext        {Betalningsvillkor}
+  \gdef\totaltext       {Total}
+  \gdef\totext          {Till}
+  \gdef\vatnotext       {Momsregistrering.}
+  \gdef\vattext		{Moms}
+  \gdef\websitetext     {Web}
+  \gdef\yourlettertext  {Ert brev}
+  \gdef\yourreftext     {Er Referens}
+  \gdef\@isodate        {\ifcase\month\or
+    Januari\or Februari\or Mars\or April\or Maj\or Juni\or
+    Juli\or Augusti\or September\or Oktober\or November\or December\fi
+    \space\number\day, \number\year}
+}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf
index 55018c52077..8c6c2f771d8 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf
@@ -1,5 +1,16 @@
 \def\isodoc@xxYY{%
-  \gdef\accountdatatext	{...} % Banking data
+  \if@isodocordinalss % no need for these if you don't use \@st et cetera below
+    \gdef\@st{\textsuperscript{st}}
+    \gdef\@nd{\textsuperscript{nd}}
+    \gdef\@rd{\textsuperscript{rd}}
+    \gdef\@th{\textsuperscript{th}}
+  \else
+    \gdef\@st{st}
+    \gdef\@nd{nd}
+    \gdef\@rd{rd}
+    \gdef\@th{th}
+  \fi
+  \gdef\paymentdatatext	{...} % Payment details
   \gdef\accountnametext	{...} % in the name of
   \gdef\accountnotext	{...} % Account no.
   \gdef\amounttext	{...} % Amount
@@ -14,7 +25,7 @@
   \gdef\enclosurestext	{...} % Enclosures:
   \gdef\enclosuretext	{...} % Enclosure:
   \gdef\faxtext		{...} % telefax
-  \gdef\invoicetext	{...} % \textbf{\textsc{\Large invoice}}
+  \gdef\invoicetext	{...} % \textsc{\Large invoice}
   \gdef\oftext		{...} % of
   \gdef\ourreftext	{...} % Our reference
   \gdef\pagetext	{...} % Page
@@ -31,13 +42,13 @@
   \gdef\yourlettertext	{...} % Your letter of
   \gdef\yourreftext	{...} % Your reference
   \gdef\@isodate        {\ifcase\day\or
-    1st\or 2nd\or 3rd\or 4th\or 5th\or
-    6th\or 7th\or 8th\or 9th\or 10th\or
-    11th\or 12th\or 13th\or 14th\or 15th\or
-    16th\or 17th\or 18th\or 19th\or 20th\or
-    21st\or 22nd\or 23rd\or 24th\or 25th\or
-    26th\or 27th\or 28th\or 29th\or 30th\or
-    31st\fi\space\ifcase\month\or
+     1\@st\or  2\@nd\or  3\@rd\or  4\@th\or  5\@th\or
+     6\@th\or  7\@th\or  8\@th\or  9\@th\or 10\@th\or
+    11\@th\or 12\@th\or 13\@th\or 14\@th\or 15\@th\or
+    16\@th\or 17\@th\or 18\@th\or 19\@th\or 20\@th\or
+    21\@st\or 22\@nd\or 23\@rd\or 24\@th\or 25\@th\or
+    26\@th\or 27\@th\or 28\@th\or 29\@th\or 30\@th\or
+    31\@st\fi\space\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\year}
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}}