integrated tweaks and fixes from the MathVRE proposal effort and re-geneated examples
This commit is contained in:
Michael Kohlhase
parent
6de8509df4
commit
4562f340f7
@ -91,19 +91,29 @@
|
||||
\newcommand\pdataref@aux[3]{\@ifundefined{#1@#2@#3}{??}{\csname #1@#2@#3\endcsname}}%
|
||||
\newcommand\pdataref@num[3]{\@ifundefined{#1@#2@#3}{0}{\csname #1@#2@#3\endcsname}}%
|
||||
\newcommand\pdataref@safe[3]{\@ifundefined{#1@#2@#3}{}{\csname #1@#2@#3\endcsname}}%
|
||||
\newcommand\pdatarefFB[4]{\@ifundefined{#1@#2@#3}%
|
||||
{\@ifundefined{#1@#2@#4}%
|
||||
{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
|
||||
{\csname #1@#2@#4\endcsname}}
|
||||
{\csname #1@#2@#3\endcsname}}
|
||||
\newcommand\pdataRef[3]{\@ifundefined{#1@#2@#3}%
|
||||
{\protect\G@refundefinedtrue\@latex@warning{#3 for #1 #2 undefined}??}%
|
||||
{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}}
|
||||
\newcommand\pdataRefFB[4]{\@ifundefined{#1@#2@#3}%
|
||||
{\@ifundefined{#1@#2@#4}%
|
||||
{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
|
||||
{\hyperlink{#1@#2@target}{\csname #1@#2@#4\endcsname}}}
|
||||
{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}}
|
||||
\newcommand\prop@count[1]{\ifcase #1 zero\or one\or two\or three\or four\or five\or six\or seven \or
|
||||
eight\or nine\or ten\or eleven \or twelve\else#1\fi}
|
||||
\newcommand\pdatacount[2]{\prop@count{\pdataref@num{#1}{#2}{count}}}
|
||||
\newcommand\pn{\pdataref{prop}{gen}{acronym}\xspace}
|
||||
\newcommand\pnlong{\pdataref{prop}{gen}{acrolong}\xspace}
|
||||
\newcommand\WPref[1]{\pdataRef{wp}{#1}{label}}
|
||||
\newcommand\WPtref[1]{\pdataRef{wp}{#1}{label}: \pdataRef{wp}{#1}{short}}
|
||||
\newcommand\WPtref[1]{\WPref{#1}: \pdataRefFB{wp}{#1}{short}{title}}
|
||||
\ifwork@areas
|
||||
\newcommand\WAref[1]{\pdataRef{wa}{#1}{label}}
|
||||
\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}}
|
||||
\newcommand\WAtref[1]{\WAref{#1}: \pdataRefFB{wa}{#1}{short}{title}}
|
||||
\fi
|
||||
\newcommand{\signatures}[1]{\section{#1}
|
||||
\qquad\number\day. \number\month. \number\year\\[6ex]
|
||||
|
||||
@ -132,7 +132,7 @@
|
||||
\@ifundefined{obj@short}{}{\pdata@def{obj}\obj@id{short}\obj@short}}
|
||||
{}
|
||||
\newcommand\OBJref[1]{\pdataRef{obj}{#1}{label}}
|
||||
\newcommand\OBJtref[1]{\pdataRef{obj}{#1}{label}: \pdataRef{obj}{#1}{title}}
|
||||
\newcommand\OBJtref[1]{\OBJref{#1}: \pdataRefFB{obj}{#1}{short}{title}}
|
||||
\ifwork@areas
|
||||
\define@key{workarea}{id}{\def\wa@id{#1}\@dmp{id=#1}}
|
||||
\define@key{workarea}{title}{\pdata@def{wa}\wa@id{title}{#1}}
|
||||
@ -141,8 +141,8 @@
|
||||
\fi
|
||||
\define@key{workpackage}{id}{\def\wp@id{#1}\@dmp{id=#1}}
|
||||
\define@key{workpackage}{title}{\pdata@def{wp}\wp@id{title}{#1}}
|
||||
\define@key{workpackage}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#1}}
|
||||
\define@key{workpackage}{short}{\pdata@def{wp}\wp@id{short}{#1}}
|
||||
\define@key{workpackage}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#1}}
|
||||
\define@key{workpackage}{type}{\def\wp@type{#1}\pdata@def{wp}\wp@id{type}{#1}}
|
||||
\define@key{workpackage}{wphases}{\def\wp@wphases{#1}\pdata@def{wp}\wp@id{wphases}{#1}}
|
||||
\define@key{workpackage}{swsites}[true]{\def\wp@swsites{#1}}
|
||||
@ -316,13 +316,16 @@
|
||||
\newcommand\lec[1]{\strut\hfil\strut\null\nobreak\hfill\hbox{$\leadsto$#1}\par}
|
||||
\newcommand\deliv@label[1]{D{#1}}
|
||||
\newcommand\delivref[2]{\pdataRef{deliv}{#1#2}{label}}
|
||||
\newcommand\delivtref[2]{\pdataRef{deliv}{#1#2}{label}: \pdataRef{deliv}{#1#2}{short}}
|
||||
\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
|
||||
\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
|
||||
\newcommand\localdelivtref[1]{\delivtref{\wp@id}{#1}}
|
||||
\define@key{deliv}{id}{\def\deliv@id{#1}}
|
||||
\define@key{deliv}{due}{\def\deliv@due{#1}}
|
||||
\define@key{deliv}{dissem}{\def\deliv@dissem{#1}}
|
||||
\define@key{deliv}{nature}{\def\deliv@nature{#1}}
|
||||
\define@key{deliv}{miles}{\def\deliv@miles{#1}}
|
||||
\define@key{deliv}{short}{\def\deliv@short{#1}}
|
||||
\define@key{deliv}{lead}{\def\deliv@lead{#1}}
|
||||
\newcounter{deliverable}
|
||||
\newcommand{\wpg@deliv}[3]{% keys, title, type
|
||||
\stepcounter{deliverable}
|
||||
@ -337,22 +340,32 @@
|
||||
\@ifundefined{deliv@short}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}
|
||||
\@ifundefined{deliv@nature}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}}
|
||||
\@ifundefined{deliv@dissem}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}}
|
||||
\@ifundefined{deliv@lead}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'lead' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{lead}{\deliv@lead}}
|
||||
\@ifundefined{deliv@due}{}{%
|
||||
\@for\@I:=\deliv@due\do{\protected@write\wpg@delivs{}{\string\deliverable%
|
||||
{\ifnum\@I<10 0\@I\else\@I\fi}% sort key
|
||||
{\@I}% due date
|
||||
{\current@label}% label
|
||||
{\@ifundefined{deliv@id}{\protect\G@refundefinedtrue\@latex@warning{key 'id' for Deliv #1
|
||||
undefined}??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for
|
||||
Deliv #1 undefined}??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv
|
||||
#1 undefined}??}{\deliv@nature}}% nature
|
||||
{\@ifundefined{deliv@id}{??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
|
||||
{#2}
|
||||
{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}}}}%WP
|
||||
\item[\current@label: (Month \deliv@due; nature: \deliv@nature, dissem.: \deliv@dissem)] \pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
|
||||
{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}%WP
|
||||
{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}}% lead
|
||||
\item[\current@label\ (%
|
||||
\delivs@legend@due: \@ifundefined{deliv@due}{??}{\deliv@due},
|
||||
\delivs@legend@nature: \@ifundefined{deliv@nature}{??}{\deliv@nature},
|
||||
\delivs@legend@dissem: \@ifundefined{deliv@dissem}{??}{\deliv@dissem},
|
||||
\delivs@legend@lead: \@ifundefined{deliv@lead}{??}{\site{\deliv@lead}})]
|
||||
\pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
|
||||
\@ifundefined{deliv@miles}{}{% print the milestones and update their deliverables
|
||||
\let\m@sep=\relax% do not print the separator the first time round
|
||||
\lec{\@for\@I:=\deliv@miles\do{% Iterate over the milestones mentioned
|
||||
@ -368,7 +381,7 @@
|
||||
\newenvironment{wpdeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wp}\else\deliv@error\fi}{}
|
||||
\newcommand\milestone@label[1]{M{#1}}
|
||||
\newcommand\mileref[1]{\pdataRef{mile}{#1}{label}}
|
||||
\newcommand\miletref[1]{\pdataRef{mile}{#1}{label}: \pdataRef{mile}{#1}{short}}
|
||||
\newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}}
|
||||
\newcounter{milestone}
|
||||
\define@key{milestone}{id}{\gdef\mile@id{#1}}
|
||||
\define@key{milestone}{month}{\gdef\mile@month{#1}}
|
||||
@ -405,16 +418,24 @@
|
||||
\newcommand\prop@milesfor[1]{\edef\@delivs{\pdataref@safe{mile}{#1}{delivs}}%
|
||||
\let\m@sep=\relax\def\new@sep{,\ }%
|
||||
\@for\@I:=\@delivs\do{\m@sep\pdataRef{deliv}\@I{label}\let\m@sep=\new@sep}}
|
||||
\newcommand{\deliverable}[8]{\pdataRef{deliv}{#4}{label}\\\hline}%sortkey,due,label,id,title,type,level
|
||||
\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|}\hline
|
||||
\#&\delivs@legend@name&\delivs@legend@wp&\delivs@legend@nature&
|
||||
\delivs@legend@level&\delivs@legend@due\\\hline\hline\else\deliv@error\fi}
|
||||
\newcommand{\deliverable}[9]{\pdataRef{deliv}{#4}{label}	\\\hline}%sortkey,due,label,id,title,type,level,lead
|
||||
\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|l|}\hline%
|
||||
\#&\textbf{\delivs@legend@name}&%
|
||||
\textbf{\delivs@legend@wp}&%
|
||||
\textbf{\delivs@legend@lead}&%
|
||||
\textbf{\delivs@legend@nature}&%
|
||||
\textbf{\delivs@legend@level}&%
|
||||
\textbf{\delivs@legend@due}\\\hline\hline%
|
||||
\endhead%
|
||||
\else\deliv@error\fi}
|
||||
{\ifdelivs\end{longtable}\fi}
|
||||
\newcommand\delivs@legend@name{Deliverable name}
|
||||
\newcommand\delivs@legend@wp{WP}
|
||||
\newcommand\delivs@legend@nature{Nature}
|
||||
\newcommand\delivs@legend@nature{Type}
|
||||
\newcommand\delivs@legend@level{Level}
|
||||
\newcommand\delivs@legend@due{Due}
|
||||
\newcommand\delivs@legend@dissem{Dissem.}
|
||||
\newcommand\delivs@legend@lead{Lead}
|
||||
\newcommand{\inputdelivs}[1]{%
|
||||
\begin{deliverables}{#1}%
|
||||
\IfFileExists{\jobname.deliverables}%
|
||||
@ -423,29 +444,34 @@
|
||||
\end{deliverables}}
|
||||
\newenvironment{tasklist}
|
||||
{\begin{compactenum}}{\end{compactenum}}
|
||||
\newcommand\task@label[1]{T#1}
|
||||
\newcommand\task@label[2]{\textbf{T#1.#2}}
|
||||
\define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}}
|
||||
\define@key{task}{wphases}{\def\task@wphases{#1}\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{#1}\@dmp{wphases=#1}}
|
||||
\define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}}
|
||||
\define@key{task}{title}{\def\task@title{#1}\pdata@def{task}{\taskin\task@id\wp@id}{title}{#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}\@dmp{lead=#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}\@dmp{partners=#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}\@dmp{PM=#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}}
|
||||
\def\task@set#1{\edef\task@id{task\thetask@all}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
|
||||
\setkeys{task}{#1}}
|
||||
\def\task@post@title@space{\quad}
|
||||
\newcounter{alltasks}
|
||||
\def\task@post@title@space{\quad}
|
||||
\newcommand\task@legend@partners{Sites: }
|
||||
\newcommand\task@legend@PM{PM}
|
||||
\newenvironment{task}[1][]%
|
||||
{\stepcounter{alltasks}
|
||||
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label{\thetask@wp}}]%
|
||||
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
|
||||
\@ifundefined{task@title}{}{\textbf\task@title}\task@post@title@space%
|
||||
\def\@initial{0-0}\ifx\task@wphases\@initial\else%
|
||||
\ (\let\@@sep=\relax\@for\@I:=\task@wphases%
|
||||
\let\@@sep=\relax\@for\@I:=\task@wphases%
|
||||
\do{\decode@wphase\@I\@@sep\show@wphase\wphase@start\wphase@end\wphase@force\let\@@sep=\sep@wphases}%
|
||||
\ifx\task@lead\@empty\else; \task@legend@partners: \site\task@lead~(\legend@lead)\fi%
|
||||
\ifx\task@partners\@empty\else\@for \@I:=\task@partners\do{, \site\@I}\fi)\\\fi}
|
||||
\fi% initial
|
||||
\hfill%
|
||||
\ifsubmit\else\ifx\task@PM\@empty\else\task@PM\ \task@legend@PM;\fi\fi%
|
||||
\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)\fi%
|
||||
\@for\@I:=\task@partners\do{, \site\@I}\\}
|
||||
{\ignorespaces}
|
||||
\newcommand\month@label[1]{M#1}
|
||||
\newcommand\show@wphase[3]{\def\@test{#3}\month@label{#1}-\month@label{#2}%
|
||||
@ -459,18 +485,19 @@
|
||||
\def\@task#1{\stepcounter{task@all}\stepcounter{task@wp}%
|
||||
\task@set{#1}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{wphases}\task@wphases
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{number}{\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}%
|
||||
\update@tasks{\taskin\task@id\wp@id}}
|
||||
\newcommand\workphase[1]{\PackageError{proposal}
|
||||
{The \protect\workphase macro is deprecated,\MessageBreak
|
||||
use the attributes wphase on the workpackage environment instead!}}
|
||||
\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{label}}
|
||||
\newcommand\taskin[2]{#2@#1}
|
||||
\newcommand\taskref[2]{\WPref{#1}.\pdataRef{task}{#1@#2}{label}}
|
||||
\newcommand\taskreflong[2]{\WPref{#1}.\pdataRef{task}{#2}{label}}
|
||||
\newcommand\tasktref[2]{\WPref{#1} (\task@label@long \pdataRef{task}{#1@#2}{number})}
|
||||
\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
|
||||
\newcommand\taskreflong[2]{\pdataRef{task}{#2}{label}}
|
||||
\newcommand\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
|
||||
\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
|
||||
\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
|
||||
\newcounter{gantt@deps}
|
||||
\def\@requires#1#2{\stepcounter{gantt@deps}%
|
||||
\edef\dep@id{taskdep\thegantt@deps}%
|
||||
@ -868,7 +895,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
|
||||
\@for\@@task:=\@@tasks\do{% iterate over the tasks
|
||||
\stepcounter{gantt@tasks}
|
||||
\@@line=\gantt@tasks\advance\@@line by -\thegantt@tasks
|
||||
\node at (-1/\gantt@xscale,\@@line) [above=-2pt] {\taskreflong\@@wp\@@task};
|
||||
\node at (-.5/\gantt@xscale,\@@line) [above=-2pt] {{\footnotesize\taskreflong\@@wp\@@task}};
|
||||
\edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
|
||||
\@for\@@ft:=\@@wphases\do{%iterate over the task-level work phases
|
||||
\decode@wphase\@@ft
|
||||
|
||||
@ -308,7 +308,7 @@
|
||||
% In the work packages we can list tasks that need to be undertaken with the
|
||||
% \DescribeEnv{tasklist}|tasklist| environment. The individual tasks are marked up with
|
||||
% the \DescribeEnv{task}|task| environment. This takes a keyval argument with the keys
|
||||
% |id| for identification, |title| for a title, and the workphase keys |wphrases|,
|
||||
% |id| for identification, |title| for a title, and the workphase keys |wphases|,
|
||||
% |start|, |end|, and |force| (see Section~\ref{sec:user:workphase}). For planning
|
||||
% involvement we can specify the overall person months via the |PM| key, the task lead via
|
||||
% |lead|, and the partners involved via the |partners| key. Finally task dependencies can
|
||||
@ -393,9 +393,10 @@
|
||||
% \DescribeMacro{\delivref}|\delivref{|\meta{wp}|}{|\meta{id}|}| where \meta{wp} is the
|
||||
% work package identifier and \meta{id} that if the deliverable and
|
||||
% \DescribeMacro{\delivtref}|\delivtref{|\meta{wp}|}{|\meta{id}|}| for a reference with
|
||||
% title. |\pdatacount{|\meta{wp}|}{delivs}| gives the number of milestones of the work
|
||||
% package \meta{wp} |\pdatacount{all}{delivs}| that of all deliverables (aggregating over
|
||||
% all work packages).
|
||||
% title. \DescribeMacro{\localdelivref}|\localdelivref| can be used to reference
|
||||
% deliverables in the same work package. |\pdatacount{|\meta{wp}|}{delivs}| gives the
|
||||
% number of milestones of the work package \meta{wp} |\pdatacount{all}{delivs}| that of
|
||||
% all deliverables (aggregating over all work packages).
|
||||
%
|
||||
% Some proposal templates ask for an overview table of the deliverables which aggregates
|
||||
% the deliverables of the respective work packages and areas ordered by due date. This can
|
||||
@ -427,8 +428,9 @@
|
||||
% (it matches the identifier given in the |id| key of the object), and \meta{aspect}
|
||||
% specifies the aspect of the saved information that is referenced.
|
||||
%
|
||||
% For a partner \meta{aspect} can be one of |number| (partner number), |short| (partner
|
||||
% acronym), |long| (official partner name), |nationality| (partner nationality).
|
||||
% \DescribeMacro{\pdatarefFB}|\pdatarefFB{|\meta{type}|}{|\meta{id}|}{|\meta{a1}|}{|\meta{a2}|}|
|
||||
% tries first |\pdataref{|\meta{type}|}{|\meta{id}|}{|\meta{a1}|}| and if that is not
|
||||
% given |\pdataref{|\meta{type}|}{|\meta{id}|}{|\meta{a2}|}|.
|
||||
%
|
||||
% For a work package \meta{aspect} can be |number|, (the work package number), |label|
|
||||
% (the label {\bf{WP$n$}} where $n$ is the work package number for referencing), |title|
|
||||
@ -437,8 +439,9 @@
|
||||
% meanings. In all cases, the referenced information carries a hyperlink to the referenced
|
||||
% object.
|
||||
%
|
||||
% The \DescribeMacro{\pdataRef}|\pdataRef| macro is a variant of |\pdataref| that also carries a
|
||||
% hyperlink (if the |hyperref| package is loaded).
|
||||
% The \DescribeMacro{\pdataRef}|\pdataRef| and \DescribeMacro{\pdataRefFB}|\pdataRefFB|
|
||||
% macros are variant of |\pdataref| and |\pdataRef| that also carry a hyperlink (if the
|
||||
% |hyperref| package is loaded).
|
||||
%
|
||||
% The \DescribeMacro{\pdatacount}|\pdatacount| macro gives access to the numbers of
|
||||
% certain aspects. For instance, the number of work packages in the proposal can be cited
|
||||
@ -909,7 +912,7 @@
|
||||
% \begin{macro}{\OBJref}
|
||||
% \begin{macrocode}
|
||||
\newcommand\OBJref[1]{\pdataRef{obj}{#1}{label}}
|
||||
\newcommand\OBJtref[1]{\pdataRef{obj}{#1}{label}: \pdataRef{obj}{#1}{title}}
|
||||
\newcommand\OBJtref[1]{\OBJref{#1}: \pdataRefFB{obj}{#1}{short}{title}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
@ -928,8 +931,8 @@
|
||||
% \begin{macrocode}
|
||||
\define@key{workpackage}{id}{\def\wp@id{#1}\@dmp{id=#1}}
|
||||
\define@key{workpackage}{title}{\pdata@def{wp}\wp@id{title}{#1}}
|
||||
\define@key{workpackage}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#1}}
|
||||
\define@key{workpackage}{short}{\pdata@def{wp}\wp@id{short}{#1}}
|
||||
\define@key{workpackage}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#1}}
|
||||
\define@key{workpackage}{type}{\def\wp@type{#1}\pdata@def{wp}\wp@id{type}{#1}}
|
||||
\define@key{workpackage}{wphases}{\def\wp@wphases{#1}\pdata@def{wp}\wp@id{wphases}{#1}}
|
||||
\define@key{workpackage}{swsites}[true]{\def\wp@swsites{#1}}
|
||||
@ -1258,12 +1261,14 @@
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\delivref}
|
||||
% \begin{macro}{\*deliv*ref}
|
||||
% This macro is generally useful to put a comment at the end of the line, possibly
|
||||
% making a new one if there is not enough space.
|
||||
% \begin{macrocode}
|
||||
\newcommand\delivref[2]{\pdataRef{deliv}{#1#2}{label}}
|
||||
\newcommand\delivtref[2]{\pdataRef{deliv}{#1#2}{label}: \pdataRef{deliv}{#1#2}{short}}
|
||||
\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
|
||||
\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
|
||||
\newcommand\localdelivtref[1]{\delivtref{\wp@id}{#1}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
@ -1276,6 +1281,7 @@
|
||||
\define@key{deliv}{nature}{\def\deliv@nature{#1}}
|
||||
\define@key{deliv}{miles}{\def\deliv@miles{#1}}
|
||||
\define@key{deliv}{short}{\def\deliv@short{#1}}
|
||||
\define@key{deliv}{lead}{\def\deliv@lead{#1}}
|
||||
% \end{macrocode}
|
||||
% The |\wpdeliv| macro cycles over the due dates and generates the relevant entries into
|
||||
% the deliverables file. The first step is to write the general metadata to the pdata
|
||||
@ -1295,8 +1301,15 @@
|
||||
\@ifundefined{deliv@short}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}
|
||||
\@ifundefined{deliv@nature}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}}
|
||||
\@ifundefined{deliv@dissem}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}}
|
||||
\@ifundefined{deliv@lead}
|
||||
{\protect\G@refundefinedtrue\@latex@warning{key 'lead' for Deliv \wpg@id undefined}}
|
||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{lead}{\deliv@lead}}
|
||||
% \end{macrocode}
|
||||
% Then we iterate over the due dates and generate an entry for teach of them.
|
||||
% \begin{macrocode}
|
||||
@ -1305,18 +1318,21 @@
|
||||
{\ifnum\@I<10 0\@I\else\@I\fi}% sort key
|
||||
{\@I}% due date
|
||||
{\current@label}% label
|
||||
{\@ifundefined{deliv@id}{\protect\G@refundefinedtrue\@latex@warning{key 'id' for Deliv #1
|
||||
undefined}??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for
|
||||
Deliv #1 undefined}??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv
|
||||
#1 undefined}??}{\deliv@nature}}% nature
|
||||
{\@ifundefined{deliv@id}{??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
|
||||
{#2}
|
||||
{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}}}}%WP
|
||||
{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}%WP
|
||||
{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}}% lead
|
||||
% \end{macrocode}
|
||||
% And finally, we generate the entry into the deliverables table.
|
||||
% \begin{macrocode}
|
||||
\item[\current@label: (Month \deliv@due; nature: \deliv@nature, dissem.: \deliv@dissem)] \pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
|
||||
\item[\current@label\ (%
|
||||
\delivs@legend@due: \@ifundefined{deliv@due}{??}{\deliv@due},
|
||||
\delivs@legend@nature: \@ifundefined{deliv@nature}{??}{\deliv@nature},
|
||||
\delivs@legend@dissem: \@ifundefined{deliv@dissem}{??}{\deliv@dissem},
|
||||
\delivs@legend@lead: \@ifundefined{deliv@lead}{??}{\site{\deliv@lead}})]
|
||||
\pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
|
||||
\@ifundefined{deliv@miles}{}{% print the milestones and update their deliverables
|
||||
\let\m@sep=\relax% do not print the separator the first time round
|
||||
\lec{\@for\@I:=\deliv@miles\do{% Iterate over the milestones mentioned
|
||||
@ -1356,7 +1372,7 @@
|
||||
% making a new one if there is not enough space.
|
||||
% \begin{macrocode}
|
||||
\newcommand\mileref[1]{\pdataRef{mile}{#1}{label}}
|
||||
\newcommand\miletref[1]{\pdataRef{mile}{#1}{label}: \pdataRef{mile}{#1}{short}}
|
||||
\newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
@ -1431,25 +1447,33 @@
|
||||
% \begin{macro}{\deliverable}
|
||||
% the first argument is an extended due date to facilitate sorting.
|
||||
% \begin{macrocode}
|
||||
\newcommand{\deliverable}[8]{\pdataRef{deliv}{#4}{label}\\\hline}%sortkey,due,label,id,title,type,level
|
||||
\newcommand{\deliverable}[9]{\pdataRef{deliv}{#4}{label}	\\\hline}%sortkey,due,label,id,title,type,level,lead
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{environment}{deliverables}
|
||||
%
|
||||
% \begin{macrocode}
|
||||
\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|}\hline
|
||||
\#&\delivs@legend@name&\delivs@legend@wp&\delivs@legend@nature&
|
||||
\delivs@legend@level&\delivs@legend@due\\\hline\hline\else\deliv@error\fi}
|
||||
\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|l|}\hline%
|
||||
\#&\textbf{\delivs@legend@name}&%
|
||||
\textbf{\delivs@legend@wp}&%
|
||||
\textbf{\delivs@legend@lead}&%
|
||||
\textbf{\delivs@legend@nature}&%
|
||||
\textbf{\delivs@legend@level}&%
|
||||
\textbf{\delivs@legend@due}\\\hline\hline%
|
||||
\endhead%
|
||||
\else\deliv@error\fi}
|
||||
{\ifdelivs\end{longtable}\fi}
|
||||
% \end{macrocode}
|
||||
% now the multilingual support
|
||||
% \begin{macrocode}
|
||||
\newcommand\delivs@legend@name{Deliverable name}
|
||||
\newcommand\delivs@legend@wp{WP}
|
||||
\newcommand\delivs@legend@nature{Nature}
|
||||
\newcommand\delivs@legend@nature{Type}
|
||||
\newcommand\delivs@legend@level{Level}
|
||||
\newcommand\delivs@legend@due{Due}
|
||||
\newcommand\delivs@legend@dissem{Dissem.}
|
||||
\newcommand\delivs@legend@lead{Lead}
|
||||
% \end{macrocode}
|
||||
% \end{environment}
|
||||
%
|
||||
@ -1475,7 +1499,7 @@
|
||||
% \end{environment}
|
||||
% The next step is to
|
||||
% \begin{macrocode}
|
||||
\newcommand\task@label[1]{T#1}
|
||||
\newcommand\task@label[2]{\textbf{T#1.#2}}
|
||||
% \end{macrocode}
|
||||
% We define the keys for the task macro
|
||||
% \begin{macrocode}
|
||||
@ -1483,15 +1507,15 @@
|
||||
\define@key{task}{wphases}{\def\task@wphases{#1}\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{#1}\@dmp{wphases=#1}}
|
||||
\define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}}
|
||||
\define@key{task}{title}{\def\task@title{#1}\pdata@def{task}{\taskin\task@id\wp@id}{title}{#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}\@dmp{lead=#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}\@dmp{partners=#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}\@dmp{PM=#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}}
|
||||
% \end{macrocode}
|
||||
% then we define an auxiliary function that gives them sensible defaults and sets the
|
||||
% internal macros.
|
||||
% \begin{macrocode}
|
||||
\def\task@set#1{\edef\task@id{task\thetask@all}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
|
||||
\setkeys{task}{#1}}
|
||||
% \end{macrocode}
|
||||
%
|
||||
@ -1506,15 +1530,20 @@
|
||||
% \begin{macrocode}
|
||||
\newcounter{alltasks}
|
||||
\def\task@post@title@space{\quad}
|
||||
\newcommand\task@legend@partners{Sites: }
|
||||
\newcommand\task@legend@PM{PM}
|
||||
\newenvironment{task}[1][]%
|
||||
{\stepcounter{alltasks}
|
||||
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label{\thetask@wp}}]%
|
||||
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
|
||||
\@ifundefined{task@title}{}{\textbf\task@title}\task@post@title@space%
|
||||
\def\@initial{0-0}\ifx\task@wphases\@initial\else%
|
||||
\ (\let\@@sep=\relax\@for\@I:=\task@wphases%
|
||||
\let\@@sep=\relax\@for\@I:=\task@wphases%
|
||||
\do{\decode@wphase\@I\@@sep\show@wphase\wphase@start\wphase@end\wphase@force\let\@@sep=\sep@wphases}%
|
||||
\ifx\task@lead\@empty\else; \task@legend@partners: \site\task@lead~(\legend@lead)\fi%
|
||||
\ifx\task@partners\@empty\else\@for \@I:=\task@partners\do{, \site\@I}\fi)\\\fi}
|
||||
\fi% initial
|
||||
\hfill%
|
||||
\ifsubmit\else\ifx\task@PM\@empty\else\task@PM\ \task@legend@PM;\fi\fi%
|
||||
\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)\fi%
|
||||
\@for\@I:=\task@partners\do{, \site\@I}\\}
|
||||
{\ignorespaces}
|
||||
% \end{macrocode}
|
||||
% now the multilingual support and presentation configuration
|
||||
@ -1538,7 +1567,7 @@
|
||||
\def\@task#1{\stepcounter{task@all}\stepcounter{task@wp}%
|
||||
\task@set{#1}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{wphases}\task@wphases
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{number}{\thetask@wp}%
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}%
|
||||
\update@tasks{\taskin\task@id\wp@id}}
|
||||
@ -1553,18 +1582,18 @@
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\localtaskref}
|
||||
% \begin{macrocode}
|
||||
\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{label}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\taskref}
|
||||
% \begin{macro}{\*task*ref}
|
||||
% \begin{macrocode}
|
||||
\newcommand\taskin[2]{#2@#1}
|
||||
\newcommand\taskref[2]{\WPref{#1}.\pdataRef{task}{#1@#2}{label}}
|
||||
\newcommand\taskreflong[2]{\WPref{#1}.\pdataRef{task}{#2}{label}}
|
||||
\newcommand\tasktref[2]{\WPref{#1} (\task@label@long \pdataRef{task}{#1@#2}{number})}
|
||||
\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
|
||||
\newcommand\taskreflong[2]{\pdataRef{task}{#2}{label}}
|
||||
\newcommand\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
|
||||
\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
|
||||
\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
% now we initialize experimental infrastructure for task dependencies (not very well used/tested)
|
||||
% \begin{macrocode}
|
||||
\newcounter{gantt@deps}
|
||||
\def\@requires#1#2{\stepcounter{gantt@deps}%
|
||||
\edef\dep@id{taskdep\thegantt@deps}%
|
||||
@ -1573,7 +1602,6 @@
|
||||
\update@deps\dep@id}
|
||||
%</cls>
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \subsection{Project Data, Referencing \& Hyperlinking}\label{sec:impl:hyperlinking}
|
||||
%
|
||||
@ -1636,6 +1664,17 @@
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\pdatarefFB}
|
||||
% a variant with fallback field,
|
||||
% \begin{macrocode}
|
||||
\newcommand\pdatarefFB[4]{\@ifundefined{#1@#2@#3}%
|
||||
{\@ifundefined{#1@#2@#4}%
|
||||
{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
|
||||
{\csname #1@#2@#4\endcsname}}
|
||||
{\csname #1@#2@#3\endcsname}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\pdataRef}
|
||||
% \begin{macrocode}
|
||||
\newcommand\pdataRef[3]{\@ifundefined{#1@#2@#3}%
|
||||
@ -1644,6 +1683,17 @@
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\pdataRefFB}
|
||||
% a variant with fallback field,
|
||||
% \begin{macrocode}
|
||||
\newcommand\pdataRefFB[4]{\@ifundefined{#1@#2@#3}%
|
||||
{\@ifundefined{#1@#2@#4}%
|
||||
{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
|
||||
{\hyperlink{#1@#2@target}{\csname #1@#2@#4\endcsname}}}
|
||||
{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
%
|
||||
% \begin{macro}{\pdatacount}
|
||||
% \begin{macrocode}
|
||||
\newcommand\prop@count[1]{\ifcase #1 zero\or one\or two\or three\or four\or five\or six\or seven \or
|
||||
@ -1662,10 +1712,10 @@
|
||||
% \begin{macro}{\W*ref}
|
||||
% \begin{macrocode}
|
||||
\newcommand\WPref[1]{\pdataRef{wp}{#1}{label}}
|
||||
\newcommand\WPtref[1]{\pdataRef{wp}{#1}{label}: \pdataRef{wp}{#1}{short}}
|
||||
\newcommand\WPtref[1]{\WPref{#1}: \pdataRefFB{wp}{#1}{short}{title}}
|
||||
\ifwork@areas
|
||||
\newcommand\WAref[1]{\pdataRef{wa}{#1}{label}}
|
||||
\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}}
|
||||
\newcommand\WAtref[1]{\WAref{#1}: \pdataRefFB{wa}{#1}{short}{title}}
|
||||
\fi
|
||||
%</pdata>
|
||||
% \end{macrocode}
|
||||
@ -2188,7 +2238,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
|
||||
\@for\@@task:=\@@tasks\do{% iterate over the tasks
|
||||
\stepcounter{gantt@tasks}
|
||||
\@@line=\gantt@tasks\advance\@@line by -\thegantt@tasks
|
||||
\node at (-1/\gantt@xscale,\@@line) [above=-2pt] {\taskreflong\@@wp\@@task};
|
||||
\node at (-.5/\gantt@xscale,\@@line) [above=-2pt] {{\footnotesize\taskreflong\@@wp\@@task}};
|
||||
\edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
|
||||
\@for\@@ft:=\@@wphases\do{%iterate over the task-level work phases
|
||||
\decode@wphase\@@ft
|
||||
@ -2399,7 +2449,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
|
||||
% LocalWords: babel true bookmarks blue LO LE page of prop sites key site RM hypertarget
|
||||
% LocalWords: def id title acronym discipline start months Proposal Erg by cls endinput
|
||||
% LocalWords: empty em name affiliation Applicants Work Address email The pn Hartenstein
|
||||
% LocalWords: curriculum vita the applicants are enclosed appendix reference Schr
|
||||
% LocalWords: curriculum vita the applicants are enclosed appendix reference Schr doctex
|
||||
% LocalWords: Research area and field work Scientific Fields Anticipated write botupPM
|
||||
% LocalWords: duration Application period Summary short lead Package label task botupMP
|
||||
% LocalWords: tasks deps number line Effort target ids count warning at pdata swsites
|
||||
@ -2456,7 +2506,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
|
||||
% LocalWords: alltasks taskreflong definecolorset leadgray wagray thewpfig fancyhfoffset
|
||||
% LocalWords: wpfigstyle colspan keyvals gantttaskchart baselinestretch NeedsTeXFormat
|
||||
% LocalWords: mileref mileref miletref backref firstinits wissenschaftlicher
|
||||
% LocalWords: wissenschaftliche startend@wphases addtocategory
|
||||
% LocalWords: wissenschaftliche startend@wphases addtocategory localdelivref
|
||||
|
||||
% \endinput
|
||||
% Local Variables:
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -7,7 +7,7 @@
|
||||
%% euproposal.dtx (with options: `pdata')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{eudata}[2013/01/13 v1.4 EU Project Data]
|
||||
\ProvidesPackage{eupdata}[2013/01/13 v1.4 EU Project Data]
|
||||
\define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
|
||||
\def\prop@gen@challenge{??}\def\prop@gen@challengeid{??}
|
||||
\define@key{prop@gen}{challenge}{\def\prop@gen@challenge{#1}\pdata@def{prop}{gen}{challenge}{#1}}
|
||||
|
||||
@ -82,7 +82,7 @@
|
||||
\define@key{site@desc}{height}{\def\site@desc@height{#1}%
|
||||
\pdata@def{sitedesc}{\@site}{height}{#1}\@dmp{ht=#1}}
|
||||
\newenvironment{sitedescription}[2][]%
|
||||
{\def\@site{#2}% remember the site ID
|
||||
{\def\c@site{#2}% remember the site ID
|
||||
\newcounter{site@#2@PM} % for the site PM
|
||||
\def\site@desc@box{false}% not box unless requested
|
||||
\def\site@desc@logo{false}% not logo unless requested
|
||||
@ -101,22 +101,27 @@
|
||||
\end{wrapfigure}%
|
||||
\fi% end box
|
||||
\pdata@target{site}{#2}%
|
||||
{\subsection{\wa@ref{institution}{#2}{acronym}: % space here
|
||||
{\subsubsection{\wa@ref{institution}{#2}{acronym}: % space here
|
||||
{\textsc{\wa@ref{institution}{#2}{name}} (\wa@ref{institution}{#2}{countryshort})}}}%
|
||||
\small%
|
||||
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{0.25ex \@plus1ex \@minus.2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}}
|
||||
{\pdata@def{site}{\@site}{reqPM}{\csname thesite@\@site @PM\endcsname}}
|
||||
{\pdata@def{site}{\c@site}{reqPM}{\csname thesite@\c@site @PM\endcsname}}
|
||||
\define@key{site@part}{type}{\def\site@part@type{#1}\@dmp{type=#1}}
|
||||
\define@key{site@part}{PM}{\def\site@part@PM{#1}\@dmp{PM=#1}}
|
||||
\define@key{site@part}{salary}{\def\site@part@salary{#1}}%\@dmp{\euro=#1}}
|
||||
\define@key{site@part}{gender}{\def\site@part@gender{#1}}%\@dmp{\euro=#1}}
|
||||
\newenvironment{participant}[2][]%
|
||||
{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}%
|
||||
{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}\def\site@part@gender{}%
|
||||
\setkeys{site@part}{#1}%
|
||||
\ifx\site@part@PM\@empty\else\addtocounter{site@\@site @PM}{\site@part@PM}\fi%
|
||||
\paragraph*{#2 \ifx\site@part@type\@empty\else(\site@part@type)\fi}%
|
||||
\ifx\site@part@PM\@empty\else\addtocounter{site@\c@site @PM}{\site@part@PM}\fi%
|
||||
\paragraph*{#2\ %
|
||||
(\ifx\site@part@type\@empty\else\site@part@type\fi%
|
||||
\ifx\site@part@gender\@empty\else, \site@part@gender\fi%
|
||||
\ifx\site@part@PM\@empty\else, \site@part@PM~PM\fi%
|
||||
)}%
|
||||
\ignorespaces}
|
||||
{\par\medskip}
|
||||
\newmdenv[frametitle=Objectives]{wpobjectives}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
% \iffalse
|
||||
%<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
%<cls>\ProvidesClass{euproposal}[2013/01/13 v1.4 EU Proposal]
|
||||
%<pdata>\ProvidesPackage{eudata}[2013/01/13 v1.4 EU Project Data]
|
||||
%<pdata>\ProvidesPackage{eupdata}[2013/01/13 v1.4 EU Project Data]
|
||||
%<reporting>\ProvidesPackage{eureporting}[2013/01/13 v1.4 EU Project Reporting]
|
||||
%<*driver>
|
||||
\documentclass[twoside]{ltxdoc}
|
||||
@ -342,7 +342,7 @@
|
||||
\define@key{site@desc}{height}{\def\site@desc@height{#1}%
|
||||
\pdata@def{sitedesc}{\@site}{height}{#1}\@dmp{ht=#1}}
|
||||
\newenvironment{sitedescription}[2][]%
|
||||
{\def\@site{#2}% remember the site ID
|
||||
{\def\c@site{#2}% remember the site ID
|
||||
\newcounter{site@#2@PM} % for the site PM
|
||||
\def\site@desc@box{false}% not box unless requested
|
||||
\def\site@desc@logo{false}% not logo unless requested
|
||||
@ -361,14 +361,14 @@
|
||||
\end{wrapfigure}%
|
||||
\fi% end box
|
||||
\pdata@target{site}{#2}%
|
||||
{\subsection{\wa@ref{institution}{#2}{acronym}: % space here
|
||||
{\subsubsection{\wa@ref{institution}{#2}{acronym}: % space here
|
||||
{\textsc{\wa@ref{institution}{#2}{name}} (\wa@ref{institution}{#2}{countryshort})}}}%
|
||||
\small%
|
||||
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{0.25ex \@plus1ex \@minus.2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}}
|
||||
{\pdata@def{site}{\@site}{reqPM}{\csname thesite@\@site @PM\endcsname}}
|
||||
{\pdata@def{site}{\c@site}{reqPM}{\csname thesite@\c@site @PM\endcsname}}
|
||||
% \end{macrocode}
|
||||
% \end{environment}
|
||||
%
|
||||
@ -382,11 +382,16 @@
|
||||
\define@key{site@part}{type}{\def\site@part@type{#1}\@dmp{type=#1}}
|
||||
\define@key{site@part}{PM}{\def\site@part@PM{#1}\@dmp{PM=#1}}
|
||||
\define@key{site@part}{salary}{\def\site@part@salary{#1}}%\@dmp{\euro=#1}}
|
||||
\define@key{site@part}{gender}{\def\site@part@gender{#1}}%\@dmp{\euro=#1}}
|
||||
\newenvironment{participant}[2][]%
|
||||
{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}%
|
||||
{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}\def\site@part@gender{}%
|
||||
\setkeys{site@part}{#1}%
|
||||
\ifx\site@part@PM\@empty\else\addtocounter{site@\@site @PM}{\site@part@PM}\fi%
|
||||
\paragraph*{#2 \ifx\site@part@type\@empty\else(\site@part@type)\fi}%
|
||||
\ifx\site@part@PM\@empty\else\addtocounter{site@\c@site @PM}{\site@part@PM}\fi%
|
||||
\paragraph*{#2\ %
|
||||
(\ifx\site@part@type\@empty\else\site@part@type\fi%
|
||||
\ifx\site@part@gender\@empty\else, \site@part@gender\fi%
|
||||
\ifx\site@part@PM\@empty\else, \site@part@PM~PM\fi%
|
||||
)}%
|
||||
\ignorespaces}
|
||||
{\par\medskip}
|
||||
% \end{macrocode}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user