1 files changed, 29 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
index a4a6536873d..ec49dbdb124 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
+++ b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% It is part of a work named "C.D.P. Bundle".
 %% 
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
 %% 
 %% The C.D.P. Bundle may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,8 +48,8 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}[1997/06/01] % LaTeX2e is required!
 \ProvidesClass{letteracdp}
-              [2005/01/01 v0.33 (**incomplete**)]
-\typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI,
+              [2006/01/01 v0.34 (**incomplete**)]
+\typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI,
   all rights reserved.}
 \@ifdefinable\@letteracdp{\def\@letteracdp{letteracdp}}
 \newcommand*\Coordinamento{%
@@ -144,6 +144,7 @@
 \do\thesubject
 \do\@subject@style
 \do\@signature@style
+\do\@place
 \do\@begin@letter@hook
 \do\@end@letter@hook
 \def\do#1{\@ifdefinable#1{\let#1\@undefined}}
@@ -292,6 +293,13 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
 \fi
 %% Command \date redefined to make changes to date local.
 \def\date#1{\def\@date{#1}}
+\newcommand*\place[1]{%
+  \ifx \@empty #1\@empty % if #1 is empty
+    \let\@place\@empty
+  \else
+    \def\@place{#1,}%
+  \fi
+}
 \input{size1\@ptsize.clo}
 \setlength\lineskip{\p@}
 \setlength\normallineskip{\p@}
@@ -715,7 +723,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
   \cleardoubleemptypage
   \c@page\@ne
   \refstepcounter{letter}%
-  \typeout{Letter \number\c@letter}%
+  \typeout{\lettername \space \number\c@letter}%
   \interlinepenalty 200 % smaller than the TeXbook value
   \parskip\medskipamount
   \ifx\@indent@pref L\else
@@ -765,7 +773,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
   \@baseletter
 }}
 \@ifdefinable\y@baseletter{\long\def\y@baseletter#1{%
-  \@cut@andcc #1\andcc @@@%
+  \@cut@andcc #1\andcc\@@@
   \def\theaddresseeaddress{#1}%
   \@baseletter
 }}
@@ -789,16 +797,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
   \the\@lett@decl
   \@begin@letter@hook
 }
-\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2@@@{%
-  \@cut@and #1\and @@@%
+\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{%
+  \@cut@and #1\and\@@@%
 }}
-\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2@@@{%
-  \@cut@nl #1\\@@@%
+\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2\@@@{%
+  \@cut@nl #1\\\@@@%
 }}
-\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2@@@{%
-  \@cut@par #1\par @@@%
+\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2\@@@{%
+  \@cut@par #1\par\@@@%
 }}
-\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2@@@{%
+\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2\@@@{%
   \def\theaddresseename{#1}%
 }}
 \newcommand*\stopbreaks{%
@@ -1135,7 +1143,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
   \cleardoublepage
   \@setup@pres
 }{%
-  \par
+  \@@par
   \addpenalty\@e@prespenalty
   \addvspace\belowpresentationvspace
 }
@@ -1153,9 +1161,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
     \cleardoublepage
     \setbox\z@\vbox\bgroup
       \@setup@pres
+      \boxmaxdepth\maxdepth
       \color@begingroup
       \penalty-\@M
-      \prevdepth\z@
   \else
     \@nofoldwarning
     \normalpresentation
@@ -1248,8 +1256,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
     \@esphack
   \fi
 }
-\newcommand*\foldingfilbreak[2][\z@]{%
-  \@foldingfilbreak{\@fold@getpen{#1}}{#2}%
+\newcommand*\foldingfilbreak[1][\z@]{%
+  \@foldingfilbreak{\@fold@getpen{#1}}%
 }
 \newcommand*\makefoldedpresentation{%
   \if@do@fold@
@@ -1281,9 +1289,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
     \nobreak\medskip
   \fi
 }}
-\newcommand*\makedate      [1][]{\@make@date{#1}NN}
-\newcommand*\maketopdate   [1][]{\@make@date{#1}NY}
-\newcommand*\makebottomdate[1][]{\@make@date{#1}YN}
+\newcommand*\makedate      [1][\@place]{\@make@date{#1}NN}
+\newcommand*\maketopdate   [1][\@place]{\@make@date{#1}NY}
+\newcommand*\makebottomdate[1][\@place]{\@make@date{#1}YN}
 \@ifdefinable\@empty@signature{\def\@empty@signature{%
   \ClassWarning{\@letteracdp}{%
     Empty signature%
@@ -1381,7 +1389,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
     \@opening
   }%
 }
-\newcommand*\@opening[1][]{%
+\newcommand*\@opening[1][\@place]{%
   \makepresentation
   \maketopdate[#1]%
   \@cdp@reserved
@@ -1713,6 +1721,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
 \newcommand*\enclname        {Allegati:}
 \newcommand*\PSname          {P.S.:}
 \newcommand*\headtoname      {A:}
+\newcommand*\lettername      {Lettera}
 \newcommand*\today{\number\day~\ifcase\month\or
   gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or
   luglio\or agosto\or settembre\or ottobre\or novembre\or dicembre\fi