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

ooopsa forgot one occurrence of \task@label

Browse Source
This commit is contained in:
Michael Kohlhase 2017-02-08 14:26:43 +01:00
parent d04fe13e22
commit efa96be31d
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/proposal.dtx
View File

@ -1298,7 +1298,11 @@
% \end{environment} % \end{environment}
% The next step is to % The next step is to
% \begin{macrocode} % \begin{macrocode}
\ifwork@areas
\newcommand\task@label[3]{\textbf{T#1.#2.#3}}
\else
\newcommand\task@label[2]{\textbf{T#1.#2}} \newcommand\task@label[2]{\textbf{T#1.#2}}
\fi
% \end{macrocode} % \end{macrocode}
% We define the keys for the task macro % We define the keys for the task macro
% \begin{macrocode} % \begin{macrocode}
@ -1337,7 +1341,8 @@
\newenvironment{task}[1][]% \newenvironment{task}[1][]%
{\stepcounter{alltasks}% {\stepcounter{alltasks}%
\@task{#1}% \@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% \ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space%
% \end{macrocode} % \end{macrocode}
% now we decode and show the work phases on the task, if they have been specified. % 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} \pdata@def{task}{\taskin\task@id\wp@id}{wphases}{\task@wphases}
\@ifundefined{deliv@issue}{} \@ifundefined{deliv@issue}{}
{\pdata@def{task}{\taskin\task@id\wp@id}{issue}{\task@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}% \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}{number}{\thetask@wp}%
\pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}% \pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}%
\update@tasks{\taskin\task@id\wp@id}} \update@tasks{\taskin\task@id\wp@id}}

BIN
base/proposal.pdf
View File

Binary file not shown.

11
base/proposal.sty
View File

@ -297,7 +297,11 @@
\ifdelivs\closeout\wpg@delivs\fi} \ifdelivs\closeout\wpg@delivs\fi}
\newenvironment{tasklist} \newenvironment{tasklist}
{\smallskip\begin{compactenum}}{\end{compactenum}\smallskip} {\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}} \newcommand\task@label[2]{\textbf{T#1.#2}}
\fi
\define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}} \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}{wphases}{\def\task@wphases{#1}\@dmp{wphases=#1}}
\define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}} \define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}}
@ -317,7 +321,8 @@
\newenvironment{task}[1][]% \newenvironment{task}[1][]%
{\stepcounter{alltasks}% {\stepcounter{alltasks}%
\@task{#1}% \@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% \ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space%
\def\@initial{0-0}% \def\@initial{0-0}%
\ifx\task@wphases\@initial\else% \ifx\task@wphases\@initial\else%
@ -363,7 +368,11 @@
\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{\task@wphases} \pdata@def{task}{\taskin\task@id\wp@id}{wphases}{\task@wphases}
\@ifundefined{deliv@issue}{} \@ifundefined{deliv@issue}{}
{\pdata@def{task}{\taskin\task@id\wp@id}{issue}{\task@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}% \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}{number}{\thetask@wp}%
\pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}% \pdata@def{task}{\taskin\task@id\wp@id}{page}{\thepage}%
\update@tasks{\taskin\task@id\wp@id}} \update@tasks{\taskin\task@id\wp@id}}