diff --git a/eu/eupdata.sty b/eu/eupdata.sty index bc761c7..9b4d46b 100644 --- a/eu/eupdata.sty +++ b/eu/eupdata.sty @@ -8,6 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eupdata}[2016/04/15 v1.5 EU Project Data] + \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \def\prop@gen@challenge{??}\def\prop@gen@challengeid{??} diff --git a/eu/euproposal.cls b/eu/euproposal.cls index 10d685a..9b3107c 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -8,6 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{euproposal}[2016/04/15 v1.5 EU Proposal] + \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} @@ -191,9 +192,9 @@ \newenvironment{riskcont}[3] {\begin{risk}{#1}{#2}{#3}\textbf{Contingency:} } {\end{risk}} -\newcommand\keypubs[1]{% +\newcommand\keypubs[2][]{% \paragraph{Key publications relevant to the project}% -{\renewcommand{\baselinestretch}{.9}\prop@paperlist{#1}}} +{\prop@paperlist[#1]{#2}}} \endinput %% %% End of file `euproposal.cls'. diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 39301d1..e01ab00 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -179,6 +179,20 @@ % \meta{prob}, where the body of the environment contains a description of the risk. The % \DescribeMacro{riskcont}|riskcont| is a variant, where \meta{title} names a risk and the % body is a description of the contingency plan. +% +% \subsection{Relevant Papers}\label{sec:user:papers} +% +% Sometimes we want to list the relevant papers in the site descriptions. We use the +% |biblatex| package to automate this. We only need to use +% \DescribeMacro{\keypubs}|\keypubs[|\meta{keys}|]{|\meta{refs}|}|, where \meta{keys} that +% specify what papers are selected and \meta{refs} is a comma-separated list of bibtex +% keys from the bibTeX database used in the proposal. +% +% The papers listed in |\keypubs| are put into a special bib\LaTeX category +% \DescribeMacro{featured}|featured|, and can thus be excluded from the general +% bibliography by adding |notcategory=featured| to the final |\printbibliography|. +% + % % \begin{newpart}{MK@MK: This is new, and only partially implemented} % \subsection{Reporting Infrastructure}\label{sec:user:report} @@ -565,13 +579,10 @@ % \subsection{Relevant Papers}\label{sec:impl:papers} % % \begin{macro}{\keypubs} -% \ednote{MK: the baselinestretch manipulation does not work here, since -% \texttt{prop@paperslist} makes its own provisions. We should provide a way of -% manipulating sizes here.} % \begin{macrocode} -\newcommand\keypubs[1]{% +\newcommand\keypubs[2][]{% \paragraph{Key publications relevant to the project}% -{\renewcommand{\baselinestretch}{.9}\prop@paperlist{#1}}} +{\prop@paperlist[#1]{#2}}} % % \end{macrocode} % \end{macro} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index 8992499..8ea95b4 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index 7d2bec4..10438ba 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -8,6 +8,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eureporting}[2016/04/15 v1.5 EU Project Reporting] + \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions \LoadClass[report,noRAM]{reporting}