diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty | 164 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls | 15 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty | 128 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty | 111 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf (renamed from Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls) | 45 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf | 75 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls | 170 |
11 files changed, 458 insertions, 294 deletions
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty b/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty deleted file mode 100644 index a78c119a25c..00000000000 --- a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty +++ /dev/null @@ -1,164 +0,0 @@ -%% -%% This is file `adiseal.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% cdpbundl.dtx (with options: `adipk') -%% -%% This is a generated file. -%% It is part of a work named "C.D.P. Bundle". -%% -%% 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 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% The C.D.P. Bundle has the LPPL maintenance status -%% "author-maintained". -%% -%% The file `manifest.txt' that comes along with this file specifies -%% what the C.D.P. Bundle consists of; more precisely, it explains how -%% the locutions "Work" and "Compiled Work", used in the LaTeX Project -%% Public License, are to be interpreted in the case of this work. -%% -%% Note that the distribution of this file alone is "distribution of -%% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! -\ProvidesPackage{adiseal} - [2006/01/01 v0.34 (development)] -\@ifdefinable\@adiseal{\def\@adiseal{adiseal}} -\newcommand*\ADIWWW{% - http://www.math.unipd.it/\string~favero/adipd/% -} -\@ifdefinable\@seal@graph@file{\def\@seal@graph@file{% - adiseal% must be an EPS or a PDF file -}} -\@ifdefinable\if@use@pixmap@{\newif\if@use@pixmap@} -\@ifdefinable\@temp@adiseal{} -\DeclareOption{nopixmap}{\@use@pixmap@false} -\DeclareOption{usepixmap}{\@use@pixmap@true} -\ExecuteOptions{nopixmap} -\ProcessOptions\relax -\def\@temp@adiseal#1{% - \@use@pixmap@false - \PackageWarningNoLine{\@adiseal}{% - Can't find the #1;\MessageBreak - option usepixmap ignored (converted to nopixmap).\MessageBreak - The ADI seal will _not_ be printed% - }% -} -\if@use@pixmap@ - \IfFileExists{\@seal@graph@file.eps}{% - \IfFileExists{epsfig.sty}{% - \RequirePackage{epsfig}% - }{% - \@temp@adiseal{epsfig package}% - }% - }{% - \@temp@adiseal{pixel map for the ADI seal}% - }% -\fi -\let\@temp@adiseal\@undefined -\@ifdefinable\@seal@box{\def\@seal@box#1{% - \parbox[t][42bp][c]{60bp}{\centerline{#1}}% -}} -\newcommand*\ADIconcert{\par\noindent - \emph\concertname - \ADIaddress -} -\DeclareRobustCommand*\ADIaddress{\par - \setbox\z@\vtop{% - \normalfont\normalsize - \leftline{% - \vtop{% - \hbox{% - \if@use@pixmap@ - \edef\@temp@adiseal{% - \noexpand\epsfig{file=\@seal@graph@file,% - height=42bp,width=60bp,clip=}% - }% - \@seal@box\@temp@adiseal - \let\@temp@adiseal\@undefined - \else - \setlength\fboxrule{.2pt}% - \setlength\fboxsep{-\fboxrule}% - \fbox{\@seal@box\substitutesealname}% - \fi - }% - }% - \kern\baselineskip - \vtop{% - \null\nointerlineskip - \hbox{% - \Large ADI% - \setbox\z@\hbox{\ignorespaces\seatacronym\unskip}% - \ifdim\wd\z@>\z@ - -\unhbox\z@ - \else - \unhbox\z@ - \fi - }% - \ialign{##\cr - \spaceskip \fontdimen\tw@\font - \@plus \@ne fil% - \@minus \fontdimen4\font - Associazione Dottorandi e\cr - Dottori di Ricerca Italiani\cr - }% - \hbox{% - \setbox\z@\hbox{\ignorespaces\seatname\unskip}% - \ifdim\wd\z@>\z@ - --- \unhbox\z@ - \else - \unhbox\z@ - \fi - }% - \global\dimen@i\prevdepth - }% - }% - \kern\p@ - \prevdepth \dimen@i - \leftline{\ttfamily\small\ADIWWW}% - \global\dimen@i\prevdepth - }% - \dimen@ \dp\z@ - \advance \dimen@ -\dimen@i - \dimen@ii .5\baselineskip - \divide \dimen@ \dimen@ii - \count@ \dimen@ - \advance \count@ 1 - \dimen@ \dp\z@ - \advance \dimen@ -\count@\dimen@ii - \box\z@ - \prevdepth\dimen@ -} -\newcommand*\concertname {di concerto con} -\newcommand*\seatacronym {PD} -\newcommand*\seatname {Sede di Padova} -\newcommand*\substitutesealname{Logo ADI} -\endinput -%% -%% End of file `adiseal.sty'. diff --git a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls index 25b17bbf96a..f606dbf0c7f 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -48,9 +51,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required! \ProvidesClass{articoletteracdp} - [2006/01/01 v0.34 (development)] -%% \typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI, -%% all rights reserved.} + [2015/02/08 v0.36 (development)] \@ifdefinable\@out@table@list{} \@ifdefinable\@in@table@list{} \@ifdefinable\@do@tf{} @@ -94,7 +95,7 @@ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}} \ExecuteOptions{plaintoc,openletterbookmarks} \ProcessOptions\relax -\LoadClass{letteracdp}[2006/01/01] +\LoadClass{letteracdp}[2015/02/08] \newcounter{section}[letter] \newcounter{paragraph}[section] \newcounter{figure}[letter] diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty index 44c9edd9999..32fd290baae 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -48,12 +51,13 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesPackage{cdpaddon} - [2006/01/01 v0.34 (development)] + [2015/02/08 v0.36 (development)] \@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}} \def\do#1{\@ifdefinable#1{\newif#1}} \do\if@using@cdp@ \do\if@use@color@ \do\if@use@hyper@ +\do\if@custom@lh@ \@ifdefinable\@cdpaddon@printer{\let\@cdpaddon@printer\@empty} \@ifdefinable\@temp@cdpaddon@a{} \@ifdefinable\@temp@cdpaddon@b{} @@ -83,10 +87,15 @@ \@unknownoptionerror \fi } -\DeclareOption{bw}{\@use@color@false} -\DeclareOption{color}{\@use@color@true} -\DeclareOption{hypertext}{\@use@hyper@true} -\DeclareOption{plaintext}{\@use@hyper@false} +\DeclareOption{bw}{\@use@color@false\@custom@lh@false} +\DeclareOption{color}{\@use@color@true\@custom@lh@false} +\DeclareOption{hypertext}{\@use@hyper@true\@custom@lh@false} +\DeclareOption{plaintext}{\@use@hyper@false\@custom@lh@false} +\DeclareOption{customletterhead}{% + \@use@color@false + \@use@hyper@false + \@custom@lh@true +} \DeclareOption*{% \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,\@@@% } @@ -96,39 +105,12 @@ \ifx\@cdpaddon@printer\@temp@cdpaddon@a \let\@cdpaddon@printer\@empty \fi -\def\@temp@cdpaddon@a#1#2#3#4#5{% - \IfFileExists{#1.sty}{% - \RequirePackage[#2]{#1}% - }{% - \@nameuse{@use@#3@false} - \PackageWarningNoLine{\@cdpaddon}{% - Can't find the #1 package;\MessageBreak - option #4 ignored (converted to #5)% - }% - }% -} \if@use@color@ - \@temp@cdpaddon@a{color}{}{color}{color}{bw} + \RequirePackage[dvipsnames]{color} \fi \if@use@hyper@ - \@temp@cdpaddon@a{hyperref}{}{hyper}{hypertext}{plaintext} + \RequirePackage{hyperref} \fi -\@ifdefinable\@back@folding@tag{\def\@back@folding@tag{% - \if@do@fold@ - \raisebox{\@lh@folding@ht}[\z@][\z@]{% - \makebox[\z@][l]{% - \color{strong@col}% - \dimen@ -\@lh@right@margin - \advance\dimen@ 1cm% - \kern\dimen@ \vbox{% - \kern -.1\p@ - \hrule \@height .1\p@ \@depth .1\p@ \@width 5mm% - \kern -.1\p@ - }% - }% - }% - \fi -}} \if@using@cdp@ \def\@temp@cdpaddon@a#1{% \@ifundefined{#1}{% @@ -141,7 +123,7 @@ is actually undefined.\MessageBreak Probably, you are using an old or modified version of that class.\MessageBreak - Proceed, but some of the colors won't come out right.% + Proceed, but keep your fingers crossed!% }% }% } @@ -202,8 +184,9 @@ \sbox{\@nameuse{#1}}{{\color{strong@col}\unhbox\z@}}% }% } - \@temp@cdpaddon@a{@folding@tag}{% - \let\@folding@tag\@back@folding@tag + \renewcommand*\foldingtagrule{% + \color{strong@col}% + \CDPFactoryFoldingTagRule } \@temp@cdpaddon@a{@logo@box@base}{% \savebox\@logo@box@base[\z@][r]{\setlength\unitlength{.625mm}% @@ -271,6 +254,67 @@ }\hss }} \fi + \newsavebox\@cdp@custom@lhead@box + \newsavebox\@cdp@custom@lfoot@box + \newsavebox\@cdp@custom@llogo@box + \def\@temp@cdpaddon@b#1#2#3#4{% + \newenvironment*{customletter#1}[1]{% + \setbox\@nameuse{@cdp@custom@l#1@box}\vbox to\z@ \bgroup + \hsize ##1\relax + \parskip \z@skip + #3% either \vss or nothing + \everypar{}% + \noindent\minipage[#2]{##1}% + \null + }{% + \par + \vskip -\baselineskip + \null + \endminipage + #4% either \vss or nothing + \egroup + \global \setbox \@ne \box \@nameuse{@cdp@custom@l#1@box}% + \xdef\@cdp@reserved{% + \setbox \@nameuse{@cdp@custom@l#1@box}\box \@ne + }% + \aftergroup \@cdp@reserved + }% + }% + \@temp@cdpaddon@b{head}{b}{\vss}{} + \@temp@cdpaddon@b{foot}{t}{}{\vss} + \@temp@cdpaddon@b{logo}{b}{\vss}{} + \newcommand*\ruleacrossheadorfoot[1][\z@]{\par + \setlength\@tempdima{#1}% + \@ifnextchar [% ] bracket matching + \@cdp@rule@across@x + {% + \@tempdimb \@tempdima + \@cdp@rule@across + }% + } + \@ifdefinable\@cdp@rule@across@x{\def\@cdp@rule@across@x[#1]{% + \setlength\@tempdimb{#1}% + \@cdp@rule@across + }} + \@ifdefinable\@cdp@rule@across{\def\@cdp@rule@across{ + \nobreak + \vskip -\baselineskip + \hb@xt@ \hsize {% + \kern \@tempdima \hrulefill \kern \@tempdimb + }% + }} + \if@custom@lh@ + \@temp@cdpaddon@a{@cdp@head}{\def\@cdp@head{% + \hss\copy\@cdp@custom@lhead@box\hss + }} + \@temp@cdpaddon@a{@cdp@foot}{\def\@cdp@foot{% + \hss\copy\@cdp@custom@lfoot@box\hss + }} + \@temp@cdpaddon@a{@cdp@logo}{\def\@cdp@logo{% + \hb@xt@ \z@ {\hss\copy\@cdp@custom@llogo@box}% + }} + \setlength\longindentation{.5\textwidth} + \fi \if@use@hyper@ \AtBeginDocument{% \@temp@cdpaddon@a{@name@and@WWW@box}{% @@ -302,7 +346,9 @@ \let\if@use@hyper@\@undefined \let\@use@hyper@true\@undefined \let\@use@hyper@false\@undefined -\let\@back@folding@tag\@undefined +\let\if@custom@lh@\@undefined +\let\@custom@lh@true\@undefined +\let\@custom@lh@false\@undefined \let\@cdpaddon@printer\@undefined \let\@temp@cdpaddon@b\@undefined \DeclareRobustCommand*\facesmile{\@face\smile} diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty new file mode 100644 index 00000000000..2e86c67dda5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty @@ -0,0 +1,111 @@ +%% +%% This is file `cdpbabel.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% cdpbundl.dtx (with options: `babel') +%% +%% This is a generated file. +%% It is part of a work named "C.D.P. Bundle". +%% +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% The C.D.P. Bundle has the LPPL maintenance status +%% "author-maintained". +%% +%% The file `manifest.txt' that comes along with this file specifies +%% what the C.D.P. Bundle consists of; more precisely, it explains how +%% the locutions "Work" and "Compiled Work", used in the LaTeX Project +%% Public License, are to be interpreted in the case of this work. +%% +%% Note that the distribution of this file alone is "distribution of +%% only part of the Work" in the sense of the LaTeX Project Public +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\NeedsTeXFormat{LaTeX2e}[1998/09/02] % LaTeX2e is required! +\ProvidesPackage{cdpbabel} + [2015/02/08 v0.36 (development)] +\@ifdefinable\@cdpbabel{\def\@cdpbabel{cdpbabel}} +\def\do#1{\@ifdefinable #1{\let #1\@empty}} +\do\@cdpbabel@perform@redefinitions +\do\@cdpbabel@letter@names +\do\@cdpbabel@artlet@names +\DeclareOption*{% + \IfFileExists{cdpnames\CurrentOption.ldf}{% + \input{cdpnames\CurrentOption.ldf}% + \edef\do##1{% + \noexpand\g@addto@macro + \noexpand\@cdpbabel@perform@redefinitions + {% + \noexpand\addto \csname captions\CurrentOption \endcsname + {##1}% + }% + }% + \@ifclassloaded{letteracdp}{% + \expandafter\do \expandafter{\@cdpbabel@letter@names}% + }{}% + \@ifclassloaded{articoletteracdp}{% + \expandafter\do \expandafter{\@cdpbabel@artlet@names}% + }{}% + \PackageInfo{\@cdpbabel}{% + Redefined the names of "C.D.P. Bundle" captions\MessageBreak + for the language `\CurrentOption'% + }% + }{% + \PackageError{\@cdpbabel}{% + Name def. file `cdpnames\CurrentOption.ldf' not found% + }{% + Files of the form `cdpnames<language>.ldf' are meant + to define the names\MessageBreak + in the language <language> of some captions used by + the "C.D.P. Bundle".\MessageBreak + You requested\MessageBreak + \space\space<language> = `\CurrentOption',\MessageBreak + but the corresponding file is missing; therefore, + probably some of these\MessageBreak + captions will not be printed as intended.\MessageBreak + This error affects only the \@cdpbabel\space package, + but not the babel package.\MessageBreak + You may continue: + type \space <return> \space to proceed.% + }% + }% + \PassOptionsToPackage{\CurrentOption}{babel}% +} +\ProcessOptions* +\let \do = \@undefined +\let \@cdpbabel@letter@names = \@undefined +\let \@cdpbabel@artlet@names = \@undefined +\RequirePackage{babel} +\@cdpbabel@perform@redefinitions +\let \@cdpbabel@perform@redefinitions = \@undefined +\endinput +%% +%% End of file `cdpbabel.sty'. diff --git a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf index a63114dd94d..723a96d5658 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf @@ -1,15 +1,16 @@ %% -%% This is file `lettcdpadi.cls', +%% This is file `cdpnamesenglish.ldf', %% generated with the docstrip utility. %% %% The original source files were: %% -%% cdpbundl.dtx (with options: `adicl') +%% cdpbundl.dtx (with options: `lang-en') %% %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -46,15 +49,27 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! -\ProvidesClass{lettcdpadi} - [2006/01/01 v0.34 (development)] -\DeclareOption{nopixmap} {\PassOptionsToPackage{nopixmap} {adiseal}} -\DeclareOption{usepixmap}{\PassOptionsToPackage{usepixmap}{adiseal}} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}} -\ProcessOptions\relax -\LoadClass{letteracdp}[2006/01/01] -\RequirePackage{adiseal}[2006/01/01] +\ProvidesFile{cdpnamesenglish.ldf}[2015/02/08] +\def\@cdpbabel@letter@names{% + \def\subjectname {Subject:}% + \def\registeredname {Registered}% + \def\registeredRRname {\registeredname~R.R.}% + \def\andccname {cc}% + \def\ccname {cc:}% + \def\enclname {Encl:}% + \def\PSname {P.S.:}% + \def\headtoname {To:}% + \def\lettername {Letter}% +} +\def\@cdpbabel@artlet@names{% + \def\contentsname {Contents}% + \def\listfigurename {List of figures}% + \def\listtablename {List of tables}% +%% \def\refname {References}% +%% \def\indexname {Index}% +%% \def\figurename {Figure}% +%% \def\tablename {Table}% +} \endinput %% -%% End of file `lettcdpadi.cls'. +%% End of file `cdpnamesenglish.ldf'. diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf new file mode 100644 index 00000000000..15a5ee3eda8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf @@ -0,0 +1,75 @@ +%% +%% This is file `cdpnamesitalian.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% cdpbundl.dtx (with options: `lang-it') +%% +%% This is a generated file. +%% It is part of a work named "C.D.P. Bundle". +%% +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% The C.D.P. Bundle has the LPPL maintenance status +%% "author-maintained". +%% +%% The file `manifest.txt' that comes along with this file specifies +%% what the C.D.P. Bundle consists of; more precisely, it explains how +%% the locutions "Work" and "Compiled Work", used in the LaTeX Project +%% Public License, are to be interpreted in the case of this work. +%% +%% Note that the distribution of this file alone is "distribution of +%% only part of the Work" in the sense of the LaTeX Project Public +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesFile{cdpnamesitalian.ldf}[2015/02/08] +\def\@cdpbabel@letter@names{% + \def\subjectname {Oggetto:}% + \def\registeredname {Raccomandata}% + \def\registeredRRname {\registeredname~A.R.}% + \def\andccname {e~p.~c.}% + \def\ccname {P.~c.:}% + \def\enclname {Allegati:}% + \def\PSname {P.S.:}% + \def\headtoname {A:}% + \def\lettername {Lettera}% +} +\def\@cdpbabel@artlet@names{% + \def\contentsname {Sommario}% + \def\listfigurename {Indice delle figure}% + \def\listtablename {Indice delle tabelle}% + \def\refname {Testi citati}% +%% \def\indexname {Indice analitico}% +%% \def\figurename {Figura}% +%% \def\tablename {Tabella}% +} +\endinput +%% +%% End of file `cdpnamesitalian.ldf'. diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def index 01a14f34de3..cff6265add8 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -59,7 +62,7 @@ %%% the name and the release date, respectively, of your file. %%% Note that the extension ".def" must be included in the file name, %%% and that the date is in the format YYYY/MM/DD. -\ProvidesFile{cdpshues-example.def}[2006/01/01 Printer-dependent file] +\ProvidesFile{cdpshues-example.def}[2015/02/08 Printer-dependent file] %%% %%% Define here the colors to use to draw the C.D.P. seal; %%% "slight@col" is the color used to paint the inner of the D and diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg index f65f2ccba85..1ca5010ce63 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -59,7 +62,7 @@ This file is special in that the cdpaddon package stops reading it as soon as it encounters the first "\DeclareCDPSealHuesDefault" command: all subsequent lines are ignored, and can hence contain explanatory comments, just like these. To save disk space (although, in this era -of gigabytes, this is not a compelling issue!), you can, if you want, +of terabytes, this is not a compelling issue!), you can, if you want, delete all lines in this file except the one which contains the first occurrence of a "\DeclareCDPSealHuesDefault" command (12 lines above); but if you do so, please be sure to read them before deleting them! diff --git a/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def index 96e5d7a64a6..7d9877d6c7b 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -46,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{epson-stylus-740.def}[2006/01/01 Printer-dependent file] +\ProvidesFile{epson-stylus-740.def}[2015/02/08 Printer-dependent file] \definecolor{slight@col}{rgb}{.8,1,.8} \definecolor{strong@col}{rgb}{0,.266667,0} \endinput diff --git a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def index 780ed1786c4..deef9e46415 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -46,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{hp-laserjet-4500.def}[2006/01/01 Printer-dependent file] +\ProvidesFile{hp-laserjet-4500.def}[2015/02/08 Printer-dependent file] \definecolor{slight@col}{cmyk}{.1,0,.1,0} \definecolor{strong@col}{cmyk}{.5,0,.5,.5} \endinput diff --git a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls index ec49dbdb124..41411b3400f 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls @@ -9,7 +9,8 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% <gustavo.mezzetti@istruzione.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 @@ -17,7 +18,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% version 2005/12/01 or later. %% %% The C.D.P. Bundle has the LPPL maintenance status %% "author-maintained". @@ -29,7 +30,9 @@ %% %% Note that the distribution of this file alone is "distribution of %% only part of the Work" in the sense of the LaTeX Project Public -%% License, and is not allowed. +%% License, and should be avoided. +%% +%% February 8, 2015 (vers. 0.36) %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -48,22 +51,22 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1997/06/01] % LaTeX2e is required! \ProvidesClass{letteracdp} - [2006/01/01 v0.34 (**incomplete**)] -\typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI, + [2015/02/08 v0.36 (**incomplete**)] +\typeout{Copyright (C) 1999-2015 by Gustavo MEZZETTI, all rights reserved.} \@ifdefinable\@letteracdp{\def\@letteracdp{letteracdp}} \newcommand*\Coordinamento{% Coordinamento dei Dottorandi e dei Dottori di Ricerca - dell'Universit\`a di Padova% + dell'Universit{\char "E0} di Padova% } \newcommand*\CoordinamentoWWW{% http://www.dei.unipd.it/\string~assdott/% } -\DeclareFixedFont\@lh@nss{OT1}{cmss}{m}{n} {12} -\DeclareFixedFont\@lh@bss{OT1}{cmss}{m}{n} {17} -\DeclareFixedFont\@lh@rm {OT1}{cmr} {m}{n} {9} -\DeclareFixedFont\@lh@it {OT1}{cmr} {m}{it}{9} -\DeclareFixedFont\@lh@tt {OT1}{cmtt}{m}{n} {9} +\DeclareFixedFont\@lh@nss{T1}{cmss}{m}{n} {12} +\DeclareFixedFont\@lh@bss{T1}{cmss}{m}{n} {17} +\DeclareFixedFont\@lh@rm {T1}{cmr} {m}{n} {9} +\DeclareFixedFont\@lh@it {T1}{cmr} {m}{it}{9} +\DeclareFixedFont\@lh@tt {T1}{cmtt}{m}{n} {9} \newcommand\@ptsize{} %% A couple of useful things that are missing from the LaTeX kernel: \@ifdefinable\@newrigidlength{\def\@newrigidlength#1{% @@ -92,6 +95,8 @@ \@newrigidlength\addresseewidth \@newrigidlength\signatureindentation \@newrigidlength\signaturewidth +\@newrigidlength\signaturerulewidth +\setlength\signaturerulewidth{5cm} \@newrigidlength\foldedheight \setlength\foldedheight{-\maxdimen} \@newrigidlength\@folding@ht @@ -132,6 +137,9 @@ \@ifdefinable\startaddrlabel{} \@ifdefinable\stopaddrlabel{} \@ifdefinable\ifactuallabel{} +\@ifdefinable\ChosenMakeOpening{} +\@ifdefinable\ChosenMakeClosing{} +\@ifdefinable\ChosenMakeSignature{} \@ifdefinable\@lett@decl{\newtoks\@lett@decl} \def\do#1{\@ifdefinable#1{\let#1\@empty}} \do\thesenderaddress @@ -147,6 +155,7 @@ \do\@place \do\@begin@letter@hook \do\@end@letter@hook +\do\@begin@block@or@and@hook \def\do#1{\@ifdefinable#1{\let#1\@undefined}} \do\presubject \do\registered @@ -172,6 +181,8 @@ \def\do#1{\@ifdefinable#1{\newif#1}} \do\if@use@eepic@ \do\if@do@fold@ +\do\if@making@labels@ +\do\if@signature@rule@ \@ifdefinable\if@new@block@{ \def\@new@block@true {\global\let\if@new@block@\iftrue } \def\@new@block@false{\global\let\if@new@block@\iffalse} @@ -246,6 +257,8 @@ \DeclareOption{mediumsubject}{\let\@subject@style\mdseries} \DeclareOption{italicsignature}{\let\@signature@style\itshape} \DeclareOption{uprightsignature}{\let\@signature@style\upshape} +\DeclareOption{signaturerule}{\@signature@rule@true} +\DeclareOption{nosignaturerule}{\@signature@rule@false} \DeclareOption{usePS}{\@use@eepic@true} \DeclareOption{noPS}{\@use@eepic@false} \DeclareOption{smartindent}{\let\@indent@pref O} @@ -277,8 +290,11 @@ \setlength\addrlabelheight{37mm}% \setlength\addrlabelborder{6mm}% } -\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,% -mediumsubject,uprightsignature,noPS,indent,105x37labels} +\ExecuteOptions{% + a4paper,10pt,oneside,onecolumn,final,% + mediumsubject,uprightsignature,nosignaturerule,noPS,indent,% + 105x37labels% +} \ProcessOptions\relax \if@use@eepic@ \IfFileExists{eepic.sty}{% @@ -612,17 +628,28 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \if@do@fold@ \raisebox{\@lh@folding@ht}[\z@][\z@]{% \makebox[\z@][l]{% - \dimen@ -\@lh@right@margin - \advance\dimen@ 1cm% + \dimen@ \paperwidth + \advance \dimen@ -1in% + \advance \dimen@ -\oddsidemargin + \advance \dimen@ -\textwidth + \advance\dimen@ -1cm% \kern\dimen@ \vbox{% - \kern -.1\p@ - \hrule \@height .1\p@ \@depth .1\p@ \@width 5mm% - \kern -.1\p@ + \color@begingroup + \foldingtagrule + \color@endgroup }% }% }% \fi }} +\newcommand*\foldingtagrule{% + \kern -.1\p@ + \hrule \@height .1\p@ \@depth .1\p@ \@width 5mm% + \kern -.1\p@ +} +\@ifdefinable\CDPFactoryFoldingTagRule{ + \let \CDPFactoryFoldingTagRule = \foldingtagrule +} \savebox\@logo@box@base[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% \put(8,16){\oval(10,10)[l]}% @@ -692,6 +719,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \newcommand \location [1]{\def\thesenderlocation{#1}} \newcommand*\telephone[1]{\def\thesenderphone{#1}} \newcommand*\makelabels{% + \@making@labels@true \AtBeginDocument{% \def\@beginlabels{\begin{labels}}% \def\@beginlabelgroup{\begin{labelgroup}}% @@ -743,7 +771,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@@par\addpenalty\z@ \clearpage \@end@letter@hook - \if@filesw + \if@filesw \if@making@labels@ \begingroup \let\\\relax \let ~\relax @@ -765,7 +793,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \string\@endlabelgroup }% \endgroup - \fi + \fi \fi } \@ifdefinable\x@baseletter{\long\def\x@baseletter[#1]#2{% \def\theaddresseename{#1}% @@ -910,6 +938,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@ifdefinable\@block@everypar{\def\@block@everypar{% \@block@parshape \@block@@everypar + \@begin@block@or@and@hook }} \@ifdefinable\x@custom@block{\def\x@custom@block#1#2#3#4#5#6#7#8#9{% \@custom@block#1#4#5#6#8#9% @@ -919,13 +948,13 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \everypar{\@block@everypar}% \@@custom@block #7% }} -\@ifdefinable\y@custom@block{\def\y@custom@block#1#2#3#4#5#6#7#8{% - \@custom@block#1#3#4#5#7#8% +\@ifdefinable\y@custom@block{\def\y@custom@block#1#2#3#4#5#6#7#8#9{% + \@custom@block#1#4#5#6#8#9% \sbox\@labels{\normalfont\ignorespaces #2\unskip}% % We use \@labels to save a box register. \@block@inden\wd\@labels \ifdim\@block@inden>\z@ - \advance \@block@inden by \subjectnamegap \relax + \advance \@block@inden #3\relax \wd\@labels\@block@inden \fi \@block@width\textwidth \advance\@block@width -\@block@inden @@ -934,7 +963,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \box\@labels \@block@@everypar }% - \@@custom@block #6% + \@@custom@block #7% }} \@ifdefinable\@custom@block{\def\@custom@block#1#2#3#4#5#6{% \if@inlabel \indent \fi @@ -1076,7 +1105,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@ifdefinable\@subject{\def\@subject#1#2{% \let\@empty@block\@empty \y@custom@block #1% - {#2}% + {#2}\subjectnamegap \abovesubjectvspace\z@skip\belowsubjectvspace \@b@subjpenalty\@M\@e@subjpenalty \let\presubject\@good@prsbj @@ -1183,9 +1212,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \advance\splittopskip\@below@folding@skip \advance\splittopskip\parskip \setbox\tw@\vsplit\z@ to\@folding@ht - \nointerlineskip - \box\tw@ - {\baselineskip\@above@folding@margin \nobreak\null}% + {\topskip\z@skip \box\tw@ + \baselineskip\@above@folding@margin \nobreak\null}% \penalty\@highpenalty \ifvoid\z@ \vskip\@below@folding@skip @@ -1300,6 +1328,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@ifdefinable\@signatureenv{\def\@signatureenv#1{\par \let\@empty@block\@empty@signature \let\and\@block@nd + \if@signature@rule@ + \let \@begin@block@or@and@hook \@make@signature@rule + \fi \x@custom@block Y% \signatureindentation\signaturewidth #1#1\z@skip @@ -1308,6 +1339,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} }} \def\end@signatureenv{% \end@custom@block N% not "Y" for efficiency + \let \@begin@block@or@and@hook \@empty \addvspace\belowsignaturevspace } \newenvironment*{signatureenv}{% @@ -1316,6 +1348,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \end@signatureenv } \newenvironment*{signatureenv*}{% + \@signature@rule@false \@signatureenv\abovesignatureshortvspace }{% \end@signatureenv @@ -1346,6 +1379,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} }% }% } +\@ifdefinable\@make@signature@rule{\def\@make@signature@rule{% + \raisebox{\baselineskip}[0pt][0pt]{% + \signaturerule + }\\*[-\baselineskip]% +}} +\newcommand*\signaturerule{% + \makebox[\signaturerulewidth]{% + \leaders \hrule \@height .1\p@ \@depth .1\p@ \hfill + }% +} \newcommand*\makeopening{\par \@ifnextchar +{\@firstoftwo\y@mopening}\x@mopening } @@ -1381,18 +1424,26 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@handwr@box\z@ \nobreak }} \newcommand*\opening{\par - \@ifnextchar +{% - \let\@cdp@reserved\y@mopening - \@firstoftwo\@opening - }{% - \let\@cdp@reserved\x@mopening - \@opening - }% + \@ifnextchar +{\@firstoftwo\y@opening}\x@opening +} +\newcommand*\y@opening[1][\@place]{% + \@opening \y@mopening {#1}% } -\newcommand*\@opening[1][\@place]{% +\newcommand*\x@opening[2][\@place]{% + \@opening{\x@mopening{#2}}{#1}% +} +\@ifdefinable\@opening{\def\@opening#1#2{% + \begingroup + \def\ChosenMakeOpening{#1}% + \OpeningSequence{#2}% + \global\dimen@i\parindent + \endgroup + \parindent\dimen@i +}} +\newcommand*\OpeningSequence[1]{% \makepresentation \maketopdate[#1]% - \@cdp@reserved + \ChosenMakeOpening } \newcommand*\makeclosing{\@par@stopbreaks \@ifnextchar +{\@firstoftwo\y@mclosing}\x@mclosing @@ -1407,18 +1458,31 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@ifstar{% \@closing{\x@msignature *}% }{% - \@ifnextchar +{% - \@firstoftwo{\y@mclosing \y@msignature}% - }{% - \@ifnextchar -{% - \@firstoftwo{\@closing \y@msignature}% - }{% + \@ifnextchar +{\@firstoftwo{% + \@@closing \y@mclosing \y@msignature + }}{% + \@ifnextchar -{\@firstoftwo{% + \@closing \y@msignature + }}{% \@closing{\x@msignature {}}% }% }% }% } -\@ifdefinable\@closing{\def\@closing#1#2{\x@mclosing{#2}#1}} +\@ifdefinable\@closing{\def\@closing#1#2{% + \@@closing{\x@mclosing{#2}}{#1}% +}} +\@ifdefinable\@@closing{\def\@@closing#1#2{% + \begingroup + \def\ChosenMakeClosing{#1}% + \def\ChosenMakeSignature{#2}% + \ClosingSequence + \endgroup +}} +\newcommand*\ClosingSequence{% + \ChosenMakeClosing + \ChosenMakeSignature +} \@ifdefinable\@handwr@box{\def\@handwr@box#1{% \vskip .5\baselineskip \setbox\z@\vbox{% @@ -1427,12 +1491,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \wd\z@\z@ \ht\z@\z@ \dp\z@\z@ \noindent\hspace*{#1}\box\z@\par \vskip .5\baselineskip\vskip\z@skip }} -\newcommand\@cc@encl[2]{\par - \noindent\parbox[t]{\textwidth}{% - \@hangfrom{\normalfont\@safe@space{#1}\enspace}% - \ignorespaces #2\strut - }\par -} +\@ifdefinable\@cc@encl{\long\def\@cc@encl#1#2{\par + \begingroup + \let\@empty@block\@empty + \y@custom@block N{#1}{.5em}% + \z@skip\z@skip\z@skip + \@M\z@\z@ + \ignorespaces #2% + \end@custom@block N% + \endgroup +}} \newcommand*\cc [1][\ccname] {\@cc@encl{#1}} \newcommand*\encl[1][\enclname]{\@cc@encl{#1}} \newenvironment{enclosures}[1][\enclname]{% @@ -1464,7 +1532,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} {\normalfont\@safe@space{#1}\enspace}\ignorespaces } \newcommand*\@PS@rubber[1][\PSname]{% - \@safe@space{#1}\space\ignorespaces + \@safe@space{#1}{\nobreak\space}\ignorespaces } \newcommand*\PS{% \ps\@ifstar{\@PS@rubber}{\@PS@rigid}% |