copying over the changes from ODK
This commit is contained in:
Michael Kohlhase
parent
54e496bfdd
commit
9534f53254
@ -331,9 +331,9 @@
|
||||
{\end{wp@delivs}}
|
||||
\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\delivref[2]{\pdataRef{deliv}{#1@#2}{label}}
|
||||
\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
|
||||
\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
|
||||
\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}}
|
||||
@ -342,6 +342,7 @@
|
||||
\define@key{deliv}{miles}{\def\deliv@miles{#1}}
|
||||
\define@key{deliv}{short}{\def\deliv@short{#1}}
|
||||
\define@key{deliv}{lead}{\def\deliv@lead{#1}}
|
||||
\define@key{deliv}{issue}{\def\deliv@issue{#1}}
|
||||
\newcounter{deliverable}
|
||||
\newcommand{\wpg@deliv}[3]{% keys, title, type
|
||||
\stepcounter{deliverable}
|
||||
@ -351,27 +352,28 @@
|
||||
\setkeys{deliv}{#1}\stepcounter{deliv}% set state
|
||||
\ifx\@type\@wp\def\current@label{\deliv@label{\ifwork@areas\thewa.\fi\thewp.\thedeliv}}
|
||||
\else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{label}{\current@label}
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{title}{#2}
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{page}{\thepage}%
|
||||
\@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}{\taskin\deliv@id\wpg@id}{short}{#2}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{short}{\deliv@short}}
|
||||
\@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{lead}{\deliv@lead}}
|
||||
\@ifundefined{deliv@due}{}{%
|
||||
\@ifundefined{deliv@issue}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{issue}{\deliv@issue}}
|
||||
\@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}{??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@id}{??}{\taskin\deliv@id\wpg@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
|
||||
{#2}
|
||||
@ -382,7 +384,7 @@
|
||||
\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}}
|
||||
\pdata@target{deliv}{\taskin\deliv@id\wpg@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
|
||||
@ -456,12 +458,13 @@
|
||||
{\begin{compactenum}}{\end{compactenum}}
|
||||
\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}{wphases}{\def\task@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}}
|
||||
\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}}
|
||||
\define@key{task}{title}{\def\task@title{#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}}
|
||||
\define@key{task}{issue}{\def\task@issue{#1}}
|
||||
\def\task@set#1{\edef\task@id{task\thetask@all}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
|
||||
\setkeys{task}{#1}}
|
||||
@ -498,7 +501,13 @@
|
||||
\newcount\task@@end
|
||||
\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}{title}{\task@title}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{lead}{\task@lead}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{partners}{\task@partners}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{PM}{\task@PM}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{\task@wphases}
|
||||
\@ifundefined{deliv@issue}{}
|
||||
{\pdata@def{task}{\taskin\task@id\wp@id}{issue}{\task@issue}}%
|
||||
\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}%
|
||||
|
||||
@ -831,7 +831,7 @@
|
||||
\@for\@I:=\prop@gen@PIs\do{%
|
||||
\item Curriculum Vitae and list of publications for
|
||||
\wa@ref3{person}\@I{personaltitle} \wa@ref3{person}\@I{name}}
|
||||
\end{itemize}\newpage
|
||||
\end{itemize}\newpage
|
||||
\printbibliography[heading=warnpubs]}
|
||||
% \end{macrocode}
|
||||
% \end{environment}
|
||||
@ -1308,9 +1308,9 @@
|
||||
% 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\delivref[2]{\pdataRef{deliv}{#1@#2}{label}}
|
||||
\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
|
||||
\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
|
||||
\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1@#2}{short}{title}}
|
||||
\newcommand\localdelivtref[1]{\delivtref{\wp@id}{#1}}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
@ -1325,6 +1325,7 @@
|
||||
\define@key{deliv}{miles}{\def\deliv@miles{#1}}
|
||||
\define@key{deliv}{short}{\def\deliv@short{#1}}
|
||||
\define@key{deliv}{lead}{\def\deliv@lead{#1}}
|
||||
\define@key{deliv}{issue}{\def\deliv@issue{#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
|
||||
@ -1339,30 +1340,31 @@
|
||||
\setkeys{deliv}{#1}\stepcounter{deliv}% set state
|
||||
\ifx\@type\@wp\def\current@label{\deliv@label{\ifwork@areas\thewa.\fi\thewp.\thedeliv}}
|
||||
\else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
|
||||
\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{label}{\current@label}
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{title}{#2}
|
||||
\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{page}{\thepage}%
|
||||
\@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}{\taskin\deliv@id\wpg@id}{short}{#2}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{short}{\deliv@short}}
|
||||
\@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@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}}
|
||||
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{lead}{\deliv@lead}}
|
||||
% \end{macrocode}
|
||||
% Then we iterate over the due dates and generate an entry for teach of them.
|
||||
% \begin{macrocode}
|
||||
\@ifundefined{deliv@due}{}{%
|
||||
\@ifundefined{deliv@issue}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{issue}{\deliv@issue}}
|
||||
\@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}{??}{\wpg@id\deliv@id}}% id
|
||||
{\@ifundefined{deliv@id}{??}{\taskin\deliv@id\wpg@id}}% id
|
||||
{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
|
||||
{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
|
||||
{#2}
|
||||
@ -1372,11 +1374,11 @@
|
||||
% And finally, we generate the entry into the deliverables table.
|
||||
% \begin{macrocode}
|
||||
\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@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}}
|
||||
\pdata@target{deliv}{\taskin\deliv@id\wpg@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
|
||||
@ -1536,16 +1538,13 @@
|
||||
% We define the keys for the task macro
|
||||
% \begin{macrocode}
|
||||
\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}{wphases}{\def\task@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}}
|
||||
\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}
|
||||
\define@key{task}{title}{\def\task@title{#1}}
|
||||
\define@key{task}{lead}{\def\task@lead{#1}}
|
||||
\define@key{task}{partners}{\def\task@partners{#1}}
|
||||
\define@key{task}{PM}{\def\task@PM{#1}}
|
||||
\define@key{task}{issue}{\def\task@issue{#1}}
|
||||
\def\task@set#1{\edef\task@id{task\thetask@all}
|
||||
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
|
||||
\setkeys{task}{#1}}
|
||||
@ -1602,7 +1601,13 @@
|
||||
\newcount\task@@end
|
||||
\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}{title}{\task@title}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{lead}{\task@lead}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{partners}{\task@partners}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{PM}{\task@PM}
|
||||
\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{\task@wphases}
|
||||
\@ifundefined{deliv@issue}{}
|
||||
{\pdata@def{task}{\taskin\task@id\wp@id}{issue}{\task@issue}}%
|
||||
\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}%
|
||||
@ -2270,11 +2275,11 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
|
||||
% \end{macrocode}
|
||||
% now the multilingual support
|
||||
% \begin{macrocode}
|
||||
\newcommand\gantt@caption@main{Gantt Chart: Overview Work Package Activities}
|
||||
\newcommand\gantt@caption@main{Gantt Chart: Overview Work Package Activities}
|
||||
\newcommand\gantt@caption@lower{lower bar shows the overall effort \if@RAM (RAM only)\fi per month}
|
||||
\newcommand\gantt@caption{\gantt@caption@main\ifgantt@draft\xspace
|
||||
(\gantt@caption@lower)\fi}
|
||||
\newcommand\gantt@footnote{Bars shown at reduced height (e.g. 50\%) indicate reduced
|
||||
(\gantt@caption@lower)\fi}
|
||||
\newcommand\gantt@footnote{Bars shown at reduced height (e.g. 50\%) indicate reduced
|
||||
intensity during that work phase (e.g. to 50\%).}
|
||||
% \end{macrocode}
|
||||
% \end{macro}
|
||||
@ -2359,7 +2364,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
|
||||
\let\@sw\relax\let\jpub\relax\let\jpro\relax\let\jorga\relax% not bother
|
||||
\let\jsoft\relax\let\jsup\relax\let\cellcolor\relax% us
|
||||
\gdef\@ct@head{}%
|
||||
\@for\@site:=\prop@gen@sites\do{\xdef\@ct@head{\@ct@head%
|
||||
\@for\@site:=\prop@gen@sites\do{\xdef\@ct@head{\@ct@head%
|
||||
&\ifx\cht@swsites\@true\@sw{\site{\@site}}\else\site{\@site}\fi}}%
|
||||
\gdef\@ct@lines{\@ct@head\tabularnewline\hline\hline} %initialize with head line
|
||||
\@for\@site:=\prop@gen@sites\do{\xdef\@ct@line{\site{\@site}}%
|
||||
@ -2370,7 +2375,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
|
||||
\begin{tabular}{|l||*{\the@site}{c|}}\hline%
|
||||
\@ct@lines\hline%
|
||||
joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ project,
|
||||
\jorga $\hat=$ organization, \jsoft $\hat=$ software/resource dev,
|
||||
\jorga $\hat=$ organization, \jsoft $\hat=$ software/resource dev,
|
||||
\jsup $\hat=$ supervision}\\\hline
|
||||
\end{tabular}}
|
||||
% \end{macrocode}
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user