merge
This commit is contained in:
parent
b88ba5db66
commit
7955bcdb30
@ -1481,6 +1481,7 @@
|
|||||||
\else
|
\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
|
\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}{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}}
|
||||||
@ -1501,10 +1502,9 @@
|
|||||||
% \begin{macrocode}
|
% \begin{macrocode}
|
||||||
\newcommand\taskin[2]{#2@#1}
|
\newcommand\taskin[2]{#2@#1}
|
||||||
\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
|
\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\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
|
||||||
\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
|
\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{locallabel}}
|
||||||
\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
|
\newcommand\localtasktref[2]{\localtaskref{#1}: \pdataRefFB{task}{\wp@id @#1}{short}{title}}
|
||||||
% \end{macrocode}
|
% \end{macrocode}
|
||||||
% \end{macro}
|
% \end{macro}
|
||||||
% now we initialize experimental infrastructure for task dependencies (not very well used/tested)
|
% now we initialize experimental infrastructure for task dependencies (not very well used/tested)
|
||||||
|
Binary file not shown.
@ -400,6 +400,7 @@
|
|||||||
\else
|
\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
|
\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}{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}}
|
||||||
@ -408,10 +409,9 @@
|
|||||||
use the attributes wphase on the workpackage environment instead!}}
|
use the attributes wphase on the workpackage environment instead!}}
|
||||||
\newcommand\taskin[2]{#2@#1}
|
\newcommand\taskin[2]{#2@#1}
|
||||||
\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
|
\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\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
|
||||||
\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
|
\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{locallabel}}
|
||||||
\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
|
\newcommand\localtasktref[2]{\localtaskref{#1}: \pdataRefFB{task}{\wp@id @#1}{short}{title}}
|
||||||
\newcounter{gantt@deps}
|
\newcounter{gantt@deps}
|
||||||
\def\@requires#1#2{\stepcounter{gantt@deps}%
|
\def\@requires#1#2{\stepcounter{gantt@deps}%
|
||||||
\edef\dep@id{taskdep\thegantt@deps}%
|
\edef\dep@id{taskdep\thegantt@deps}%
|
||||||
|
Loading…
Reference in New Issue
Block a user