Research
/
LaTeX-proposal
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more

This commit is contained in:
Michael Kohlhase 2017-02-08 10:26:28 +01:00
parent 733f5889cf
commit 7b77c2f946
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
base/proposal.dtx
View File

@ -1123,7 +1123,7 @@
% \begin{macrocode}
\newenvironment{workpackage}[1][]%
{\begin{work@package}[#1]%
\ifgrantagreement\else
\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%
@ -1347,7 +1347,7 @@
\do{\decode@wphase\@I%
\@@sep\show@wphase\wphase@start\wphase@end\wphase@force%
\let\@@sep=\sep@wphases}%
\fi% initial
\fi% initial
% \end{macrocode}
% in non-|submit| mode we give the specified PM for cross-checking
% \begin{macrocode}
@ -1361,9 +1361,19 @@
% if there are no partners, then we show the RM/RAM contributions specified (if any)
% \begin{macrocode}
\ifx\task@partners\@empty
\@for\@site:=\prop@gen@sites\do{%
\xdef\@@involvement{}%
\xdef\@@inv{}%
\xdef\@@sep{, }%
\def\m@sep{}%
\edef\@@sites{\prop@gen@sites}%
\@for\@site:=\@@sites\do{%
\edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}%
\ifx\@@RM\@empty\else\site{\@site}: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi, \fi}%
\ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep%
\fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key
% \end{macrocode}
% finally, we ignore any spaces that may follow the the |task| environment
@ -1632,7 +1642,7 @@
% the corresponding presentation macro.
% \begin{macrocode}
\newcommand\@milestone[3]{% id, title, description
\item \textbf{\miles@legend@milestone\xspace\pdata@target{mile}\mile@id{\pdataref{mile}{#1}{label}}
\item \textbf{\miles@legend@milestone\xspace\pdata@target{mile}\mile@id{\pdataref{mile}{#1}{label}}
(\miles@legend@month \pdataref{mile}\mile@id{month})
\textbf{#2}} #3}
\newcommand\miles@legend@month{Month}

BIN
base/proposal.pdf
View File

Binary file not shown.

16
base/proposal.sty
View File

@ -190,7 +190,7 @@
{\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
\newenvironment{workpackage}[1][]%
{\begin{work@package}[#1]%
\ifgrantagreement\else
\ifgrantagreement\else%
\if@sites\goodbreak\medskip\wpheadertable%
\else\subsubsection*{{\wptitle} (\wprm)}\fi%
\addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
@ -329,9 +329,19 @@
\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
\@for\@site:=\prop@gen@sites\do{%
\xdef\@@involvement{}%
\xdef\@@inv{}%
\xdef\@@sep{, }%
\def\m@sep{}%
\edef\@@sites{\prop@gen@sites}%
\@for\@site:=\@@sites\do{%
\edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}%
\ifx\@@RM\@empty\else\site{\@site}: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi, \fi}%
\ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep%
\fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key
\ignorespaces}
{\medskip}