isodoc (24nov13)

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

13 files changed, 69 insertions, 54 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 ccc088d9f56..c16fe706aee 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf
@@ -28,6 +28,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {A}
   \gdef\vatnotext       {N\'um. IVA}
+  \gdef\vattext		{IVA}
   \gdef\websitetext     {Web}
   \gdef\yourlettertext  {La seva carta del}
   \gdef\yourreftext     {La seva refer\`encia}
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 f3ca9110861..5d0638c72f3 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf
@@ -16,17 +16,18 @@
   \gdef\faxtext         {Fax}
   \gdef\ibantext        {\scshape iban}
   \gdef\invoicetext     {Rechnung}
-  \gdef\oftext          {aus}
+  \gdef\oftext          {von}
   \gdef\ourreftext      {Unser Zeichen}
   \gdef\pagetext        {Seite}
   \gdef\phonetext       {Telefon}
   \gdef\referencetext   {Referenz-Nr.}
   \gdef\routingnotext   {\scshape blz}
-  \gdef\subjecttext     {\bfseries}
+  \gdef\subjecttext     {}
   \gdef\termtext        {Zahlungstermin}
   \gdef\totaltext       {Insgesamt}
   \gdef\totext          {An}
   \gdef\vatnotext       {USt-IdNr.}
+  \gdef\vattext		{MwSt}
   \gdef\websitetext     {Webseite}
   \gdef\yourlettertext  {Ihr Brief vom}
   \gdef\yourreftext     {Ihr Zeichen}
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 da017b55312..e2864472826 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf
@@ -27,6 +27,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {To}
   \gdef\vatnotext       {vat no.}
+  \gdef\vattext		{Vat}
   \gdef\websitetext     {website}
   \gdef\yourlettertext  {Your letter of}
   \gdef\yourreftext     {Your reference}
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 3d053f105d3..1a059550fbf 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf
@@ -27,6 +27,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {To}
   \gdef\vatnotext       {vat no.}
+  \gdef\vattext		{Vat}
   \gdef\websitetext     {website}
   \gdef\yourlettertext  {Your letter of}
   \gdef\yourreftext     {Your reference}
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 d2bd782e545..c7adf949f80 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf
@@ -29,6 +29,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {A}
   \gdef\vatnotext       {N\'um. IVA}
+  \gdef\vattext		{IVA}
   \gdef\websitetext     {Web}
   \gdef\yourlettertext  {Su carta de}
   \gdef\yourreftext     {Su referencia}
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 c6b8d9b710d..f6c82807b45 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf
@@ -27,6 +27,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {\`A l'attention de}
   \gdef\vatnotext       {no. T.V.A.}
+  \gdef\vattext         {T.V.A.}
   \gdef\websitetext     {site Web}
   \gdef\yourlettertext  {Votre lettre du}
   \gdef\yourreftext     {Vos r\'ef\'erences:}
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 122e416339a..bba1c0ca56f 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf
@@ -28,6 +28,7 @@
   \gdef\totaltext       {Totale}
   \gdef\totext          {All'attenzione di:}
   \gdef\vatnotext       {Partita I.V.A.}
+  \gdef\vattext         {I.V.A.}
   \gdef\websitetext     {sito Web:}
   \gdef\yourlettertext  {Vostra lettera del:}
   \gdef\yourreftext     {Vostro riferimento:}
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 7e2d8221bd3..9335445e044 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf
@@ -28,6 +28,7 @@
   \gdef\totaltext       {Total}
   \gdef\totext          {Til}
   \gdef\vatnotext       {Org. nr.}
+  \gdef\vattext         {Mva}
   \gdef\websitetext     {hjemmeside}
   \gdef\yourlettertext  {Deres brev av}
   \gdef\yourreftext     {Deres ref:}
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 7d46e994748..f7b9cfca9e2 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf
@@ -28,6 +28,7 @@
   \gdef\totaltext       {Totaal}
   \gdef\totext          {Aan}
   \gdef\vatnotext       {ondernemingsnummer}
+  \gdef\vattext         {btw}
   \gdef\websitetext     {webstek}
   \gdef\yourlettertext  {Uw brief van}
   \gdef\yourreftext     {Uw kenmerk}
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 c3013381743..b311f7ddd7d 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf
@@ -27,6 +27,7 @@
   \gdef\totaltext       {Totaal}
   \gdef\totext          {Aan}
   \gdef\vatnotext       {btwnummer}
+  \gdef\vattext         {btw}
   \gdef\websitetext     {webstek}
   \gdef\yourlettertext  {Uw brief van}
   \gdef\yourreftext     {Uw kenmerk}
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 8226a0bdf9c..8ca6417fbdf 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf
@@ -28,6 +28,7 @@
   \gdef\totaltext       {Ukupno}
   \gdef\totext          {U}
   \gdef\vatnotext       {porez br.}
+  \gdef\vattext         {PDV}
   \gdef\websitetext     {Website}
   \gdef\yourlettertext  {Va\v se pismo od}
   \gdef\yourreftext     {Va\v s broj}
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index af2452ba748..f47269e5f25 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}%
-   [2013/08/27 v1.00 isodoc class for letters and invoices]
+   [2013/08/27 v1.01 isodoc class for letters and invoices]
 \ifx\pdfoutput\undefined\else%
 \ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
 \fi\fi
@@ -212,7 +212,17 @@
 \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}
+\newcommand{\@isodocsym}{%
+  \fontfamily{mvs}\fontencoding{U}%
+  \fontseries{m}\fontshape{n}\selectfont
+}
+\def\EuroSymbol   {{\@isodocsym\char164}}
+\def\EUROSymbol   {{\@isodocsym\char99 }}
+\def\LetterSymbol {{\@isodocsym\char66 }}
+\def\EmailSymbol  {{\@isodocsym\char107}}
+\def\PhoneSymbol  {{\@isodocsym\char84 }}
+\def\MobileSymbol {{\@isodocsym\char72 }}
+\let\EUR\EuroSymbol
 \newdimen\iso@outdent
 \newdimen\iso@signpos
 \newdimen\iso@down
@@ -429,7 +439,7 @@
   \clearpage{\pagestyle{empty}\cleardoublepage}
   \setcounter{section}{0}
   \setkeys{isodoc}{#1}
-  \def\isodoc@lead{\ifforeign+\areacode-\else\phoneprefix\fi}
+  \def\isodoc@lead{\ifforeign+\areacode\,\else\phoneprefix\fi}
   \ifx\isodoc@phone\empty\else\def\phone{\isodoc@lead\isodoc@phone}\fi
   \ifx\isodoc@cellphone\empty\else\def\cellphone{\isodoc@lead\isodoc@cellphone}\fi
   \ifx\isodoc@fax\empty\else\def\fax{\isodoc@lead\isodoc@fax}\fi
@@ -456,7 +466,7 @@
        \totext: \toname\ (\date)}
   \else
     \fancyhead[L]{\color{headingcolor}%
-    \totext: \toname\ (\date)}
+    \mbox{\totext: \toname\ (\date)}}
     \fancyhead[R]{\color{headingcolor}%
     \pagetext\ \thepage\ \oftext{}
     \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
@@ -497,9 +507,11 @@
     }
     \ifx\subject\empty\else%
       \Tbox{35}{\subjectpos}{140}{\noindent
-        \begin{tabularx}{\hsize}{@{}l>{\raggedright}X@{}}
-          \@hft\subjecttext&\subject
-        \end{tabularx}
+        \ifx\subjecttext\empty{\bfseries\subject}\else%
+          \begin{tabularx}{\hsize}{@{}l>{\raggedright}X@{}}
+            \@hft\subjecttext&\subject
+          \end{tabularx}
+        \fi
       }
     \fi
   \else
@@ -528,36 +540,43 @@
   \vspace{\textskip mm}
   \thispagestyle{empty}
   \noindent\ignorespaces#2
-  {\parindent=0pt\parskip=\baselineskip
-    \ifclosing
-      \ifcase\autographversion
-        \par\closing\closingcomma\\\signature   % 0: closing on the next line
-      \or\par\closing\closingcomma\\[\closingskip]\signature % 1: whiteskip
-      \or\autographA
-      \or\autographB
-      \or\autographC
-      \or\autographD
-      \or\autographE
-      \or\autographF
-      \or\autographG
-      \or\autographH
-      \else
-        \par\Undefined{autograph: \autographversion}\\
-      \fi
-    \fi
-    \ifx\enclosures\empty\else
-      \vfill
-      \setbox1=\vbox{\enclosures}%
-      \textbf{\ifdim\ht1>\baselineskip\enclosurestext\else\enclosuretext\fi}%
-      \\\enclosures
-    \fi
-    \ifx\copyto\empty\else
-      \ifx\enclosures\empty\vfill\else\\[2ex]\fi
-      \setbox1=\vbox{\copyto}%
-      \textbf{\copytotext}%
-      \\\copyto
-    \fi
-  }
+  \ifclosing
+    \par\noindent\begin{minipage}[t]{\hsize}
+      \parindent=0pt\parskip=\baselineskip
+        \ifcase\autographversion
+          \par\closing\closingcomma\\\signature   % 0: closing on the next line
+        \or\par\closing\closingcomma\\[\closingskip]\signature % 1: whiteskip
+        \or\autographA
+        \or\autographB
+        \or\autographC
+        \or\autographD
+        \or\autographE
+        \or\autographF
+        \or\autographG
+        \or\autographH
+        \else
+          \par\Undefined{autograph: \autographversion}\\
+        \fi
+    \end{minipage}
+  \fi
+  \ifx\enclosures\empty\else
+    \par\noindent\begin{minipage}[t]{\hsize}
+      \parindent=0pt\parskip=\baselineskip
+        \vfill
+        \setbox1=\vbox{\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
+    \end{minipage}
+  \fi
   \label{LastPageOf\thelettercount}
 }}
 \def\Cbox#1#2#3#4{%
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodocsymbols.sty b/Master/texmf-dist/tex/latex/isodoc/isodocsymbols.sty
deleted file mode 100644
index d5b21b0bc1d..00000000000
--- a/Master/texmf-dist/tex/latex/isodoc/isodocsymbols.sty
+++ /dev/null
@@ -1,15 +0,0 @@
-\ProvidesPackage{isodocsymbols}
-  [2010/12/04 v1.0 Symbols for isodoc]
-\IfFileExists{marvosym.sty}{}{\ClassError{isodoc}{package marvosym is not installed}{}}
-\newcommand{\@isodocsym}{%
-  \fontfamily{mvs}\fontencoding{U}%
-  \fontseries{m}\fontshape{n}\selectfont
-}
-\def\EuroSymbol   {{\@isodocsym\char164}}
-\def\EUROSymbol   {{\@isodocsym\char99 }}
-\def\LetterSymbol {{\@isodocsym\char66 }}
-\def\EmailSymbol  {{\@isodocsym\char107}}
-\def\PhoneSymbol  {{\@isodocsym\char84 }}
-\def\MobileSymbol {{\@isodocsym\char72 }}
-\let\EUR\EuroSymbol
-\endinput