copying over Nicolas upgrades

base/proposal.dtx

@@ -541,6 +541,7 @@
 %<*cls|reporting>
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
@@ -551,6 +552,7 @@
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
@@ -634,11 +636,22 @@
 % We specify the page headings. 
 %    \begin{macrocode}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
 \fancyhfoffset{0pt}
+\fi
 \fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 %</cls|reporting>
 %    \end{macrocode}
@@ -709,6 +722,8 @@
 \pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}}
 \define@key{prop@gen}{acrolong}{\def\prop@gen@acrolong{#1}%
 \pdata@def{prop}{gen}{acrolong}{#1}}
+\define@key{prop@gen}{proposalnumber}{\def\prop@gen@proposalnumber{#1}%
+\pdata@def{prop}{gen}{proposalnumber}{#1}}
 \define@key{prop@gen}{discipline}{\def\prop@gen@discipline{#1}%
 \pdata@def{prop}{gen}{discipline}{#1}}
 \define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}%
@@ -1050,11 +1065,13 @@
 %    \begin{macrocode}
 \newenvironment{workpackage}[1][]%
 {\begin{work@package}[#1]%
+\ifgrantagreement\else 
 %\if@wpsubsection\subsubsection*{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}\fi
 \if@sites\goodbreak\medskip\wpheadertable%
 \else\subsubsection*{{\wptitle} (\wprm)}\fi%
 \addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
-\noindent\ignorespaces}
+\noindent\ignorespaces%
+\fi}
 {\end{work@package}}
 %    \end{macrocode}
 %  \end{environment}
@@ -1302,6 +1319,7 @@
 \else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
 \pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
 \pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
+\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
 \@ifundefined{deliv@short}
 {\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
 {\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
@@ -1387,11 +1405,13 @@
 \newcounter{milestone}
 \define@key{milestone}{id}{\gdef\mile@id{#1}}
 \define@key{milestone}{month}{\gdef\mile@month{#1}}
+\define@key{milestone}{verif}{\gdef\mile@verif{#1}}
 \newcommand\milestone[3][]{%
 \ifdelivs%
 \setkeys{milestone}{#1}\stepcounter{milestone}%
 \pdata@def{mile}\mile@id{label}{\milestone@label{\themilestone}}%
 \pdata@def{mile}\mile@id{month}{\mile@month}%
+\pdata@def{mile}\mile@id{verif}{\mile@verif}%
 \pdata@def{mile}\mile@id{title}{#2}%
 \pdata@def{mile}\mile@id{description}{#3}%
 \@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%

eu/euproposal.dtx

@@ -304,7 +304,8 @@
 % \begin{environment}{prop@proposal}
 %    \begin{macrocode}
 \renewenvironment{prop@proposal}
-{\thispagestyle{empty}\begin{center}
+{\ifgrantagreement\else
+  \thispagestyle{empty}\begin{center}
   {\Large \prop@gen@instrument}\\[.2cm]
   {\Large\textbf\prop@gen@callname}\\[.4cm]
   {\LARGE \prop@gen@callid}\\[.8cm]
@@ -341,6 +342,7 @@
 {\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
 \end{center}
 \newpage
+\fi% ifgrantagreement
 \setcounter{tocdepth}{2}\setcounter{part}{2}}
 {\newpage\printbibliography[heading=warnpubs,maxnames=999]}
 %    \end{macrocode}
@@ -464,7 +466,7 @@
 % \end{macro}
 %
 % \subsection{Milestones and Deliverables}\label{sec:impl:deliverables}
-% 
+%
 % \begin{environment}{wpdelivs}
 %   We make the deliverables boxed in EU proposals, this is simple with |mdframed.sty|.
 %    \begin{macrocode}

eu/examples/strep/draft.tex

@@ -0,0 +1 @@
+\input{proposal.tex}

eu/examples/strep/final.tex

@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit}
+\input{proposal.tex}
+
+%%% Local Variables:
+%%% mode: LaTeX
+%%% TeX-master: t
+%%% End:

eu/examples/strep/grantagreement.tex

@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit,grantagreement}
+\input{proposal.tex}
+
+%%% Local Variables:
+%%% mode: LaTeX
+%%% TeX-master: t
+%%% End: