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

fixing deliverables table

This commit is contained in:
Michael Kohlhase 2019-01-20 07:03:49 +01:00
parent 7e1f91c7a2
commit acb0fd6200
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/proposal.dtx
View File

@ -1320,9 +1320,10 @@
\else \else
\@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps} \@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps}
\fi \fi
\ifdelivs\@ifundefined{mile@stones}{} \ifdelivs\edef\mile@stones{\pdataref@safe{all}{mile}{ids}}
{\@for\@I:=\mile@stones\do{% \@for\@I:=\mile@stones\do{%
\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}}\fi \message{milestone: \@I, delivs: \csname\@I delivs\endcsname}
\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}\fi
\ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi \ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi
\pdata@def{all}{wp}{count}{\theallwp} \pdata@def{all}{wp}{count}{\theallwp}
\ifdelivs \ifdelivs
@ -1566,8 +1567,6 @@
% \end{macro} % \end{macro}
% %
% \begin{macro}{\*deliv*ref} % \begin{macro}{\*deliv*ref}
% 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} % \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\localdelivref[1]{\delivref{\wp@id}{#1}}
@ -1663,7 +1662,7 @@
\expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty \expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty
{\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator {\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator
\else\expandafter\xdef\csname\@I delivs\endcsname%if not add it \else\expandafter\xdef\csname\@I delivs\endcsname%if not add it
{\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}%
}% end gray color }% end gray color
} }
% \end{macrocode} % \end{macrocode}
@ -1690,8 +1689,6 @@
% \end{macro} % \end{macro}
% %
% \begin{macro}{\mileref} % \begin{macro}{\mileref}
% 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} % \begin{macrocode}
\newcommand\mileref[1]{\pdataRef{mile}{#1}{label}} \newcommand\mileref[1]{\pdataRef{mile}{#1}{label}}
\newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}} \newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}}

BIN
base/proposal.pdf
View File

Binary file not shown.

9
base/proposal.sty
View File

@ -296,9 +296,10 @@
\else \else
\@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps} \@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps}
\fi \fi
\ifdelivs\@ifundefined{mile@stones}{} \ifdelivs\edef\mile@stones{\pdataref@safe{all}{mile}{ids}}
{\@for\@I:=\mile@stones\do{% \@for\@I:=\mile@stones\do{%
\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}}\fi \message{milestone: \@I, delivs: \csname\@I delivs\endcsname}
\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}\fi
\ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi \ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi
\pdata@def{all}{wp}{count}{\theallwp} \pdata@def{all}{wp}{count}{\theallwp}
\ifdelivs \ifdelivs
@ -500,7 +501,7 @@
\expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty \expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty
{\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator {\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator
\else\expandafter\xdef\csname\@I delivs\endcsname%if not add it \else\expandafter\xdef\csname\@I delivs\endcsname%if not add it
{\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}%
}% end gray color }% end gray color
} }
\newenvironment{wadeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wa}\else\deliv@error\fi}{} \newenvironment{wadeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wa}\else\deliv@error\fi}{}