diff --git a/base/proposal.dtx b/base/proposal.dtx index e92f439..8d7cd89 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1481,6 +1481,7 @@ \else \pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}% \fi +\pdata@def{task}{\taskin\task@id\wp@id}{locallabel}{\task@@label\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}} @@ -1501,10 +1502,9 @@ % \begin{macrocode} \newcommand\taskin[2]{#2@#1} \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}} +\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{locallabel}} +\newcommand\localtasktref[2]{\localtaskref{#1}: \pdataRefFB{task}{\wp@id @#1}{short}{title}} % \end{macrocode} % \end{macro} % now we initialize experimental infrastructure for task dependencies (not very well used/tested) diff --git a/base/proposal.pdf b/base/proposal.pdf index 1af1cd6..4f806b8 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/proposal.sty b/base/proposal.sty index 3188b33..cf9e26d 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -400,6 +400,7 @@ \else \pdata@def{task}{\taskin\task@id\wp@id}{label}{\task@label\thewp\thetask@wp}% \fi +\pdata@def{task}{\taskin\task@id\wp@id}{locallabel}{\task@@label\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}} @@ -408,10 +409,9 @@ use the attributes wphase on the workpackage environment instead!}} \newcommand\taskin[2]{#2@#1} \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}} +\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{locallabel}} +\newcommand\localtasktref[2]{\localtaskref{#1}: \pdataRefFB{task}{\wp@id @#1}{short}{title}} \newcounter{gantt@deps} \def\@requires#1#2{\stepcounter{gantt@deps}% \edef\dep@id{taskdep\thegantt@deps}%