diff --git a/base/proposal.dtx b/base/proposal.dtx index 01895a1..282b248 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1361,6 +1361,7 @@ % \end{macrocode} % and we list the partners who contribute if they are specified. % \begin{macrocode} +\if@sites% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \@for\@I:=\task@partners\do{, \site\@I}\\\fi% % \end{macrocode} @@ -1379,6 +1380,7 @@ \fi}% \@@RM empty \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \fi% no partners key +\fi% sites % \end{macrocode} % finally, we ignore any spaces that may follow the the |task| environment % \begin{macrocode} diff --git a/base/proposal.sty b/base/proposal.sty index ada0d92..9a5ea8d 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -332,6 +332,7 @@ \let\@@sep=\sep@wphases}% \fi% initial \ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi% +\if@sites% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \@for\@I:=\task@partners\do{, \site\@I}\\\fi% \ifx\task@partners\@empty @@ -347,6 +348,7 @@ \fi}% \@@RM empty \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \fi% no partners key +\fi% sites \ignorespaces} {\smallskip} \newcommand\month@label[1]{M#1} diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty index 9ace969..8018663 100644 --- a/dfg/dfgpdata.sty +++ b/dfg/dfgpdata.sty @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgpdata}[2016/11/24 v1.4 DFG Project Data] +\ProvidesPackage{dfgpdata}[2016/12/15 v1.4 DFG Project Data] \newif\ifdeutsch\deutschfalse \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}} \ProcessOptions diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index d4f56a6..b1d0b04 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{dfgproposal}[2016/11/24 v1.4 DFG Proposal] +\ProvidesClass{dfgproposal}[2016/12/15 v1.4 DFG Proposal] \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 70a9158..78c485f 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index f88a134..49c0c25 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgreporting}[2016/11/24 v1.4 DFG Project Reporting] +\ProvidesPackage{dfgreporting}[2016/12/15 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index 1ead921..fd84d58 100644 Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index 67eefc5..a0ca99a 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf index 80a689f..0427843 100644 Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/eupdata.sty b/eu/eupdata.sty index 7b25884..7822683 100644 --- a/eu/eupdata.sty +++ b/eu/eupdata.sty @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eupdata}[2016/07/06 v1.5 EU Project Data] +\ProvidesPackage{eupdata}[2016/12/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}} diff --git a/eu/euproposal.cls b/eu/euproposal.cls index 39d72d2..b7a8147 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{euproposal}[2016/07/06 v1.5 EU Proposal] +\ProvidesClass{euproposal}[2016/12/15 v1.5 EU Proposal] \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index aef5b24..b7a4dc7 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index bb00257..e0b4a62 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eureporting}[2016/07/06 v1.5 EU Project Reporting] +\ProvidesPackage{eureporting}[2016/12/15 v1.5 EU Project Reporting] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index 749d1b2..b6c0dbd 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ