proposal (19feb13)

git-svn-id: svn://tug.org/texlive/trunk@29174 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 1586 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
new file mode 100644
index 00000000000..a08372865b9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
@@ -0,0 +1,110 @@
+%%
+%% This is file `pdata.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% proposal.dtx  (with options: `pdata')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{pdata}[2013/02/13 v1.4 Project Data]
+\RequirePackage{workaddress}[2011/05/03]
+\RequirePackage{eurosym}
+\newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
+\newcounter{@site}%
+\define@key{prop@gen}{site}{\@sitestrue\@dmp{site=#1}%
+\stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}%
+\@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}%
+\define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}%
+\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
+\define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}%
+\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
+\define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax%
+\@ifundefined{prop@gen@employed@lines}%
+{\xdef\prop@gen@employed@lines{\wa@ref{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
+{\xdef\prop@gen@employed@lines{\prop@gen@employed@lines \wa@ref{institution}{#1}{shortname} & ##1\tabularnewline\hline}}}}}
+\define@key{prop@gen}{RM}{\@dmp{RM=#1}\if@sites%
+\PackageWarning{Do not use the RM key in the presence of sites}\else%
+\pdata@def{all}{intended}{RM}{#1}\fi}
+\define@key{prop@gen}{RAM}{\@dmp{RAM=#1}\if@sites%
+\PackageWarning{Do not use the RAM key in the presence of sites}\else%
+\pdata@def{all}{intended}{RAM}{#1}\fi}
+\define@key{prop@gen}{PI}{\@dmp{PI=#1}%
+\@ifundefined{prop@gen@PIs}{\xdef\prop@gen@PIs{#1}}{\xdef\prop@gen@PIs{\prop@gen@PIs,#1}}}
+\define@key{prop@gen}{pubspage}{\@ifundefined{prop@gen@pubspages}%
+{\xdef\prop@gen@pubspages{#1}}{\xdef\prop@gen@pubspages{\prop@gen@pubspages,#1}}}
+\define@key{prop@gen}{importfrom}{\message{importing proposal data from #1.pdata}\readpdata{#1}}
+\define@key{prop@gen}{instrument}{\def\prop@gen@instrument{#1}%
+\pdata@def{prop}{gen}{instrument}{#1}\@dmp{inst=#1}}
+\define@key{prop@gen}{title}{\def\prop@gen@title{#1}%
+\pdata@def{prop}{gen}{title}{#1}}
+\define@key{prop@gen}{acronym}{\gdef\prop@gen@acronym{#1}%
+\pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}}
+\define@key{prop@gen}{acrolong}{\def\prop@gen@acrolong{#1}%
+\pdata@def{prop}{gen}{acrolong}{#1}}
+\define@key{prop@gen}{discipline}{\def\prop@gen@discipline{#1}%
+\pdata@def{prop}{gen}{discipline}{#1}}
+\define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}%
+\pdata@def{prop}{gen}{areas}{#1}}
+\define@key{prop@gen}{start}{\def\prop@gen@start{#1}%
+\pdata@def{prop}{gen}{start}{#1}}
+\define@key{prop@gen}{months}{\def\prop@gen@months{#1}%
+\pdata@def{prop}{gen}{months}{#1}}
+\define@key{prop@gen}{since}{\def\prop@gen@since{#1}%
+\pdata@def{prop}{gen}{since}{#1}}
+\define@key{prop@gen}{totalduration}{\def\prop@gen@totalduration{#1}%
+\pdata@def{prop}{gen}{totalduration}{#1}}
+\define@key{prop@gen}{fundsuntil}{\def\prop@gen@fundsuntil{#1}%
+\pdata@def{prop}{gen}{fundsuntil}{#1}}
+\newcommand\prop@gen@acro{ACRONYM}
+\newcommand\prop@gen@months{???}
+\newcommand\prop@gen@title{???Proposal Title???}
+\newcommand\prop@gen@instrument{??? Instrument ???}
+\newcommand\prop@tl[2]{\xdef\tab@line{}
+\@for\tl@ext:={#1}\do{\xdef\tab@line{\tab@line&#2}}
+\tab@line}
+\def\prop@gen@compactht{false}
+\define@key{prop@gen}{compactht}[true]{\def\prop@gen@compactht{#1}}
+\newif\ifwork@areas\work@areastrue
+\DeclareOption{noworkareas}{\work@areasfalse}
+\ProcessOptions
+\RequirePackage{xspace}
+\newwrite\pdata@out
+\newcommand\pdata@open[1]{\immediate\openout\pdata@out=#1.pdata}
+\newcommand\pdata@close{\closeout\pdata@out}
+\newcommand\readpdata[1]{\IfFileExists{#1.pdata}
+{\message{proposal: Reading Project Data}\makeatletter\input{#1.pdata}\makeatother}
+{proposal: No Project Data found, (forward) references may be compromized}}
+\newcommand\pdata@target[3]{\hypertarget{#1@#2@target}{#3}}
+\newcommand\pdata@def[4]{%\@pdata@def{#1}{#2}{#3}{#4}%
+  \protected@write\pdata@out{}{\string\@pdata@def{#1}{#2}{#3}{#4}}}
+\newcommand\@pdata@def[4]{\expandafter\gdef\csname #1@#2@#3\endcsname{#4}}
+\newcommand\pdataref[3]{\@ifundefined{#1@#2@#3}%
+               {\protect\G@refundefinedtrue\@latex@warning{#3 for #1 #2 undefined}??}%
+                {\csname #1@#2@#3\endcsname}}%
+\newcommand\pdataref@aux[3]{\@ifundefined{#1@#2@#3}{??}{\csname #1@#2@#3\endcsname}}%
+\newcommand\pdataref@num[3]{\@ifundefined{#1@#2@#3}{0}{\csname #1@#2@#3\endcsname}}%
+\newcommand\pdataref@safe[3]{\@ifundefined{#1@#2@#3}{}{\csname #1@#2@#3\endcsname}}%
+\newcommand\pdataRef[3]{\@ifundefined{#1@#2@#3}%
+{\protect\G@refundefinedtrue\@latex@warning{#3 for #1 #2 undefined}??}%
+{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}}
+\newcommand\prop@count[1]{\ifcase #1 zero\or one\or two\or three\or four\or five\or six\or seven \or
+  eight\or nine\or ten\or eleven \or twelve\else#1\fi}
+\newcommand\pdatacount[2]{\prop@count{\pdataref@num{#1}{#2}{count}}}
+\newcommand\pn{\pdataref{prop}{gen}{acronym}\xspace}
+\newcommand\pnlong{\pdataref{prop}{gen}{acrolong}\xspace}
+\newcommand\WPref[1]{\pdataRef{wp}{#1}{label}}
+\newcommand\WPtref[1]{\pdataRef{wp}{#1}{label}: \pdataRef{wp}{#1}{short}}
+\ifwork@areas
+\newcommand\WAref[1]{\pdataRef{wa}{#1}{label}}
+\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}}
+\fi
+\newcommand{\signatures}[1]{\section{#1}
+\qquad\number\day. \number\month. \number\year\\[6ex]
+\strut\qquad Date\hfill\@for\@p:=\prop@gen@PIs\do{%
+\wa@ref{person}\@p{personaltitle}~\wa@ref{person}\@p{name}\hfill}}
+\def\@dmp#1{\ifkeys\marginpar{#1}\fi}
+\renewcommand\euro{\officialeuro\xspace}
+\endinput
+%%
+%% End of file `pdata.sty'.
diff --git a/Master/texmf-dist/tex/latex/proposal/base/proposal.cls b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
new file mode 100644
index 00000000000..6e1b3aa39b0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
@@ -0,0 +1,915 @@
+%%
+%% This is file `proposal.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% proposal.dtx  (with options: `cls')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{proposal}[2013/02/13 v1.4 Project Proposal]
+\newif\if@wpsubsection\@wpsubsectionfalse
+\newif\ifsubmit\submitfalse
+\newif\ifpublic\publicfalse
+\newif\ifkeys\keysfalse
+\newif\ifdelivs\delivsfalse
+\newif\ifwork@areas\work@areastrue
+\newif\if@RAM\@RAMfalse
+\def\proposal@class{article}
+\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
+\DeclareOption{submit}{\submittrue}
+\DeclareOption{public}{\publictrue}
+\DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
+\DeclareOption{RAM}{\@RAMtrue}
+\DeclareOption{report}{\def\proposal@class{report}}
+\DeclareOption{keys}{\keystrue}
+\DeclareOption{deliverables}{\delivstrue}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessOptions
+\LoadClass[a4paper,twoside]{\proposal@class}
+\RequirePackage{amssymb}
+\RequirePackage{url}
+\RequirePackage{graphicx}
+\RequirePackage{colortbl}
+\RequirePackage{xcolor}
+\RequirePackage{rotating}
+\RequirePackage{fancyhdr}
+\RequirePackage{array}
+\RequirePackage{xspace}
+\RequirePackage{comment}
+\AtBeginDocument{\ifpublic\excludecomment{private}\fi}
+\RequirePackage{tikz}
+\RequirePackage{paralist}
+\RequirePackage{a4wide}
+\RequirePackage{boxedminipage}
+\renewcommand{\thempfootnote}{\roman{mpfootnote}}
+\renewcommand{\familydefault}{\sfdefault}
+\RequirePackage[scaled=.90]{helvet}
+\RequirePackage{textcomp}
+\RequirePackage[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex]{biblatex}[2010/11-19]
+\RequirePackage{csquotes}
+\RequirePackage{mdframed}
+\RequirePackage{pdata}
+\definecolor{darkblue}{rgb}{0,0,.7}
+\ifsubmit\def\prop@link@color{darkblue}\else\def\prop@link@color{blue}\fi
+\RequirePackage[bookmarks=true,linkcolor=\prop@link@color,
+ citecolor=\prop@link@color,urlcolor=\prop@link@color,colorlinks=true,
+ breaklinks=true, bookmarksopen=true]{hyperref}
+\ifsubmit
+\RequirePackage[hide]{ed}
+\RequirePackage[final,today]{svninfo}
+\else
+\RequirePackage[show]{ed}
+\RequirePackage[eso-foot,today]{svninfo}
+\fi
+\renewcommand\ednoteshape{\sl\footnotesize}
+\ifpublic\excludecomment{private}\else\includecomment{private}\fi
+\setcounter{secnumdepth}{3}
+\newif\ifofpage\ofpagefalse
+\fancyhead[RE,LO]{\prop@gen@acronym}
+\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\pagestyle{fancyplain}
+\newmdenv[settings=\large]{emphbox}
+\newenvironment{prop@proposal}
+{\thispagestyle{empty}%
+\begin{center}
+  {\LARGE \prop@gen@instrument}\\[.2cm]
+  {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
+  {\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]
+  {\large\today}\\[1em]
+  \begin{tabular}{c*{\the@PIs}{c}}
+    \prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{name}}\\
+    \prop@tl\prop@gen@PIs{\wa@ref{institution}{\wa@ref{person}\tl@ext{affiliation}}{name}}
+ \end{tabular}\\[2cm]
+\end{center}
+\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
+{\section{List of Attachments}
+\begin{itemize}
+\@for\@I:=\prop@gen@PIs\do{%
+\item Curriculum Vitae and list of publications for
+  \wa@ref{person}\@I{personaltitle} \wa@ref{person}\@I{name}
+\end{itemize}}\newpage
+\printbibliography[heading=warnpubs,maxnames=999]}
+\newenvironment{proposal}[1][]{\readpdata\jobname
+\ofpagetrue\setkeys{prop@gen}{#1}
+\pdata@open\jobname
+\if@sites\else
+\define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}}
+\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi
+\fi
+\newcounter{@PIs}
+\@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}}
+\newcounter{@sites}
+\@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}}}
+\setcounter{page}{0}
+\begin{prop@proposal}}
+{\end{prop@proposal}
+\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse
+\pdata@close}
+\newcommand\site[1]{\hyperlink{site@#1@target}{\wa@ref{institution}{#1}{acronym}}}
+\newcommand\sitename[1]{\hyperlink{site@#1@target}{\wa@ref{institution}{#1}{name}}}
+\newcommand\objective@label[1]{O#1}
+\define@key{obj}{id}{\def\obj@id{#1}\@dmp{id=#1}}
+\define@key{obj}{title}{\def\obj@title{#1}\@dmp{title=#1}}
+\define@key{obj}{short}{\def\obj@short{#1}\@dmp{short=#1}}
+\newcounter{objective}
+\newenvironment{objective}[1][]
+{\let\obj@id\relax\let\obj@title\relax\let\obj@short%
+\relax\setkeys{obj}{#1}\stepcounter{objective}%
+\goodbreak\smallskip\par\noindent%
+\textbf{\objective@label{\arabic{objective}}:%
+~\pdata@target{obj}{\obj@id}{\pdataref{obj}{\obj@id}{title}}\ignorespaces}%
+\pdata@def{obj}\obj@id{label}{\objective@label\theobjective}%
+\@ifundefined{obj@title}{}{\pdata@def{obj}\obj@id{title}\obj@title}%
+\@ifundefined{obj@short}{}{\pdata@def{obj}\obj@id{short}\obj@short}}
+{}
+\newcommand\OBJref[1]{\pdataRef{obj}{#1}{label}}
+\newcommand\OBJtref[1]{\pdataRef{obj}{#1}{label}: \pdataRef{obj}{#1}{title}}
+\ifwork@areas
+\define@key{workarea}{id}{\def\wa@id{#1}\@dmp{id=#1}}
+\define@key{workarea}{title}{\pdata@def{wa}\wa@id{title}{#1}}
+\define@key{workarea}{short}{\pdata@def{wa}\wa@id{short}{#1}}
+\define@key{workarea}{lead}{\pdata@def{wa}\wa@id{lead}{#1}}
+\fi
+\define@key{workpackage}{id}{\def\wp@id{#1}\@dmp{id=#1}}
+\define@key{workpackage}{title}{\pdata@def{wp}\wp@id{title}{#1}}
+\define@key{workpackage}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#1}}
+\define@key{workpackage}{short}{\pdata@def{wp}\wp@id{short}{#1}}
+\define@key{workpackage}{type}{\def\wp@type{#1}\pdata@def{wp}\wp@id{type}{#1}}
+\define@key{workpackage}{wphases}{\def\wp@wphases{#1}\pdata@def{wp}\wp@id{wphases}{#1}}
+\newcommand\wp@mk@title[1]{Work Package {#1}}
+\newcommand\wp@label[1]{WP{#1}}
+\ifwork@areas
+\newcommand\wa@label[1]{WA{#1}}
+\newcommand\wa@mk@title[1]{Work Area {#1}}
+\fi
+\ifwork@areas\newcounter{wa}\newcounter{wp}[wa]\else\newcounter{wp}\fi
+\ifdelivs\newcounter{deliv}[wp]\fi
+\newcounter{allwp}
+\newcommand\update@wps[1]{\@ifundefined{@wps}{\xdef\@wps{#1}}{\xdef\@wps{\@wps,#1}}}
+\newcommand\update@tasks[1]{\@ifundefined{@tasks}{\xdef\@tasks{#1}}{\xdef\@tasks{\@tasks,#1}}}
+\newcommand\update@deps[1]{\@ifundefined{task@deps}{\xdef\task@deps{#1}}{\xdef\task@deps{\task@deps,#1}}}
+\ifwork@areas\def\update@was#1{\@ifundefined{@was}{\xdef\@was{#1}}{\xdef\@was{\@was,#1}}}\fi
+\newcommand\decode@wphase[1]{\expandafter\decode@p@start#1@%
+\local@count\wphase@end\advance\local@count by -\wphase@start%
+\def\wphase@len{\the\local@count}}
+\def\decode@p@start#1-#2@{\def\wphase@start{#1}\decode@p@end#2!@}
+\def\decode@p@end#1!#2@{\def\wphase@end{#1}\def\@test{#2}%
+\ifx\@test\@empty\def\wphase@force{1}\else\decode@p@force#2\fi}
+\def\decode@p@force#1!{\def\wphase@force{#1}}
+\def\wphases@start#1-#2@{\def\wphase@start{#1}}
+\newcommand\startend@wphases[1]{\def\@test{#1}
+\ifx\@test\@empty\def\wphase@start{0}\def\wphase@end{0}\else%
+\@for\@I:=#1\do{\expandafter\decode@p@start\@I @}
+\expandafter\wphases@start#1@\fi}
+\newcounter{wp@RM}
+\if@RAM\newcounter{wp@RAM}\fi
+\newenvironment{work@package}[1][]%
+{\def\wp@wphases{0-0}% default values
+\setkeys{workpackage}{#1}\stepcounter{wp}\stepcounter{allwp}%
+\startend@wphases\wp@wphases%
+\pdata@def{wp}\wp@id{start}\wphase@start\pdata@def{wp}\wp@id{end}\wphase@end%
+\@ifundefined{wp@type}{}{\pdata@def{wp}\wp@id{type}\wp@type}%
+\let\@tasks=\relax%
+\edef\wp@num{\ifwork@areas\thewa.\fi\thewp}%
+\pdata@def{wp}\wp@id{label}{\wp@label\wp@num}%
+\pdata@def{wp}\wp@id{number}{\thewp}%
+\pdata@def{wp}\wp@id{page}{\thepage}%
+\update@wps\wp@id%
+\edef\wp@num{\ifwork@areas\thewa.\fi\thewp}%
+\pdata@def{wp}{\wp@id}{num}{\thewp}%
+\if@sites%
+\setcounter{wp@RM}{0}\if@RAM\setcounter{wp@RAM}{0}\fi%
+\@for\@site:=\prop@gen@sites\do{%
+\edef\@RM{\pdataref@num\wp@id\@site{RM}}\addtocounter{wp@RM}{\@RM}%
+\if@RAM\edef\@RAM{\pdataref@num\wp@id\@site{RAM}}\addtocounter{wp@RAM}{\@RAM}\fi}
+\pdata@def{wp}\wp@id{RM}{\thewp@RM}%
+\if@RAM\pdata@def{wp}\wp@id{RAM}{\thewp@RAM}\fi%
+\fi}% if@sites
+{\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
+\newenvironment{workpackage}[1][]%
+{\begin{work@package}[#1]%
+\if@sites\goodbreak\medskip\wpheadertable%
+\else\subsubsection*{{\wptitle} (\wprm)}\fi%
+\addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
+}
+{\end{work@package}}
+\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
+\newcommand\wprm{\pdataref@safe{wp}\wp@id{RM}\if@RAM\ RM+\pdataref{wp}\wp@id{RAM} RAM\fi}
+\newcount\site@contribution%
+\newcommand\if@site@contributes[2]{%
+\ifx\prop@gen@compactht\@true
+\if@RAM\ifnum\pdataref@num\wp@id{#1}{RM} > 0 \ifnum \pdataref@num\wp@id{#1}{RAM} > 0 #2\fi\fi
+\else\ifnum\pdataref@num\wp@id{#1}{RM} > 0 #2\fi\fi
+\else #2\fi}
+\newcounter{wp@sites@num}
+\newcommand\wp@sites@efforts@lines{%
+\setcounter{wp@sites@num}{0}
+{\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax%
+\let\site\relax\let\textbf\relax\let\sum@style\relax\let\lead@style\relax%
+\xdef\wp@sites@line{\wp@legend@site}\xdef\wp@efforts@line{\wp@legend@effort}%initialize lines
+\@for\@site:=\prop@gen@sites\do{\if@site@contributes\@site{\stepcounter{wp@sites@num}}%
+\xdef\wp@sites@line{\wp@sites@line%
+\if@site@contributes\@site{&\ifx\@site\wp@lead\lead@style{\site{\@site}}\else\site{\@site}\fi}}%
+\xdef\wp@efforts@line{\wp@efforts@line%
+\if@site@contributes\@site{&\pdataref@safe\wp@id\@site{RM}\if@RAM+\pdataref@safe\wp@id\@site{RAM}\fi}}}%
+\xdef\wp@sites@line{\wp@sites@line&\sum@style{\wp@legend@all}}%
+\xdef\wp@efforts@line{\wp@efforts@line&
+\sum@style{\textbf{\pdataref{wp}\wp@id{RM}\if@RAM+\pdataref{wp}\wp@id{RAM}\fi}}}}}
+\newcommand\wpheadertable{%
+\wp@sites@efforts@lines%
+\par\noindent\begin{tabular}{|l||l|*{\thewp@sites@num}{c|}|c|}\hline%
+\textbf{\wp@mk@title{\wp@num}}&\wp@sites@line\\\hline%
+\textsf{\pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}} &\wp@efforts@line\\\hline%
+\end{tabular}\smallskip\par\noindent\ignorespaces}
+\newcommand\wp@legend@site{Site}
+\newcommand\wp@legend@effort{Effort\if@RAM{ (RM+RAM)}\fi}
+\newcommand\wp@legend@all{\textbf{all}}
+\newcounter{prop@RM}\if@RAM\newcounter{prop@RAM}\fi
+\ifwork@areas
+\newcounter{wa@RM}\if@RAM\newcounter{wa@RAM}\fi\newcounter{wa@wps}
+\newenvironment{workarea}[1][]
+{\setkeys{workarea}{#1}
+\let\@wps=\relax
+\stepcounter{wa}
+\pdata@def{wa}{\wa@id}{label}{\wa@label\thewa}
+\pdata@def{wa}{\wa@id}{number}{\thewa}
+\pdata@def{wa}{\wa@id}{page}{\thepage}
+\update@was{\wa@id}
+\pdata@def{wa}{\wa@id}{num}{\thewa}
+\setcounter{wa@RM}{0}\if@RAM\setcounter{wa@RAM}{0}\fi\setcounter{wa@wps}{0}
+\edef\@@wps{\pdataref@aux\wa@id{wp}{ids}}
+\@for\@wp:=\@@wps\do{\stepcounter{wa@wps}%
+\if@sites
+\@for\@site:=\prop@gen@sites\do{%
+  \edef\@RM{\pdataref@num\@wp\@site{RM}}
+  \if@RAM\edef\@RAM{\pdataref@num\@wp\@site{RAM}}\fi
+  \addtocounter{wa@RM}{\@RM}\addtocounter{prop@RM}{\@RM}
+  \if@RAM\addtocounter{wa@RAM}{\@RAM}\addtocounter{prop@RAM}{\@RAM}\fi}
+\else
+\edef\@RM{\pdataref@num{wp}\@wp{RM}}
+\if@RAM\edef\@RAM{\pdataref@num{wp}\@wp{RAM}}\fi
+\addtocounter{wa@RM}{\@RM}\addtocounter{prop@RM}{\@RM}
+\if@RAM\addtocounter{wa@RAM}{\@RAM}\addtocounter{prop@RAM}{\@RAM}\fi
+\fi}
+\pdata@def{wa}\wa@id{RM}\thewa@RM
+\pdata@def{prop}{all}{RM}\theprop@RM
+\if@RAM
+\pdata@def{wa}\wa@id{RAM}\thewa@RAM
+\pdata@def{prop}{all}{RAM}\theprop@RAM
+\fi
+\subsubsection*{{\wa@mk@title\thewa}: {\pdata@target{wa}\wa@id{\pdataref{wa}\wa@id{title}}}}
+\addcontentsline{toc}{subsubsection}{{\wa@mk@title\thewa}: \pdataref{wa}\wa@id{title}}}
+{\@ifundefined{@wps}{}{\pdata@def\wa@id{wp}{ids}\@wps}\pdata@def\wa@id{wp}{count}\thewa@wps}\fi
+\ifdelivs\newwrite\wpg@delivs\fi
+\newenvironment{workplan}%
+{\ifdelivs\immediate\openout\wpg@delivs=\jobname.delivs\fi
+\ifwork@areas\let\@was=\relax\else\let\@wps=\relax\fi}%
+{\@ifundefined{task@deps}{}{\pdata@def{all}{task}{deps}{\task@deps}}
+\pdata@def{all}{task}{count}{\thealltasks}
+\ifwork@areas
+\@ifundefined{@was}{}{\pdata@def{all}{wa}{ids}\@was}
+\else
+\@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps}
+\fi
+\ifdelivs\@ifundefined{mile@stones}{}
+{\@for\@I:=\mile@stones\do{%
+\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}}\fi
+\ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi
+\pdata@def{all}{wp}{count}{\theallwp}
+\ifdelivs
+\pdata@def{all}{deliverables}{count}{\thedeliverable}
+\pdata@def{all}{milestones}{count}{\themilestone}
+\fi
+\ifdelivs\closeout\wpg@delivs\fi}
+\newcommand\deliv@error{\PackageError{proposal}
+{To use use deliverables, you have to specify the option 'deliverables'}}
+\newenvironment{wpdelivs}{\begin{wp@delivs}}{\end{wp@delivs}}
+\newenvironment{wp@delivs}
+{\ifdelivs\textbf\deliv@legend@delivs:\\[-3ex]%
+\begin{compactdesc}\else\deliv@error\fi}
+{\ifdelivs\end{compactdesc}\fi}
+\newcommand\deliv@legend@delivs{Deliverables}
+\newenvironment{wadelivs}
+{\textbf\deliv@legend@delivs:\\[-3ex]\begin{wp@delivs}}
+{\end{wp@delivs}}
+\newcommand\lec[1]{\strut\hfil\strut\null\nobreak\hfill\hbox{$\leadsto$#1}\par}
+\newcommand\deliv@label[1]{M{#1}}
+\newcommand\delivref[2]{\pdataRef{deliv}{#1#2}{label}}
+\newcommand\delivtref[2]{\pdataRef{deliv}{#1#2}{label}: \pdataRef{deliv}{#1#2}{short}}
+\define@key{deliv}{id}{\def\deliv@id{#1}}
+\define@key{deliv}{due}{\def\deliv@due{#1}}
+\define@key{deliv}{dissem}{\def\deliv@dissem{#1}}
+\define@key{deliv}{nature}{\def\deliv@nature{#1}}
+\define@key{deliv}{miles}{\def\deliv@miles{#1}}
+\define@key{deliv}{short}{\def\deliv@short{#1}}
+\newcounter{deliverable}
+\newcommand{\wpg@deliv}[3]{% keys, title, type
+\stepcounter{deliverable}
+\let\deliv@miles=\relax% clean state
+\def\@type{#3}\def\@wp{wp}% set up ifx
+\def\wpg@id{\csname #3@id\endcsname}
+\setkeys{deliv}{#1}\stepcounter{deliv}% set state
+\ifx\@type\@wp\def\current@label{\deliv@label{\ifwork@areas\thewa.\fi\thewp.\thedeliv}}
+\else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
+\pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
+\pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
+\@ifundefined{deliv@short}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
+\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}
+\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}
+\@ifundefined{deliv@due}{}{%
+\@for\@I:=\deliv@due\do{\protected@write\wpg@delivs{}{\string\deliverable%
+{\ifnum\@I<10 0\@I\else\@I\fi}% sort key
+{\@I}% due date
+{\current@label}% label
+{\@ifundefined{deliv@id}{\protect\G@refundefinedtrue\@latex@warning{key 'id' for Deliv #1
+      undefined}??}{\wpg@id\deliv@id}}% id
+{\@ifundefined{deliv@dissem}{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for
+      Deliv #1 undefined}??}{\deliv@dissem}}% dissemination level
+{\@ifundefined{deliv@nature}{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv
+      #1 undefined}??}{\deliv@nature}}% nature
+{#2}
+{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}}}}%WP
+\item[\current@label: (Month \deliv@due; nature: \deliv@nature, dissem.: \deliv@dissem)] \pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
+\@ifundefined{deliv@miles}{}{% print the milestones and update their deliverables
+\let\m@sep=\relax% do not print the separator the first time round
+\lec{\@for\@I:=\deliv@miles\do{% Iterate over the milestones mentioned
+\m@sep\pdataRef{mile}{\@I}{label}% print the milestone reference
+\let\m@sep=,}}%set the separator for the next times
+\def\d@sep{,}
+ \@for\@I:=\deliv@miles\do{% Iterate over the milestones mentioned
+ \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
+   \else\expandafter\xdef\csname\@I delivs\endcsname%if not add it
+      {\csname\@I delivs\endcsname\d@sep\wpg@id\deliv@id}\fi}}}
+\newenvironment{wadeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wa}\else\deliv@error\fi}{}
+\newenvironment{wpdeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wp}\else\deliv@error\fi}{}
+\newcommand\milestone@label[1]{M{#1}}
+\newcommand\mileref[1]{\pdataRef{mile}{#1}{label}}
+\newcommand\miletref[1]{\pdataRef{mile}{#1}{label}: \pdataRef{mile}{#1}{short}}
+\newcounter{milestone}
+\define@key{milestone}{id}{\gdef\mile@id{#1}}
+\define@key{milestone}{month}{\gdef\mile@month{#1}}
+\define@key{milestone}{verif}{\gdef\mile@verif{#1}}
+\newcommand\milestone[3][]{%
+\ifdelivs%
+\setkeys{milestone}{#1}\stepcounter{milestone}%
+\pdata@def{mile}\mile@id{label}{\milestone@label{\themilestone}}%
+\pdata@def{mile}\mile@id{month}{\mile@month}%
+\pdata@def{mile}\mile@id{verif}{\mile@verif}%
+\pdata@def{mile}\mile@id{title}{#2}%
+\@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
+\@milestone{#1}{#2}{#3}% presentation
+\else\deliv@error\fi}
+\newcommand\@milestone[3]{%
+\pdata@target{mile}\mile@id{\textbf{\milestone@label\themilestone}}&
+\textbf{#2} &
+\prop@milesfor\mile@id &
+\pdataref{mile}\mile@id{month} &
+\pdataref{mile}\mile@id{verif}\\\hline
+\multicolumn{5}{|p{14cm}|}{#3}\\\hline\hline}
+\newenvironment{milestones}{\begin{@milestones}}{\end{@milestones}}
+\newenvironment{@milestones}
+{\ifdelivs\begin{longtable}{|l|p{4cm}|p{5cm}|l|p{2.5cm}|}\hline
+\#&\miles@legend@name&\miles@legend@involved&\miles@legend@month&\miles@legend@verif\\\hline\hline%
+\else\deliv@error\fi}
+{\ifdelivs\end{longtable}%
+\footnotetext\miles@legend@footnote\fi}
+\newcommand\miles@legend@name{Name}
+\newcommand\miles@legend@month{Mo}
+\newcommand\miles@legend@verif{Means of Verif.}
+\newcommand\miles@legend@involved{WPs\footnotemark/Deliverables involved}
+\newcommand\miles@legend@footnote{The work package number is the first number in the deliverable number.}
+\newcommand\prop@milesfor[1]{\edef\@delivs{\pdataref@safe{mile}{#1}{delivs}}%
+\let\m@sep=\relax\def\new@sep{,\ }%
+\@for\@I:=\@delivs\do{\m@sep\pdataRef{deliv}\@I{label}\let\m@sep=\new@sep}}
+\newcommand{\deliverable}[8]{\pdataRef{deliv}{#4}{label}&#7&#8&#6&#5&#2\\\hline}%sortkey,due,label,id,title,type,level
+\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|}\hline
+\#&\delivs@legend@name&\delivs@legend@wp&\delivs@legend@nature&
+\delivs@legend@level&\delivs@legend@due\\\hline\hline\else\deliv@error\fi}
+{\ifdelivs\end{longtable}\fi}
+\newcommand\delivs@legend@name{Deliverable name}
+\newcommand\delivs@legend@wp{WP}
+\newcommand\delivs@legend@nature{Nature}
+\newcommand\delivs@legend@level{Level}
+\newcommand\delivs@legend@due{Due}
+\newcommand{\inputdelivs}[1]{%
+\begin{deliverables}{#1}%
+\IfFileExists{\jobname.deliverables}%
+{\input{\jobname.deliverables}}%
+{\IfFileExists{\jobname.delivs}{\input{\jobname.delivs}}{}}
+\end{deliverables}}
+\newenvironment{tasklist}
+{\begin{compactenum}}{\end{compactenum}}
+\newcommand\task@label[1]{T#1}
+\define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}}
+\define@key{task}{wphases}{\def\task@wphases{#1}\pdata@def{task}{\taskin\task@id\wp@id}{wphases}{#1}\@dmp{wphases=#1}}
+\define@key{task}{requires}{\@requires\task@id{#1}\@dmp{req=#1}}
+\define@key{task}{title}{\def\task@title{#1}\pdata@def{task}{\taskin\task@id\wp@id}{title}{#1}\@dmp{title=#1}}
+\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}\@dmp{lead=#1}}
+\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}\@dmp{partners=#1}}
+\def\task@set#1{\edef\task@id{task\thetask@all}
+\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}
+\setkeys{task}{#1}}
+\newcounter{alltasks}
+\newenvironment{task}[1][]%
+{\stepcounter{alltasks}
+\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label{\thetask@wp}}]%
+\@ifundefined{task@title}{}{\textbf\task@title}%
+\def\@initial{0-0}\ifx\task@wphases\@initial\else%
+\ (\let\@@sep=\relax\@for\@I:=\task@wphases%
+\do{\decode@wphase\@I\@@sep\show@wphase\wphase@start\wphase@end\wphase@force\let\@@sep=\sep@wphases}%
+\ifx\task@lead\@empty\else; \task@legend@partners: \site\task@lead~(\legend@lead)\fi%
+\ifx\task@partners\@empty\else\@for \@I:=\task@partners\do{, \site\@I}\fi)\\\fi}
+{}
+\newcommand\month@label[1]{M#1}
+\newcommand\show@wphase[3]{\def\@test{#3}\month@label{#1}-\month@label{#2}%
+\ifx\@test\@empty\@ #3}
+\newcommand\sep@wphases{; }
+\newcommand\legend@partners{Partners}
+\newcommand\legend@lead{lead}
+\newcommand\task@label@long{Task}
+\newcounter{task@all}\newcounter{task@wp}[wp]
+\newcount\task@@end
+\def\@task#1{\stepcounter{task@all}\stepcounter{task@wp}%
+\task@set{#1}%
+\pdata@def{task}{\taskin\task@id\wp@id}{wphases}\task@wphases
+\pdata@def{task}{\taskin\task@id\wp@id}{label}{\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}}
+\newcommand\workphase[1]{\PackageError{proposal}
+  {The \protect\workphase macro is deprecated,\MessageBreak
+    use the attributes wphase on the workpackage environment instead!}}
+\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{label}}
+\newcommand\taskin[2]{#2@#1}
+\newcommand\taskref[2]{\WPref{#1}.\pdataRef{task}{#1@#2}{label}}
+\newcommand\taskreflong[2]{\WPref{#1}.\pdataRef{task}{#2}{label}}
+\newcommand\tasktref[2]{\WPref{#1} (\task@label@long \pdataRef{task}{#1@#2}{number})}
+\newcounter{gantt@deps}
+\def\@requires#1#2{\stepcounter{gantt@deps}%
+\edef\dep@id{taskdep\thegantt@deps}%
+\pdata@def{taskdep}\dep@id{from}{\taskin{#1}\wp@id}%
+\pdata@def{taskdep}\dep@id{to}{#2}%
+\update@deps\dep@id}
+\newcommand\prop@lead[1]{\@ifundefined{wp@#1@lead}%
+{\protect\G@refundefinedtrue\@latex@warning{lead for WP #1 undefined}??}%
+{\csname wp@#1@lead\endcsname}}
+\definecolorset{gray/rgb/hsb/cmyk}{}{}%
+{leadgray,.90/.90,.90,.90/0,0,.90/0,0,0,.10;%
+wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
+\newcommand\sum@style[1]{\cellcolor{wagray}{\textbf{#1}}}
+\newcommand\wa@style[1]{\cellcolor{wagray}{\textbf{#1}}}
+\newcommand\wp@style[1]{#1}
+\newcommand\lead@style[1]{\cellcolor{leadgray}{\textit{#1}}}
+\newcommand\wp@lead@style@explained{light gray italicised}
+\newcounter{wpfig@options}
+\define@key{wpfig}{size}{\def\wpfig@size{#1}\@dmp{size=#1}}
+\def\@true{true}
+\def\wpfig@pages{false}
+\define@key{wpfig}{pages}[true]{\def\wpfig@pages{#1}\stepcounter{wpfig@options}}
+\def\wpfig@type{false}
+\define@key{wpfig}{type}[true]{\def\wpfig@type{#1}\stepcounter{wpfig@options}}
+\def\wpfig@start{false}
+\define@key{wpfig}{start}[true]{\def\wpfig@start{#1}\stepcounter{wpfig@options}}
+\def\wpfig@length{false}
+\define@key{wpfig}{length}[true]{\def\wpfig@length{#1}\stepcounter{wpfig@options}}
+\def\wpfig@end{false}
+\define@key{wpfig}{end}[true]{\def\wpfig@end{#1}\stepcounter{wpfig@options}}
+\def\@sw#1{\begin{sideways}#1\end{sideways}}
+\newenvironment{wp@figure}{\begin{figure}[ht]\wpfig@style\begin{center}
+{\let\@sw\relax\let\textbf\relax\let\site\relax%
+\gdef\wpfig@headline{\wpfig@legend@wap&\wpfig@legend@title%
+\ifx\wpfig@type\@true&\wpfig@legend@type\fi%
+\ifx\wpfig@pages\@true&\@sw{\wpfig@legend@page}\fi%
+\ifx\wpfig@start\@true&\@sw{\wpfig@legend@start}\fi%
+\ifx\wpfig@length\@true&\@sw{\wpfig@legend@length}\fi
+\ifx\wpfig@end\@true&\@sw{\wpfig@legend@end}\fi}%
+\if@sites%
+\@for\@site:=\prop@gen@sites\do{%
+\xdef\wpfig@headline{\wpfig@headline&\@sw{\wpfig@legend@siteRM{\@site}}}%
+\if@RAM\xdef\wpfig@headline{\wpfig@headline&\@sw{\wpfig@legend@siteRAM{\@site}}}\fi}%
+\xdef\wpfig@headline{\wpfig@headline&\@sw{\wpfig@legend@totalRM}}%
+\if@RAM\xdef\wpfig@headline{\wpfig@headline&\@sw{\wpfig@legend@totalRAM}}\fi%
+\else% if@sites
+\xdef\wpfig@headline{\wpfig@headline &\@sw{\wpfig@legend@RM}\if@RAM&\@sw{\wpfig@legend@RAM}\fi}
+\fi}%if@sites
+\if@RAM\begin{tabular}{|l|l|*{\thewpfig@options}{r|}*{\the@sites}{r|r|}|r|r|}\hline
+\else\begin{tabular}{|l|l|*{\thewpfig@options}{r|}|*{\the@sites}{r|}|r|}\hline\fi
+\wpfig@headline\\\hline\hline}
+{\end{tabular}\smallskip\\
+\wpfig@legend@RAM@expl
+\if@sites; \wpfig@legend@lead@expl\fi
+\caption{\wpfig@legend@caption}\label{fig:wplist}
+\end{center}\end{figure}}
+\newcommand\wpfig@legend@wap{\textbf{\ifwork@areas{WA/P}\else{WP}\fi}}
+\newcommand\wpfig@legend@title{\textbf{Title}}
+\newcommand\wpfig@legend@type{\textbf{type}}
+\newcommand\wpfig@legend@page{\textbf{page}}
+\newcommand\wpfig@legend@start{\textbf{start}}
+\newcommand\wpfig@legend@length{\textbf{length}}
+\newcommand\wpfig@legend@end{\textbf{end}}
+\newcommand\wpfig@legend@siteRM[1]{\site{#1}\if@RAM\ RM\fi}
+\newcommand\wpfig@legend@siteRAM[1]{\site{#1}\ RAM}
+\newcommand\wpfig@legend@totalRM{total\if@RAM\ RM\fi}
+\newcommand\wpfig@legend@totalRAM{total RAM}
+\newcommand\wpfig@legend@RM{RM}
+\newcommand\wpfig@legend@RAM{RAM}
+\newcommand\wpfig@legend@RAM@expl{\if@RAM R(A)M $\widehat=$ Researcher (Assistant) Months\else\ Efforts in PM\fi}
+\newcommand\wpfig@legend@lead@expl{WP lead efforts \wp@lead@style@explained}
+\newcommand\wpfig@legend@caption{{\ifwork@areas Work Areas and \fi}Work Packages}
+\def\wpfig@style{}
+\newcommand\wpfigstyle[1]{\def\wpfig@style{#1}}
+\newcount\local@count
+\newcount\@@@RM\if@RAM\newcount\@@@RAM\fi
+\newcount\all@@@RM\if@RAM\newcount\all@@@RAM\fi
+\newcommand{\wpfig}[1][]{\setcounter{wpfig@options}{0}\setkeys{wpfig}{#1}
+{\gdef\@wp@lines{}%initialize
+\let\tabularnewline\relax\let\hline\relax\let\lead@style\relax% so they
+\let\wa@style\relax\let\wp@style\relax \let\@sw\relax\let\textbf\relax% do not
+\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax\let\hyperlink=\relax% bother
+\let\pn\relax\let\xspace\relax% us
+\ifwork@areas
+\edef\@@was{\pdataref@safe{all}{wa}{ids}}%
+\@for\@@wa:=\@@was\do{% iterate over the work areas
+\xdef\@@wa@line{\wa@style{\pdataRef{wa}\@@wa{label}}%
+&\wa@style{\@ifundefined{wa@\@@wa @short}{\pdataref{wa}\@@wa{title}}{\pdataref{wa}\@@wa{short}}}%
+\ifx\wpfig@type\@true&\wa@style{\pdataref{wa}\@@wa{type}}\fi%
+\ifx\wpfig@pages\@true&\wa@style{\pdataref{wa}\@@wa{page}}\fi%
+\ifx\wpfig@start\@true&\wa@style{\pdataref{wa}\@@wa{start}}\fi%
+\ifx\wpfig@length\@true&\wa@style{\pdataref{wa}\@@wa{len}}\fi%
+\ifx\wpfig@end\@true&\wa@style{\pdataref{wa}\@@wa{end}}\fi}
+\if@sites
+\@for\@site:=\prop@gen@sites\do{%
+\edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}%
+\local@count 0%
+\@for\@@wp:=\@@wps\do{\advance\local@count by \pdataref@num\@@wp\@site{RM}}%
+\pdata@def\@@wa\@site{RM}{\the\local@count}%
+\xdef\@@wa@line{\@@wa@line&\wa@style{\the\local@count}}%
+\if@RAM
+\local@count 0%
+\@for\@@wp:=\@@wps\do{\advance\local@count by \pdataref@num\@@wp\@site{RAM}}
+\pdata@def\@@wa\@site{RAM}{\the\local@count}%
+\xdef\@@wa@line{\@@wa@line&\wa@style{\the\local@count}}%
+\fi}
+\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wa\@site{RM}}%
+\xdef\@@wa@line{\@@wa@line &\wa@style{\textbf{\the\local@count}}}
+\if@RAM
+\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wa\@site{RAM}}%
+\xdef\@@wa@line{\@@wa@line &\wa@style{\textbf{\the\local@count}}}
+\fi
+\else% if@sites
+\edef\@@wps{\pdataref@safe{all}{wp}{ids}}%
+\xdef\@@wa@line{\@@wa@line&\wa@style{\pdataref{wa}\@@wa{RM}}
+\if@RAM&\wa@style{\pdataref{wa}\@@wa{RAM}}\fi}%
+\fi% if@sites
+\xdef\@wp@lines{\@wp@lines\@@wa@line\tabularnewline\hline}% add the line for the workarea
+\edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over its work packages
+\xdef\@@wp@line{\pdataRef{wp}\@@wp{label}%
+&\@ifundefined{wp@\@@wp @short}{\pdataref{wp}\@@wp{title}}{\pdataref{wp}\@@wp{short}}%
+\ifx\wpfig@type\@true&\pdataref{wp}\@@wp{type}\fi%
+\ifx\wpfig@pages\@true&\pdataref{wp}\@@wp{page}\fi%
+\ifx\wpfig@start\@true&\pdataref{wp}\@@wp{start}\fi%
+\ifx\wpfig@length\@true&\pdataref{wp}\@@wp{len}\fi%
+\ifx\wpfig@end\@true&\pdataref{wp}\@@wp{end}\fi}
+\if@sites
+\@for\@site:=\prop@gen@sites\do{%
+\edef\@@lead{\pdataref@safe{wp}\@@wp{lead}}
+\edef\@@RM{\ifx\@@lead\@site\lead@style{\pdataref@safe\@@wp\@site{RM}}\else\wp@style{\pdataref@safe\@@wp\@site{RM}}\fi}
+\xdef\@@wp@line{\@@wp@line&\@@RM}
+\if@RAM
+\edef\@@RAM{\ifx\@@lead\@site\lead@style{\pdataref@safe\@@wp\@site{RAM}}\else\wp@style{\pdataref@safe\@@wp\@site{RAM}}\fi}
+\xdef\@@wp@line{\@@wp@line&\@@RAM}
+\fi}
+\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wp\@site{RM}}%
+\xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}}
+\if@RAM
+\global\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wp\@site{RAM}}%
+\xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}}
+\fi% if@sites
+\else% if@sites
+\xdef\@@wp@line{\@@wp@line&\wp@style{\pdataref@safe{wp}\@@wp{RM}}}
+\if@RAM\xdef\@@wp@line{\@@wp@line&\wp@style{\pdataref@safe{wp}\@@wp{RAM}}}\fi
+\fi% if@sites
+\xdef\@wp@lines{\@wp@lines\@@wp@line\tabularnewline\hline}}}
+\else% ifwork@areas
+\edef\@@wps{\pdataref@safe{all}{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over its work packages
+\xdef\@@wp@line{\pdataRef{wp}\@@wp{label}%
+&\@ifundefined{wp@\@@wp @short}{\pdataref{wp}\@@wp{title}}{\pdataref{wp}\@@wp{short}}
+\ifx\wpfig@type\@true&\pdataref{wp}\@@wp{type}\fi%
+\ifx\wpfig@pages\@true&\pdataref{wp}\@@wp{page}\fi%
+\ifx\wpfig@start\@true&\pdataref{wp}\@@wp{start}\fi%
+\ifx\wpfig@length\@true&\pdataref{wp}\@@wp{len}\fi%
+\ifx\wpfig@end\@true&\pdataref{wp}\@@wp{end}\fi}
+\if@sites
+\@for\@site:=\prop@gen@sites\do{%
+\edef\@@lead{\pdataref@safe{wp}\@@wp{lead}}
+\edef\@@RM{\ifx\@@lead\@site\lead@style{\pdataref@safe\@@wp\@site{RM}}\else\wp@style{\pdataref@safe\@@wp\@site{RM}}\fi}
+\xdef\@@wp@line{\@@wp@line&\@@RM}
+\if@RAM
+\edef\@@RAM{\ifx\@@lead\@site\lead@style{\pdataref@safe\@@wp\@site{RAM}}\else\wp@style{\pdataref@safe\@@wp\@site{RAM}}\fi}
+\xdef\@@wp@line{\@@wp@line&\wp@style\@@RAM}
+\fi}
+\global\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wp\@site{RM}}%
+\xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}}
+\if@RAM
+\global\local@count0\relax%
+\@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num{#1}\@site{RAM}}%
+\xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}}
+\fi
+\else% if@sites
+\xdef\@@wp@line{\@@wp@line&\wp@style{\pdataref@safe{wp}\@@wp{RM}}}
+\if@RAM\xdef\@@wp@line{\@@wp@line&\wp@style{\pdataref@safe{wp}\@@wp{RAM}}\fi}
+\fi% if@sites
+\xdef\@wp@lines{\@wp@lines\@@wp@line\tabularnewline\hline}}
+\fi%ifwork@areas
+\gdef\@totals{}
+\ifwork@areas
+\if@sites
+\@for\@site:=\prop@gen@sites\do{% iterate over the sites
+\@@@RM=0\if@RAM\@@@RAM=0\fi
+\edef\@@was{\pdataref@safe{all}{wa}{ids}}%
+\@for\@@wa:=\@@was\do{% iterate over the work areas
+\edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over the work packages
+\advance\@@@RM by \pdataref@num\@@wp\@site{RM}%
+\if@RAM\advance\@@@RAM by \pdataref@num\@@wp\@site{RAM}\fi}}
+\pdata@def{all}\@site{RM}{\the\@@@RM}\if@RAM\pdata@def{all}\@site{RAM}{\the\@@@RAM}\fi
+\advance\all@@@RM by \the\@@@RM\if@RAM\advance\all@@@RAM by \the\@@@RAM\fi
+\xdef\@totals{\@totals & \textbf{\the\@@@RM}\if@RAM& \textbf{\the\@@@RAM}\fi}}
+\xdef\@totals{\@totals & \textbf{\the\all@@@RM}\if@RAM&\textbf{\the\all@@@RAM}\fi}
+\pdata@def{all}{total}{RM}{\the\all@@@RM}\if@RAM\pdata@def{all}{total}{RAM}{\the\all@@@RAM}\fi
+\else% if@sites
+\@@@RM=0\if@RAM\@@@RAM=0\fi
+\edef\@@was{\pdataref@safe{all}{wa}{ids}}%
+\@for\@@wa:=\@@was\do{\edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over the work packages
+\advance\@@@RM by \pdataref@num{wp}\@@wp{RM}%
+\if@RAM\advance\@@@RAM by \pdataref@num{wp}\@@wp{RAM}\fi}}
+\pdata@def{all}{total}{RM}{\the\@@@RM}\if@RAM\pdata@def{all}{total}{RAM}{\the\@@@RAM}\fi
+\xdef\@totals{&\the\@@@RM\if@RAM &\the\@@@RAM\fi}
+\fi% if@sites
+\else%i.e. no work@areas
+\if@sites
+\@for\@site:=\prop@gen@sites\do{%iterate over the sites
+\@@@RM=0\if@RAM\@@@RAM=0\fi%
+\edef\@@wps{\pdataref@safe{all}{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over the work packages
+\advance\@@@RM by \pdataref@num\@@wp\@site{RM}%
+\if@RAM\advance\@@@RAM by \pdataref@num\@@wp\@site{RAM}\fi}
+\pdata@def{all}\@site{RM}{\the\@@@RM}\if@RAM\pdata@def{all}\@site{RAM}{\the\@@@RAM}\fi
+\xdef\@totals{\@totals & \textbf{\the\@@@RM}\if@RAM& \textbf{\the\@@@RAM}\fi}
+\advance\all@@@RM by \the\@@@RM\if@RAM\advance\all@@@RAM by \the\@@@RAM\fi}
+\xdef\@totals{\@totals &\textbf{\the\all@@@RM}\if@RAM&\textbf{\the\all@@@RAM}\fi}
+\pdata@def{all}{total}{RM}{\the\all@@@RM}\if@RAM\pdata@def{all}{total}{RAM}{\the\all@@@RAM}\fi
+\else% if@sites
+\@@@RM=0\if@RAM\@@@RAM=0\fi
+\edef\@@wps{\pdataref@safe{all}{wp}{ids}}%
+\@for\@@wp:=\@@wps\do{% iterate over the work packages
+\advance\@@@RM by \pdataref@num{wp}\@@wp{RM}%
+\if@RAM\advance\@@@RAM by \pdataref@num{wp}\@@wp{RAM}\fi}
+\pdata@def{all}{total}{RM}{\the\@@@RM}\if@RAM\pdata@def{all}{total}{RAM}{\the\@@@RAM}\fi
+\xdef\@totals{&\the\@@@RM\if@RAM &\the\@@@RAM\fi}
+\fi% if@sites
+\fi
+\gdef\intended@totals{}
+\if@sites
+\@for\@site:=\prop@gen@sites\do{
+\xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{site}\@site{intendedRM}}}
+\if@RAM\xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{site}\@site{intendedRAM}}}\fi}
+\if@RAM\xdef\intended@totals{\intended@totals&&}\else\xdef\intended@totals{\intended@totals&}\fi
+\else% if@sites
+\xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{all}{intended}{RM}}}
+\if@RAM\xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{all}{intended}{RAM}}}\fi
+\fi}% if@sites
+\local@count\thewpfig@options\advance\local@count by 2
+\begin{wp@figure}
+\@wp@lines\hline%
+\multicolumn{\the\local@count}{|c||}{\prop@legend@totals}\@totals\\\hline%
+\ifsubmit\else\multicolumn{\the\local@count}{|c||}{\prop@legend@intendedtotals}%
+\intended@totals\\\hline\fi
+\end{wp@figure}}
+\newcommand\prop@legend@totals{\textbf{totals}}
+\newcommand\prop@legend@intendedtotals{\textbf{intended totals}}
+\newif\ifgantt@draft\gantt@draftfalse
+\define@key{gantt}{xscale}{\def\gantt@xscale{#1}}
+\define@key{gantt}{yscale}{\def\gantt@yscale{#1}}
+\define@key{gantt}{step}{\def\gantt@step{#1}}
+\define@key{gantt}{size}{\def\gantt@size{#1}}
+\define@key{gantt}{draft}[true]{\ifsubmit\else\gantt@drafttrue\fi}
+\def\gantt@set#1{\gantt@draftfalse\def\gantt@xscale{1}\def\gantt@yscale{.35}\def\gantt@step{3}
+\setkeys{gantt}{#1}}
+\newenvironment{gantt}[2][]
+{\gantt@set{#1}
+\@ifundefined{gantt@size}{}{\csname\gantt@size\endcsname}
+\newdimen\gantt@ymonths
+\gantt@ymonths=#2 cm
+\advance\gantt@ymonths by .5cm
+\begin{tikzpicture}[xscale=\gantt@xscale,yscale=\gantt@yscale]
+\draw[xstep=\gantt@step,gray,very thin] (0,0) grid (\prop@gen@months,#2);
+\foreach \x in {0,\gantt@step,...,\prop@gen@months} \node at (\x,\gantt@ymonths) {\x};}
+{\end{tikzpicture}}
+\newdimen\gantt@ymid\newdimen\gantt@yinc\newdimen\gantt@xend
+\newcommand{\@action}[5]{%
+\gantt@ymid=#2 cm\gantt@yinc=\gantt@yscale cm
+\gantt@xend=#3 cm\advance\gantt@xend by #4 cm
+\advance\gantt@ymid by \gantt@yinc
+\fill (#3,#2) rectangle +(#4,#5);
+\node (#1@left) at (#3,\gantt@ymid) {};
+\node (#1@right) at (\gantt@xend,\gantt@ymid) {};}
+\def\@dependency#1#2{\draw[->,line width=2pt,color=red] (#1@right) -- (#2@left);}
+\newcommand\gantt@compute@effort[3]{% start, len, force
+  \@@e=#1\advance\@@e by #2
+  \ifnum\thegantt@month<#1\else
+  \ifnum\thegantt@month<\@@e
+  \gantt@plus=#3cm\advance\gantt@effort by \gantt@plus\fi\fi}
+\newcommand{\ganttchart}[1][]{\begin{figure}[ht]\centering
+\gantt@set{#1}
+\def\gantt@wps{\pdataref@num{all}{wp}{count}}
+\begin{gantt}[#1]{\gantt@wps}
+ \newcounter{taskwps}\newcount\@@line
+ \edef\@@was{\pdataref@safe{all}{wa}{ids}}
+ \ifwork@areas
+ \@for\@@wa:=\@@was\do{% iterate over work areas
+   \edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}
+   \@for\@@wp:=\@@wps\do{% iterate over work packages
+     \stepcounter{taskwps}
+     \@@line=\gantt@wps\advance\@@line by -\thetaskwps
+     \edef\@@tasks{\pdataref@safe\@@wp{task}{ids}}
+     \node at (-1/\gantt@xscale,\@@line) [above=-2pt] {\pdataRef{wp}\@@wp{label}};
+     \edef\@@wphases{\pdataref@safe{wp}\@@wp{wphases}}
+     \@for\@@ft:=\@@wphases\do{%wp-level work phases
+       \decode@wphase\@@ft
+       \@action\@@wp\@@line\wphase@start\wphase@len\wphase@force}
+     \@for\@@task:=\@@tasks\do{% tasks
+       \edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
+       \@for\@@ft:=\@@wphases\do{%task-level work phases
+         \decode@wphase\@@ft
+         \@action\@@task\@@line\wphase@start\wphase@len\wphase@force}}}}
+ \else% ifwork@ares
+ \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
+ \@for\@@wp:=\@@wps\do{% iterate over work packages
+   \stepcounter{taskwps}
+   \@@line=\gantt@wps\advance\@@line by -\thetaskwps
+   \edef\@@tasks{\pdataref@safe\@@wp{task}{ids}}
+   \node at (-1/\gantt@xscale,\@@line) [above=-2pt] {\pdataRef{wp}\@@wp{label}};
+   \edef\@@wphases{\pdataref@safe{wp}\@@wp{wphases}}
+   \@for\@@ft:=\@@wphases\do{%iterate over the wp-level work phases
+     \decode@wphase\@@ft
+     \@action\@@wp\@@line\wphase@start\wphase@len\wphase@force}
+   \@for\@@task:=\@@tasks\do{% task-level work phases
+     \edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
+     \@for\@@ft:=\@@wphases\do{%iterate over the task-level work phases
+       \decode@wphase\@@ft
+       \@action\@@task\@@line\wphase@start\wphase@len\wphase@force}}}
+ \fi% ifwork@areas
+ \edef\@@deps{\pdataref@safe{all}{task}{deps}}
+ \@for\@@dep:=\@@deps\do{%
+   \@dependency{\pdataref@safe{taskdep}\@@dep{from}}{\pdataref@safe{taskdep}\@@dep{to}}}
+ \ifgantt@draft
+    \newcounter{gantt@month}
+    \newcount\@@e\newdimen\gantt@effort\newdimen\gantt@plus
+    \@whilenum\thegantt@month<\prop@gen@months\do{% step over months
+      \gantt@effort=0cm
+      \ifwork@areas
+      \edef\@@was{\pdataref@safe{all}{wa}{ids}}
+      \@for\@@wa:=\@@was\do{% iterate over work areas
+        \edef\@@wps{\pdataref@safe\@@wa{wp}{ids}}
+        \@for\@@wp:=\@@wps\do{% iterate over work packages
+          \edef\@@wphases{\pdataref@safe{wp}\@@wp{wphases}}
+          \@for\@@ft:=\@@wphases\do{%iterate over the wp-level work phases
+            \decode@wphase\@@ft
+            \gantt@compute@effort\wphase@start\wphase@len\wphase@force}
+          \edef\@@tasks{\pdataref@safe\@@wp{task}{ids}}
+          \@for\@@task:=\@@tasks\do{% iterate over tasks
+          \edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
+          \@for\@@ft:=\@@wphases\do{%iterate over the wp-level work phases
+            \decode@wphase\@@ft
+            \gantt@compute@effort\wphase@start\wphase@len\wphase@force}}}}
+      \fill  (\thegantt@month,-5) rectangle +(1,\gantt@effort);
+      \else% ifwork@areas
+      \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
+      \@for\@@wp:=\@@wps\do{% iterate over work packages
+          \edef\@@wphases{\pdataref@safe{wp}\@@wp{wphases}}
+          \@for\@@ft:=\@@wphases\do{%iterate over the wp-level work phases
+            \decode@wphase\@@ft
+            \gantt@compute@effort\wphase@start\wphase@len\wphase@force}
+          \edef\@@tasks{\pdataref@safe\@@wp{task}{ids}}
+          \@for\@@task:=\@@tasks\do{% iterate over tasks
+          \edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
+          \@for\@@ft:=\@@wphases\do{%iterate over the wp-level work phases
+            \decode@wphase\@@ft
+            \gantt@compute@effort\wphase@start\wphase@len\wphase@force}}}
+      \fill  (\thegantt@month,-5) rectangle +(1,\gantt@effort);
+      \fi% ifwork@areas
+      \stepcounter{gantt@month}}
+   \fi% ifgantt@draft
+  \end{gantt}
+  \caption{\gantt@caption}\label{fig:gantt}
+\end{figure}}
+\newcommand\gantt@caption@main{Overview Work Package Activities}
+\newcommand\gantt@caption@lower{lower bar shows the overall effort \if@RAM (RAM only)\fi per month}
+\newcommand\gantt@caption{\gantt@caption@main\ifgantt@draft\xspace (\gantt@caption@lower)\fi}
+\newcommand{\gantttaskchart}[1][]{\begin{figure}[ht]\centering\gantt@set{#1}
+\def\gantt@tasks{\pdataref@num{all}{task}{count}}
+\begin{gantt}[#1]{\gantt@tasks}
+  \newcounter{gantt@tasks}\newcount\@@line
+  \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
+   \@for\@@wp:=\@@wps\do{% iterate over work packages
+     \edef\@@tasks{\pdataref@safe\@@wp{task}{ids}}
+     \@for\@@task:=\@@tasks\do{% iterate over the tasks
+       \stepcounter{gantt@tasks}
+       \@@line=\gantt@tasks\advance\@@line by -\thegantt@tasks
+       \node at (-1/\gantt@xscale,\@@line) [above=-2pt] {\taskreflong\@@wp\@@task};
+       \edef\@@wphases{\pdataref@safe{task}\@@task{wphases}}
+       \@for\@@ft:=\@@wphases\do{%iterate over the task-level work phases
+         \decode@wphase\@@ft
+         \@action\@@task\@@line\wphase@start\wphase@len\wphase@force
+      }}}% end all iterations
+    \end{gantt}
+    \caption{\gantt@caption@main}\label{fig:gantt}
+\end{figure}}
+\newcommand\jpub{\textcolor{\prop@link@color}{\textbf{\large{$\star$}}}}
+\newcommand\jpro{\textcolor{\prop@link@color}{\textbf{\large{$\bullet$}}}}
+\newcommand\jorga{\textcolor{\prop@link@color}{\textbf{\large{$\circ$}}}}
+\newcommand\add@joint[3]{\@ifundefined{coherence@#1@#2}%
+{\@namedef{coherence@#1@#2}{#3}}%
+{\expandafter\g@addto@macro\csname coherence@#1@#2\endcsname{#3}}}
+\newcommand\prop@joint[2]{\@for\@first:=#2\do{%
+\@for\@second:=#2\do{\ifx\@first\@second\else\add@joint\@first\@second{#1}\fi}}}
+\newcommand\jointproj[1]{\prop@joint\jpro{#1}}
+\newcommand\jointpub[1]{\prop@joint\jpro{#1}}
+\newcommand\jointorga[1]{\prop@joint\jorga{#1}}
+\newcommand{\coherencematrix}{
+{\let\tabularnewline\relax\let\hline\relax\let\site\relax% so they do
+ \let\@sw\relax\let\jpub\relax\let\jpro\relax\let\jorga\relax% not bother us
+\gdef\@ct@head{}
+\@for\@site:=\prop@gen@sites\do{\xdef\@ct@head{\@ct@head &\site{\@site}}}
+\gdef\@ct@lines{\@ct@head\tabularnewline\hline\hline} %initialize with head line
+\@for\@site:=\prop@gen@sites\do{\xdef\@ct@line{\site{\@site}}
+  \@for\@@site:=\prop@gen@sites\do{
+    \xdef\@ct@line{\@ct@line&\ifx\@site\@@site{X}\fi
+      \@ifundefined{coherence@\@site @\@@site}{}{\@nameuse{coherence@\@site @\@@site}}}}
+  \xdef\@ct@lines{\@ct@lines\@ct@line\tabularnewline\hline}}}
+\begin{tabular}{|l||*{\the@site}{c|}}\hline
+\@ct@lines\hline
+joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ project,
+  \jorga $\hat=$ organization}\\\hline
+\end{tabular}}
+\newcommand\coherencetable{%
+\begin{table}[ht]
+\begin{center}\small\setlength{\tabcolsep}{.5em}
+\renewcommand{\arraystretch}{.9}\coherencematrix
+\end{center}
+\caption{\coherence@caption}\label{tab:collaboration}
+\end{table}}
+\newcommand\coherence@caption{Previous Collaboration between {\pn} members}
+\defbibheading{empty}{}
+\newif\if@allpapers\@allpaperstrue
+\newcommand\prop@ppl[3][]{\@allpapersfalse\message{ppl processing: #2}%
+\printbibliography[heading=subbibliography,maxnames=999,type=#2,title=#3#1]%
+\@ifundefined{prop@rl}{\xdef\prop@rl{#2}}{\xdef\prop@rl{\prop@rl, #2}}}
+\newcommand\prop@prl[1]{\message{unclassified: #1}%
+\printbibliography[heading=subbibliography,maxnames=999,title=Unclassified,#1]}%
+\define@key{paperlist}{unclassified}[true]{\message{unclass: \prop@rl}\prop@prl\prop@rl}
+\define@key{paperlist}{articles}[true]{\prop@ppl{article}{Articles}}
+\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}}
+\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}}
+\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}}
+\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}}
+\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}}
+\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}}
+\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
+\newcommand\prop@paperlist[2][]{%
+\begin{refsection}%
+\nocite{#2}%
+\let\biboldfont\bibfont%
+\renewcommand{\bibfont}{\footnotesize}%
+\renewcommand{\baselinestretch}{.9}
+\setkeys{paperlist}{#1}
+\@ifundefined{prop@rl}{}{\@latex@warning{some papers are not classified!}}
+\if@allpapers\printbibliography[heading=empty,maxnames=999]\fi%
+\let\bibfont\biboldfont%
+\end{refsection}}
+\def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
+\def\prop@warnpubs@title{References}
+\defbibheading{warnpubs}{\section*{\prop@warnpubs@title}%
+  \@ifundefined{prop@gen@pubspages}
+ {\@latex@warning{No publication pages specified;
+                   use the pubspage key in the proposal environment!}}
+  {\prop@warnpubs@message%
+ \@for\@I:=\prop@gen@pubspages\do{\par\noindent\csname\@I\endcsname}}}
+\defbibheading{empty}{}
+\endinput
+%%
+%% End of file `proposal.cls'.
diff --git a/Master/texmf-dist/tex/latex/proposal/base/reporting.cls b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
new file mode 100644
index 00000000000..936238b2633
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
@@ -0,0 +1,137 @@
+%%
+%% This is file `reporting.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% proposal.dtx  (with options: `reporting')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{reporting}[2013/02/13 v1.4 Project Reporting]
+\newif\if@wpsubsection\@wpsubsectionfalse
+\newif\ifsubmit\submitfalse
+\newif\ifpublic\publicfalse
+\newif\ifkeys\keysfalse
+\newif\ifdelivs\delivsfalse
+\newif\ifwork@areas\work@areastrue
+\newif\if@RAM\@RAMfalse
+\def\proposal@class{article}
+\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
+\DeclareOption{submit}{\submittrue}
+\DeclareOption{public}{\publictrue}
+\DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
+\DeclareOption{RAM}{\@RAMtrue}
+\DeclareOption{report}{\def\proposal@class{report}}
+\DeclareOption{keys}{\keystrue}
+\DeclareOption{deliverables}{\delivstrue}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessOptions
+\LoadClass[a4paper,twoside]{\proposal@class}
+\RequirePackage{amssymb}
+\RequirePackage{url}
+\RequirePackage{graphicx}
+\RequirePackage{colortbl}
+\RequirePackage{xcolor}
+\RequirePackage{rotating}
+\RequirePackage{fancyhdr}
+\RequirePackage{array}
+\RequirePackage{xspace}
+\RequirePackage{comment}
+\AtBeginDocument{\ifpublic\excludecomment{private}\fi}
+\RequirePackage{tikz}
+\RequirePackage{paralist}
+\RequirePackage{a4wide}
+\RequirePackage{boxedminipage}
+\renewcommand{\thempfootnote}{\roman{mpfootnote}}
+\renewcommand{\familydefault}{\sfdefault}
+\RequirePackage[scaled=.90]{helvet}
+\RequirePackage{textcomp}
+\RequirePackage[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex]{biblatex}[2010/11-19]
+\RequirePackage{csquotes}
+\RequirePackage{mdframed}
+\RequirePackage{pdata}
+\definecolor{darkblue}{rgb}{0,0,.7}
+\ifsubmit\def\prop@link@color{darkblue}\else\def\prop@link@color{blue}\fi
+\RequirePackage[bookmarks=true,linkcolor=\prop@link@color,
+ citecolor=\prop@link@color,urlcolor=\prop@link@color,colorlinks=true,
+ breaklinks=true, bookmarksopen=true]{hyperref}
+\ifsubmit
+\RequirePackage[hide]{ed}
+\RequirePackage[final,today]{svninfo}
+\else
+\RequirePackage[show]{ed}
+\RequirePackage[eso-foot,today]{svninfo}
+\fi
+\renewcommand\ednoteshape{\sl\footnotesize}
+\ifpublic\excludecomment{private}\else\includecomment{private}\fi
+\setcounter{secnumdepth}{3}
+\newif\ifofpage\ofpagefalse
+\fancyhead[RE,LO]{\prop@gen@acronym}
+\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\pagestyle{fancyplain}
+\newif\if@report\@reportfalse
+\newenvironment{report}[1][]%
+{\@reporttrue\readpdata\jobname%
+\ofpagetrue\setkeys{prop@gen}{#1}%
+\pdata@open\jobname%
+\@ifundefined{prop@gen@PIs}{}{\newcounter{@PIs}\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}}%
+\@ifundefined{prop@gen@sites}{}{\newcounter{@sites}\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}}}%
+\setcounter{page}{0}%
+\begin{prop@report}}
+{\end{prop@report}%
+\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse\newpage
+\printbibliography[heading=warnpubs,maxnames=999]
+\pdata@close}
+\newenvironment{prop@report}
+{\begin{center}
+  {\LARGE Final Project Report}\\[.2cm]
+  {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
+  {\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]
+  {\large\today}\\[1em]
+  \begin{tabular}{c*{\the@PIs}{c}}
+    \prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{name}}\\
+    \prop@tl\prop@gen@PIs{\wa@ref{institution}{\wa@ref{person}\tl@ext{affiliation}}{name}}
+ \end{tabular}\\[2cm]
+\end{center}
+\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
+{}
+\defbibheading{empty}{}
+\newif\if@allpapers\@allpaperstrue
+\newcommand\prop@ppl[3][]{\@allpapersfalse\message{ppl processing: #2}%
+\printbibliography[heading=subbibliography,maxnames=999,type=#2,title=#3#1]%
+\@ifundefined{prop@rl}{\xdef\prop@rl{#2}}{\xdef\prop@rl{\prop@rl, #2}}}
+\newcommand\prop@prl[1]{\message{unclassified: #1}%
+\printbibliography[heading=subbibliography,maxnames=999,title=Unclassified,#1]}%
+\define@key{paperlist}{unclassified}[true]{\message{unclass: \prop@rl}\prop@prl\prop@rl}
+\define@key{paperlist}{articles}[true]{\prop@ppl{article}{Articles}}
+\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}}
+\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}}
+\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}}
+\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}}
+\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}}
+\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}}
+\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
+\newcommand\prop@paperlist[2][]{%
+\begin{refsection}%
+\nocite{#2}%
+\let\biboldfont\bibfont%
+\renewcommand{\bibfont}{\footnotesize}%
+\renewcommand{\baselinestretch}{.9}
+\setkeys{paperlist}{#1}
+\@ifundefined{prop@rl}{}{\@latex@warning{some papers are not classified!}}
+\if@allpapers\printbibliography[heading=empty,maxnames=999]\fi%
+\let\bibfont\biboldfont%
+\end{refsection}}
+\def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
+\def\prop@warnpubs@title{References}
+\defbibheading{warnpubs}{\section*{\prop@warnpubs@title}%
+  \@ifundefined{prop@gen@pubspages}
+ {\@latex@warning{No publication pages specified;
+                   use the pubspage key in the proposal environment!}}
+  {\prop@warnpubs@message%
+ \@for\@I:=\prop@gen@pubspages\do{\par\noindent\csname\@I\endcsname}}}
+\defbibheading{empty}{}
+\endinput
+%%
+%% End of file `reporting.cls'.
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
new file mode 100644
index 00000000000..8b8ee0a5ea5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
@@ -0,0 +1,83 @@
+%%
+%% This is file `dfgpdata.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% dfgproposal.dtx  (with options: `pdata')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{dfgpdata}[2013/02/13 v1.4 DFG Project Data]
+\newif\ifdeutsch\deutschfalse
+\DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
+\ProcessOptions
+\define@key{prop@gen}{thema}{\def\prop@gen@thema{#1}\pdata@def{prop}{gen}{thema}{#1}}
+\renewcommand\prop@gen@instrument{Neuantrag auf Sachbeihilfe}
+\newcommand\prop@gen@thema{??? Thema ???}
+\newcommand\deu[1]{#1}
+\newcommand\dfg@applicants@lines{%
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{personaltitle} \wa@ref{person}\tl@ext{name}}\\
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{academictitle}}\\
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{birthdate}}\\}
+\newcommand\dfg@applicants@institute@lines{%
+\prop@tl\prop@gen@PIs{\wa@ref{institution}{\wa@ref{person}\tl@ext{affiliation}}{shortname}}\\
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{workaddress}}\\
+\prop@tl\prop@gen@PIs{Tel: \wa@ref{person}\tl@ext{worktel}}\\
+\prop@tl\prop@gen@PIs{Fax: \wa@ref{person}\tl@ext{workfax}}\\
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{email}}\\}
+\newcommand\dfg@applicants@private@lines{%
+\prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{privaddress}}\\
+\prop@tl\prop@gen@PIs{Tel: \wa@ref{person}\tl@ext{privtel}}\\}
+\newcommand\dfg@applicants{%
+\subsection{\if@sites\ifnum\the@sites>1 Joint Proposal; \fi\fi%
+Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
+\dfg@applicants@table}
+\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic \deu{(Thema)}\fi}\prop@gen@thema}
+\newcommand\dfg@area@field{%
+\ifdeutsch\subsection{Fachgebiet und Arbeitsrichtung}\else
+\subsection{Research area and field of work \deu{(Fachgebiet und Arbeitsrichtung)}}\fi
+\ifdeutsch Disziplin\else Scientific discipline\fi:  \prop@gen@discipline\\
+\ifdeutsch Arbeitsgebiet\else Fields of work\fi:  \prop@gen@areas}
+\newcommand\dfgprojpapers[2][]{\prop@paperlist[#1]{#2}}
+\ifdeutsch
+\renewcommand\prop@of@pages[2]{Seite~#1\ifofpage~von~#2\fi}
+\renewcommand\wp@mk@title[1]{Arbeitspaket {#1}}
+\renewcommand\wp@label[1]{AP{#1}}
+\ifwork@areas
+\renewcommand\wa@label[1]{AB{#1}}
+\renewcommand\wa@mk@title[1]{Arbeitsbereich {#1}}
+\fi
+\renewcommand\prop@legend@totals{\textbf{Summen}}
+\renewcommand\prop@legend@intendedtotals{\textbf{intendierte Summen}}
+\renewcommand\wpfig@legend@wap{\textbf{\ifwork@areas{Arbeitsbereiche}\else{AP}\fi}}
+\renewcommand\wpfig@legend@title{\textbf{Titel}}
+\renewcommand\wpfig@legend@type{\textbf{Typ}}
+\renewcommand\wpfig@legend@page{\textbf{Seite}}
+\renewcommand\wpfig@legend@start{\textbf{Start}}
+\renewcommand\wpfig@legend@length{\textbf{Dauer}}
+\renewcommand\wpfig@legend@end{\textbf{Ende}}
+\renewcommand\wpfig@legend@siteRM[1]{\site{#1}\if@RAM\ PM\fi}
+\renewcommand\wpfig@legend@siteRAM[1]{\site{#1}\ HM}
+\renewcommand\wpfig@legend@totalRM{Summe\if@RAM\ PM\fi}
+\renewcommand\wpfig@legend@totalRAM{Summe HM}
+\renewcommand\wpfig@legend@RM{PM}
+\renewcommand\wpfig@legend@RAM{HM}
+\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate;\else\ Aufw\"ande in Personenmonaten\\\fi}
+\renewcommand\wpfig@legend@lead@expl{(Arbeitspaketleiter sind \wp@lead@style@explained}
+\renewcommand\wp@lead@style@explained{grau und kursiv markiert)}
+\renewcommand\wpfig@legend@caption{{\ifwork@areas Arbeitsbereiche und \fi}Arbeitspakete}
+\renewcommand\wp@legend@site{Partner}
+\renewcommand\wp@legend@effort{Aufwand\if@RAM{ (PM+HM)}\fi}
+\renewcommand\wp@legend@all{\textbf{Summe}}
+\renewcommand\gantt@caption@main{Zeitliche Verteilung der Arbeitspakete}
+\renewcommand\gantt@caption@lower{draft: unten die Lastverteilung}
+\renewcommand\coherence@caption{Bisherige Kollaboration der {\pn} Partner}
+\renewcommand\objective@label[1]{Z#1}
+\renewcommand\task@label[1]{S#1}
+\renewcommand\legend@partners{Partner}
+\renewcommand\legend@lead{Leiter}
+\renewcommand\task@label@long{Schritt}
+\fi
+\endinput
+%%
+%% End of file `dfgpdata.sty'.
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
new file mode 100644
index 00000000000..c4fd7488d0c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
@@ -0,0 +1,107 @@
+%%
+%% This is file `dfgproposal.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% dfgproposal.dtx  (with options: `cls')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{dfgproposal}[2013/02/13 v1.4 DFG Proposal]
+\newif\ifgeneral\generalfalse
+\DeclareOption{general}{\generaltrue}
+\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
+\ProcessOptions
+\LoadClass{proposal}
+\RequirePackage{eurosym}
+\RequirePackage{dfgpdata}
+\ifdeutsch\RequirePackage[ngerman]{babel}
+\else\RequirePackage[ngerman,USenglish]{babel}\fi
+\newenvironment{sitedescription}[2][]%
+{\def\@test{#1}\def\@@title{\ifx\@test\@empty\wa@ref{institution}{#2}{acronym}\else #1\fi:
+\textsc{\wa@ref{institution}{#2}{name}}}
+\@for\@I:=#2\do{\pdata@target{site}\@I{}}\subsubsection\@@title}
+{}
+\newlength\applicants@table@columnwidth
+\newcommand\dfg@applicants@table%
+{\setlength\applicants@table@columnwidth\textwidth
+\advance\applicants@table@columnwidth by -6em
+\divide\applicants@table@columnwidth by \the@PIs
+\ifnum\the@PIs>2\begin{tabular}{|l|*{\the@PIs}{p{\applicants@table@columnwidth}|}}
+\else\begin{tabular}{|l|*{\the@PIs}{l|}}\fi
+\hline
+\dfg@applicants@lines\hline
+&\multicolumn{\the@PIs}{|l|}{\textbf{Work Address\deu{ (Dienstanschrift)}:}}\\\hline
+\dfg@applicants@institute@lines\hline
+&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
+\dfg@applicants@private@lines\hline
+\end{tabular}}
+\renewenvironment{prop@proposal}
+{\thispagestyle{empty}%
+\begin{center}
+{\LARGE \prop@gen@instrument}\\[.2cm]
+{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
+{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]
+{\large\today}\\[1em]
+\WAauthorblock[aff]\prop@gen@PIs\\[2cm]
+\end{center}
+\edef\keep@tocdepth{\value{tocdepth}}
+\setcounter{tocdepth}{1}\tableofcontents
+\setcounter{tocdepth}{\keep@tocdepth}
+\newpage\thispagestyle{empty}
+\ifgeneral\setcounter{section}{-1}
+\ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
+\section{General Information (for the ELAN system only)}\fi
+\dfg@applicants
+\dfg@topic
+\dfg@area@field
+\ifdeutsch\subsection{Voraussichtliche Gesamtdauer}\else
+\subsection{Anticipated total duration \deu{(Voraussichtliche Gesamtdauer)}}
+\fi
+\@ifundefined{prop@gen@totalduration}{????}{\prop@gen@totalduration};
+\ifdeutsch
+\@ifundefined{prop@gen@since}{Erstantrag}{Fortsetungsantrag, das Project l\"auft seit
+  \prop@gen@since.}
+\else
+\@ifundefined{prop@gen@since}{initial proposal}{continuation proposal, the project started
+  \prop@gen@since.}
+\fi
+\ifdeutsch\subsection{Antragszeitraum}\else
+\subsection{Application period \deu{(Antragszeitraum)}}\fi
+\prop@gen@months\quad Months starting \prop@gen@start
+\@ifundefined{prop@gen@fundsuntil}{}
+{ (\ifdeutsch mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)}
+\ifdeutsch\else\selectlanguage{USenglish}\fi
+\newpage\fi %ifgeneral
+\setcounter{page}{1}}
+{}
+\ifdeutsch
+\def\prop@warnpubs@message{Viele der Publikationen der Antragsteller sind verf\"ugbar unter folgenden URLs:}
+\def\prop@warnpubs@title{Literatur}
+\fi
+\newcommand\attachments{\ifdeutsch\section{Verzeichnis der Anlagen}\else
+\section{List of Attachments \deu{(Verzeichnis der Anlagen)}}\fi
+\begin{itemize}
+\@for\@I:=\prop@gen@PIs\do{%
+ \item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else
+ Curriculum Vitae and list of publications for \fi
+   \@nameuse{wa@person@\@I @personaltitle}
+   \@nameuse{wa@person@\@I @name}
+  (CD + \ifdeutsch Ausdruck\else printed version\fi)}
+\ifdeutsch
+\item Publications either cited in section~\ref{sec:ourpubs} or occurring in one of the
+  curricula vitae (CD only)\else
+\item Zitierte Publicationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe
+  (nur CD)\fi
+\end{itemize}}
+\ifgeneral
+\newenvironment{Summary}{%
+\thispagestyle{empty}
+\ifdeutsch\subsection{Zusammenfassung}\else
+\subsection{Summary \deu{(Zusammenfassung; siehe~\ref{sec:zusammenfassung})}}\fi}
+{\newpage\setcounter{page}1}
+\else\excludecomment{Summary}\fi
+\endinput
+%%
+%% End of file `dfgproposal.cls'.
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
new file mode 100644
index 00000000000..c229c48734a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
@@ -0,0 +1,67 @@
+%%
+%% This is file `dfgreporting.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% dfgproposal.dtx  (with options: `reporting')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{dfgreporting}[2013/02/13 v1.4 DFG Project Reporting]
+\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
+\ProcessOptions
+\LoadClass{reporting}
+\RequirePackage{eurosym}
+\RequirePackage{dfgpdata}
+\ifdeutsch\RequirePackage[ngerman]{babel}
+\else\RequirePackage[ngerman,USenglish]{babel}\fi
+\define@key{prop@gen}{reportperiod}{\def\prop@gen@reportperiod{#1}}
+\define@key{prop@gen}{applareas}{\def\prop@gen@applareas{#1}}
+\define@key{prop@gen}{key}{\@dmp{key=#1}%
+\@ifundefined{prop@gen@keys}{\xdef\prop@gen@keys{#1}}{\xdef\prop@gen@keys{\prop@gen@keys,#1}}}
+\define@key{prop@gen}{coop}{\@dmp{coop=#1}%
+\@ifundefined{prop@gen@coops}{\xdef\prop@gen@coops{{#1}}}{\xdef\prop@gen@coops{\prop@gen@coops,{#1}}}}
+\define@key{prop@gen}{projpapers}{\def\prop@gen@projpapers{#1}}
+\newcommand\dfg@applicants@table%
+{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
+\dfg@applicants@lines\hline
+&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
+\dfg@applicants@private@lines\hline
+\end{tabular}}
+\newcommand\dfg@institute@table%
+{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
+\dfg@applicants@institute@lines\hline
+\end{tabular}}
+\newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}}
+\newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}}
+\renewenvironment{prop@report}
+{\selectlanguage{USenglish}
+\thispagestyle{empty}%
+\begin{center}
+  {\LARGE Final Project Report}\\[.2cm]
+  {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
+  {\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]
+  {\large Reference number(s): \show@prop@gen@keys}\\[.2cm]
+  {\large\today}\\[1em]
+ \begin{tabular}{c*{\the@PIs}{c}}
+   \prop@tl\prop@gen@PIs{\wa@ref{person}\tl@ext{name}}\\
+   \prop@tl\prop@gen@PIs{\wa@ref{institution}{\wa@ref{person}\tl@ext{affiliation}}{name}}
+ \end{tabular}\\[2cm]
+\end{center}
+\setcounter{tocdepth}{1}\tableofcontents\newpage\setcounter{page}{1}
+\section{General Information \deu{(Allgemeine Angaben)}}
+\subsection{Reference Numbers \deu{(DFG Gesch\"aftszeichen)}}
+\show@prop@gen@keys
+\dfg@applicants
+\subsection{Institute/Chair \deu{(Institut/Lehrstuhl)}}\dfg@institute@table
+\dfg@topic
+\subsection{Report and Funding Period \deu{(Berichts- und F\"orderzeitraum)}}
+\prop@gen@reportperiod
+\dfg@area@field
+\subsection{Application Areas \deu{(Verwertungsfelder)}}\prop@gen@applareas
+\dfgprojpapers\prop@gen@projpapers}
+{\signatures{Signatures \deu{(Unterschriften)}}}
+\endinput
+%%
+%% End of file `dfgreporting.cls'.
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
new file mode 100644
index 00000000000..4ba33a1f4c2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
@@ -0,0 +1,27 @@
+%%
+%% This is file `eupdata.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% euproposal.dtx  (with options: `pdata')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{eudata}[2013/01/13 v1.4 EU Project Data]
+\define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
+\def\prop@gen@challenge{??}\def\prop@gen@challengeid{??}
+\define@key{prop@gen}{challenge}{\def\prop@gen@challenge{#1}\pdata@def{prop}{gen}{challenge}{#1}}
+\define@key{prop@gen}{challengeid}{\def\prop@gen@challengeid{#1}\pdata@def{prop}{gen}{challengeid}{#1}}
+\def\prop@gen@objective{??}\def\prop@gen@objectiveid{??}
+\define@key{prop@gen}{objective}{\def\prop@gen@objective{#1}\pdata@def{prop}{gen}{objective}{#1}}
+\define@key{prop@gen}{objectiveid}{\def\prop@gen@objectiveid{#1}\pdata@def{prop}{gen}{objectiveid}{#1}}
+\def\prop@gen@outcome{??}\def\prop@gen@outcomeid{??}
+\define@key{prop@gen}{outcome}{\def\prop@gen@outcome{#1}\pdata@def{prop}{gen}{outcome}{#1}}
+\define@key{prop@gen}{outcomeid}{\def\prop@gen@outcomeid{#1}\pdata@def{prop}{gen}{outcomeid}{#1}}
+\define@key{prop@gen}{callname}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callname}{#1}}
+\define@key{prop@gen}{callid}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callid}{#1}}
+\define@key{prop@gen}{iconrowheight}{\def\prop@gen@iconrowheight{#1}}
+\define@key{prop@gen}{topicsaddressed}{\def\prop@gen@topicsaddressed{#1}}
+\endinput
+%%
+%% End of file `eupdata.sty'.
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
new file mode 100644
index 00000000000..f7b592f24ca
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
@@ -0,0 +1,116 @@
+%%
+%% This is file `euproposal.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% euproposal.dtx  (with options: `cls')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{euproposal}[2013/01/13 v1.4 EU Proposal]
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
+\ProcessOptions
+\LoadClass[report,noRAM]{proposal}
+\RequirePackage{longtable}
+\RequirePackage{eurosym}
+\RequirePackage{wrapfig}
+\RequirePackage{eupdata}
+\def\thepart{\Alph{part}}
+\setcounter{part}{2}
+\def\thechapter{\thepart.\arabic{chapter}}
+\def\numberline#1{\hb@xt@\@tempdima{#1\hfil} }
+\newcommand\prop@sites@table{\def\@@table{}
+{\let\tabularnewline\relax\let\hline\relax
+\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref{site}\@I{number}}
+\xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @name}}
+\xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @acronym}}
+\xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @countryshort}\tabularnewline\hline}}}
+\begin{tabular}{|l|p{8cm}|l|l|}\hline
+\# & Participant organisation name & Short name &  Country\\\hline\hline
+\@@table
+\end{tabular}}
+\renewenvironment{prop@proposal}
+{\thispagestyle{empty}\begin{center}
+  {\Large \prop@gen@instrument}\\[.2cm]
+  {\LARGE\textbf\prop@gen@callname}\\[.4cm]
+  {\Large \prop@gen@callid}\\[.4cm]
+  {\LARGE\textbf\prop@gen@title}\\[.3cm]
+  {\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]
+\end{center}
+{\large\prop@gen@instrument}\\
+{\large\textbf{Date of Preparation: \today}}
+\ifsubmit\else\\{\large\textbf{Revision}: {\svnInfoRevision} of \svnInfoDate}\fi\\[1em]
+{\large}
+\begin{large}
+ \begin{description}
+  \item[Work program topics addressed by \pn:]
+    \@ifundefined{prop@gen@topicsaddressed}
+    {\textbf{Challenge \prop@gen@challengeid}: \prop@gen@challenge,
+    \textbf{Objective \prop@gen@objectiveid}: \prop@gen@objective,
+    \textbf{target outcome \prop@gen@outcomeid}) \prop@gen@outcome.}
+    {\prop@gen@topicsaddressed}\\[1em]
+  \item[Coordinator:] \wa@ref{person}\prop@gen@coordinator{name}
+  \item[e-mail:] \wa@ref{person}\prop@gen@coordinator{email}
+  \item[tel/fax:] \wa@ref{person}\prop@gen@coordinator{worktelfax}
+  \end{description}
+\end{large}
+\vspace*{1em}
+\begin{center}
+\prop@sites@table\vfill
+\@ifundefined{prop@gen@iconrowheight}{}
+{\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
+\end{center}
+\newpage
+\setcounter{tocdepth}{2}\setcounter{part}{2}}
+{\newpage\printbibliography[heading=warnpubs,maxnames=999]}
+\def\prop@gen@instrument{Proposal Instrument (e.g. IP)}
+\newenvironment{sitedescription}[2][]{\def\@test{#1}%
+\begin{wrapfigure}{r}{5.4cm}\vspace{-2.5ex}%
+\begin{tabular}{|p{5cm}|}\hline\vspace{1mm}%
+\ifx\@test\@empty%
+\wa@institution@logo[height=1.3cm]{#2}\else%
+\wa@institution@logo[#1]{#2}\fi\\[1ex]%
+\textbf{\wa@ref{institution}{#2}{type}.\hfill \wa@ref{institution}{#2}{country}}\\%
+\small\wa@ref{institution}{#2}{streetaddress}, \wa@ref{institution}{#2}{townzip}\\\hline%
+\end{tabular}\vspace{-2.5ex}%
+\end{wrapfigure}%
+\pdata@target{site}{#2}%
+{\subsection{\wa@ref{institution}{#2}{acronym}:%
+{\textsc{\wa@ref{institution}{#2}{name}}  (\wa@ref{institution}{#2}{countryshort})}}}%
+\small%
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+                                    {0.25ex \@plus1ex \@minus.2ex}%
+                                    {-1em}%
+                                    {\normalfont\normalsize\bfseries}}}
+{}
+\newmdenv[frametitle=Objectives]{wpobjectives}
+\newmdenv[frametitle=Description]{wpdescription}
+\renewenvironment{workpackage}[1][]
+{\begin{work@package}[#1]\subsubsection*{\wptitle}
+\addcontentsline{toc}{subsubsection}{\wp@label\wp@num: \pdataref{wp}\wp@id{title}}}
+{\end{work@package}}
+\newcounter{@sitespo}\newcounter{@sitespt}
+\renewcommand\wpheadertable{%
+\wp@sites@efforts@lines%
+\setcounter{@sitespo}{\thewp@sites@num}\addtocounter{@sitespo}{1}%
+\setcounter{@sitespt}{\thewp@sites@num}\addtocounter{@sitespt}{2}%
+\par\noindent\begin{tabular}{|l|*{\thewp@sites@num}{c|}c|}\hline%
+\multicolumn{\the@sitespt}{|l|}{\textbf{\wp@mk@title{\wp@num}: }%
+\textsf{\pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}}\\\hline%
+\textbf{Start: }\pdataref{wp}\wp@id{start}&%
+\multicolumn{\the@sitespo}{l|}{\textbf{Activity Type: }\pdataref{wp}\wp@id{type}}\\\hline%
+\wp@sites@line\\\hline%
+\wp@efforts@line\\\hline%
+\end{tabular}\smallskip\par\noindent\ignorespaces}
+\newenvironment{risk}[3]
+{\paragraph{Risk: #1}\hfill\emph{probability}: #2, \emph{gravity}: #3\par\noindent\ignorespaces}
+{}
+\newenvironment{riskcont}[3]
+{\begin{risk}{#1}{#2}{#3}\textbf{Contingency:} }
+{\end{risk}}
+\newcommand\keypubs[1]{%
+\paragraph{Key publications relevant to the project}%
+{\renewcommand{\baselinestretch}{.9}\prop@paperlist{#1}}}
+\endinput
+%%
+%% End of file `euproposal.cls'.
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
new file mode 100644
index 00000000000..dd37cc4c9c7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
@@ -0,0 +1,24 @@
+%%
+%% This is file `eureporting.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% euproposal.dtx  (with options: `reporting')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{eureporting}[2013/01/13 v1.4 EU Project Reporting]
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
+\ProcessOptions
+\LoadClass[report,noRAM]{reporting}
+\RequirePackage{longtable}
+\RequirePackage{eurosym}
+\RequirePackage{wrapfig}
+\RequirePackage{eupdata}
+\define@key{prop@gen}{reportperiod}{\def\prop@gen@reportperiod{#1}}
+\define@key{prop@gen}{key}{\@dmp{key=#1}%
+\@ifundefined{prop@gen@keys}{\xdef\prop@gen@keys{#1}}{\xdef\prop@gen@keys{\prop@gen@keys,#1}}}
+\define@key{prop@gen}{projpapers}{\def\prop@gen@projpapers{#1}}
+\endinput
+%%
+%% End of file `eureporting.cls'.