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

merged in changes, protecting partners and partner RM/RAM with \if@sites, re-generating all examples

Browse Source
This commit is contained in:
Michael Kohlhase 2017-02-10 17:16:53 +01:00
commit bf41ddd53b
3 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
base/proposal.dtx
View File

@ -29,7 +29,7 @@
\RecordChanges \RecordChanges
\usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage{textcomp,url,paralist,a4wide,xspace}
\usepackage[show]{ed} \usepackage[show]{ed}
\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex} \usepackage[maxbibnames=9,maxcitenames=2,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
\addbibresource{../lib/proposal.bib} \addbibresource{../lib/proposal.bib}
% temporary fix due to http://tex.stackexchange.com/questions/311426/bibliography-error-use-of-blxbblverbaddi-doesnt-match-its-definition-ve % temporary fix due to http://tex.stackexchange.com/questions/311426/bibliography-error-use-of-blxbblverbaddi-doesnt-match-its-definition-ve
\makeatletter\def\blx@maxline{77}\makeatother \makeatletter\def\blx@maxline{77}\makeatother
@ -644,7 +644,7 @@
\renewcommand{\familydefault}{\sfdefault} \renewcommand{\familydefault}{\sfdefault}
\RequirePackage[scaled=.90]{helvet} \RequirePackage[scaled=.90]{helvet}
\RequirePackage{textcomp} \RequirePackage{textcomp}
\RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19] \RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
\RequirePackage{csquotes} \RequirePackage{csquotes}
\RequirePackage{mdframed} \RequirePackage{mdframed}
% \end{macrocode} % \end{macrocode}
@ -1123,7 +1123,7 @@
% \begin{macrocode} % \begin{macrocode}
\newenvironment{workpackage}[1][]% \newenvironment{workpackage}[1][]%
{\begin{work@package}[#1]% {\begin{work@package}[#1]%
\ifgrantagreement\else \ifgrantagreement\else%
%\if@wpsubsection\subsubsection*{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}\fi %\if@wpsubsection\subsubsection*{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}\fi
\if@sites\goodbreak\medskip\wpheadertable% \if@sites\goodbreak\medskip\wpheadertable%
\else\subsubsection*{{\wptitle} (\wprm)}\fi% \else\subsubsection*{{\wptitle} (\wprm)}\fi%
@ -1293,12 +1293,16 @@
% \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
% \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}
@ -1336,7 +1340,9 @@
% \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}%
{\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.
@ -1347,7 +1353,7 @@
\do{\decode@wphase\@I% \do{\decode@wphase\@I%
\@@sep\show@wphase\wphase@start\wphase@end\wphase@force% \@@sep\show@wphase\wphase@start\wphase@end\wphase@force%
\let\@@sep=\sep@wphases}% \let\@@sep=\sep@wphases}%
\fi% initial \fi% initial
% \end{macrocode} % \end{macrocode}
% in non-|submit| mode we give the specified PM for cross-checking % in non-|submit| mode we give the specified PM for cross-checking
% \begin{macrocode} % \begin{macrocode}
@ -1361,15 +1367,23 @@
% 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
\@for\@site:=\prop@gen@sites\do{% \xdef\@@involvement{}\xdef\@@inv{}%
\xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around
\edef\@@sites{\prop@gen@sites}%
\@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\site{\@site}: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi, \fi}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep% but the second time show it.
\fi}% \@@RM empty
\ifx\@@inv\@empty\else(RM{\if@RAM/RAM\fi} distribution: \@@involvement)\strut\\\fi
\fi% no partners key \fi% no partners key
% \end{macrocode} % \end{macrocode}
% 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}
@ -1399,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{task@issue}{} \@ifundefined{task@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}}
@ -1632,7 +1650,7 @@
% the corresponding presentation macro. % the corresponding presentation macro.
% \begin{macrocode} % \begin{macrocode}
\newcommand\@milestone[3]{% id, title, description \newcommand\@milestone[3]{% id, title, description
\item \textbf{\miles@legend@milestone\xspace\pdata@target{mile}\mile@id{\pdataref{mile}{#1}{label}} \item \textbf{\miles@legend@milestone\xspace\pdata@target{mile}\mile@id{\pdataref{mile}{#1}{label}}
(\miles@legend@month \pdataref{mile}\mile@id{month}) (\miles@legend@month \pdataref{mile}\mile@id{month})
\textbf{#2}} #3} \textbf{#2}} #3}
\newcommand\miles@legend@month{Month} \newcommand\miles@legend@month{Month}

BIN
base/proposal.pdf
View File

Binary file not shown.

32
base/proposal.sty
View File

@ -28,7 +28,7 @@
\renewcommand{\familydefault}{\sfdefault} \renewcommand{\familydefault}{\sfdefault}
\RequirePackage[scaled=.90]{helvet} \RequirePackage[scaled=.90]{helvet}
\RequirePackage{textcomp} \RequirePackage{textcomp}
\RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19] \RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
\RequirePackage{csquotes} \RequirePackage{csquotes}
\RequirePackage{mdframed} \RequirePackage{mdframed}
\RequirePackage{pdata} \RequirePackage{pdata}
@ -190,7 +190,7 @@
{\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}} {\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
\newenvironment{workpackage}[1][]% \newenvironment{workpackage}[1][]%
{\begin{work@package}[#1]% {\begin{work@package}[#1]%
\ifgrantagreement\else \ifgrantagreement\else%
\if@sites\goodbreak\medskip\wpheadertable% \if@sites\goodbreak\medskip\wpheadertable%
\else\subsubsection*{{\wptitle} (\wprm)}\fi% \else\subsubsection*{{\wptitle} (\wprm)}\fi%
\addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}% \addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
@ -296,8 +296,12 @@
\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}
\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}}
@ -316,7 +320,9 @@
\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}%
{\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%
@ -329,12 +335,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
\@for\@site:=\prop@gen@sites\do{% \xdef\@@involvement{}\xdef\@@inv{}%
\xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around
\edef\@@sites{\prop@gen@sites}%
\@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\site{\@site}: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi, \fi}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}%
\xdef\@@involvement{\@@involvement% and
\m@sep\@site: \@@RM\if@RAM\ifx\@@RAM\@empty\else/\@@RM\fi\fi}
\let\m@sep=\@@sep% but the second time show it.
\fi}% \@@RM empty
\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}%
@ -354,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{task@issue}{} \@ifundefined{task@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}}