merged in changes, protecting partners and partner RM/RAM with \if@sites, re-generating all examples

This commit is contained in:
Michael Kohlhase 2017-02-10 17:17:01 +01:00
parent bf41ddd53b
commit d4124bd5f4
14 changed files with 10 additions and 6 deletions

View File

@ -1361,6 +1361,7 @@
% \end{macrocode} % \end{macrocode}
% and we list the partners who contribute if they are specified. % and we list the partners who contribute if they are specified.
% \begin{macrocode} % \begin{macrocode}
\if@sites%
\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)%
\@for\@I:=\task@partners\do{, \site\@I}\\\fi% \@for\@I:=\task@partners\do{, \site\@I}\\\fi%
% \end{macrocode} % \end{macrocode}
@ -1379,6 +1380,7 @@
\fi}% \@@RM empty \fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key \fi% no partners key
\fi% sites
% \end{macrocode} % \end{macrocode}
% finally, we ignore any spaces that may follow the the |task| environment % finally, we ignore any spaces that may follow the the |task| environment
% \begin{macrocode} % \begin{macrocode}

View File

@ -332,6 +332,7 @@
\let\@@sep=\sep@wphases}% \let\@@sep=\sep@wphases}%
\fi% initial \fi% initial
\ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi% \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)% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)%
\@for\@I:=\task@partners\do{, \site\@I}\\\fi% \@for\@I:=\task@partners\do{, \site\@I}\\\fi%
\ifx\task@partners\@empty \ifx\task@partners\@empty
@ -347,6 +348,7 @@
\fi}% \@@RM empty \fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key \fi% no partners key
\fi% sites
\ignorespaces} \ignorespaces}
{\smallskip} {\smallskip}
\newcommand\month@label[1]{M#1} \newcommand\month@label[1]{M#1}

View File

@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `pdata') %% dfgproposal.dtx (with options: `pdata')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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 \newif\ifdeutsch\deutschfalse
\DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}} \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
\ProcessOptions \ProcessOptions

View File

@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `cls') %% dfgproposal.dtx (with options: `cls')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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 \newif\ifgeneral\generalfalse
\DeclareOption{general}{\generaltrue} \DeclareOption{general}{\generaltrue}
\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}

Binary file not shown.

View File

@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `reporting') %% dfgproposal.dtx (with options: `reporting')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
\ProcessOptions \ProcessOptions

Binary file not shown.

Binary file not shown.

View File

@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `pdata') %% euproposal.dtx (with options: `pdata')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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}{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}} \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}}

View File

@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `cls') %% euproposal.dtx (with options: `cls')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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 \newif\ifpartB\partBfalse
\DeclareOption{partB}{\partBtrue} \DeclareOption{partB}{\partBtrue}

Binary file not shown.

View File

@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `reporting') %% euproposal.dtx (with options: `reporting')
%% %%
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \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}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
\ProcessOptions \ProcessOptions

Binary file not shown.