diff --git a/base/proposal.dtx b/base/proposal.dtx index 1e94dc6..cb68639 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1298,7 +1298,11 @@ % \end{environment} % The next step is to % \begin{macrocode} +\ifwork@areas +\newcommand\task@label[3]{\textbf{T#1.#2.#3}} +\else \newcommand\task@label[2]{\textbf{T#1.#2}} +\fi % \end{macrocode} % We define the keys for the task macro % \begin{macrocode} @@ -1337,7 +1341,8 @@ \newenvironment{task}[1][]% {\stepcounter{alltasks}% \@task{#1}% -\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]% +\item[\pdata@target{task}{\taskin\task@id\wp@id}% +{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]% \ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space% % \end{macrocode} % now we decode and show the work phases on the task, if they have been specified. @@ -1408,7 +1413,11 @@ \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}}% +\ifwork@areas +\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewa\thewp\thetask@wp}% +\else \pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}% +\fi \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}} diff --git a/base/proposal.pdf b/base/proposal.pdf index 657855e..1d8d1e0 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/proposal.sty b/base/proposal.sty index 0a4b9fe..cd91642 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -297,7 +297,11 @@ \ifdelivs\closeout\wpg@delivs\fi} \newenvironment{tasklist} {\smallskip\begin{compactenum}}{\end{compactenum}\smallskip} +\ifwork@areas +\newcommand\task@label[3]{\textbf{T#1.#2.#3}} +\else \newcommand\task@label[2]{\textbf{T#1.#2}} +\fi \define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}} \define@key{task}{wphases}{\def\task@wphases{#1}\@dmp{wphases=#1}} \define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}} @@ -317,7 +321,8 @@ \newenvironment{task}[1][]% {\stepcounter{alltasks}% \@task{#1}% -\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]% +\item[\pdata@target{task}{\taskin\task@id\wp@id}% +{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]% \ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space% \def\@initial{0-0}% \ifx\task@wphases\@initial\else% @@ -363,7 +368,11 @@ \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}}% +\ifwork@areas +\pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewa\thewp\thetask@wp}% +\else \pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}% +\fi \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}}