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

better task spacing

Browse Source
This commit is contained in:
Michael Kohlhase 2017-02-08 13:59:59 +01:00
parent 7b77c2f946
commit 9a0a7dfe8e
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
base/proposal.dtx
View File

@ -1293,7 +1293,7 @@
% \begin{environment}{tasklist} % \begin{environment}{tasklist}
% \begin{macrocode} % \begin{macrocode}
\newenvironment{tasklist} \newenvironment{tasklist}
{\begin{compactenum}}{\end{compactenum}} {\smallskip\begin{compactenum}}{\end{compactenum}\smallskip}
% \end{macrocode} % \end{macrocode}
% \end{environment} % \end{environment}
% The next step is to % The next step is to
@ -1336,7 +1336,8 @@
% \begin{macrocode} % \begin{macrocode}
\newenvironment{task}[1][]% \newenvironment{task}[1][]%
{\stepcounter{alltasks}% {\stepcounter{alltasks}%
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]% \@task{#1}%
\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
\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.
@ -1361,17 +1362,15 @@
% if there are no partners, then we show the RM/RAM contributions specified (if any) % if there are no partners, then we show the RM/RAM contributions specified (if any)
% \begin{macrocode} % \begin{macrocode}
\ifx\task@partners\@empty \ifx\task@partners\@empty
\xdef\@@involvement{}% \xdef\@@involvement{}\xdef\@@inv{}%
\xdef\@@inv{}% \xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around
\xdef\@@sep{, }%
\def\m@sep{}%
\edef\@@sites{\prop@gen@sites}% \edef\@@sites{\prop@gen@sites}%
\@for\@site:=\@@sites\do{% \@for\@site:=\@@sites\do{%
\edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}% \edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}%
\ifx\@@RM\@empty\else\xdef\@@inv{showit}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and \xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi} \m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep% \let\m@sep=\@@sep% but the second time show it.
\fi}% \@@RM empty \fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key \fi% no partners key
@ -1379,7 +1378,7 @@
% finally, we ignore any spaces that may follow the the |task| environment % finally, we ignore any spaces that may follow the the |task| environment
% \begin{macrocode} % \begin{macrocode}
\ignorespaces} \ignorespaces}
{\medskip} {\smallskip}
% \end{macrocode} % \end{macrocode}
% now the multilingual support and presentation configuration % now the multilingual support and presentation configuration
% \begin{macrocode} % \begin{macrocode}

BIN
base/proposal.pdf
View File

Binary file not shown.

15
base/proposal.sty
View File

@ -296,7 +296,7 @@
\fi \fi
\ifdelivs\closeout\wpg@delivs\fi} \ifdelivs\closeout\wpg@delivs\fi}
\newenvironment{tasklist} \newenvironment{tasklist}
{\begin{compactenum}}{\end{compactenum}} {\smallskip\begin{compactenum}}{\end{compactenum}\smallskip}
\newcommand\task@label[2]{\textbf{T#1.#2}} \newcommand\task@label[2]{\textbf{T#1.#2}}
\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}}
@ -316,7 +316,8 @@
\newcommand\task@legend@PM{PM} \newcommand\task@legend@PM{PM}
\newenvironment{task}[1][]% \newenvironment{task}[1][]%
{\stepcounter{alltasks}% {\stepcounter{alltasks}%
\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]% \@task{#1}%
\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
\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%
@ -329,22 +330,20 @@
\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)%
\@for\@I:=\task@partners\do{, \site\@I}\\\fi% \@for\@I:=\task@partners\do{, \site\@I}\\\fi%
\ifx\task@partners\@empty \ifx\task@partners\@empty
\xdef\@@involvement{}% \xdef\@@involvement{}\xdef\@@inv{}%
\xdef\@@inv{}% \xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around
\xdef\@@sep{, }%
\def\m@sep{}%
\edef\@@sites{\prop@gen@sites}% \edef\@@sites{\prop@gen@sites}%
\@for\@site:=\@@sites\do{% \@for\@site:=\@@sites\do{%
\edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}% \edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}%
\ifx\@@RM\@empty\else\xdef\@@inv{showit}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and \xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi} \m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep% \let\m@sep=\@@sep% but the second time show it.
\fi}% \@@RM empty \fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi \ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key \fi% no partners key
\ignorespaces} \ignorespaces}
{\medskip} {\smallskip}
\newcommand\month@label[1]{M#1} \newcommand\month@label[1]{M#1}
\newcommand\show@wphase[3]{\edef\@test{#3}\def\@one{1}% \newcommand\show@wphase[3]{\edef\@test{#3}\def\@one{1}%
\month@label{#1}-\month@label{#2}% \month@label{#1}-\month@label{#2}%