From e8299fc9754ac30a4b4834ddb21f13fb100eda2f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 12 Feb 2018 22:56:01 +0000 Subject: cdpbundl (12feb18) git-svn-id: svn://tug.org/texlive/trunk@46613 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/cdpbundl/00readme.txt | 4 +- Master/texmf-dist/doc/latex/cdpbundl/Makefile | 6 +- Master/texmf-dist/doc/latex/cdpbundl/README | 2 +- .../texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.pdf | Bin 352036 -> 352497 bytes .../texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.tex | 288 +++---- .../texmf-dist/doc/latex/cdpbundl/cdpbundl-doc.pdf | Bin 399198 -> 400639 bytes Master/texmf-dist/doc/latex/cdpbundl/manifest.txt | 4 +- .../texmf-dist/source/latex/cdpbundl/cdpbundl.dtx | 933 ++++++++++++++------- .../texmf-dist/source/latex/cdpbundl/cdpbundl.ins | 8 +- .../tex/latex/cdpbundl/articoletteracdp.cls | 18 +- Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty | 9 +- Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty | 6 +- .../tex/latex/cdpbundl/cdpnamesenglish.ldf | 6 +- .../tex/latex/cdpbundl/cdpnamesitalian.ldf | 6 +- .../tex/latex/cdpbundl/cdpshues-example.def | 6 +- Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg | 4 +- .../tex/latex/cdpbundl/epson-stylus-740.def | 6 +- .../tex/latex/cdpbundl/hp-laserjet-4500.def | 6 +- .../texmf-dist/tex/latex/cdpbundl/letteracdp.cls | 57 +- 19 files changed, 828 insertions(+), 541 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt b/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt index bd7bb8c8fa3..56b06303e31 100644 --- a/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt +++ b/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt @@ -4,7 +4,7 @@ This is file `00readme.txt'. This file is part of a work named "C.D.P. Bundle". -Copyright (C) 1999-2015 by Gustavo MEZZETTI +Copyright (C) 1999-2018 by Gustavo MEZZETTI . The C.D.P. Bundle may be distributed and/or modified under the @@ -27,7 +27,7 @@ This file, after giving a brief description of the C.D.P. Bundle, explains how to install it and how to generate its--alas, still incomplete!--documentation. -April 1, 2015 (vers. 0.36) +February 8, 2018 (vers. 0.36d) diff --git a/Master/texmf-dist/doc/latex/cdpbundl/Makefile b/Master/texmf-dist/doc/latex/cdpbundl/Makefile index 9f73d1162e1..ac43bf40943 100644 --- a/Master/texmf-dist/doc/latex/cdpbundl/Makefile +++ b/Master/texmf-dist/doc/latex/cdpbundl/Makefile @@ -1,6 +1,6 @@ # makefile # -# 2015 Apr 01 +# 2018 Feb 08 # # Macro definitions ROOT_NAME = cdpbundl @@ -61,10 +61,10 @@ code: doc: $(DOCUM_FILE) $(DOCUM_FILE): $(DTX_NAME) - # Hack for getting index and glossary in the toc since first run: +# Hack for getting index and glossary in the toc since first run: $(GEN_FAKE_INDEX) $(GEN_FAKE_GLOSSARY) - # We know how many runs are needed: +# We know how many runs are needed: $(LATEX) $(DTX_NAME) $(LATEX) $(DTX_NAME) $(MAKEINDEX) -s gind.ist -t $(ROOT_NAME).ilg -o $(ROOT_NAME).ind \ diff --git a/Master/texmf-dist/doc/latex/cdpbundl/README b/Master/texmf-dist/doc/latex/cdpbundl/README index 70bac093879..a66239f197d 100644 --- a/Master/texmf-dist/doc/latex/cdpbundl/README +++ b/Master/texmf-dist/doc/latex/cdpbundl/README @@ -1,4 +1,4 @@ -(Version indicator: 2015 Apr 01) +(Version indicator: 2018 Feb 08) The C.D.P. Bundle was originally developed for a free association named "C.D.P." (more on it in the documentation), to typeset its official letters diff --git a/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.pdf b/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.pdf index 95bd14a0a3c..853cac7aa8e 100644 Binary files a/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.pdf and b/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.pdf differ diff --git a/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.tex b/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.tex index 85f05354232..87e3cc0b7fb 100644 --- a/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.tex +++ b/Master/texmf-dist/doc/latex/cdpbundl/cdp-ver-0-36.tex @@ -1,8 +1,8 @@ \begin{filecontents}{myarticletter.cls} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesClass{myarticletter} - [2015/02/15 v0.02 (development)] -\LoadClassWithOptions{articoletteracdp}[2015/01/20] + [2018/02/08 v0.03 (development)] +\LoadClassWithOptions{articoletteracdp}[2018/02/08] \input{mylogo.def} \endinput \end{filecontents} @@ -10,9 +10,9 @@ \begin{filecontents}{mylogo.def} -\ProvidesFile{mylogo.def}[2015/02/08 v0.01 (development)] +\ProvidesFile{mylogo.def}[2018/02/08 v0.03 (development)] -\RequirePackage[customletterhead]{cdpaddon}[2015/01/21] +\RequirePackage[customletterhead]{cdpaddon}[2018/02/08] \RequirePackage{color} \DeclareFontFamily{T1}{my@calli}{} @@ -59,8 +59,8 @@ \documentclass - [twoside,boldsubject,italicsignature,shortindent,signaturerule] - {myarticletter}[2015/02/08] + [twoside,boldsubject,italicsignature,shortindent,signaturerule] + {myarticletter}[2018/02/08] \usepackage[T1]{fontenc} \usepackage[english]{cdpbabel} \usepackage[bookmarksnumbered,hypertexnames=false]{hyperref} @@ -69,19 +69,19 @@ \name{Gustavo Mezzetti} \signature{Gustavo Mezzetti} \address{ - Gustavo \textsc{Mezzetti}\\ - \protect\href - {mailto:gustavo.mezzetti@istruzione.it} - {\nolinkurl{gustavo.mezzetti@istruzione.it}} + Gustavo \textsc{Mezzetti}\\ + \protect\href + {mailto:gustavo.mezzetti@istruzione.it} + {\nolinkurl{gustavo.mezzetti@istruzione.it}} } -\date{April~1, 2015} +\date{February~8, 2018} \hypersetup{ - pdftitle = {The C.D.P. Bundle version 0.36}, - pdfauthor = {G. Mezzetti}, - pdfsubject = {Instructions on how use the C.D.P. Bundle}, - pdfcreationdate = {D:20150401120000}, - pdfmoddate = {D:20150401120000} + pdftitle = {The C.D.P. Bundle version 0.36}, + pdfauthor = {G. Mezzetti}, + pdfsubject = {Instructions on how use the C.D.P. Bundle}, + pdfcreationdate = {D:20180208120000}, + pdfmoddate = {D:20180208120000} } \pagestyle{headings} @@ -93,20 +93,20 @@ \DeclareRobustCommand*{\packlass}[1]{{\normalfont\sffamily #1}} \DeclareRobustCommand*{\opz}[1]{{\normalfont\ttfamily #1}} \DeclareRobustCommand*{\env}[1]{% - {\texorpdfstring{\normalfont\ttfamily}{}#1}% + {\texorpdfstring{\normalfont\ttfamily}{}#1}% } \DeclareRobustCommand*{\sty}[1]{{\normalfont\ttfamily #1}} \DeclareRobustCommand*{\filedir}[1]{{\normalfont\ttfamily #1}} \DeclareRobustCommand*{\cntr}[1]{{\normalfont\ttfamily #1}} \DeclareRobustCommand*{\command}[1]{% - {\texorpdfstring{\normalfont\ttfamily \char\escapechar}{\pdfbslash}#1}% + {\texorpdfstring{\normalfont\ttfamily \char\escapechar}{\pdfbslash}#1}% } \newcommand*{\meta}[1]{\(\langle\textit{#1}\rangle\)} \newcommand*{\strongemph}[1]{\textbf{#1}} \newcommand*{\zerolistvertspaces}{% - \setlength{\parskip}{0pt}% - \setlength{\topsep}{\parskip}% - \setlength{\partopsep}{\parskip}% + \setlength{\parskip}{0pt}% + \setlength{\topsep}{\parskip}% + \setlength{\partopsep}{\parskip}% } \newcommand*{\lcdp}{\packlass{letteracdp}} @@ -150,20 +150,20 @@ % Note that we use "\def" here, not "\let". \newcommand*\cleantop{% - \dimen@ \baselineskip - \advance \dimen@ -\topskip - \prevdepth \dimen@ + \dimen@ \baselineskip + \advance \dimen@ -\topskip + \prevdepth \dimen@ } \newcommand*\cleanbot{% - \dimen@ \baselineskip - \advance \dimen@ -\topskip - \advance \dimen@ -\prevdepth - \vskip \dimen@ - \prevdepth \z@ + \dimen@ \baselineskip + \advance \dimen@ -\topskip + \advance \dimen@ -\prevdepth + \vskip \dimen@ + \prevdepth \z@ } \newcommand*\cleanbotp{% - \vskip -\prevdepth - \prevdepth \z@ + \vskip -\prevdepth + \prevdepth \z@ } \makeatother @@ -186,12 +186,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{letterhead}[Whom it may concern]{ - To whom may be concerned\\ - with writing letters with \LaTeX\\ - (and want them to bear a letterhead - of \emph{their own} choice!) + To whom may be concerned\\ + with writing letters with \LaTeX\\ + (and want them to bear a letterhead + of \emph{their own} choice!) }[ - The \Bundle\ version 0.36. + The \Bundle\ version 0.36. ] \opening{Dear friends:} @@ -278,14 +278,14 @@ greenish thing?''; so, let's start with this one! %%%% \begin{listing}[p] - \cleantop + \cleantop \begin{verbatim} \documentclass [twoside,boldsubject,italicsignature,shortindent,signaturerule] - {letteracdp}[2015/01/20] + {letteracdp}[2018/02/08] \usepackage[T1]{fontenc} \usepackage[english]{cdpbabel} -\usepackage[customletterhead]{cdpaddon}[2015/01/21] +\usepackage[customletterhead]{cdpaddon}[2018/02/08] \usepackage{url,lipsum} \address{ @@ -293,7 +293,7 @@ greenish thing?''; so, let's start with this one! \protect\url{gustavo.mezzetti@istruzione.it} } \signature{Gustavo Mezzetti} -\date{February~8, 2015} +\date{February~8, 2018} \place{Padova} @@ -330,9 +330,9 @@ greenish thing?''; so, let's start with this one! \end{document} \end{verbatim} - \caption{How to customize the letterhead} - \label{lis:customletter} - \cleanbotp + \caption{How to customize the letterhead} + \label{lis:customletter} + \cleanbotp \end{listing} %%%% @@ -356,9 +356,9 @@ too, but also the preamble is absolutley OK\@---we start a \eclh\ environment. This environment has the following synopsis: % \begin{flushleft} - \verb|\begin{customletterhead}{|\meta{wdth}\verb|}|\quad - \meta{text}\quad - \verb|\end{customletterhead}| + \verb|\begin{customletterhead}{|\meta{wdth}\verb|}|\quad + \meta{text}\quad + \verb|\end{customletterhead}| \end{flushleft} % As you can see, it resembles a \env{minipage} environment, except that you @@ -374,9 +374,9 @@ Next, we do the same for the footer, using the \eclf\ environment, which is syntactically identical to \eclh: % \begin{flushleft} - \verb|\begin{customletterfoot}{|\meta{wdth}\verb|}|\quad - \meta{text}\quad - \verb|\end{customletterfoot}| + \verb|\begin{customletterfoot}{|\meta{wdth}\verb|}|\quad + \meta{text}\quad + \verb|\end{customletterfoot}| \end{flushleft} % By examining the code, you can easily tell that, this time, the footer will be @@ -442,7 +442,7 @@ command (or anything else that typesets text). %%%% \begin{listing}[tbp] - \cleantop + \cleantop \begin{verbatim} \begin{foldedletterhead}[Someone Else]{ To Someone Else\\ @@ -470,9 +470,9 @@ command (or anything else that typesets text). \end{foldedletterhead} \end{verbatim} - \caption{How to customize the letterhead for a single letter} - \label{lis:customletterlocal} - \cleanbot + \caption{How to customize the letterhead for a single letter} + \label{lis:customletterlocal} + \cleanbot \end{listing} %%%% @@ -513,17 +513,17 @@ distinct files, as we are now going to explain. %%%% \begin{listing}[p] - \cleantop + \cleantop \begin{verbatim} \NeedsTeXFormat{LaTeX2e} % LaTeX2e is required! \ProvidesClass{myletter} - [2015/02/08 v0.01 (development)] -\LoadClassWithOptions{letteracdp}[2015/01/20] + [2018/02/08 v0.03 (development)] +\LoadClassWithOptions{letteracdp}[2018/02/08] \input{mylogo.def} \endinput \end{verbatim} - \caption{Contents of the\/ \filedir{myletter.cls} file} - \label{lis:myletter} + \caption{Contents of the\/ \filedir{myletter.cls} file} + \label{lis:myletter} \end{listing} %%%% @@ -532,23 +532,23 @@ distinct files, as we are now going to explain. \begin{verbatim} \NeedsTeXFormat{LaTeX2e} % LaTeX2e is required! \ProvidesClass{myarticletter} - [2015/02/08 v0.01 (development)] -\LoadClassWithOptions{articoletteracdp}[2015/01/20] + [2018/02/08 v0.03 (development)] +\LoadClassWithOptions{articoletteracdp}[2018/02/08] \input{mylogo.def} \endinput \end{verbatim} - \caption{Contents of the\/ \filedir{myarticletter.cls} file} - \label{lis:myarticletter} + \caption{Contents of the\/ \filedir{myarticletter.cls} file} + \label{lis:myarticletter} \end{listing} %%%% %%%% \begin{listing}[p] - \cleantop + \cleantop \begin{verbatim} -\ProvidesFile{mylogo.def}[2015/02/08 v0.01 (development)] +\ProvidesFile{mylogo.def}[2018/02/08 v0.03 (development)] -\RequirePackage[customletterhead]{cdpaddon}[2015/01/21] +\RequirePackage[customletterhead]{cdpaddon}[2018/02/08] \begin{customletterhead}{\textwidth} \centering \Huge @@ -563,9 +563,9 @@ distinct files, as we are now going to explain. \endinput \end{verbatim} - \caption{Contents of the\/ \filedir{mylogo.def} file} - \label{lis:mylogo} - \cleanbotp + \caption{Contents of the\/ \filedir{mylogo.def} file} + \label{lis:mylogo} + \cleanbotp \end{listing} %%%% @@ -582,11 +582,11 @@ which is the single place where the redefinition of the letterhead occurs. %%%% \begin{listing}[tbp] - \cleantop + \cleantop \begin{verbatim} -\ProvidesFile{mylogo.def}[2015/02/08 v0.01 (development)] +\ProvidesFile{mylogo.def}[2018/02/08 v0.03 (development)] -\RequirePackage[customletterhead]{cdpaddon}[2015/01/21] +\RequirePackage[customletterhead]{cdpaddon}[2018/02/08] \RequirePackage{color} \DeclareFontFamily{T1}{my@calli}{} @@ -630,9 +630,9 @@ which is the single place where the redefinition of the letterhead occurs. \endinput \end{verbatim} - \caption{Contents of a more elaborated\/ \filedir{mylogo.def} file} - \label{lis:mylogo-more} - \cleanbotp + \caption{Contents of a more elaborated\/ \filedir{mylogo.def} file} + \label{lis:mylogo-more} + \cleanbotp \end{listing} %%%% @@ -746,7 +746,7 @@ file that, by convention, must be named name of the corresponding language option (for example, % \begin{verbatim} - \usepackage[english,italian]{cdpbabel} + \usepackage[english,italian]{cdpbabel} \end{verbatim} % invokes both \filedir{cdpnamesenglish.ldf} and \filedir{cdpnamesitalian.ldf}, in @@ -755,51 +755,51 @@ listing~\ref{lis:cdpnames}. %%%% \begin{listing}[tbp] - \cleantop - \zerolistvertspaces - \begin{flushleft} - \verb|\ProvidesFile{cdpnames|\meta{language}\verb|.ldf}[|% - \meta{date \& version}\verb|]| - \end{flushleft} + \cleantop + \zerolistvertspaces + \begin{flushleft} + \verb|\ProvidesFile{cdpnames|\meta{language}\verb|.ldf}[|% + \meta{date \& version}\verb|]| + \end{flushleft} \begin{verbatim} \def\@cdpbabel@letter@names{% \end{verbatim} - \begin{flushleft} - \verb| \def\subjectname {|\meta{Subject:}\verb|}%|\\ - \verb| \def\registeredname {|\meta{Registered}\verb|}%|\\ - \verb| \def\registeredRRname {|\meta{Registered R.R.}\verb|}%|\\ - \verb| \def\andccname {|\meta{cc (in addresses)}\verb|}%|\\ - \verb| \def\ccname {|\meta{cc (at end of letters)}\verb|}%|\\ - \verb| \def\enclname {|\meta{Encl:}\verb|}%|\\ - \verb| \def\PSname {|\meta{P.S.:}\verb|}%|\\ - \verb| \def\headtoname {|\meta{To:}\verb|}%|\\ - \verb| \def\lettername {|\meta{Letter}\verb|}%| - \end{flushleft} + \begin{flushleft} + \verb| \def\subjectname {|\meta{Subject:}\verb|}%|\\ + \verb| \def\registeredname {|\meta{Registered}\verb|}%|\\ + \verb| \def\registeredRRname {|\meta{Registered R.R.}\verb|}%|\\ + \verb| \def\andccname {|\meta{cc (in addresses)}\verb|}%|\\ + \verb| \def\ccname {|\meta{cc (at end of letters)}\verb|}%|\\ + \verb| \def\enclname {|\meta{Encl:}\verb|}%|\\ + \verb| \def\PSname {|\meta{P.S.:}\verb|}%|\\ + \verb| \def\headtoname {|\meta{To:}\verb|}%|\\ + \verb| \def\lettername {|\meta{Letter}\verb|}%| + \end{flushleft} \begin{verbatim} % More captions could be added in the future. } \def\@cdpbabel@artlet@names{% \end{verbatim} - \begin{flushleft} - \verb| \def\contentsname {|\meta{Contents}\verb|}%|\\ - \verb| \def\listfigurename {|\meta{List of figures}\verb|}%|\\ - \verb| \def\listtablename {|\meta{List of tables}\verb|}%|\\ - \verb| \def\refname {|\meta{References}\verb|}%|\\ - \verb| \def\indexname {|\meta{Index}\verb|}%|\\ - \verb| \def\figurename {|\meta{Figure}\verb|}%|\\ - \verb| \def\tablename {|\meta{Table}\verb|}%|\\ - \end{flushleft} + \begin{flushleft} + \verb| \def\contentsname {|\meta{Contents}\verb|}%|\\ + \verb| \def\listfigurename {|\meta{List of figures}\verb|}%|\\ + \verb| \def\listtablename {|\meta{List of tables}\verb|}%|\\ + \verb| \def\refname {|\meta{References}\verb|}%|\\ + \verb| \def\indexname {|\meta{Index}\verb|}%|\\ + \verb| \def\figurename {|\meta{Figure}\verb|}%|\\ + \verb| \def\tablename {|\meta{Table}\verb|}%|\\ + \end{flushleft} \begin{verbatim} % More captions could be added in the future. } \endinput \end{verbatim} - \caption{Contents of a - \filedir{cdpnames}\protect\meta{language}\filedir{.ldf} file} - \label{lis:cdpnames} - \cleanbot + \caption{Contents of a + \filedir{cdpnames}\protect\meta{language}\filedir{.ldf} file} + \label{lis:cdpnames} + \cleanbot \end{listing} %%%% @@ -851,9 +851,9 @@ horizontal mode''), and it should construct a horizontal box containing the rule, aligned along the baseline of the box itself; for example, % \begin{verbatim} - \renewcommand*{\signaturerule}{% - \makebox[5cm]{\hrulefill} - } + \renewcommand*{\signaturerule}{% + \makebox[5cm]{\hrulefill} + } \end{verbatim} % could be a typical (re)definition. The default definition of @@ -865,9 +865,9 @@ the default definition of \verb|\signaturerule|. Should you ever redefine the latter, you should honor this parameter in your redefinition, \emph{e.g.}, % \begin{verbatim} - \renewcommand*{\signaturerule}{% - \makebox[\signaturerulewidth]{\hrulefill} - } + \renewcommand*{\signaturerule}{% + \makebox[\signaturerulewidth]{\hrulefill} + } \end{verbatim} % But I~think you will hardly need this: most users will content themselves with @@ -905,7 +905,7 @@ shown in a separate letter at the end of this file. %%%% \begin{listing}[tbp] - \cleantop + \cleantop \begin{verbatim} \documentclass [twoside,boldsubject,italicsignature,shortindent,signaturerule] @@ -921,7 +921,7 @@ shown in a separate letter at the end of this file. \protect\url{m.y.name@my.company.com} } \signature{Mike Y. Name\\Sails Manager} -\date{February~8, 2015} +\date{February~8, 2018} \place{Mamina del Rey} \hfuzz = 0pt @@ -949,15 +949,15 @@ collection of sails for the incoming yachting season\ldots \closing{Sincerely,} -\encl{2015 Catalogue\\Invitation card} +\encl{2018 Catalogue\\Invitation card} \end{foldedletterhead} \end{document} \end{verbatim} - \caption{A sample input file that uses the new features} - \label{lis:sample} - \cleanbotp + \caption{A sample input file that uses the new features} + \label{lis:sample} + \cleanbotp \end{listing} %%%% @@ -975,7 +975,7 @@ page. Please note that \packlass{myletter} also used to be (a great many years ago) the obsolete name of the \packlass{akletter} document class. Instructing you to create a custom class by that name shouldn't cause you any trouble in -2015~\facesmile, but I~want to inform you all the same of the potential name +2018~\facesmile, but I~want to inform you all the same of the potential name conflict. \end{letterhead} @@ -993,24 +993,24 @@ conflict. \begingroup -\date{February~8, 2015} +\date{February~8, 2018} \begin{customletterhead}{\textwidth} - \centering \Huge - My Huge Centered Letterhead + \centering \Huge + My Huge Centered Letterhead \end{customletterhead} \begin{customletterfoot}{\textwidth} - \raggedleft \tiny - \ruleacrossheadorfoot - My (almost unreadable) small print\\ - flushed against the right margin. + \raggedleft \tiny + \ruleacrossheadorfoot + My (almost unreadable) small print\\ + flushed against the right margin. \end{customletterfoot} \setlength\longindentation{.5\textwidth} \let \foldingtagrule = \CDPFactoryFoldingTagRule \begin{foldedletterhead}[Whom it may concern] - {To whom it may concern} - [My own letterhead, at last!] + {To whom it may concern} + [My own letterhead, at last!] \makepresentation \maketopdate\relax @@ -1033,21 +1033,21 @@ conflict. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{foldedletterhead}[Someone Else]{ - To Someone Else\\ - Some other place\\ - Some other city + To Someone Else\\ + Some other place\\ + Some other city }[ - Another letterhead. + Another letterhead. ] \begin{customletterhead}{\textwidth} - \raggedright \Huge - A different head + \raggedright \Huge + A different head \end{customletterhead} \begin{customletterfoot}{\textwidth} - \centering - \ruleacrossheadorfoot - A different foot + \centering + \ruleacrossheadorfoot + A different foot \end{customletterfoot} \opening{Dear Someone,} @@ -1072,22 +1072,22 @@ conflict. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{foldedletterhead}[R.~J.~Drofnats]{ - Revinu~J. \textsc{Drofnats}\\ - Department of Farm Ecology\\ - University of St.\,Anford\\ - Haga Alto, CA~94321 + Revinu~J. \textsc{Drofnats}\\ + Department of Farm Ecology\\ + University of St.\,Anford\\ + Haga Alto, CA~94321 }[ - Our new sails. + Our new sails. ] \name{Michael Youngster Name} \address{ Mike Y. \textsc{Name}\\ - Sails Manager\\ + Sails Manager\\ \protect\url{m.y.name@my.company.com} } \signature{Mike Y. Name\\Sails Manager} -\date{February~8, 2015} +\date{February~8, 2018} \place{Mamina del Rey} \opening{Dear affectionate customer:} @@ -1099,7 +1099,7 @@ sails for the incoming yachting season\ldots \closing{Sincerely,} -\encl{2015 Catalogue\\Invitation card} +\encl{2018 Catalogue\\Invitation card} \end{foldedletterhead} diff --git a/Master/texmf-dist/doc/latex/cdpbundl/cdpbundl-doc.pdf b/Master/texmf-dist/doc/latex/cdpbundl/cdpbundl-doc.pdf index fe53eed312d..de219c9602c 100644 Binary files a/Master/texmf-dist/doc/latex/cdpbundl/cdpbundl-doc.pdf and b/Master/texmf-dist/doc/latex/cdpbundl/cdpbundl-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt b/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt index 4740110aa59..8983828df01 100644 --- a/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt +++ b/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt @@ -3,7 +3,7 @@ This is file `manifest.txt'. This file is part of a work named "C.D.P. Bundle". -Copyright (C) 1999-2015 by Gustavo MEZZETTI +Copyright (C) 1999-2018 by Gustavo MEZZETTI . The C.D.P. Bundle may be distributed and/or modified under the @@ -22,7 +22,7 @@ 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. -April 1, 2015 (vers. 0.36) +February 8, 2018 (vers. 0.36d) diff --git a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx index b37bec6bd9d..82ac568da66 100644 --- a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx +++ b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx @@ -5,7 +5,7 @@ % % This file is part of a work named "C.D.P. Bundle". % -% Copyright (C) 1999-2015 by Gustavo MEZZETTI +% Copyright (C) 1999-2018 by Gustavo MEZZETTI % . % % The C.D.P. Bundle may be distributed and/or modified under the @@ -32,50 +32,49 @@ % \fi % % \def\filename{cdpbundl.dtx} -% \def\fileversion{0.36} -% \def\filedate{2015/02/08} -% \def\docdate {2015/04/01} -% \def\doclongdate{April~1, 2015} +% \def\fileversion{0.36d} +% \def\filedate{2018/02/08} +% \def\docdate {2018/02/08} +% \def\doclongdate{February~8, 2018} % -% \CheckSum{4984} +% \CheckSum{4989} % % \DeclareRobustCommand*{\Bundle}{C.D.P. Bundle} % -% \changes{0.30}{2001 Jul 01}{First release of the \Bundle} +% \changes{0.30}{2001 Jul 01}{First release of the \Bundle.} % \changes{0.31}{2001 Dec 01}{Added support for the \protect\opz{usePS} -% option in the \protect\packlass{\protect\cdpaddon} package} +% option in the \protect\packlass{\protect\cdpaddon} package.} % \changes{0.32}{2002 Jul 01}{Removed support for the \protect\opz{usePS} -% option in the \protect\packlass{\protect\cdpaddon} package} +% option in the \protect\packlass{\protect\cdpaddon} package.} % \changes{0.33}{2005 Jan 01}{Reorganized code of the % \protect\packlass{\protect\articoletteracdp} class and of the % \protect\packlass{\protect\cdpaddon} package to make it compatible -% with the \protect\packlass{\protect\HyperRef} package} +% with the \protect\packlass{\protect\HyperRef} package.} % \changes{0.34}{2006 Jan 01}{Improved interaction with the -% \protect\packlass{\protect\HyperRef} package} +% \protect\packlass{\protect\HyperRef} package.} % \changes{0.34}{2006 Jan 01}{Corrected positioning of floats -% in float pages} -% \changes{0.34}{2006 Jan 01}{Added \protect\texttt{\protect\bslash place} -% command} -% \changes{0.35}{About 2013}{Never publicly released. Some of the changes -% listed below for vers.~0.36 were actually introduced in this version.} -% \changes{0.36}{2015 Feb 08}{Added \protect\texttt{\protect\bslash -% OpeningSequence} command and related macros, in part.\ -% the \protect\texttt{\protect\bslash ChosenMakeOpening} hook.} -% \changes{0.36}{2015 Feb 08}{Added \protect\texttt{\protect\bslash -% ClosingSequence} command and related macros, in particular -% \protect\texttt{\protect\bslash ChosenMakeClosing} and -% \protect\texttt{\protect\bslash ChosenMakeSignature}.} +% in float pages.} +% \changes{0.34}{2006 Jan 01}{Added \texttt{\protect\bslash place} command.} +% \changes{0.35}{About 2013}{This version was never publicly released, but some +% of the changes listed below for vers.~0.36 were actually introduced in this +% version.} +% \changes{0.36}{2015 Feb 08}{Added \texttt{\protect\bslash OpeningSequence} +% command and related macros, in part.\ the \texttt{\protect\bslash +% ChosenMakeOpening} hook.} +% \changes{0.36}{2015 Feb 08}{Added \texttt{\protect\bslash ClosingSequence} +% command and related macros, in particular \texttt{\protect\bslash +% ChosenMakeClosing} and \texttt{\protect\bslash ChosenMakeSignature}.} % \changes{0.36}{2015 Feb 08}{Eventually added functionality to the % \protect\packlass{\protect\cdpaddon} package to support user-defined -% letterheads.}^^A +% letterheads.} % \changes{0.36}{2015 Feb 08}{Added \protect\relax the -% \protect\opz{signaturerule} option, and its related stuff -% (the \protect\texttt{\protect\bslash signaturerule} command, -% the \protect\texttt{\protect\bslash signaturerulewidth} parameter), -% to support rules that mark where to sign by hand.} +% \protect\opz{signaturerule} option, and its related stuff (the +% \texttt{\protect\bslash signaturerule} command, the \texttt{\protect\bslash +% signaturerulewidth} parameter), to support rules that mark where to sign by +% hand.} % \changes{0.36}{2015 Feb 08}{Delegated to a new command -% (\protect\texttt{\protect\bslash foldingtagrule}) the task of drawing -% the sign that shows where the sheet is to be folded.} +% (\texttt{\protect\bslash foldingtagrule}) the task of drawing the sign that +% shows where the sheet is to be folded.} % \changes{0.36}{2015 Feb 08}{Removed the \protect\packlass{\protect\adiseal} % package and the \protect\packlass{\protect\lettcdpadi} document class.} % \changes{0.36}{2015 Feb 08}{Tidied up in several points the code of the @@ -109,7 +108,7 @@ % \DoNotIndex{\setlength,\setcounter,\addtolength} % \DoNotIndex{\expandafter,\do,\relax,\advance,\multiply,\divide} % \DoNotIndex{\DeclareOption,\ExecuteOptions,\ProcessOptions} -% \DoNotIndex{\",\.,\@} +% \DoNotIndex{\",\.} % % \IndexPrologue{ % \section{\indexname} @@ -120,6 +119,7 @@ % \setcounter{IndexColumns}{2} % % \GlossaryPrologue{\section{Change History}} +% \let \GlossaryParms = \IndexParms % % \setcounter{StandardModuleDepth}{1} % @@ -143,11 +143,37 @@ % \newcommand*{\hplj}{hp-laserjet-4500.def} % \newcommand*{\cdpshues}{cdpshues.cfg} % \newcommand*{\textoken}[1]{\(\langle\mbox{\normalfont #1}\rangle\)} -% \newcommand*{\param}[1]{\(\mbox{\##1}\leftarrow {\,}\)} +% % \makeatletter +% +% \newcounter{paramlist} +% \renewcommand*{\theparamlist}{^^A +% \ifnum \value{paramlist}>\z@ +% \ifnum \value{paramlist}<10 +% \arabic{paramlist}^^A +% \else +% \@ctrerr +% \fi +% \fi +% } +% \newenvironment*{paramlist}{^^A +% \setcounter{paramlist}\z@ +% \@beginparpenalty \@M \relax +% \setlength\topsep{\z@}^^A +% \tabbing +% \(\mbox{\#0}\leftarrow {\,}\)\=\kill +% }{^^A +% \endtabbing +% } +% \newcommand*{\param}{^^A +% \stepcounter{paramlist}^^A +% \(\mbox{\#\theparamlist}\leftarrow{}\)\>^^A +% } % \newcommand*{\myspecialindex}[2] % {\special@index{#1\actualchar#2\encapchar main}} +% % \makeatother +% % \newcommand*{\counterindex}[1]{\myspecialindex{#1}{{\string\ttfamily % \space #1} (counter)}\index{counters:\levelchar{\protect\ttfamily % #1}\encapchar usage}} @@ -172,11 +198,17 @@ % } % \newcommand*{\closeofsentencespace}{\spacefactor \sfcode `. \space} % -% \DeclareFixedFont{\lhnss}{T1}{cmss}{m}{n} {12} -% \DeclareFixedFont{\lhbss}{T1}{cmss}{m}{n} {17} -% \DeclareFixedFont{\lhrm} {T1}{cmr} {m}{n} {9} -% \DeclareFixedFont{\lhit} {T1}{cmr} {m}{it}{9} -% \DeclareFixedFont{\lhtt} {T1}{cmtt}{m}{n} {9} +% \DeclareFixedFont{\lhnss}{OT1}{cmss}{m}{n} {12} +% \DeclareFixedFont{\lhbss}{OT1}{cmss}{m}{n} {17} +% \DeclareFixedFont{\lhrm} {OT1}{cmr} {m}{n} {9} +% \DeclareFixedFont{\lhit} {OT1}{cmr} {m}{it}{9} +% \DeclareFixedFont{\lhtt} {OT1}{cmtt}{m}{n} {9} +% +% \providecommand*{\pdfbookmark}[3][]{} +% \providecommand*{\href}[3][]{#3} +% \providecommand*{\nolinkurl}[1]{\url{#1}} ^^A if hyperref isn't loades, +% ^^A hand over to url package +% \providecommand{\hypersetup}{} % % % @@ -184,25 +216,24 @@ % The \Bundle\thanks{This file has version % \fileversion, release date \filedate; % last documentation update: \docdate. -% Copyright \copyright~1999--2015 by G.~Mezzetti +% Copyright \copyright~1999--2018 by G.~Mezzetti % (see page~\pageref{S:Copy}).} % } % \author{G. Mezzetti} % \date{\doclongdate} % -% \makeatletter -% \@ifundefined{hypersetup}{}{ -% \hypersetup{ -% pdftitle = {The C.D.P. Bundle}, -% pdfauthor = {G. Mezzetti}, -% pdfsubject = {Documentation of the C.D.P. Bundle}, -% pdfkeywords = {letter, letterhead}, -% pdfcreationdate = {D:20150401120000}, -% pdfmoddate = {D:20150401120000} -% } -% } -% \makeatother +% \hypersetup{ +% pdftitle = {The C.D.P. Bundle}, +% pdfauthor = {G. Mezzetti}, +% pdfsubject = {Documentation of the C.D.P. Bundle}, +% pdfkeywords = {letter, letterhead}, +% pdfcreationdate = {D:20180208120000}, +% pdfmoddate = {D:20180208120000}, +% bookmarksopen, +% bookmarksopenlevel = 1 +% } % +% \pdfbookmark[0]{Front Matter}{FrontMatter} % \maketitle % % \begin{abstract} @@ -230,7 +261,7 @@ % \label{S:Copy} % \vspace{-\parskip} % -% Copyright \copyright~1999--2015 by Gustavo \textsc{Mezzetti}. All +% Copyright \copyright~1999--2018 by Gustavo \textsc{Mezzetti}. All % rights are reserved, except as noted below. % % This document has been produced by feeding to a \LaTeX\ typesetting @@ -422,6 +453,17 @@ % % Sorry, but for now I~cannot offer any more. % +% \paragraph*{About version 0.36d.} +% It became necessary to release a patch of version~0.36, which has in turn +% been given the version number 0.36d, because an awful bug was discovered +% that absolutely required correction; I~then took this opportunity to +% eliminate as well a few minor errors in the code that I~had noticed +% meanwhile. I~should also mention the fact that the fonts used to print the +% letterhead of the \emph{Coordinamento} have been switched back to OT1 +% encoding (please don't ask why). Unfortunately, all the remarks set forth +% above about the weaknesses in the code design remain valid in this patched +% version too. +% % % % \setcounter{secnumdepth}{3} @@ -487,7 +529,7 @@ % \texttt{tex/latex/cdpbundl/} % \end{quote} % -% \subsection{Configuring the \packlass{\cdpaddon} package} +% \subsection{Configuring the \protect\packlass{\cdpaddon} package} % \label{sS:config} % % The \packlass{\cdpaddon} package is the part of the \Bundle\ @@ -751,8 +793,8 @@ %} % %\endinput\end{verbatim} -% \caption{Contents of a \filedir{cdpnames}\meta{language}\filedir{.ldf} -% file} +% \caption{Contents of a +% \protect\filedir{cdpnames}\meta{language}\protect\filedir{.ldf} file} % \label{fig:cdpnames} % \end{figure} % @@ -892,7 +934,7 @@ % Haga Alto, CA~94321 (U.S.A.) %} %\signature{R.~J. Drofnats\\Professor} -%\date{February~8, 2015} % as usual, date is optional, default is \today +%\date{February~8, 2018} % as usual, date is optional, default is \today %\place{St.\,Anford} % place where the letter is written (optional) % %% Uncomment the following declaration if you want running heads: @@ -927,7 +969,7 @@ %\end{letterhead} % %\end{document}\end{verbatim} -% \caption{A sample input file for the \packlass{\letteracdp} +% \caption{A sample input file for the \protect\packlass{\letteracdp} % document class} % \label{fig:input} % \end{figure} @@ -1010,7 +1052,7 @@ % even if The Copyright Holder or said other party has been advised of % the possibility of such damages. % -% \subsection{Options of the \packlass{\letteracdp} class} +% \subsection{Options of the \protect\packlass{\letteracdp} class} % \label{sS:Options} % % Of course, you load the \packlass{\letteracdp} class by means of the @@ -1254,7 +1296,7 @@ % \protect\url{gustavo.mezzetti@istruzione.it} %} %\signature{Gustavo Mezzetti} -%\date{February~8, 2015} +%\date{February~8, 2018} %\place{Padova} % % @@ -1318,18 +1360,18 @@ % \packlass{akletter} document class. Instructing you to create a custom % class by that name shouldn't cause you any trouble in % ^^A ( paren match -% 2015~:-), but I~want to inform you all the same of the potential name +% 2018~:-), but I~want to inform you all the same of the potential name % conflict.} % % \begin{figure}[tbp] % \zerolistvertspaces % \begin{verbatim}\NeedsTeXFormat{LaTeX2e} % LaTeX2e is required! %\ProvidesClass{myletter} -% [2015/02/08 v0.01 (development)] +% [2018/02/08 v0.01 (development)] %\LoadClassWithOptions{letteracdp}[2015/01/20] %\input{mylogo.def} %\endinput\end{verbatim} -% \caption{Contents of the \filedir{myletter.cls} file} +% \caption{Contents of the \protect\filedir{myletter.cls} file} % \label{fig:myletter} % \end{figure} % @@ -1337,17 +1379,17 @@ % \zerolistvertspaces % \begin{verbatim}\NeedsTeXFormat{LaTeX2e} % LaTeX2e is required! %\ProvidesClass{myarticletter} -% [2015/02/08 v0.01 (development)] +% [2018/02/08 v0.01 (development)] %\LoadClassWithOptions{articoletteracdp}[2015/01/20] %\input{mylogo.def} %\endinput\end{verbatim} -% \caption{Contents of the \filedir{myarticletter.cls} file} +% \caption{Contents of the \protect\filedir{myarticletter.cls} file} % \label{fig:myarticletter} % \end{figure} % % \begin{figure}[tbp] % \zerolistvertspaces -% \begin{verbatim}\ProvidesFile{mylogo.def}[2015/02/08 v0.01 (development)] +% \begin{verbatim}\ProvidesFile{mylogo.def}[2018/02/08 v0.01 (development)] % %\RequirePackage[customletterhead]{cdpaddon}[2015/01/21] % @@ -1363,7 +1405,7 @@ %\end{customletterfoot} % %\endinput\end{verbatim} -% \caption{Contents of the \filedir{mylogo.def} file} +% \caption{Contents of the \protect\filedir{mylogo.def} file} % \label{fig:mylogo} % \end{figure} % @@ -1380,6 +1422,7 @@ % \providecommand*\bysame{\leavevmode\hbox to3em{\hrulefill}\thinspace} % % \clearpage +% \pdfbookmark[0]{Back Matter}{BackMatter} % \begin{thebibliography}{99} % \addcontentsline{toc}{section}{\refname} % @@ -1431,12 +1474,10 @@ % \rlap{\url{http://www.math.unipd.it/~mezzetti/Gustavo/Ludic/CDP/ver0-31.tex}} % % \bibitem{ver036} -% \bysame, \href -% {http://mirrors.ctan.org/macros/latex/contrib/cdpbundl/cdp-ver-0-36.pdf} -% {\emph{The \Bundle\ version~0.36}}, -% available on CTAN\@ as part of the \href -% {http://www.ctan.org/pkg/cdpbundl} -% {\Bundle} vers.~0.36. +% \bysame, \emph{The \Bundle\ version~0.36}, +% included in the documentation of the \packlass{\cdpbundl} package,\\ +% \href{file:cdp-ver-0-36.pdf} +% {\nolinkurl{$TEXMF/doc/latex/cdpbundl/cdp-ver-0-36.pdf}} % % \end{thebibliography} % } @@ -1446,6 +1487,8 @@ % \clearpage % \part{Implementation} % +% \changes{0.36a-c}{Between 2015 and 2018}{Never publicly released.} +% % \section{About this part} % % This part is of interest only to \LaTeX\ hackers; to avoid @@ -1514,7 +1557,7 @@ % \end{macrocode} % \noindent\null\par % -% \section{The code for the \packlass{\letteracdp} class} +% \section{The code for the \protect\packlass{\letteracdp} class} % % This part of the file goes into \filedir{\letteracdp.cls}. % \begin{macrocode} @@ -1540,12 +1583,12 @@ % will eventually be removed, I hope! % \begin{macrocode} \ProvidesClass{letteracdp} - [2015/02/08 v0.36 (**incomplete**)] + [2018/02/08 v0.36d (**incomplete**)] % \end{macrocode} % Print a copyright message on the terminal, just below the name % of the class. % \begin{macrocode} -\typeout{Copyright (C) 1999-2015 by Gustavo MEZZETTI, +\typeout{Copyright (C) 1999-2018 by Gustavo MEZZETTI, all rights reserved.} % \end{macrocode} % @@ -1562,13 +1605,15 @@ % \subsection{Initial code} % % \begin{macro}{\Coordinamento} +% \changes{0.36d}{2018 Feb 08}{Made the accent of ``Universit\`a'' +% independent of the currently selected font encoding.}^^A % Define the following macros near the beginning of the code, so it % will be easy to change them. The first one is the full name of the % \emph{Coordinamento}: % \begin{macrocode} \newcommand*\Coordinamento{% Coordinamento dei Dottorandi e dei Dottori di Ricerca - dell'Universit{\char "E0} di Padova% + dell'Universit\`a di Padova% } % \end{macrocode} % \end{macro} @@ -1581,15 +1626,22 @@ % \end{macrocode} % \end{macro} % -% Declare the fonts used to print the letterhead and the footer; -% they are declared as ``fixed fonts'' so that they are not -% affected by options (\emph{e.g.}, \opz{12pt}), packages -% (\emph{e.g.}, \opz{times}), and so on. +% Declare the fonts used to print the letterhead and the footer. In 1999 +% I~knew so little about font selection in \LaTeXe\ that I~believed that it +% was necessary to declare them as ``fixed fonts'' in order to preserve them +% from being affected by options (\emph{e.g.}, \opz{12pt}), packages +% (\emph{e.g.}, \opz{times}), and so on. Of course, this is nonsense, and it +% is probably wiser to switch to "\usefont"; but for the moment (vers.~0.36d) +% I~am not (yet) going to do so. +% \changes{0.36d}{2018 Feb 08}{Switched the fonts for the CDP\ letterhead +% back to OT1 encoding.}^^A +% Note that, in vers.~0.36d, the fonts for the CDP\ letterhead have been +% switched back to OT1 encoding. % \begin{macro}{\@lh@nss} % Main font for letterhead is Computer Modern Sans Serif 12pt % (LetterHead\slash Normal Sans Serif): % \begin{macrocode} -\DeclareFixedFont\@lh@nss{T1}{cmss}{m}{n} {12} +\DeclareFixedFont\@lh@nss{OT1}{cmss}{m}{n} {12} % \end{macrocode} % \end{macro} % \begin{macro}{\@lh@bss} @@ -1597,28 +1649,28 @@ % Computer Modern Sans Serif 17pt (LetterHead\slash Bigger Sans % Serif): % \begin{macrocode} -\DeclareFixedFont\@lh@bss{T1}{cmss}{m}{n} {17} +\DeclareFixedFont\@lh@bss{OT1}{cmss}{m}{n} {17} % \end{macrocode} % \end{macro} % \begin{macro}{\@lh@rm} % Main font for footer: Computer Modern Roman 9pt % (LetterHead\slash RoMan): % \begin{macrocode} -\DeclareFixedFont\@lh@rm {T1}{cmr} {m}{n} {9} +\DeclareFixedFont\@lh@rm {OT1}{cmr} {m}{n} {9} % \end{macrocode} % \end{macro} % \begin{macro}{\@lh@it} % The words ``World Wide Web'' are printed in italics % (LetterHead\slash ITalics): % \begin{macrocode} -\DeclareFixedFont\@lh@it {T1}{cmr} {m}{it}{9} +\DeclareFixedFont\@lh@it {OT1}{cmr} {m}{it}{9} % \end{macrocode} % \end{macro} % \begin{macro}{\@lh@tt} % And finally, the web address is printed in teletype font % (LetterHead\slash TeleType): % \begin{macrocode} -\DeclareFixedFont\@lh@tt {T1}{cmtt}{m}{n} {9} +\DeclareFixedFont\@lh@tt {OT1}{cmtt}{m}{n} {9} % \end{macrocode} % \end{macro} % @@ -1666,16 +1718,14 @@ % \end{macrocode} % \end{macro} % -% A number of counter, lengths, etc.\ are defined here, at the -% beginning of the class, to detect as soon as possible if any name -% conflicts with an already defined one. The idea is that, since the -% class is pretty long, it is better to avoid to discover near the end -% that it cannot be used because of a name that is already defined; -% but of course, with the speed of modern computers this is not at all -% a problem, so it is very likely that in future releases all -% declarations will be moved to the place they naturally belong to. -% Presently, however, they are almost all listed here; for many of -% them, some explanations are given here, and a more precise description +% A number of counter, lengths, etc.\ are defined here, early in the code, to +% detect as soon as possible if any name conflicts with an already defined +% one. The idea was that, since the class is pretty long, it is better to +% avoid to discover near the end that it cannot be used because of a name +% that is already defined; but of course, with the speed of modern computers +% this is not at all a problem, so this is just more nonsense that should be +% eliminated. Presently, however, they are almost all listed here; for many +% of them, some explanations are given here, and a more precise description % is deferred until the spot where the corresponding entity is used. % % \counterindex{letter} @@ -1751,12 +1801,12 @@ % \end{macrocode} % % \begin{macro}{\@lh@left@margin} -% The second type of parameters we are going to define are rigid -% lengths (\textoken{dimen}'s). The first two govern the position of -% the CDP seal with respect to the text margins (see also -% fig.~\ref{fig:plo} on page~\pageref{fig:plo}). More precisely, -% "\@lh@left@margin" is the horizontal distance from the left margin of -% text to the \emph{right} edge of the seal\ldots +% The second type of parameters we are going to define are rigid lengths +% (\textoken{dimen}'s). The first two govern the position of the CDP\ seal +% with respect to the text margins (see also fig.~\ref{fig:plo} on +% page~\pageref{fig:plo}). More precisely, "\@lh@left@margin" is the +% horizontal distance from the left margin of text to the \emph{right} edge +% of the seal\ldots % \begin{macrocode} \@newrigidlength\@lh@left@margin % \end{macrocode} @@ -1831,7 +1881,7 @@ % "\signaturerule" (which is backed up in "\CDPFactorySignatureRule"): % \begin{macrocode} \@newrigidlength\signaturerulewidth -\setlength\signaturerulewidth{5cm} + \setlength\signaturerulewidth{5cm} % \end{macrocode} % \end{macro} % \begin{macro}{\foldedheight} @@ -2091,7 +2141,6 @@ \@ifdefinable\@endlabelgroup{} \@ifdefinable\@endlabels{} \@ifdefinable\startaddrlabel{} -\@ifdefinable\startaddrlabel{} \@ifdefinable\stopaddrlabel{} \@ifdefinable\ifactuallabel{} \@ifdefinable\ChosenMakeOpening{} @@ -2203,22 +2252,28 @@ \do\@place % \end{macrocode} % \end{macro} -% \begin{macro}{\@begin@letter@hook} -% This hook is executed when a letter starts, at the very end of the -% process of setting up the ``letter-making'' environment, just -% after the declarations stored in "\@lett@decl". It may turn out to -% be useful in packages and derived classes, and in fact it is used by -% the \packlass{articoletteracdp} class. It is not a token register -% because it is envisioned that many independent segments of code -% will want to store tokens in it, and this can easily be achieved -% with the "\g@addto@macro" function, which requires that its -% argument be a macro, not a token register. -% \begin{macrocode} -\do\@begin@letter@hook -% \end{macrocode} -% \end{macro} -% \begin{macro}{\@end@letter@hook} -% This is analogous to "\@begin@letter@hook", but is executed at the +% \begin{macro}{\@cdp@begin@letter@hook} +% \changes{0.36d}{2018 Feb 08}{Name has been changed (it used to be +% \texttt{\protect\bslash @begin@letter@hook}) to avoid clash with +% a macro built by the \protect\packlass{etoolbox} package.}^^A +% This hook is executed when a letter starts, at the very end of the setup of +% the ``letter-making'' environment, just after the declarations stored in +% "\@lett@decl". It may prove useful in packages and derived classes, and in +% fact it is used by the \packlass{articoletteracdp} class. It is not a +% token register because it is envisioned that many independent segments of +% code will want to store tokens in it, and this can easily be achieved with +% the "\g@addto@macro" function, which requires that its argument be a macro, +% not a token register. In vers.~0.36d, the names of this hook and of the +% following one were changed to avoid a conflict with the \packlass{etoolbox} +% package.. +% \begin{macrocode} +\do\@cdp@begin@letter@hook +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@cdp@end@letter@hook} +% \changes{0.36d}{2018 Feb 08}{Same as +% \texttt{\protect\bslash @cdp@begin@letter@hook}.}^^A +% This is analogous to "\@cdp@begin@letter@hook", but is executed at the % end of every ``letter-making'' environment, after its last page has % been finished off and ejected, but before writing to the % \filedir{.aux} file the information for the associated address labels. @@ -2226,7 +2281,7 @@ % later, which is executed \emph{before} ejecting the last page of % the letter. % \begin{macrocode} -\do\@end@letter@hook +\do\@cdp@end@letter@hook % \end{macrocode} % \end{macro} % \begin{macro}{\@begin@block@or@and@hook} @@ -2360,11 +2415,11 @@ % \end{macrocode} % \begin{macro}{\if@use@eepic@} % The user can request, through the \opz{usePS} option, that the -% \packlass{eepic} package be used to trace the lines that make up the -% CDP seal, for better graphical result; the user's indication, -% however, will be honored only if the \packlass{eepic} package is -% available on the system (of course!). This switch is set to ``true'' -% if the \packlass{eepic} package is present and should be used. +% \packlass{eepic} package be used to trace the lines that make up the CDP\ +% seal, for better graphical result; the user's indication, however, will be +% honored only if the \packlass{eepic} package is available on the system (of +% course!). This switch is set to ``true'' if the \packlass{eepic} package +% is present and should be used. % \begin{macrocode} \do\if@use@eepic@ % \end{macrocode} @@ -2413,25 +2468,25 @@ % We need the following box registers to hold precompiled parts of % the letterhead and of the footer. % \begin{macro}{\@logo@box@base} -% This holds the main part of the CDP seal; more precisely, that -% part that appears both in the \ldots\sty{letterhead} and in the -% \sty{logo}\ldots page styles. +% This holds the main part of the CDP\ seal; more precisely, that part that +% appears both in the \ldots\sty{letterhead} and in the \sty{logo}\ldots page +% styles. % \begin{macrocode} \newsavebox\@logo@box@base % \end{macrocode} % \end{macro} % \begin{macro}{\@logo@box@addS} -% This holds the part of the CDP seal that should be added to the -% part contained in "\@logo@box@base" to obtain the seal as it appears -% in the \sty{logo}\ldots page styles. +% This holds the part of the CDP\ seal that should be added to the part +% contained in "\@logo@box@base" to obtain the seal as it appears in the +% \sty{logo}\ldots page styles. % \begin{macrocode} \newsavebox\@logo@box@addS % \end{macrocode} % \end{macro} % \begin{macro}{\@logo@box@addL} -% This holds the part of the CDP seal that should be added to the -% part contained in "\@logo@box@base" to obtain the seal embedded -% in the \ldots\sty{letterhead} page styles. +% This holds the part of the CDP\ seal that should be added to the part +% contained in "\@logo@box@base" to obtain the seal embedded in the +% \ldots\sty{letterhead} page styles. % \begin{macrocode} \newsavebox\@logo@box@addL % \end{macrocode} @@ -2773,12 +2828,11 @@ % ^^A ( paren match % fairly common in the business world~:-), so it has now been supported. % -% Next, we have the options used to tell whether PostScript -% commands, inserted by means of the \packlass{eepic} package, should be -% used, or not, to draw the CDP seal. Here we simply set the internal -% switch according to the user's request; if we later find that the -% \packlass{eepic} package is not available, we shall force the switch -% to false. +% Next, we have the options used to tell whether PostScript commands, +% inserted by means of the \packlass{eepic} package, should be used, or not, +% to draw the CDP\ seal. Here we simply set the internal switch according to +% the user's request; if we later find that the \packlass{eepic} package is +% not available, we shall force the switch to false. % \begin{macrocode} \DeclareOption{usePS}{\@use@eepic@true} \DeclareOption{noPS}{\@use@eepic@false} @@ -3099,6 +3153,7 @@ % \put(18,8){\line(1,0){10}} % \put(18,9){\line(1,0){10}} % \end{picture}^^A +% \fontencoding{OT1}\selectfont % \lhnss oordinamento dei {\lhbss D}\kern-.033333em ottorandi di % {\lhbss P}\kern-.1em adova\enspace\hrulefill\kern-1cm % }}} @@ -3111,9 +3166,10 @@ % \setlength{\parfillskip}{0pt} % \noindent\rule{0pt}{10pt}\kern-1cm\hrulefill\kern-1cm\par % \setlength{\baselineskip}{11pt} +% \fontencoding{OT1}\selectfont % \hbox to \hsize{\hss\lhrm % Coordinamento dei Dottorandi e dei Dottori di Ricerca -% dell'Universit\`{a} di Padova +% dell'Universit\`{a} di Padova^^A % \hss} % \hbox to \hsize{\hss % \lhit World Wide Web:\/ @@ -3622,20 +3678,25 @@ % \end{macrocode} % \end{macro} % -% The following part of the code deals with initializations the have -% to be deferred until the "\begin{document}" hook. The most complex -% of these is the check about the "\foldedheight" parameter. Recall -% that this parameter, which is initialized to a default value by the -% code which handles the \ldots\opz{paper} options, can be altered by -% the user at any time, but has to be converted in an internal form -% afterwards; before making the conversion, we need to check that the -% value lies in the prescribed range. If this is not the case, we -% issue a warning and set the "\if@do@fold@" switch to false: the -% following two macros, which are used below, take care of this, -% providing two different types of warning. They take two arguments, -% used to modify the warning printed to the user: argument "#1" will be -% either the word ``short'' or the word ``tall'', and argument "#2" -% will contain text giving further help. +% The following part of the code deals with initializations the have to be +% deferred until the "\begin{document}" hook. The most complex of these is +% the check about the "\foldedheight" parameter. Recall that this parameter, +% which is initialized to a default value by the code which handles the +% \ldots\opz{paper} options, can be altered by the user at any time, but has +% to be converted in an internal form afterwards; before making the +% conversion, we need to check that the value lies in the prescribed range. +% If this is not the case, we issue a warning and set the "\if@do@fold@" +% switch false: the "\@checkfoldedheight" macro, which will be defined below, +% takes care of this, and relies on the following two macros to provide two +% different types of warning. They take two arguments, used to customize the +% message that the user will see: argument "#1" should be either the word +% ``short'' or the word ``tall'', argument "#2" should contain text giving +% further help. +% +% In addition, the user can ``validate'' a new value assigned to +% "\foldedheight" at any point in the document, by means of the +% "\checkfoldedheight" command: this commands issues a warning also when the +% check is successful. % % \begin{macro}{\@folding@ht@warn} % This macro is invoked when the value of "\foldedheight" is found @@ -3654,7 +3715,8 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\@folding@ht@NO} -% This macro is used by the "\checkfoldedheight" command. +% This macro is invoked when the value of "\foldedheight" is found to be +% wrong in a check being made by the "\checkfoldedheight" command. % \begin{macrocode} \@ifdefinable\@folding@ht@NO{\def\@folding@ht@NO#1#2{% \ClassWarning{\@letteracdp}{% @@ -3683,15 +3745,45 @@ }}% % \end{macrocode} % \end{macro} -% -% Uncommented code starts here. +% \begin{macro}{\@checkfoldedheight} +% This is the internal version of the macro that checks the value of +% "\foldedheight"; it is invoked both by the "\checkfoldedheight" command and +% by the check that is made during the "\AtBeginDocument" hook. The +% arguments have the following meaning: +% \begin{paramlist} +% \param +% command to execute if the value is bad (see below);\\ +% \param +% command to execute if the value is OK\ (takes no arguments). +% \end{paramlist} +% The command passed in~\#1 must take two arguments, as follow: +% \begin{paramlist} +% \param +% either the word ``short'' or the word ``tall'';\\ +% \param +% message giving additional information. +% \end{paramlist} +% Note that both "\@folding@ht@warn" and "\@folding@ht@NO" conform to this +% calling protocol. % \begin{macrocode} \@ifdefinable\@checkfoldedheight{\def\@checkfoldedheight#1#2{% +% \end{macrocode} +% To begin with, the value of "\foldedheight" must be positive in order for +% folded letters to be allowed. +% \begin{macrocode} \ifdim\foldedheight>\z@ +% \end{macrocode} +% Values greater than \( \frac{6}{10}"\paperheight" \) are rejected as too +% large. +% \begin{macrocode} \ifdim\foldedheight>.6\paperheight - #1{tall}{% action to take if value is bad - It must not exceed 0.6\protect\paperheight% + #1{tall}{% + It must not exceed 0.6\protect\paperheight }% +% \end{macrocode} +% "\@folding@ht" holds the height of the folded flap measured from the top +% margin \emph{of the text}. +% \begin{macrocode} \else \setlength\@folding@ht{\foldedheight}% \addtolength\@folding@ht{-1in}% @@ -3699,11 +3791,18 @@ \addtolength\@folding@ht{-\headheight}% \setlength\@lh@folding@ht{-\@folding@ht}% \addtolength\@folding@ht{-\headsep}% +% \end{macrocode} +% If the height of the folded flap measured from the top margin of the text +% is less than $2.5\,\mbox{cm}$, it is rejected as well as too small. +% \begin{macrocode} \ifdim\@folding@ht<2.5cm - #1{short}{% action to take if value is bad + #1{short}{% At least 2cm _of_text_ and 0.5cm of margin\MessageBreak must be allowed above the folding% }% +% \end{macrocode} +% Otherwise, the value of "\foldedheight" is acceptable. +% \begin{macrocode} \else \setlength\@above@folding@margin{1cm}% \setlength\@above@folding@shrink{5mm}% @@ -3713,35 +3812,85 @@ \advance\dimen@ \@below@folding@skip \advance\dimen@ -\topskip \dimen@ii -\dimen@ - \divide\dimen@ \dimen4% + \divide\dimen@ \dimen4 \count@ \dimen@ \advance\dimen@ii \count@\dimen4% \addtolength\@below@folding@skip{\dimen@ii}% \addtolength\@folding@ht{-\@above@folding@margin}% - #2% action to take if value is OK +% \end{macrocode} +% Note that the command passed in~\#2 \emph{must} take care of setting the +% "\if@do@fold@" switch to ``true''. +% \begin{macrocode} + #2% +% \end{macrocode} +% End of "\ifdim\@folding@ht<2.5cm": +% \begin{macrocode} \fi +% \end{macrocode} +% End of "\ifdim\foldedheight>.6\paperheight": +% \begin{macrocode} \fi +% \end{macrocode} +% When \( "\foldedheight" \le 0 \), folded letters are silently shunned: +% \begin{macrocode} \else \@do@fold@false \fi }} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\checkfoldedheight} +% This is the user-level command, for checking the value of "\foldedheight" +% at the user's request (as opposed to checking it at the "\AtBeginDocument" +% hook). +% \begin{macrocode} \newcommand*\checkfoldedheight{% \@checkfoldedheight\@folding@ht@NO\@folding@ht@OK } +% \end{macrocode} +% \end{macro} +% +% Now we perform step~\ref*{plostep4} (see \hyperref[plostep4]{above}) of +% our ``strategy for setting the page layout parameters'': +% \begin{macrocode} \AtBeginDocument{% \setlength\@lh@left@margin{4cm}% \addtolength\@lh@left@margin{-1in}% \addtolength\@lh@left@margin{-\oddsidemargin}% \setlength\@lh@right@margin{\@lh@left@margin}% \addtolength\@lh@right@margin{-2cm}% +% \end{macrocode} +% This is the ``"\begin{document}"'' check for the value of "\foldedheight": +% it calls "\@folding@ht@warn" if the current value is bad, and simply sets +% the "\if@do@fold@" switch to ``true'' (without giving any warning) if it +% is~OK\@. +% \begin{macrocode} \@checkfoldedheight\@folding@ht@warn\@do@fold@true \let\@folding@ht@warn\@undefined } +% \end{macrocode} +% +% \begin{macro}{\@oordinamento@box} +% \changes{0.36d}{2018 Feb 08}{Added selection of the OT1 font encoding to +% the code that presets the b/w version.}^^A +% The reason for typesetting this box here was (in 1999) to save compilation +% time. In version 0.36d, "\fontencoding{OT1}\selectfont" has been added. +% \begin{macrocode} \sbox\@oordinamento@box{% - \@lh@nss oordinamento dei {\@lh@bss D}\kern-.033333em ottorandi di + \fontencoding{OT1}\selectfont\@lh@nss + oordinamento dei {\@lh@bss D}\kern-.033333em ottorandi di {\@lh@bss P}\kern-.1em adova\enspace } +% \end{macrocode} +% \end{macro} +% Now that we know the width of "\@oordinamento@box", we can now compute the +% value of "\longindentation": +% \begin{macrocode} \computelongindentation +% \end{macrocode} +% +% Uncommented code starts here. +% \begin{macrocode} \newcommand*\standardvertspaces{% \setlength\aboveaddressvspace {\medskipamount}% \@msetlength\andaddressvspace {2}{\medskipamount}% @@ -3946,8 +4095,30 @@ % \end{macrocode} % \end{macro} % -% \subsubsection{Macros for drawing the CDP seal} +% \subsubsection{Macros for drawing the CDP\ seal} +% +% There are essentially two reasons for which I~cannot get rid of these: +% \begin{enumerate} +% \renewcommand*{\theenumi}{{\normalfont (\textit{\roman{enumi}})}} +% \renewcommand*{\labelenumi}{\theenumi} +% \item +% sentimental reasons; +% \item +% we must ensure that it is still possible to typeset the legacy +% documentation, which uses the letterhead of the \emph{Coordinamento}. +% \end{enumerate} +% In 1999, people of the \emph{Coordinamento} used the \Bundle\ on a variety +% of personal computers (mostly Macintoshes) that were often connected to +% printers lacking a PostScript interpreter; it was therefore essential that +% the CDP\ seal could be drawn relying exclusively on those capabilities of +% the \env{picture} environment that are implemented without having recourse +% to any particular driver (\emph{e.g.}, \texttt{dvips}). This had indeed +% been a fundamental principle in the design of the logotype. % +% \begin{macro}{\@logo@box@base} +% This holds the main part of the CDP\ seal; more precisely, that part that +% appears both in the \ldots\sty{letterhead} and in the \sty{logo}\ldots page +% styles. % \begin{macrocode} \savebox\@logo@box@base[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% @@ -3965,34 +4136,76 @@ \put(8,9){\line(1,0){5}}% \put(13,23){\line(1,0){10}}% \end{picture}% -}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@logo@box@addS} +% This holds the part of the CDP\ seal that should be added to the part +% contained in "\@logo@box@base" to obtain the seal as it appears in the +% \sty{logo}\ldots page styles. +% \begin{macrocode} \savebox\@logo@box@addS[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% \thicklines \put(18,8){\line(1,0){8}}% \put(18,9){\line(1,0){8}}% \end{picture}% -}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@logo@box@addL} +% This holds the part of the CDP\ seal that should be added to the part +% contained in "\@logo@box@base" to obtain the seal embedded in the +% \ldots\sty{letterhead} page styles. +% \begin{macrocode} \savebox\@logo@box@addL[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% \thicklines \put(18,8){\line(1,0){10}}% \put(18,9){\line(1,0){10}}% \end{picture}% -}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@logo@overlay} +% Utility macro, that typesets the part of the logo that is common to the +% letterhead too. Note the final "\copy" primitive, that lacks its argument. +% \begin{macrocode} \@ifdefinable\@logo@overlay{\def\@logo@overlay{% \kern\@lh@left@margin \copy\@logo@box@base \copy }} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@cdp@logo} +% This macro is invoked by "\ps@"\ldots\ macros to typeset the seal. +% \begin{macrocode} \@ifdefinable\@cdp@logo{\def\@cdp@logo{% \@logo@overlay\@logo@box@addS }} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@cdp@head} +% This macro is invoked by "\ps@"\ldots\ macros to typeset the letterhead. +% Note that it fills up the current horizontal box. +% \begin{macrocode} \@ifdefinable\@cdp@head{\def\@cdp@head{% \@logo@overlay\@logo@box@addL \copy\@oordinamento@box \hrulefill \kern\@lh@right@margin }} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@name@and@WWW@box} +% This holds the footer used in the \sty{firstletterhead} and +% \sty{foldedletterhead} page styles, which contains the full name of +% the \emph{Coordinamento} and its web address. +% \changes{0.36d}{2018 Feb 08}{Added selection of the OT1 font encoding to +% the code that presets the b/w version.}^^A +% Vers.~0.36d: added "\fontencoding{OT1}\selectfont". +% \begin{macrocode} \setbox\@name@and@WWW@box = \vtop{% \baselineskip 11\p@ + \fontencoding{OT1}\selectfont \hb@xt@\z@{\hss \@lh@rm\Coordinamento \hss}% \hb@xt@\z@{% \hss @@ -4001,6 +4214,17 @@ \hss }% } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@cdp@foot} +% This macro is invoked by "\ps@"\ldots\ macros to typeset the footer +% associated with the letterhead. It draws a horizontal rule that runs along +% the baseline of the footer (the same baseline on which page numbers would +% lie) starting from a distance of $-"\@lh@right@margin"$ into the left +% margin and stopping at an equal distance into the right margin, and then +% appends under this rule the saved contents of "\@name@and@WWW@box", +% horizontally centered with "\hfil". +% \begin{macrocode} \@ifdefinable\@cdp@foot{\def\@cdp@foot{% \reset@font \setlength\@tempdima{\textwidth}% @@ -4013,20 +4237,47 @@ }\hss }} % \end{macrocode} +% \end{macro} % -% \subsubsection{``Letter-making'' environments} +% \subsubsection{\textquotedblleft Letter-making\textquotedblright\ environments} % +% We start with the commands that set the sender's data. +% +% \begin{macro}{\name} +% The sender's name (\emph{e.g.}, "\name{R.~J.~Drofnats}"). % \begin{macrocode} \newcommand*\name [1]{\def\thesendername{#1}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\signature} +% The sender's signature (\emph{e.g.}, +% "\signature{R.~J.~Drofnats\\Professor}"). +% \begin{macrocode} \newcommand \signature[1]{\def\thesendersignature{#1}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\address} +% The sender's address, \emph{including} the name. +% \begin{macrocode} \newcommand \address [1]{\def\thesenderaddress{#1}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\location} +% The sender's location (\emph{e.g.}, floor, room number\ldots). +% \begin{macrocode} \newcommand \location [1]{\def\thesenderlocation{#1}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\telephone} +% The sender's telephone number. +% \begin{macrocode} \newcommand*\telephone[1]{\def\thesenderphone{#1}} % \end{macrocode} +% \end{macro} % % \begin{macro}{\makelabels} % \changes{0.36}{2015 Feb 08}{Added new instruction -% \protect\texttt{\protect\bslash @making@labels@true}.} +% \texttt{\protect\bslash @making@labels@true}.}^^A % The "\makelabels" command now sets the "\if@making@labels@" switch. % \begin{macrocode} \newcommand*\makelabels{% @@ -4077,20 +4328,19 @@ % % \begin{environment}{baseletter} % \changes{0.31}{2001 Dec 01}{Reintroduced the first mandatory argument -% to hold local initializations} -% All the ``letter-making'' environments are based upon this one, -% which is the lowest-level one. Its purpose is to take the basic -% actions that are needed to begin and end every kind of letter. In -% this version of the code it takes two arguments (this has changed -% several times among different releases), which are meant to contain -% code that performs any custom initialization required by the -% higher-level environments (or by the user, if this environment is -% called directly by the user). The code passed in~"#1" is executed -% before the core initializations provided by "baseletter", but inside -% the group implied by this environment; the code passed in~"#2" is -% executed as the last thing (just before "\@begin@letter@hook"). Other -% arguments will be picked up by the "\x@baseletter" or -% "\y@baseletter" macro. +% to hold local initializations.}^^A +% All the ``letter-making'' environments are based upon this one, which is +% the lowest-level one. Its purpose is to take the basic actions that are +% needed to begin and end every kind of letter. In this version of the code +% it takes two arguments (this has changed several times among different +% releases), which are meant to contain code that performs any custom +% initialization required by the higher-level environments (or by the user, +% if this environment is called directly by the user). The code passed +% in~"#1" is executed before the core initializations provided by +% "baseletter", but inside the group implied by this environment; the code +% passed in~"#2" is executed as the last thing (just before +% "\@cdp@begin@letter@hook"). Other arguments will be picked up by the +% "\x@baseletter" or "\y@baseletter" macro. % \begin{macrocode} \newenvironment{baseletter}[2]{% #1% @@ -4101,9 +4351,12 @@ % \end{macrocode} % Obvious initializations; note that "\cleardoubleemptypage" calls % "\onecolumn". +% \changes{0.36d}{2018 Feb 08}{Added \texttt{\protect\bslash global} before +% \texttt{\protect\bslash c@page\protect\bslash @ne}.}^^A +% Vers.~0.36d: added "\global" in front of "\c@page\@ne". % \begin{macrocode} \cleardoubleemptypage - \c@page\@ne + \global\c@page\@ne \refstepcounter{letter}% \typeout{\lettername \space \number\c@letter}% \interlinepenalty 200 % smaller than the TeXbook value @@ -4152,16 +4405,20 @@ % \packlass{letteracdp} class; it is used, for instance, by % \packlass{articoletteracdp}. Note that it is executed \emph{after} % ejecting the last page of the letter. +% \changes{0.36d}{2018 Feb 08}{Changed the name of the (former) +% \texttt{\protect\bslash @end@letter@hook} hook to +% \texttt{\protect\bslash @cdp@end@letter@hook}.}^^A +% (Vers.~0.36d: changed name, added \texttt{@cdp} prefix.) % \begin{macrocode} - \@end@letter@hook + \@cdp@end@letter@hook % \end{macrocode} % Write to the \filedir{.aux} file the data for the address labels. % This is rather tricky because we can have multiple addressees % \emph{and} multiple senders % \changes{0.36}{2015 Feb 08}{Added check for the -% \protect\texttt{\protect\bslash if@making@labels@} switch before -% writing to the \protect\filedir{.aux} file unneeded information for -% generating the address labels.} +% \texttt{\protect\bslash if@making@labels@} switch before writing to the +% \protect\filedir{.aux} file unneeded information for generating the +% address labels.}^^A % (v.~0.36: note the new check for "\if@making@labels@", in order to write % to the \filedir{.aux} file the information about the address labels % only when it is actually needed). @@ -4271,7 +4528,7 @@ }% \fi \the\@lett@decl - \@begin@letter@hook + \@cdp@begin@letter@hook } \@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{% \@cut@and #1\and\@@@% @@ -4411,7 +4668,7 @@ % % \begin{macro}{\@block@everypar} % Code executed when a block or an ``"\and"-section'' begins. -% \changes{0.36}{2015 Feb 08}{Added a hook, \protect\texttt{\protect\bslash +% \changes{0.36}{2015 Feb 08}{Added a hook, \texttt{\protect\bslash % @begin@block@or@and@hook}.}^^A % 2015 Feb~08 (v.~0.36): "\@begin@block@or@and@hook" added. % \begin{macrocode} @@ -4426,21 +4683,28 @@ % \begin{macro}{\x@custom@block} % General utility macro for generating blocks that, like address blocks, % haven't got a label, but for which, in exchange, the indentation and the -% width can be set independently of one another. Parameters:\strut\\* -% \strut -% \begin{tabular}{r@{}l} -% \param{1} & switch: \( \mbox{Y} = \mbox{add} \) space above and below, -% \( \mbox{N} = \mbox{don't} \) add it;\\ -% \param{2} & block indentation from left margin (\textoken{dimen});\\ -% \param{3} & block width (\textoken{dimen});\\ -% \param{4} & vertical space above block (\textoken{glue});\\ -% \param{5} & vertical space between ``"\and"-sections'' -% (\textoken{glue});\\ -% \param{6} & vertical space below block (\textoken{glue});\\ -% \param{7} & penalty for breaking before block;\\ -% \param{8} & penalty for breaking between ``"\and"-sections'';\\ -% \param{9} & penalty for breaking after block.\\ -% \end{tabular}\strut +% width can be set independently of one another. Parameters: +% \begin{paramlist} +% \param +% switch: \( \mbox{Y} = \mbox{add} \) space above and below, +% \( \mbox{N} = \mbox{don't} \) add it;\\ +% \param +% block indentation from left margin (\textoken{dimen});\\ +% \param +% block width (\textoken{dimen});\\ +% \param +% vertical space above block (\textoken{glue});\\ +% \param +% vertical space between ``"\and"-sections'' (\textoken{glue});\\ +% \param +% vertical space below block (\textoken{glue});\\ +% \param +% penalty for breaking before block;\\ +% \param +% penalty for breaking between ``"\and"-sections'';\\ +% \param +% penalty for breaking after block. +% \end{paramlist} % \begin{macrocode} \@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% @@ -4459,21 +4723,28 @@ % indentation and the width are deduced from the width of the label itself. % \changes{0.36}{2015 Feb 08}{Added parameter for space after label.}^^A % 2015 Feb~08 (v.~0.36): added new parameter for the amount of -% horizontal space after the label. Parameters now are:\strut\\* -% \strut -% \begin{tabular}{r@{}l} -% \param{1} & switch: \( \mbox{Y} = \mbox{add} \) space above and below, -% \( \mbox{N} = \mbox{don't} \) add it;\\ -% \param{2} & label;\\ -% \param{3} & horizontal space after label (\textoken{dimen});\\ -% \param{4} & vertical space above block (\textoken{glue});\\ -% \param{5} & vertical space between ``"\and"-sections'' -% (\textoken{glue});\\ -% \param{6} & vertical space below block (\textoken{glue});\\ -% \param{7} & penalty for breaking before block;\\ -% \param{8} & penalty for breaking between ``"\and"-sections'';\\ -% \param{9} & penalty for breaking after block.\\ -% \end{tabular}\strut +% horizontal space after the label. Parameters now are: +% \begin{paramlist} +% \param +% switch: \( \mbox{Y} = \mbox{add} \) space above and below, +% \( \mbox{N} = \mbox{don't} \) add it;\\ +% \param +% label;\\ +% \param +% horizontal space after label (\textoken{dimen});\\ +% \param +% vertical space above block (\textoken{glue});\\ +% \param +% vertical space between ``"\and"-sections'' (\textoken{glue});\\ +% \param +% vertical space below block (\textoken{glue});\\ +% \param +% penalty for breaking before block;\\ +% \param +% penalty for breaking between ``"\and"-sections'';\\ +% \param +% penalty for breaking after block. +% \end{paramlist} % \begin{macrocode} \@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% @@ -4639,8 +4910,8 @@ % \begin{macro}{\@subject} % Inner implementation of \env{subject}\slash\env{subject*} environments. % \changes{0.36}{2015 Feb 08}{Now this macro passes -% \protect\texttt{\protect\bslash subjectnamegap} as parameter~\#3 to -% \protect\texttt{\protect\bslash y@custom@block}.}^^A +% \texttt{\protect\bslash subjectnamegap} as parameter~\#3 to +% \texttt{\protect\bslash y@custom@block}.}^^A % 2015 Feb~08 (v.~0.36): now passes the "\subjectnamegap" macro % as parameter~\#3 to "\y@custom@block", parameter added in this same % version. @@ -4737,9 +5008,8 @@ \@setup@pres }{% % \end{macrocode} -% \changes{0.34}{2006 Jan 01}{At the end of the environment, -% changed \protect\texttt{\protect\bslash par} into -% \protect\texttt{\protect\bslash @@par}} +% \changes{0.34}{2006 Jan 01}{At the end of the environment, changed +% \texttt{\protect\bslash par} into \texttt{\protect\bslash @@par}.}^^A % Changed the following line from "\par" to "\@@par" (v.~0.34): % \begin{macrocode} \@@par @@ -4789,8 +5059,8 @@ \@setup@pres % \end{macrocode} % \changes{0.34}{2006 Jan 01}{Added setting of -% \protect\texttt{\protect\bslash boxmaxdepth} -% at the beginning of the environment} +% \texttt{\protect\bslash boxmaxdepth} at the beginning of the +% environment.}^^A % Added the following line (v.~0.34), even if the depth of "\box0" % will be checked later: % \begin{macrocode} @@ -4805,8 +5075,8 @@ \penalty-\@M % \end{macrocode} % \changes{0.34}{2006 Jan 01}{Removed a superfluous setting of -% \protect\texttt{\protect\bslash prevdepth} -% from the beginning of the environment} +% \texttt{\protect\bslash prevdepth} from the beginning of the +% environment.}^^A % Removed the following line (v.~0.34): we have no need to insert % interline glue here, and it is even wrong to do it; we will insert the % "\topskip" glue below with a trick (which, in any case, would remove @@ -5287,13 +5557,13 @@ % \end{macro} % % \begin{macro}{\@opening} -% Prepare call to "\OpeningSequence", then call it. Parameters:\strut\\* -% \strut -% \begin{tabular}{r@{}l} -% \param{1} & intended meaning of "\ChosenMakeOpening";\\ -% \param{2} & contents of optional argument of "\opening" -% (defaults to "\@place").\\ -% \end{tabular}\strut +% Prepare call to "\OpeningSequence", then call it. Parameters: +% \begin{paramlist} +% \param +% intended meaning of "\ChosenMakeOpening";\\ +% \param +% contents of optional argument of "\opening" (defaults to "\@place"). +% \end{paramlist} % \begin{macrocode} \@ifdefinable\@opening{\def\@opening#1#2{% % \end{macrocode} @@ -5409,12 +5679,13 @@ % \end{macro} % % \begin{macro}{\@@closing} -% Prepare call to "\ClosingSequence", then call it. Parameters:\strut\\* -% \strut -% \begin{tabular}{r@{}l} -% \param{1} & intended meaning of "\ChosenMakeClosing";\\ -% \param{2} & intended meaning of "\ChosenMakeSignature".\\ -% \end{tabular}\strut +% Prepare call to "\ClosingSequence", then call it. Parameters: +% \begin{paramlist} +% \param +% intended meaning of "\ChosenMakeClosing";\\ +% \param +% intended meaning of "\ChosenMakeSignature". +% \end{paramlist} % \begin{macrocode} \@ifdefinable\@@closing{\def\@@closing#1#2{% % \end{macrocode} @@ -5606,7 +5877,7 @@ \else\ifnum\c@emptyaddrlabels<\@cdp@gencount \begingroup \let\ifactuallabel\@secondoftwo - \@whilenum\c@totallabel<\c@emptyaddrlabels\do{\@mlabel{}{}}% + \@whilenum\c@totallabel<\c@emptyaddrlabels\do{\basemlabel{}{}}% \endgroup \else \@emptyaddrlabels@err @@ -5615,14 +5886,16 @@ % \end{macrocode} % % \begin{environment}{baselabels} -% This is the actual environment for producing sheets of address -% labels: the \env{labels} environment (see below) is simply a wrapper -% that offers the user the opportunity of changing some settings before -% invoking \env{baselabels}. +% This is the actual environment for producing sheets of address labels: the +% \env{labels} environment (see below) is simply a wrapper that offers the +% user the chance of making some changes after calling \env{baselabels}. +% \changes{0.36d}{2018 Feb 08}{Added \texttt{\protect\bslash global} before +% \texttt{\protect\bslash c@page\protect\bslash @ne}.}^^A +% V.~0.36d: "\global\c@page\@ne". % \begin{macrocode} \newenvironment*{baselabels}{% \cleardoubleemptypage - \c@page\@ne + \global\c@page\@ne \typeout{Address Labels}% \pagestyle{empty}% \textwidth \c@addrlabelcolumns\addrlabelwidth @@ -5903,7 +6176,7 @@ % \end{macrocode} % \noindent\null\par % -% \section{The code for the \packlass{\articoletteracdp} class} +% \section{The code for the \protect\packlass{\articoletteracdp} class} % % This part of the file goes into \filedir{\articoletteracdp.cls}. % \begin{macrocode} @@ -5915,7 +6188,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required! \ProvidesClass{articoletteracdp} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] % \end{macrocode} % % \subsection{Initial code} @@ -6023,7 +6296,7 @@ % \subsection{Class loading} % % \begin{macrocode} -\LoadClass{letteracdp}[2015/02/08] +\LoadClass{letteracdp}[2018/02/08] % \end{macrocode} % % \subsection{Main code} @@ -6039,18 +6312,17 @@ \newcounter{table}[letter] % \end{macrocode} % -% Stuff for dealing with the \packlass{\HyperRef} package. The -% problem is our non-standard hierarchy of sectioning commands, with -% paragraphs placed directly below sections. In this version (0.34) we -% choose a different approach than the one we adopted in version 0.33, -% redefining "\theHparagraph"; of course, this must be done -% \emph{after} \packlass{\HyperRef} has been loaded, and we could not -% find any better place for this than the "\AtBeginDocument" hook. -% Within the same hook, we also redefine "\theHsection" (the counter -% used by \packlass{\@hyperref} to generate hyperlinks to sections) so -% that sections with the same number, but included in different -% letters, will have different anchors; we fix the bookmark level for -% paragraphs, too. +% Stuff for dealing with the \packlass{\HyperRef} package. The problem is +% our non-standard hierarchy of sectioning commands, with paragraphs placed +% directly below sections. In this version (0.34) we choose a different +% approach than the one we adopted in version 0.33, redefining +% "\theHparagraph"; of course, this must be done \emph{after} +% \packlass{\HyperRef} has been loaded, and we could not find any better +% place for this than the "\AtBeginDocument" hook. Within the same hook, we +% also redefine "\theHsection" (the counter used by \packlass{\HyperRef} to +% generate hyperlinks to sections) so that sections with the same number, but +% included in different letters, will have different anchors; we fix the +% bookmark level for paragraphs, too. % \begin{macrocode} \AtBeginDocument{% \def\theHletter{\arabic{letter}}% @@ -6060,7 +6332,7 @@ \def\toclevel@paragraph{2}% }{% % \end{macrocode} -% If the \packlass{\@hyperref} package is not loaded, we ensure that +% If the \packlass{\HyperRef} package is not loaded, we ensure that % "\@letter@bookmarks" acts as a no-op: % \begin{macrocode} \let\@letter@bookmark\@gobbletwo @@ -6095,8 +6367,8 @@ \def\author#1{\def\@author{#1}} % \end{macrocode} % -% \subsubsection{Managing the \filedir{.toc}, \filedir{.lof}, and -% \filedir{.lot} files} +% \subsubsection{Managing the \protect\filedir{.toc}, +% \protect\filedir{.lof}, and \protect\filedir{.lot} files} % % \begin{macrocode} %% Inner command \@starttoc redefined to make table of contents, etc. @@ -6118,13 +6390,13 @@ } % \end{macrocode} % -% The "\@begin@letter@hook" macro is invoked whenever a letter -% starts; we want (possibly, see above) a bookmark to be generated for -% the letter. Note that we use "\theletter" for the letter number -% presented to the user, and "\theHletter" for the number used to +% The "\@cdp@begin@letter@hook" (new name in vers.~0.36d) macro is invoked +% whenever a letter starts; we want (possibly, see above) a bookmark to be +% generated for the letter. Note that we use "\theletter" for the letter +% number presented to the user, and "\theHletter" for the number used to % generate the anchor. % \begin{macrocode} -\g@addto@macro\@begin@letter@hook{% +\g@addto@macro\@cdp@begin@letter@hook{% \edef\@cdp@reserved{% \noexpand\@letter@bookmark {\lettername\space\theletter}{letter.\theHletter}% @@ -6215,6 +6487,9 @@ % % \subsubsection{Floats} % +% \changes{0.36d}{2018 Feb 08}{The assignment of \texttt{\protect\bslash +% c@topnumber} to \texttt{\protect\bslash c@dbltopnumber} has been made +% \texttt{\protect\bslash global}.}^^A % \begin{macrocode} \setcounter{topnumber}{\tw@} \renewcommand\topfraction{.7} @@ -6223,7 +6498,7 @@ \setcounter{totalnumber}{\thr@@} \renewcommand\textfraction{.2} \renewcommand\floatpagefraction{.5} -\c@dbltopnumber\c@topnumber +\global\c@dbltopnumber\c@topnumber \let\dbltopfraction\topfraction \let\dblfloatpagefraction\floatpagefraction \setlength \floatsep {\bigskipamount} @@ -6244,15 +6519,13 @@ % \subsubsection{Title, section heads, figures, bibliography\ldots} % % \begin{macro}{\maketitle} -% Without the \packlass{\@hyperref} package, the "\maketitle" -% command can take the same optional argument as "\maketopdate", for -% specifying a short string to be prepended to the date; and in this -% case, the new "\place" declaration will be automatically honored. -% But the former feature will break if \packlass{\@hyperref} is -% loaded, and no remedy seems feasible for this, since -% \packlass{\@hyperref} assumes that "\maketitle" hasn't got any -% arguments. Note also that a period is automatically added to the -% title. +% Without the \packlass{\HyperRef} package, the "\maketitle" command can take +% the same optional argument as "\maketopdate", for specifying a short string +% to be prepended to the date; and in this case, the new "\place" declaration +% will be automatically honored. But the former feature will break if +% \packlass{\HyperRef} is loaded, and no remedy seems feasible for this, +% since \packlass{\HyperRef} assumes that "\maketitle" hasn't got any +% arguments. Note also that a period is automatically added to the title. % \begin{macrocode} \newcommand*\maketitle{% \begingroup @@ -6389,12 +6662,12 @@ \renewcommand\theenumiv{\@arabic\c@enumiv}% }% \sloppy - \clubpenalty 4000 - \@clubpenalty \clubpenalty + \clubpenalty 4000 \@clubpenalty \clubpenalty \widowpenalty 4000 \sfcode`\.\@m }{% - \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% + \def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% \endlist } \newcommand*\newblock{\hskip .11em\@plus.33em\@minus.07em} @@ -6419,7 +6692,7 @@ % \end{macrocode} % \noindent\null\par % -% \section{The code for the \packlass{\cdpaddon} package} +% \section{The code for the \protect\packlass{\cdpaddon} package} % % This part of the file goes into \filedir{\cdpaddon.sty}. % \begin{macrocode} @@ -6432,7 +6705,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesPackage{cdpaddon} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] \@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}} % \end{macrocode} % @@ -6548,11 +6821,11 @@ % % \subsection{Package loading} % -% V.~0.34a: fixed up the use of dvips names -% (bug reported by Tommaso Gordini).^^A % \changes{0.34a}{2010 Jun 01}{Fixed up the use of dvips names in the % \protect\packlass{\protect\cdpaddon} package (bug reported by Tommaso -% Gordini).} +% Gordini).}^^A +% V.~0.34a: fixed up the use of dvips names +% (bug reported by Tommaso Gordini). % V.~0.36: also removed the ridiculous check for the presence of standard % packages on the system! % \begin{macrocode} @@ -6893,16 +7166,19 @@ % \begin{environment}{customletterlogo} % These three environments are defined similarly, so we use one of the % ``scratch'' macros to perform their definition -% The parameters are:\strut\\* -% \strut -% \begin{tabular}{r@{}l} -% \param{1} & \( \texttt{head} \mathbin{|} \texttt{foot} \mathbin{|} -% \texttt{logo} \);\\ -% \param{2} & intended alignment of the \env{minipage} -% (\( \texttt{b} \mathbin{|} \texttt{t} \));\\ -% \param{3} & either "\vss" or nothing;\\ -% \param{4} & either "\vss" or nothing.\\ -% \end{tabular}\strut +% The parameters are: +% \begin{paramlist} +% \param +% \( \texttt{head} \mathbin{|} \texttt{foot} \mathbin{|} +% \texttt{logo} \);\\ +% \param +% intended alignment of the \env{minipage} +% (\( \texttt{b} \mathbin{|} \texttt{t} \));\\ +% \param +% either "\vss" or nothing;\\ +% \param +% either "\vss" or nothing. +% \end{paramlist} % \begin{macrocode} \def\@temp@cdpaddon@b#1#2#3#4{% \newenvironment*{customletter#1}[1]{% @@ -7006,10 +7282,16 @@ \hss\copy\@cdp@custom@lfoot@box\hss }} % \end{macrocode} -% The logo is assumed to protrude to the left of the header line. +% \changes{0.36d}{2018 Feb 08}{Changed \texttt{\protect\bslash hb@xt@ +% \protect\bslash z@\protect\symbol{`\{}\protect\bslash +% hss}\,\ldots\texttt{\protect\symbol{`\}}} to \texttt{\protect\bslash +% llap\protect\symbol{`\{}}\,\ldots\texttt{\protect\symbol{`\}}} in the +% code that typesets the custom logo.}^^A +% The logo is assumed to protrude to the left of the header +% ("\llap" used in v.~0.36d). % \begin{macrocode} \@temp@cdpaddon@a{@cdp@logo}{\def\@cdp@logo{% - \hb@xt@ \z@ {\hss\copy\@cdp@custom@llogo@box}% + \llap{\copy\@cdp@custom@llogo@box}% }} % \end{macrocode} % Do not forget to reset "\longindentation"! @@ -7022,19 +7304,22 @@ % \begin{macrocode} \if@use@hyper@ % \end{macrocode} -% \ldots well, we take care of them. The precompilation of the footer -% must be deferred until the "\begin{document}" hook, because the macros -% of the \packlass{hyperref} package are not available for actual -% typesetting until that moment. Note that we just need to encapsulate -% the web address of the \emph{Coordinamento} into an "\href" command: -% the color-switching command has already been given above, inside the -% "\@cdp@foot" box (the color must be changed independently of the use -% of hyperlinks). +% \ldots well, we take care of them. The precompilation of the footer must +% be deferred until the "\begin{document}" hook, because the macros of the +% \packlass{\HyperRef} package are not available for actual typesetting until +% that moment. Note that here we only add the "\href" command: the +% color-switching has already been taken care of inside the "\@cdp@foot" box +% (the use of color is independent of the use of hyperlinks). +% \changes{0.36d}{2018 Feb 08}{Added selection of OT1 font encoding to the +% code that presets the ``hyperlink'' version of +% \texttt{\protect\bslash @name@and@WWW@box}.}^^A +% Vers.~0.36d: added "\fontencoding{OT1}\selectfont". % \begin{macrocode} \AtBeginDocument{% \@temp@cdpaddon@a{@name@and@WWW@box}{% \setbox\@name@and@WWW@box = \vtop{% \baselineskip 11\p@ + \fontencoding{OT1}\selectfont \hb@xt@\z@{\hss \@lh@rm\Coordinamento \hss}% \hb@xt@\z@{% \hss @@ -7045,8 +7330,8 @@ }% }% % \end{macrocode} -% Of course, in this case we cannot release the "\@temp@cdpaddon@a" -% macro until the "\begin{document}" hook, too. +% In this case we must defer releasing "\@temp@cdpaddon@a" until +% "\begin{document}". % \begin{macrocode} \let\@temp@cdpaddon@a\@undefined } @@ -7139,7 +7424,7 @@ % \end{macrocode} % \noindent\null\par % -% \section{The code for the \packlass{\cdpbabel} package} +% \section{The code for the \protect\packlass{\cdpbabel} package} % % This part of the file goes into \filedir{\cdpbabel.sty}. % \begin{macrocode} @@ -7153,7 +7438,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1998/09/02] % LaTeX2e is required! \ProvidesPackage{cdpbabel} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] \@ifdefinable\@cdpbabel{\def\@cdpbabel{cdpbabel}} % \end{macrocode} % @@ -7276,7 +7561,7 @@ % configuration files) used by the \packlass{\cdpaddon} and % the \packlass{\cdpbabel} packages. % -% \subsection{The \filedir{\example} file} +% \subsection{The \protect\filedir{\example} file} % % This part of the file goes into the prototype definition file % \filedir{\example}. All comments are left in the code because this @@ -7297,7 +7582,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}[2015/02/08 Printer-dependent file] +\ProvidesFile{cdpshues-example.def}[2018/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 @@ -7310,30 +7595,30 @@ % % \end{macrocode} % -% \subsection{The \filedir{\epson} file} +% \subsection{The \protect\filedir{\epson} file} % % This part of the file goes into the definition file % \filedir{\epson}. % \begin{macrocode} %<*epson> -\ProvidesFile{epson-stylus-740.def}[2015/02/08 Printer-dependent file] +\ProvidesFile{epson-stylus-740.def}[2018/02/08 Printer-dependent file] \definecolor{slight@col}{rgb}{.8,1,.8} \definecolor{strong@col}{rgb}{0,.266667,0} % % \end{macrocode} % -% \subsection{The \filedir{\hplj} file} +% \subsection{The \protect\filedir{\hplj} file} % % This part of the file goes into the definition file \filedir{\hplj}. % \begin{macrocode} %<*hplj> -\ProvidesFile{hp-laserjet-4500.def}[2015/02/08 Printer-dependent file] +\ProvidesFile{hp-laserjet-4500.def}[2018/02/08 Printer-dependent file] \definecolor{slight@col}{cmyk}{.1,0,.1,0} \definecolor{strong@col}{cmyk}{.5,0,.5,.5} % % \end{macrocode} % -% \subsection{The \filedir{\cdpshues} file} +% \subsection{The \protect\filedir{\cdpshues} file} % % This part of the file goes into the configuration file % \filedir{\cdpshues}. Again, we leave all comments in the generated @@ -7389,13 +7674,13 @@ taken into consideration: all subsequent lines are ignored. % % \end{macrocode} % -% \subsection{The \filedir{\cdpnamesenglish} file} +% \subsection{The \protect\filedir{\cdpnamesenglish} file} % % This part of the file goes into the language definition file % \filedir{\cdpnamesenglish}. % \begin{macrocode} %<*lang-en> -\ProvidesFile{cdpnamesenglish.ldf}[2015/02/08] +\ProvidesFile{cdpnamesenglish.ldf}[2018/02/08] \def\@cdpbabel@letter@names{% \def\subjectname {Subject:}% \def\registeredname {Registered}% @@ -7419,13 +7704,13 @@ taken into consideration: all subsequent lines are ignored. % % \end{macrocode} % -% \subsection{The \filedir{\cdpnamesitalian} file} +% \subsection{The \protect\filedir{\cdpnamesitalian} file} % % This part of the file goes into the language definition file % \filedir{\cdpnamesitalian}. % \begin{macrocode} %<*lang-it> -\ProvidesFile{cdpnamesitalian.ldf}[2015/02/08] +\ProvidesFile{cdpnamesitalian.ldf}[2018/02/08] \def\@cdpbabel@letter@names{% \def\subjectname {Oggetto:}% \def\registeredname {Raccomandata}% diff --git a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins index 6a521c505b0..40cff0bd277 100644 --- a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins +++ b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins @@ -3,7 +3,7 @@ % % This file is part of a work named "C.D.P. Bundle". % -% Copyright (C) 1999-2015 by Gustavo MEZZETTI +% Copyright (C) 1999-2018 by Gustavo MEZZETTI % . % % The C.D.P. Bundle may be distributed and/or modified under the @@ -26,7 +26,7 @@ % only part of the Work" in the sense of the LaTeX Project Public % License, and should be avoided. % -% February 20, 2015 (vers. 0.36) +% February 8, 2018 (vers. 0.36d) % \input docstrip @@ -119,7 +119,7 @@ This is a generated file. It is part of a work named "C.D.P. Bundle". -Copyright (C) 1999-2015 by Gustavo MEZZETTI +Copyright (C) 1999-2018 by Gustavo MEZZETTI . The C.D.P. Bundle may be distributed and/or modified under the @@ -142,7 +142,7 @@ 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) +February 8, 2018 (vers. 0.36d) \endpreamble diff --git a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls index f606dbf0c7f..ad71fbd60b5 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -51,7 +51,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required! \ProvidesClass{articoletteracdp} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] \@ifdefinable\@out@table@list{} \@ifdefinable\@in@table@list{} \@ifdefinable\@do@tf{} @@ -95,7 +95,7 @@ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}} \ExecuteOptions{plaintoc,openletterbookmarks} \ProcessOptions\relax -\LoadClass{letteracdp}[2015/02/08] +\LoadClass{letteracdp}[2018/02/08] \newcounter{section}[letter] \newcounter{paragraph}[section] \newcounter{figure}[letter] @@ -131,7 +131,7 @@ \@nobreakfalse \endgroup } -\g@addto@macro\@begin@letter@hook{% +\g@addto@macro\@cdp@begin@letter@hook{% \edef\@cdp@reserved{% \noexpand\@letter@bookmark {\lettername\space\theletter}{letter.\theHletter}% @@ -212,7 +212,7 @@ \setcounter{totalnumber}{\thr@@} \renewcommand\textfraction{.2} \renewcommand\floatpagefraction{.5} -\c@dbltopnumber\c@topnumber +\global\c@dbltopnumber\c@topnumber \let\dbltopfraction\topfraction \let\dblfloatpagefraction\floatpagefraction \setlength \floatsep {\bigskipamount} @@ -358,12 +358,12 @@ \renewcommand\theenumiv{\@arabic\c@enumiv}% }% \sloppy - \clubpenalty 4000 - \@clubpenalty \clubpenalty + \clubpenalty 4000 \@clubpenalty \clubpenalty \widowpenalty 4000 \sfcode`\.\@m }{% - \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% + \def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% \endlist } \newcommand*\newblock{\hskip .11em\@plus.33em\@minus.07em} diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty index 32fd290baae..b6ae8b8849e 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -51,7 +51,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesPackage{cdpaddon} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] \@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}} \def\do#1{\@ifdefinable#1{\newif#1}} \do\if@using@cdp@ @@ -311,7 +311,7 @@ \hss\copy\@cdp@custom@lfoot@box\hss }} \@temp@cdpaddon@a{@cdp@logo}{\def\@cdp@logo{% - \hb@xt@ \z@ {\hss\copy\@cdp@custom@llogo@box}% + \llap{\copy\@cdp@custom@llogo@box}% }} \setlength\longindentation{.5\textwidth} \fi @@ -320,6 +320,7 @@ \@temp@cdpaddon@a{@name@and@WWW@box}{% \setbox\@name@and@WWW@box = \vtop{% \baselineskip 11\p@ + \fontencoding{OT1}\selectfont \hb@xt@\z@{\hss \@lh@rm\Coordinamento \hss}% \hb@xt@\z@{% \hss diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty index 2e86c67dda5..ab3c3c24dbf 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpbabel.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -51,7 +51,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/09/02] % LaTeX2e is required! \ProvidesPackage{cdpbabel} - [2015/02/08 v0.36 (development)] + [2018/02/08 v0.36d (development)] \@ifdefinable\@cdpbabel{\def\@cdpbabel{cdpbabel}} \def\do#1{\@ifdefinable #1{\let #1\@empty}} \do\@cdpbabel@perform@redefinitions diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf index 723a96d5658..cd82fa9be05 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesenglish.ldf @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -49,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{cdpnamesenglish.ldf}[2015/02/08] +\ProvidesFile{cdpnamesenglish.ldf}[2018/02/08] \def\@cdpbabel@letter@names{% \def\subjectname {Subject:}% \def\registeredname {Registered}% diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf index 15a5ee3eda8..40abd494f1a 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpnamesitalian.ldf @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -49,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{cdpnamesitalian.ldf}[2015/02/08] +\ProvidesFile{cdpnamesitalian.ldf}[2018/02/08] \def\@cdpbabel@letter@names{% \def\subjectname {Oggetto:}% \def\registeredname {Raccomandata}% diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def index cff6265add8..35dbe9a9619 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -62,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}[2015/02/08 Printer-dependent file] +\ProvidesFile{cdpshues-example.def}[2018/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 1ca5010ce63..b05dbb497d7 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 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 7d9877d6c7b..8e507bc49aa 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,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -49,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{epson-stylus-740.def}[2015/02/08 Printer-dependent file] +\ProvidesFile{epson-stylus-740.def}[2018/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 deef9e46415..d6ae3cd1141 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,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -49,7 +49,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{hp-laserjet-4500.def}[2015/02/08 Printer-dependent file] +\ProvidesFile{hp-laserjet-4500.def}[2018/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 41411b3400f..8f0573526c1 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-2015 by Gustavo MEZZETTI +%% Copyright (C) 1999-2018 by Gustavo MEZZETTI %% . %% %% The C.D.P. Bundle may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% only part of the Work" in the sense of the LaTeX Project Public %% License, and should be avoided. %% -%% February 8, 2015 (vers. 0.36) +%% February 8, 2018 (vers. 0.36d) %% %% \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 @@ -51,22 +51,22 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1997/06/01] % LaTeX2e is required! \ProvidesClass{letteracdp} - [2015/02/08 v0.36 (**incomplete**)] -\typeout{Copyright (C) 1999-2015 by Gustavo MEZZETTI, + [2018/02/08 v0.36d (**incomplete**)] +\typeout{Copyright (C) 1999-2018 by Gustavo MEZZETTI, all rights reserved.} \@ifdefinable\@letteracdp{\def\@letteracdp{letteracdp}} \newcommand*\Coordinamento{% Coordinamento dei Dottorandi e dei Dottori di Ricerca - dell'Universit{\char "E0} di Padova% + dell'Universit\`a di Padova% } \newcommand*\CoordinamentoWWW{% http://www.dei.unipd.it/\string~assdott/% } -\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} +\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} \newcommand\@ptsize{} %% A couple of useful things that are missing from the LaTeX kernel: \@ifdefinable\@newrigidlength{\def\@newrigidlength#1{% @@ -96,7 +96,7 @@ \@newrigidlength\signatureindentation \@newrigidlength\signaturewidth \@newrigidlength\signaturerulewidth -\setlength\signaturerulewidth{5cm} + \setlength\signaturerulewidth{5cm} \@newrigidlength\foldedheight \setlength\foldedheight{-\maxdimen} \@newrigidlength\@folding@ht @@ -134,7 +134,6 @@ \@ifdefinable\@endlabelgroup{} \@ifdefinable\@endlabels{} \@ifdefinable\startaddrlabel{} -\@ifdefinable\startaddrlabel{} \@ifdefinable\stopaddrlabel{} \@ifdefinable\ifactuallabel{} \@ifdefinable\ChosenMakeOpening{} @@ -153,8 +152,8 @@ \do\@subject@style \do\@signature@style \do\@place -\do\@begin@letter@hook -\do\@end@letter@hook +\do\@cdp@begin@letter@hook +\do\@cdp@end@letter@hook \do\@begin@block@or@and@hook \def\do#1{\@ifdefinable#1{\let#1\@undefined}} \do\presubject @@ -436,8 +435,8 @@ \@ifdefinable\@checkfoldedheight{\def\@checkfoldedheight#1#2{% \ifdim\foldedheight>\z@ \ifdim\foldedheight>.6\paperheight - #1{tall}{% action to take if value is bad - It must not exceed 0.6\protect\paperheight% + #1{tall}{% + It must not exceed 0.6\protect\paperheight }% \else \setlength\@folding@ht{\foldedheight}% @@ -447,7 +446,7 @@ \setlength\@lh@folding@ht{-\@folding@ht}% \addtolength\@folding@ht{-\headsep}% \ifdim\@folding@ht<2.5cm - #1{short}{% action to take if value is bad + #1{short}{% At least 2cm _of_text_ and 0.5cm of margin\MessageBreak must be allowed above the folding% }% @@ -460,12 +459,12 @@ \advance\dimen@ \@below@folding@skip \advance\dimen@ -\topskip \dimen@ii -\dimen@ - \divide\dimen@ \dimen4% + \divide\dimen@ \dimen4 \count@ \dimen@ \advance\dimen@ii \count@\dimen4% \addtolength\@below@folding@skip{\dimen@ii}% \addtolength\@folding@ht{-\@above@folding@margin}% - #2% action to take if value is OK + #2% \fi \fi \else @@ -485,7 +484,8 @@ \let\@folding@ht@warn\@undefined } \sbox\@oordinamento@box{% - \@lh@nss oordinamento dei {\@lh@bss D}\kern-.033333em ottorandi di + \fontencoding{OT1}\selectfont\@lh@nss + oordinamento dei {\@lh@bss D}\kern-.033333em ottorandi di {\@lh@bss P}\kern-.1em adova\enspace } \computelongindentation @@ -666,21 +666,21 @@ \put(8,9){\line(1,0){5}}% \put(13,23){\line(1,0){10}}% \end{picture}% -}% +} \savebox\@logo@box@addS[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% \thicklines \put(18,8){\line(1,0){8}}% \put(18,9){\line(1,0){8}}% \end{picture}% -}% +} \savebox\@logo@box@addL[\z@][r]{\setlength\unitlength{.625mm}% \begin{picture}(32,16)(-3,7.87)% \thicklines \put(18,8){\line(1,0){10}}% \put(18,9){\line(1,0){10}}% \end{picture}% -}% +} \@ifdefinable\@logo@overlay{\def\@logo@overlay{% \kern\@lh@left@margin \copy\@logo@box@base \copy @@ -694,6 +694,7 @@ }} \setbox\@name@and@WWW@box = \vtop{% \baselineskip 11\p@ + \fontencoding{OT1}\selectfont \hb@xt@\z@{\hss \@lh@rm\Coordinamento \hss}% \hb@xt@\z@{% \hss @@ -749,7 +750,7 @@ #1% \@lett@decl{#2}% \cleardoubleemptypage - \c@page\@ne + \global\c@page\@ne \refstepcounter{letter}% \typeout{\lettername \space \number\c@letter}% \interlinepenalty 200 % smaller than the TeXbook value @@ -770,7 +771,7 @@ \stopletter \@@par\addpenalty\z@ \clearpage - \@end@letter@hook + \@cdp@end@letter@hook \if@filesw \if@making@labels@ \begingroup \let\\\relax @@ -823,7 +824,7 @@ }% \fi \the\@lett@decl - \@begin@letter@hook + \@cdp@begin@letter@hook } \@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{% \@cut@and #1\and\@@@% @@ -1566,7 +1567,7 @@ \else\ifnum\c@emptyaddrlabels<\@cdp@gencount \begingroup \let\ifactuallabel\@secondoftwo - \@whilenum\c@totallabel<\c@emptyaddrlabels\do{\@mlabel{}{}}% + \@whilenum\c@totallabel<\c@emptyaddrlabels\do{\basemlabel{}{}}% \endgroup \else \@emptyaddrlabels@err @@ -1574,7 +1575,7 @@ } \newenvironment*{baselabels}{% \cleardoubleemptypage - \c@page\@ne + \global\c@page\@ne \typeout{Address Labels}% \pagestyle{empty}% \textwidth \c@addrlabelcolumns\addrlabelwidth -- cgit v1.2.3