proposal (23nov15)

git-svn-id: svn://tug.org/texlive/trunk@38923 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2015-11-23 23:03:44 +0000
committer: Karl Berry <karl@freefriends.org> 2015-11-23 23:03:44 +0000
commit: a30f052f895d1f1fd9f112c555d360a2f5845929 (patch)
tree: 75e851693ac839f7510674f192badb317e43d87b
parent: 17317dd1f84901e202fb95e31a0eee9c51e50d74 (diff)
128 files changed, 1532 insertions, 4181 deletions
diff --git a/Master/texmf-dist/doc/latex/proposal/README b/Master/texmf-dist/doc/latex/proposal/README.md
index c027bb1bc51..3fa7664c442 100644
--- a/Master/texmf-dist/doc/latex/proposal/README
+++ b/Master/texmf-dist/doc/latex/proposal/README.md
@@ -1,4 +1,6 @@
-*proposal.cls: A set of LaTeX classes for preparing proposals for collaborative projects
+LaTeX-proposal
+==============
+proposal.cls: A set of LaTeX classes for preparing proposals for collaborative projects
 
 The base proposal class supports many of the general elemenst of project proposals. It is
 optimized towards collaborate projects. This class is intended to be specialized to
@@ -7,14 +9,16 @@ particular funding bodies that have their own styles.
 MANIFEST: 
 base:	  the base proposal class
 dfg: 	  the instance for Deutsche Forschungsgemeinschaft
-eu: 	      	  the instance for EU proposals
+eu: 	      the instance for EU proposals
 etc:		  style files from the sTeX bundle added for convenience 
-                  (only in SVN, not on CTAN)
+                  (only on GitHub, not on CTAN)
 lib: 		  Makefiles for the management of self-documenting packages
+bin:        A script that makes GitHub issues from the deliverables of a
+                  proposal for project managment if the proposal is granted. 
 
 Copyright(c) 2010 Michael Kohlhase
 The package is distributed under the terms of the LaTeX Project Public License (LPPL)
 
 The development version of this package can be found at
-https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal
-
+https://github.com/KWARC/LaTeX-proposal
+This also contains examples and Makefiles that help the proposal writing process.
diff --git a/Master/texmf-dist/doc/latex/proposal/base/proposal.pdf b/Master/texmf-dist/doc/latex/proposal/base/proposal.pdf
index ba743d029e2..2c003129237 100644
--- a/Master/texmf-dist/doc/latex/proposal/base/proposal.pdf
+++ b/Master/texmf-dist/doc/latex/proposal/base/proposal.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/dfgproposal.pdf b/Master/texmf-dist/doc/latex/proposal/dfg/dfgproposal.pdf
index 3feea998f21..fe2aee6b1f3 100644
--- a/Master/texmf-dist/doc/latex/proposal/dfg/dfgproposal.pdf
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/dfgproposal.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/Makefile b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/Makefile
index 1965593ba49..44336c1ef7f 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/Makefile
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/Makefile
@@ -1,3 +1,9 @@
+###########################################################################
+# Automating proposal management by make.
+# The participants work on proposal.tex in "draft" mode, which gives a lot
+# of information to the developers. Variants submit.tex and public.tex are
+# used to prepare official versions (hiding development/private info). 
+###########################################################################
 # possibly customize the following variables to your setting
 PROPOSAL = proposal.tex 	# the proposal
 BIB = ../lib/dummy.bib	        # bibTeX databases
@@ -11,7 +17,7 @@ PDATA 		= $(PROPOSAL:%.tex=%.pdata)       # the proposal project data
 SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
 PDFLATEX = pdflatex -interaction batchmode -file-line-error
 BBL.base = 1 
-BBL = proposal.bbl $(BBL.base:%=proposal%-blx.bbl)
+BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl)
 PROPCLS.dir = $(PROP.dir)/base
 PROPETC.dir = $(PROP.dir)/etc
 DFGPROPCLS.dir = $(PROP.dir)/dfg
@@ -24,6 +30,12 @@ PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(DFGPROPCLS.clssty:%=$(DFGPROPCL
 
 all: $(TARGET.pdf)
 
+submit:
+	$(MAKE) -w PROPOSAL=submit.tex all
+
+public:
+	$(MAKE) -w PROPOSAL=public.tex all
+
 cd: 	                                           # make cd will prepare CD for burning
 	mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD
 
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/funds.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/funds.tex
index 03c068249b5..93faf326acf 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/funds.tex
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/funds.tex
@@ -1,11 +1,10 @@
-\svnInfo $Id: funds.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/funds.tex $
-\section{Requested Modules/Funds \deu{(Beantragte Module/Mittel)}}
+\section{Requested Modules/Funds}\label{sec:funds}
 
 For each applicant, we apply for funding within the Basic Module.
 
-\subsection{Funding for Staff \deu{(Personalbedarf)}}\label{sec:positions}
-\subsubsection{Research Staff}
+\subsection{Funding for Staff}\label{sec:positions}
+
+\subsubsection{Research Staff}\label{sec:positions:research}
 
 We apply for the following positions. All run over the entire duration of the proposed project.
 
@@ -24,18 +23,18 @@ One student with BSc. for 2 years at $100 \%$ for Michael Kohlhase.
 
 One student with BSc. for 2 years at $100 \%$ for Florian Rabe.
 
-\subsubsection{Non-academic Staff} None.
+\subsubsection{Non-Academic Staff \qquad None.}
 
-\subsubsection{Student assistants} None.
+\subsubsection{Student Assistants \qquad None.}
 
-\subsection{Funding for direct project costs}
+\subsection{Funding for Direct Project Costs}\label{sec;funds:direct}
 
-\subsubsection{Equipment up to 10,000 \texteuro, software and consumables}
+\subsubsection{Equipment up to 10,000 \texteuro, Software and Consumables}
 
 None.  PC will cover the workspace, computing needs, and consumables for its staff as part
 of the basic support.
 
-\subsubsection{Travel Expenses\deu{(Reisen)}}\label{sec:travel}
+\subsubsection{Travel Expenses}\label{sec:travel}
 
 \begin{oldpart}{rework}
   The travel budget shall cover:
@@ -56,7 +55,7 @@ of the basic support.
   (PC and Jacobs University).
 \end{oldpart}
 
-\subsubsection{Visiting Researchers}
+\subsubsection{Visiting Researchers}\label{sec:funds:visiting}
 
 Total expenses \textbf{10.200 \texteuro}
 \medskip
@@ -66,13 +65,13 @@ an average duration of 3 weeks, we estimate the cost of one visit at 600 {\texte
 traveling and 70 {\texteuro} per night for accommodation, amounting to 2040 \texteuro per
 visit.
 
-\subsubsection{Expenses for laboratory animals} None.
-
-\subsubsection{Other costs \deu{(Sonstige Kosten)}} None.
-
-\subsubsection{Project-related publication expenses} None.
+\subsubsubsection{-- 4.1.2.6, 4.1.3 (Expenses for Laboratory Animals / Other Costs
+/ Project Related Publication Expenses / Instrumentation) \sf\qquad n/a}
 
-\subsection{Funding for Instrumentation} None.
+% \subsubsection{Expenses for Laboratory Animals} None.
+% \subsubsection{Other Costs} None.
+% \subsubsection{Project-Related Publication Expenses} None.
+% \subsection{Funding for Instrumentation} None.
 
 %%% Local Variables: 
 %%% mode: LaTeX
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/preconditions.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/preconditions.tex
new file mode 100644
index 00000000000..7f4e82c5c3d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/preconditions.tex
@@ -0,0 +1,104 @@
+\section{Project Requirements}\label{sec:requirements}
+
+\subsection{Employment Status Information}\label{sec:req:employment-status}
+
+\begin{todo}{from the proposal template}
+  For each applicant, state the last name, first name, and employment status (including
+  duration of contract and funding body, if on a fixed-term contract).
+\end{todo}
+
+\subsection{First-time Proposal Data}\label{sec:req:first}
+
+\begin{todo}{from the proposal template}
+  Only if applicable: Last name, first name of first-time applicant.
+
+  If this is your first proposal, reviewers will consider this fact when assessing your
+  pro- posal. Previous proposals for research fellowships, publication funding, travel
+  allow- ances, or funding for scientific networks are not considered first proposals. If
+  you are submitting a “first-time proposal” and it is part of a joint proposal, please
+  note that your independent project must be distinct from the other projects.
+
+  If you have already submitted a proposal as an applicant for a research grant and have
+  received a letter informing you of the funding decision, or if you have led an independ-
+  ent junior research group or project in a Collaborative Research Centre or Research
+  Unit, you are no longer eligible to submit a “first proposal”. If you have submitted a
+  “first-time proposal” and it was rejected, you may resubmit the application, in revised
+  form, as a first-time proposal for the same project.
+\end{todo}
+
+\subsection{Composition of the Project Group}\label{sec:req:group}
+
+\begin{todo}{from the proposal template}
+  List only those individuals who will work on the project but will not be paid out of the
+  project funds. State each person’s name, academic title, employment status, and type of
+  funding.
+
+  Please list separately the individuals paid by your institution and those paid using
+  other third-party funding (including fellowships).
+\end{todo}
+
+\begin{sitedescription}{jacu}
+  The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by
+  Michael Kohlhase for has the following members
+  \begin{compactdesc}
+  \item[Dr. N.N.] is the \ldots She has a background in\ldots.
+  \end{compactdesc}
+  Additionally, the group has attracted about 10 undergraduate and master's students that
+  actively take part in the project work and various aspects of research.
+\end{sitedescription}
+
+\begin{sitedescription}{pcg}
+  Power Consulting GmbH is the leading provider of semantic document solutions. Dr. Senior
+  Researcher leads an applied research group consisting of
+  \begin{compactdesc}
+  \item[Dr. N.N.] is the \ldots She has a background in\ldots.
+  \end{compactdesc}
+  The group has access to seven programming slaves specializing in web development and
+  document transformation techniques
+\end{sitedescription}
+
+
+\subsection{Cooperation with other Researchers}\label{sec:coop}
+
+\subsubsection{Planned Cooperations}\label{sec:coop:planned}
+\begin{todo}{from the proposal template}
+  Researchers with whom you have agreed to cooperate on this project
+\end{todo}
+\begin{compactdesc}
+\item[Prof. Dr. Super Akquisiteur (Uni Paderborn)] knows exactly what to do to get funding
+  with DFG, we will interview him closely and integrate all his intuitions into the {\pn}
+  templates.
+\item[Prof. Dr. Habe Nichts (Uni Hinterpfuiteufel)] has never gotten a grant proposal
+  through with DFG, we will try to avoid his mistakes.
+\item[Dr. Sach Bearbeiter (DFG)] will consult with the DFG requirements to be met in the
+  proposals.
+\item[Dr. Donald Knuth (Stanford University)] is so surprised that we want to do grant
+  proposals in {\TeX/\LaTeX} that he will help us with any problems we have in coding in
+  this wonderful programming language.
+\end{compactdesc}
+
+\subsubsection{Scientific Collaborations in the past Three Years}\label{sec:past-coop}
+
+\begin{todo}{from the proposal template}
+  Researchers with whom you have collaborated scientifically within the past three years
+
+  This information will assist the DFG’s Head Office in avoiding potential conflicts of
+  in- terest during the review process.
+\end{todo}
+
+\subsection{Scientific Equipment}\label{sec:req:equipment}
+
+Jacobs University provides laptops or desktop workstations for all academic
+employees. Great Consulting GmbH. is rolling in money anyways and has all of the latest
+gadgets.
+
+
+\subsection{Project-Relevant Interests in Commercial Enterprises\qquad n/a}
+
+%%% Local Variables: 
+%%% mode: LaTeX
+%%% TeX-master: "proposal"
+%%% End: 
+
+% LocalWords:  Durchf uhrung subsubsection ipower Hinterpfuiteufel Sach Aktivit
+% LocalWords:  Erkl arungen
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/proposal.tex
index 04ca1eb8351..e586fc2461c 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.tex
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/proposal.tex
@@ -1,17 +1,11 @@
-% the document class specification for the proposal writing process, add the 'submit' option
-% for submitting (switches off various draft features); add the 'public' option to exclude
-% any private parts. 
-\documentclass[RAM]{dfgproposal}
-%\documentclass[submit]{dfgproposal}
-%\documentclass[submit,public]{dfgproposal}
-\bibliography{../lib/dummy}
+% The main file for developing the proposal. 
+% Variants with different class options are 
+% - submit.tex (no draft stuff, no ednotes, no revision information)
+% - public.tex (like submit.tex, but no financials either) 
+\providecommand{\classoptions}{,keys} % to be overwritten in variants
+\documentclass[RAM,gitinfo\classoptions]{dfgproposal}
+\addbibresource{../lib/dummy}
 \usepackage[utf8]{inputenc}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: proposal.tex 22963 2012-01-13 08:47:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/proposal.tex $
-%
 \input{../lib/WApersons}
 
 
@@ -25,11 +19,9 @@
 \urldef{\gcpubs}\url{http://www.pcg.phony/~gc/pubs.html}
 \urldef{\mikopubs}\url{http://kwarc.info/kohlhase/publications.html}
 \begin{proposal}[PI=miko,PI=gc,site=jacu,site=pcg,
-  pubspage=mikopubs,
-  pubspage=gcpubs,
   thema=Intelligentes Schreiben von Antr\"agen,
   acronym={iPoWr},
-  acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}sal} {\underline{Wr}iting},
+  acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}posal} {\underline{Wr}iting},
   title=\pn: \protect\pnlong,
   totalduration=3 years,
   since=1. Feb 2009,
@@ -39,16 +31,28 @@
   discipline=Computer Science, 
   areas=Knowledge Management]
 
+\begin{Zusammenfassung}
+  \begin{todo}{in das Elan System kopieren}
+    Fassen Sie die relevanten Projektziele allgemeinverst''andlich in maximal 3000 Zeichen
+    (keine Sonderzeichen) zusammen
+  \end{todo}
+  Das Schreiben von Antr"agen ist ein kollaborativer Prozess in dem Betr"age von mehreren
+  Personen integriert werden mu"ussen. Ein ASCII-basiertes Format wie {\LaTeX} erlaubt die
+  Koordination dieses Prozesses mittels Versionsverwaltungssystemen wie
+  Subversion. Dadurch k''onnen sich die Antragsteller auf Inhalte konzentrieren anstatt
+  auf die Mechanik der Dokumentenverwaltung.
+\end{Zusammenfassung}
+
 \begin{Summary}
-  \begin{todo}{}
-    Summarize the relevant goals of the proposed project in generally intellegible
-    terms. Do not use more than 15 lines (max. 1600 characters).
+  \begin{todo}{copy into the Elan system}
+    Summarize the relevant goals of the proposed project in generally intelligible
+    terms. Do not use more than 3000 characters, no special characters allowed.
   \end{todo}
   Writing grant proposals is a collaborative effort that requires the integration of
-  contributions from many individuals. The use of an ASCII-based format like LaTeX allows
-  to coordinate the process via a source code control system like Subversion, allowing the
-  proposal writing team to concentrate on the contents rather than the mechanics of
-  wrangling with text fragments and revisions.
+  contributions from many individuals. The use of an ASCII-based format like {\LaTeX}
+  allows to coordinate the process via a source code control system like Subversion,
+  allowing the proposal writing team to concentrate on the contents rather than the
+  mechanics of wrangling with text fragments and revisions.
 \end{Summary}
 
 % It is often good to separate the top-level sections into separate files. 
@@ -56,23 +60,22 @@
 \input{state}
 \input{workplan}
 
-\section{Bibliography concerning the state of the art, the research objectives, and the
-  work programme \deu{(Literaturverzeichnis zum Stand der Forschung, zu den Zielen und dem
-    Arbeitsprogramm)}}
+\section{Bibliography Concerning the State of the Art, the Research objectives, and the
+  Work Programme}\label{sec:bib}
 
 \begin{todo}{from the proposal template}
 In this bibliography, list only the works you cite in your presentation of the state of the
 art, the research objectives, and the work programme. This bibliography is not the list
 of publications. Non-published works must be included with the proposal.
 \end{todo}
-\printbibliography[heading=empty]
+\printbibliography[heading=empty,notcategory=featured]
 % the following will not become part of the public proposal after all most of this is
 % technical or confidential.
 %\begin{private}
 \input{funds}
 \input{preconditions}
 
-\section{Additional information \deu{(Ergänzende Erklärungen)}}
+\section{Additional Information}\label{sec:additional}
 
 Funding proposal XYZ-83282 has been submitted prior to this proposal on related topic XYZ.
 \end{proposal}
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.pdf b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.pdf
new file mode 100644
index 00000000000..2c9e43abdba
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.tex
new file mode 100644
index 00000000000..00c95f15a35
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/public.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{,submit,public}
+\input{proposal}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/state.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/state.tex
new file mode 100644
index 00000000000..245c513b459
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/state.tex
@@ -0,0 +1,59 @@
+\section{State of the Art and Preliminary Work}\label{sec:state}
+\begin{todo}{from the proposal guidelines}
+  For new proposals please explain briefly and precisely the state of the art in your
+  field in its direct relationship to your project. This description should make clear in
+  which context you situate your own research and in what areas you intend to make a
+  unique, innovative, promising contribution. This description must be concise and
+  understand- able without referring to additional literature.
+
+  For renewal proposals, please report on your previous work. This report should also be
+  understandable without referring to additional literature.
+
+  To illustrate and enhance your presentation you may refer to your own and others’ pub-
+  lications. Indicate whenever you are referring to other researchers’ work.  Please list
+  all cited publications in your bibliography under section 3. This reference list is not
+  consid- ered your list of publications. Note that reviewers are not required to read any
+  of the works you cite. This also applies to review sessions that are held on site. In
+  this case, manuscripts and publications that provide more information on the progress
+  reports and are published up to the review panel’s meeting may be made available at the
+  meeting to enable reviewers to read through the information. Reviews will be based only
+  on the text of the actual proposal.
+\end{todo}
+\subsection{List of Project-Related Publications}\label{sec:projpapers}
+
+\begin{todo}{from the proposal template}
+  Please include a list of own publications that are related to the proposed project. It
+  serves as an important basis for assessing your proposal. The number of publications to
+  cite here is determined as follows:
+  \begin{compactdesc}
+    \item[Single applicant] two publications per year of the funding duration
+    \item[Multiple applicants] three publications per year of the funding duration
+    \end{compactdesc}
+    These rules refer to the proposed funding duration for new proposals and the completed
+    duration for renewal proposals.
+    
+    If you are submitting a proposal to the DFG for the first time and have therefore not
+    published in the proposed research area, please list the up to five most important
+    publications so far.
+\end{todo}
+
+\subsubsection{Peer-Reviewed Articles}
+
+\dfgprojpapers{Kohlhase:pdpl10,providemore}
+
+\ednote{Anmerkung Jens: Ein nützliches Feature wäre hier, wenn das Paket eine (eventuell
+  über Optionen der Dokumentklasse unterdrückbare) Warnung ausgeben würde, wenn zu viele
+  Publikationen entsprechend DFG-Richtlinien angegeben werden. Die Anzahl ist sehr eng
+  begrenzt.}
+
+\subsubsection{Other Articles\qquad None.}
+\subsubsection{Patents\qquad None.}
+
+%%% Local Variables: 
+%%% mode: LaTeX
+%%% TeX-master: "proposal"
+%%% End: 
+
+% LocalWords:  subsubsections dfgprojpapers pdpl10 providemore compactdesc
+% LocalWords:  ourpubs nociteprolist KohKoh ccbssmt09 KohRabZho tmlmrsca10
+% LocalWords:  Hutter09 sifemp09
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.pdf b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.pdf
new file mode 100644
index 00000000000..9fee2535279
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.tex
new file mode 100644
index 00000000000..5d92f9374de
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/submit.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit}
+\input{proposal}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/workplan.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/workplan.tex
index f481ada4049..a68a3b553dd 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/workplan.tex
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/workplan.tex
@@ -1,8 +1,6 @@
-\svnInfo $Id: workplan.tex 23021 2012-01-19 13:30:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/workplan.tex $
-\section{Objectives and Work Programme \deu{(Ziele und Arbeitsprogramm)}}
+\section{Objectives and Work Programme}\label{sec:workplan}
 
-\subsection{Anticipated total duration of the project \deu{(Voraussichtliche Gesamtdauer des Projekts)}}
+\subsection{Anticipated Total Duration of the Project}\label{sec:duration}
 
 \begin{todo}{from the proposal template}
 Please state
@@ -12,7 +10,7 @@ Please state
 \end{itemize}
 \end{todo}
 
-\subsection{Objectives \deu{(Ziele)}}
+\subsection{Objectives}\label{sec:objectives}
 
 \begin{objective}[id=firstobj,title=Supporting Authors]
   This is the first objective, after all we have to write proposals all the time, and we
@@ -24,18 +22,17 @@ Please state
 \end{objective}
 
 
-\subsection{Work programme including proposed research methods \deu{(Arbeitsprogramm inkl. vorgesehener Untersuchungsmethoden)}}
+\subsection{Work Programme Including Proposed Research Methods}\label{sec:wawp}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%\subsection{Description (Beschreibung)}%\label{sec:state}
 \LaTeX is the best document markup language, it can even be used for literate
 programming~\cite{DK:LP,Lamport:ladps94,Knuth:ttb84}
+
 \begin{todo}{from the proposal template}
  review the state of the art in the and your own contribution to it; probably you want to
   divide this into subsubsections. 
 \end{todo}
 
-% \dfgprojpapers{Kohlhase:pdpl10,providemore}
 \begin{todo}{from the proposal template}
 For each applicant
 
@@ -197,15 +194,13 @@ We abstract an example from existing proposals
 
 \ganttchart[draft,xscale=.45] 
 
-\subsection{Data Handling \deu{(Umgang mit den im Projekt erzielten Forschungsdaten)}}
-
-All project results will be published for at least x years at our archive at \url{http://example.org}.
-
-\subsection{Other Information \deu{(Weitere Angaben)}} Not applicable.
+\subsection{Data Handling}\label{sec:data}
 
-\subsection{Explanations on the proposed investigations \deu{(Erläuterungen zu den vorgesehenen Untersuchungen)}} Not applicable.
+The \pn project will not systematically produce researchdata. All project results will be
+published for at least $x$ years at our archive at \url{http://example.org}.
 
-\subsection{Information on scientific and financial involvement of international cooperation partners \deu{(Erläuterungen zur inhaltlichen und finanziellen Projektbeteiligung von Kooperationspartnerinnen und Kooperationspartnern im Ausland)}} Not applicable.
+\subsection{-- 2.7 (Other Information / Explanations on the Proposed Investigations / Information on Scientific and Financial Involvement of International
+  Cooperation Partners) \qquad \sf n/a}
 
 
 %%% Local Variables: 
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/zusammenfassung.tex b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/zusammenfassung.tex
index 08ee8567039..ca39d955195 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/zusammenfassung.tex
+++ b/Master/texmf-dist/doc/latex/proposal/dfg/proposal/zusammenfassung.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: zusammenfassung.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/zusammenfassung.tex $
 \begin{Abriss}
 \begin{todo}{from the proposal template}
   Fassen Sie hier bitte die wesentlichen Ziele Ihres Vorhabens allgemeinverständlich und
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/euproposal.pdf b/Master/texmf-dist/doc/latex/proposal/eu/euproposal.pdf
index 3112d41d715..4d93696e632 100644
--- a/Master/texmf-dist/doc/latex/proposal/eu/euproposal.pdf
+++ b/Master/texmf-dist/doc/latex/proposal/eu/euproposal.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/Makefile b/Master/texmf-dist/doc/latex/proposal/eu/strep/Makefile
index 7cd9e01cc1b..9b4a6fdb04c 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/Makefile
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/Makefile
@@ -1,3 +1,9 @@
+###########################################################################
+# Automating proposal management by make.
+# The participants work on proposal.tex in "draft" mode, which gives a lot
+# of information to the developers. Variants submit.tex and public.tex are
+# used to prepare official versions (hiding development/private info). 
+###########################################################################
 # possibly customize the following variables to your setting
 PROPOSAL = propB.tex 		# the proposal
 BIB = ../lib/dummy.bib	        # bibTeX databases
@@ -14,7 +20,7 @@ PDATA 		= $(PROPOSAL:%.tex=%.pdata)       # the proposal project data
 SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
 PDFLATEX = pdflatex -interaction batchmode -file-line-error
 BBL.base = 1 2 3 4
-BBL = propB.bbl $(BBL.base:%=propB%-blx.bbl)
+BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl)
 PROPCLS.dir = $(PROP.dir)/base
 PROPETC.dir = $(PROP.dir)/etc
 EUPROPCLS.dir = $(PROP.dir)/eu
@@ -27,8 +33,11 @@ PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS.
 
 all: $(TBIB.pdf) $(TSIMP.pdf)
 
-cd: 	                                           # make cd will prepare CD for burning
-	mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD
+submit:
+	$(MAKE) -w PROPOSAL=final.tex all
+
+public:
+	$(MAKE) -w PROPOSAL=public.tex all
 
 bbl:	$(BBL)
 $(BBL): %.bbl: %.aux
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/README b/Master/texmf-dist/doc/latex/proposal/eu/strep/README
index 72aee78682a..72aee78682a 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/README
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/README
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/deliverables.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/deliverables.tex
index 3ea8b1d89a1..355a7fd13e9 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/deliverables.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/deliverables.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: deliverables.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/deliverables.tex $
 \subsection{List of Deliverables}\label{sec:deliverables}
 
 \begin{todo}{from the proposal template}
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/draft.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/draft.tex
new file mode 100644
index 00000000000..9b8be16dd9e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/draft.tex
@@ -0,0 +1 @@
+\input{proposal.tex}
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/final.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/final.tex
new file mode 100644
index 00000000000..3d105cc4092
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/final.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit}
+\input{proposal.tex}
+
+%%% Local Variables:
+%%% mode: LaTeX
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/grantagreement.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/grantagreement.tex
new file mode 100644
index 00000000000..b90ee7b8f74
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/grantagreement.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit,grantagreement}
+\input{proposal.tex}
+
+%%% Local Variables:
+%%% mode: LaTeX
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/impact.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/impact.tex
index a1fb6b32c3a..210ebdee35f 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/impact.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/impact.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: impact.tex 22965 2012-01-13 14:29:23Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/impact.tex $
 \chapter{Impact}\label{chap:impact}
 \ednote{Maximum length for the whole of Section 3 –-- ten pages}
 
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/implementation.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/implementation.tex
index 7bacc07dd07..5d687c903dd 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/implementation.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/implementation.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: implementation.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/implementation.tex $
 \chapter{Implementation}\label{chap:implementation}
 
 \section{Management Structure and Procedures}\label{chap:management}
@@ -13,6 +11,8 @@ The Project Management of {\pn} is based on its Consortium Agreement, which will
 signed before the Contract is signed by the Commission. The Consortium Agreement will
 enter into force as from the date the contract with the European Commission is signed.
 \subsection{Organizational structure}\label{sec:management-structure}
+\subsection{Milestones}\label{sec:milestones}
+\milestonetable
 \subsection{Risk Assessment and Management}
 \subsection{Information Flow and Outreach}\label{sec:spread-excellence}
 \subsection{Quality Procedures}\label{sec:quality-management}
@@ -53,6 +53,8 @@ joint publications (only international, peer reviewed ones).
 \jointorga{jacu,efo,baz}
 \jointpub{efo,baz,jacu}
 \jointproj{efo,bar}
+\jointsup{jacu,bar}
+\jointsoft{baz,efo}
 \coherencetable
 
 \subsection{Subcontracting}\label{sec:subcontracting}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/issues.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/issues.tex
index 831f8029f30..e17761b8b76 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/issues.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/issues.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: issues.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/issues.tex $
 \chapter{Ethical Issues}\label{chap:ethical}
 \begin{todo}{from the proposal template}
   Describe any ethical issues that may arise in the project. In particular, you should
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/methodology.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/methodology.tex
index 2c9c6e0722e..86eea4c848a 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/methodology.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/methodology.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: methodology.tex 22975 2012-01-14 19:43:38Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/methodology.tex $
 \section{Scientific/Technical Methodology and Work Plan}\label{sec:methodology}
 \begin{todo}{from the proposal template}
   A detailed work plan should be presented, broken down into work packages\footnote{A work
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/milestones.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/milestones.tex
index f71d33d9654..b64a865eace 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/milestones.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/milestones.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: milestones.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/milestones.tex $
 \subsection{List of Milestones}\label{sec:milestones}
 
 \begin{todo}{from the proposal template}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/objectives.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/objectives.tex
index 8e18ffe6814..d960032a304 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/objectives.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/objectives.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: objectives.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/objectives.tex $
 \section{Concept and Objectives}\label{sec:objectives}
 \begin{todo}{from the proposal template}
   Explain the concept of your project. What are the main ideas that led you to propose
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/progress.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/progress.tex
index 7b780fcd4d9..bd392290253 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/progress.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/progress.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: progress.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/progress.tex $
 \section{Progress beyond the State-of-the-Art}\label{sec:progress}
 \begin{todo}{from the proposal template}
  Describe the state-of-the-art in the area concerned, and the advance that the proposed
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/propB.tex
index 9d5e174e2b5..986826c9433 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/propB.tex
@@ -1,22 +1,14 @@
-% the document class specification for the proposal writing process, add the 'submit' option
-% for submitting (switches off various draft features); add the 'public' option to exclude
-% any private parts. 
-\documentclass[noworkareas,deliverables]{euproposal}
-%\documentclass[submit,noworkareas,deliverables]{euproposal}
-%\documentclass[submit,public,noworkareas,deliverables]{euproposal}
-%% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697)
+% The main file for developing the proposal. 
+% Variants with different class options are 
+% - submit.tex (no draft stuff, no ednotes, no revision information)
+% - public.tex (like submit.tex, but no financials either) 
+\providecommand{\classoptions}{,keys} % to be overwritten in variants
+\documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal}
 %\usepackage[T1]{fontenc}
 %\usepackage[utf8]{inputenc}
-\bibliography{../lib/dummy}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: propB.tex 22989 2012-01-15 18:40:10Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/propB.tex $
-%
+\addbibresource{../lib/dummy}
 \input{../lib/WApersons}% Some sections of the included files depend on this.
 
-
 \begin{document}
 \begin{center}\color{red}\huge
   This mock proposal is just an example for \texttt{euproposal.cls} it reflects the ICT
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/public.pdf b/Master/texmf-dist/doc/latex/proposal/eu/strep/public.pdf
new file mode 100644
index 00000000000..2c9e43abdba
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/public.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/public.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/public.tex
new file mode 100644
index 00000000000..00c95f15a35
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/public.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{,submit,public}
+\input{proposal}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/quality.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/quality.tex
index 640a35f149c..5aee278b8f9 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/quality.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/quality.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: quality.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/quality.tex $
 \chapter{Scientific and Technical Quality}\label{chap:quality}
 \begin{todo}{from the proposal template}
   Maximum length for the whole of Section 1 –-- twenty pages, not including the tables in
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/risks.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/risks.tex
index 44c2f0121bc..19580761f7c 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/risks.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/risks.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: risks.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/risks.tex $
 \subsection{Significant Risks and Associated Contingency Plans}\label{sec:risks}
 \begin{todo}{from the proposal template}
   Describe any significant risks, and associated contingency plans
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-bar.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-bar.tex
index 1f0d0274105..13868a7e78d 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-bar.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-bar.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: site-bar.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-bar.tex $
 \begin{sitedescription}{bar}
 
 \paragraph{Organization}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-baz.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-baz.tex
index c97fa101e81..d3f5d1f0fdd 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-baz.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-baz.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: site-baz.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-baz.tex $
 \begin{sitedescription}{baz}
 \paragraph{Organization}
 \paragraph{Main tasks}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-efo.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-efo.tex
index 72687546012..c3bafffadff 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-efo.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-efo.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: site-efo.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-efo.tex $
 \begin{sitedescription}{efo}
 \paragraph{Organization}
  The EFO is the world leader in futurology, \ldots
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-jacu.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-jacu.tex
index e646098a6e2..6b4fe3b8c7e 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-jacu.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-jacu.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: site-jacu.tex 22989 2012-01-15 18:40:10Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-jacu.tex $
 \begin{sitedescription}{jacu}
 
 \paragraph{Organization} Jacobs University Bremen is a private research university patterned
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-templatex.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-templatex.tex
index 9e83e6cdd8d..6ffc6ad7240 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/site-templatex.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/site-templatex.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: site-jacu.tex 6306 2011-11-04 05:13:42Z kohlhase $
-\svnKeyword $HeadURL: https://svn.mathweb.org/repos/mathweb.org/projects/simsalabim/site-jacu.tex $
 \begin{sitedescription}{???}
 
 \paragraph{Organization:}
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.pdf b/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.pdf
new file mode 100644
index 00000000000..9fee2535279
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.pdf
diff --git a/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.tex
new file mode 100644
index 00000000000..5d92f9374de
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/submit.tex
@@ -0,0 +1,7 @@
+\newcommand{\classoptions}{submit}
+\input{proposal}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/workplan.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/workplan.tex
index c67775afba3..d189192bbec 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/workplan.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/workplan.tex
@@ -1,6 +1,3 @@
-\svnInfo $Id: workplan.tex 22989 2012-01-15 18:40:10Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/workplan.tex $
-
 \begin{todo}{from the proposal template}
 \begin{enumerate}
 \item Describe the overall strategy of the work plan\ednote{Maximum length – one page}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-class.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-class.tex
index b16a6be560e..c0c45198612 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-class.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-class.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-class.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-class.tex $
 \begin{workpackage}[id=class,type=RTD,lead=jacu,
                     wphases=3-9!1,
                     title=A {\LaTeX} class for EU Proposals,short=Class,
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-dissem.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-dissem.tex
index cc5fe68cdb2..7ad3fa9b1fe 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-dissem.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-dissem.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-dissem.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-dissem.tex $
 \begin{workpackage}%
 [id=dissem,type=RTD,lead=efo,
  wphases=10-24!1,
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-management.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-management.tex
index fb8522e851f..4ee5c645d34 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-management.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-management.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-management.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-management.tex $
 \begin{workpackage}[id=management,type=MGT,wphases=0-24!.2,
   title=Project Management,short=Management,
   jacuRM=2,barRM=2,efoRM=2,bazRM=2]
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-temple.tex b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-temple.tex
index e4f5306e3a3..92426deaf63 100644
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/wp-temple.tex
+++ b/Master/texmf-dist/doc/latex/proposal/eu/strep/wp-temple.tex
@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-temple.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-temple.tex $
 \begin{workpackage}[id=temple,type=DEM,lead=bar,
   wphases=6-12!1,
   title={\pn} Proposal Template,short=Template,barRM=6,bazRM=6]
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/Makefile b/Master/texmf-dist/doc/latex/proposal/examples/Makefile
deleted file mode 100644
index 3674fb34992..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-DIRS = proposal report simple-proposal
-all: 
-	@for d in $(DIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/README b/Master/texmf-dist/doc/latex/proposal/examples/README
deleted file mode 100644
index 15664e15d80..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory contains examples for DFG proposals and reports marked up with the 
-proposal/dfgproposal class. 
-
-proposal:	     	    a DFG proposal 'Einzelverfahren' in the new template (valid
-		              from Oct 2011. (provided by Jens Lehmann; thanks)
-report: 	            a corresponding report 
-simple-proposal: a simple DFG proposal (no work areas, no sites), re-uses files from above  
-lib: 		            shared files (affiliation database, bibTeX, logos)
-dfg: 		    DFG documents explaining the proposal/reporting process
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02.pdf
deleted file mode 100644
index 77d271eaa4e..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02e.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02e.pdf
deleted file mode 100644
index b11d2bd81aa..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/1_02e.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_01.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_01.pdf
deleted file mode 100644
index 7de5394ddaa..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_01.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_010.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_010.pdf
deleted file mode 100644
index c1657e0f9a9..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_010.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_012e.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_012e.pdf
deleted file mode 100644
index e777ff15be0..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/2_012e.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_de.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_de.pdf
deleted file mode 100644
index 3dc8ab59df8..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_de.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_en.pdf b/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_en.pdf
deleted file mode 100644
index e40b07942ad..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/dfgdocs/54_01_en.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/breakthrough.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/breakthrough.tex
deleted file mode 100644
index 05570e33774..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/breakthrough.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\svnInfo $Id: breakthrough.tex 21554 2011-04-30 05:53:27Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/breakthrough.tex $
-\section{Targeted breakthrough and long-term vision}\label{sec:objectives}
-\begin{todo}{from the proposal template}
-  Describe the breakthrough(s) that you are targeting to achieve. What is the long-term
-  vision (scientific, technological, societal, other) that motivates this breakthrough?
-  Explain how this breakthrough is an essential step towards the achievement of your
-  long-term vision, in particular in terms of new forms and uses of information and
-  information technologies. Describe the concrete objectives that you consider to
-  constitute the proof-of-concept of such a breakthrough. The objectives should be those
-  that you consider achievable within the project, in spite of the inherent risks. They
-  should be stated in a verifiable form, including through the milestones that will be
-  indicated under Section 1.3 below.
-\end{todo}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/impact.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/impact.tex
deleted file mode 100644
index d1a65bb8f48..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/impact.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-\svnInfo $Id: impact.tex 22929 2012-01-08 09:25:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/impact.tex $
-\chapter{Impact}\label{chap:impact}
-\ednote{Maximum length for the whole of Section 3 –-- ten pages}
-\begin{todo}{from the proposal template}
-``Contribution to the scientific foundations of future information and communication technologies that
-may be radically different from present day ICT. It may, for example, open new avenues for science and
-technology, or lead to a paradigm shift in the way technologies are conceived or applied. FET-Open research is not required to have direct short-term technological or societal impact but it will take concrete
-steps towards achieving its long-term vision, supported by a critical exploration of the potential implications for the environment and for society.''
-
-``All FET-Open activities should contribute to securing and strengthening the future potential for high-risk / high-impact visionary research. To achieve this, FET-Open is expected to generate new collaborations involving a broad range of disciplines, the established scientists as well as the talented young ones, and a diversity of actors in research, including small and independent research organisations and high-tech SMEs, whenever relevant in terms of the activities proposed. International collaboration should exploit synergies in the global science and technology scene, to increase impact and to raise the level of excellence world-wide.''
-\end{todo}
-\section{Transformational impact on science, technology and/or society}\label{sec:transformational-impact}
-\begin{todo}{from the proposal template}
-      If successful, what would be the transformative impact of your project? What difference will it make, especially in terms of long-lasting changes on science, technology, society or theories? Mention the steps that will be needed after the project to bring about these impacts. Explain why this contribution requires a European (rather than a national or local) approach. Indicate how account is taken of other national or international research activities. Mention any assumptions and external factors that may determine whether the impacts will be achieved.
-\end{todo}
-\section{Contribution at the European level towards the expected impacts listed in the work programme}\label{sec:european-contribution}
-\begin{todo}{from the proposal template}
-      Explain how your project contributes to securing and strengthening the future potential for high-risk / high-impact visionary research, through its results or through the organisation of the work and collaborations within your consortium . Will you generate new diverse collaborations, or impact on current practice in this kind of research? Where relevant, highlight how international collaboration exploits synergies in the global science and technology scene, increases impact and raises the level of excellence world-wide.
-\end{todo}
-
-\section{Dissemination and/or Use of Project Results}\label{sec:outreach}
-
-\begin{todo}{from the proposal template}
-      Describe the measures you propose for the dissemination and/or exploitation of project results, and how these will increase the impact of the project. In designing these measures, you should take into account a variety of communication means and target groups as appropriate (e.g. policy-makers, interest groups, media and the public at large).
-
-For more information on communication guidance, see the URL \url{http://ec.europa.eu/research/science-society/science-communication/index_en.htm}
-
-      Describe also your plans for the management of knowledge (intellectual property) acquired in the course of the project.
-\end{todo}
-
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  ednote
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/implementation.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/implementation.tex
deleted file mode 100644
index fbc8645d1b3..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/implementation.tex
+++ /dev/null
@@ -1,101 +0,0 @@
-\svnInfo $Id: implementation.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/implementation.tex $
-\chapter{Implementation}\label{chap:implementation}
-
-\section{Management Structure and Procedures}\label{chap:management}
-\begin{todo}{from the proposal template}
-  Describe the organizational structure and decision-making mechanisms
-  of the project. Show how they are matched to the nature, complexity
-  and scale of the project.  Maximum length of this section: five pages.
-\end{todo}
-
-The Project Management of {\pn} is based on its Consortium Agreement, which will be
-signed before the Contract is signed by the Commission. The Consortium Agreement will
-enter into force as from the date the contract with the European Commission is signed.
-\subsection{Organizational structure}\label{sec:management-structure}
-\subsection{Risk Assessment and Management}
-\subsection{Information Flow and Outreach}\label{sec:spread-excellence}
-\subsection{Quality Procedures}\label{sec:quality-management}
-\subsection{Internal Evaluation Procedures}
-\newpage
-\section{Individual Participants}\label{sec:partners}
-\begin{todo}{from the proposal template}
-For each participant in the proposed project, provide a brief description of the legal entity, the main
-tasks they have been attributed, and the previous experience relevant to those tasks. Provide also a
-short profile of the individuals who will be undertaking the work.\\
-Maximum length for Section 2.2: one page per participant. However, where two or more departments within
-an organisation have quite distinct roles within the proposal, one page per department is acceptable.\\
-The maximum length applying to a legal entity composed of several members, each of which is a separate
-legal entity (for example an EEIG1), is one page per member, provided that the members have quite distinct
-roles within the proposal.
-\end{todo}
-\newpage
-\input{../strep/site-jacu}\newpage
-\input{../strep/site-efo}\newpage
-\input{../strep/site-bar}\newpage
-\input{../strep/site-baz}\newpage
-
-\section{The {\protect\pn} consortium as a whole}
-\begin{todo}{from the proposal template}
-  Describe how the participants collectively constitute a consortium capable of achieving
-  the project objectives, and how they are suited and are committed to the tasks assigned
-  to them. Show the complementarity between participants. Explain how the composition of
-  the consortium is well-balanced in relation to the objectives of the project.  
-
-  If appropriate describe the industrial/commercial involvement to ensure exploitation of
-  the results. Show how the opportunity of involving SMEs has been addressed
-\end{todo}
-
-The project partners of the \pn project have a long history of successful collaboration;
-Figure~\ref{fig:collaboration} gives an overview over joint projects (including proposals) and
-joint publications (only international, peer reviewed ones).
-
-\jointpub{jacu}{efo}
-\jointpub{efo}{baz}
-\jointproj{efo}{baz}
-\coherencetable
-
-\subsection{Subcontracting}\label{sec:subcontracting}
-\begin{todo}{from the proposal template}
-  If any part of the work is to be sub-contracted by the participant responsible for it,
-  describe the work involved and explain why a sub-contract approach has been chosen for
-  it.
-\end{todo}
-\subsection{Other Countries}\label{sec:other-countries}
-\begin{todo}{from the proposal template}
-  If a one or more of the participants requesting EU funding is based outside of the EU
-  Member states, Associated countries and the list of International Cooperation Partner
-  Countries\footnote{See CORDIS web-site, and annex 1 of the work programme.}, explain in
-  terms of the project’s objectives why such funding would be essential.
-\end{todo}
-
-\subsection{Additional Partners}\label{sec:assoc-partner}
-\begin{todo}{from the proposal template}
-  If there are as-yet-unidentified participants in the project, the expected competences,
-  the role of the potential participants and their integration into the running project
-  should be described
-\end{todo}
-\section{Resources to be Committed}\label{sec:resources}
-\begin{todo}{from the proposal template}
-Maximum length: two pages
-
-Describe how the totality of the necessary resources will be mobilized, including any resources that
-will complement the EC contribution. Show how the resources will be integrated in a coherent way,
-and show how the overall financial plan for the project is adequate.
-
-In addition to the costs indicated on form A3 of the proposal, and the effort shown in Section 1.3
-above, please identify any other major costs (e.g. equipment). Ensure that the figures stated in Part B
-are consistent with these.
-\end{todo}
-
-\subsection{Travel Costs and Consumables}\label{sec:travel-costs}
-\subsection{Subcontracting Costs}
-\subsection{Other Costs}
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  pn newpage site-jacu site-efo site-baz jointpub efo baz
-% LocalWords:  jointproj coherencetable assoc-partner
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/methodology.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/methodology.tex
deleted file mode 100644
index 4614aeee0da..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/methodology.tex
+++ /dev/null
@@ -1,59 +0,0 @@
-\svnInfo $Id: methodology.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/methodology.tex $
-\section[S/T Methodology]{S/T Methodology\footnote{Note that, whereas the scientific and technological methodology is evaluated
-under the criteria ‘S/T quality’, the quality of the
-actual workplan is evaluated under FET-Open under the criteria ‘Implementation’.}}\label{sec:methodology}
-\begin{todo}{from the proposal template}
-Provide a detailed description of the scientific and technological approach or methodology
-by which you will attempt to reach your objectives. Demonstrate that you are aware of the
-level and nature of the risks of failure, and that you have a good idea on how to address
-these risks. Describe a progression of crucial milestones and decision points for your
-project, and their expected timing. What would constitute success? What would you learn
-from an eventual failure? Where relevant, show how your approach takes into account the
-difficulties inherent to the multi-disciplinary nature of the idea or approach that you
-are proposing. 
- A detailed work plan should be presented, broken down into work
-packages\footnote{A work package is a major sub-division of the proposed project with a
-  verifiable end-point – normally a deliverable or an important milestone in the overall
-  project.} (WPs) which should follow the logical phases of the implementation of the
-project, and include consortium management and assessment of progress and results. (Note
-that your overall approach to management will be described later, in Section 2).
-
-Notes: The number of work packages used must be appropriate to the complexity of the work
-and the overall value of the proposed project. The planning should be sufficiently
-detailed to justify the proposed effort and allow progress monitoring by the Commission.
-
-\end{todo}
-\newpage\input{workplan}
-
-\newpage
-\subsection{Work Package List}\label{sec:wplist}
-
-\begin{todo}{from the proposal template}
-Please indicate one activity per work package:
-RTD = Research and technological development; DEM = Demonstration; MGT = Management of the consortium
-\end{todo}
-
-%\makeatletter\wp@total@RM{management}\makeatother
-\wpfig[pages,type]
-
-\newpage\input{../strep/deliverables}
-\newpage\input{../strep/milestones}
-
-\subsection{Work Package Descriptions}\label{sec:workpackages}
-\begin{workplan}
-\input{../strep/wp-management}\newpage
-\input{../strep/wp-dissem}\newpage
-\input{../strep/wp-class}\newpage
-\input{../strep/wp-temple}\newpage
-\end{workplan}
-\newpage\input{../strep/risks}
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords: workplan newpage wplist makeatletter makeatother wpfig
-% LocalWords:  workpackages wp-dissem wp-class wp-temple
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/novelty.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/novelty.tex
deleted file mode 100644
index d64c541eeb1..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/novelty.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\svnInfo $Id: novelty.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/novelty.tex $
-\section{Novelty and foundational character}\label{sec:progress}
-\begin{todo}{from the proposal template}
-  Describe the state-of-the-art in the area(s) concerned, and the advance that the
-  proposed project would bring about. Clearly describe the novelty of your proposal. In
-  what way do you challenge current thinking or assumptions? Novelty should come from new
-  ideas, not from the incremental refinement of existing approaches. It can also come from
-  new and unexpected combinations of insights from various disciplines. What is the
-  scientific foundation that you aim to develop and what are the specific contributions to
-  science and technology that your project will make (including in case of failure)?
-\end{todo}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB-blx.bib b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB-blx.bib
deleted file mode 100644
index 86bcc8cec2f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB-blx.bib
+++ /dev/null
@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
-}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.bbl b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.bbl
deleted file mode 100644
index 1183e5ec5e6..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.bbl
+++ /dev/null
@@ -1,76 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{DK:LP}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Knuth}{K.}%
-     {Donald~E.}{D.~E.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {The University of Chicago Press}%
-  }
-  \strng{namehash}{KDE1}
-  \strng{fullhash}{KDE1}
-  \field{sortinit}{K}
-  \field{title}{{Literate Programming}}
-  \field{year}{1992}
-\endentry
-
-\entry{Knuth:ttb84}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Knuth}{K.}%
-     {Donald~E.}{D.~E.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Addison Wesley}%
-  }
-  \strng{namehash}{KDE1}
-  \strng{fullhash}{KDE1}
-  \field{sortinit}{K}
-  \field{title}{The {\TeX}book}
-  \field{year}{1984}
-\endentry
-
-\entry{Lamport:ladps94}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Lamport}{L.}%
-     {Leslie}{L.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Addison Wesley}%
-  }
-  \strng{namehash}{LL1}
-  \strng{fullhash}{LL1}
-  \field{sortinit}{L}
-  \field{title}{LaTeX: A Document Preparation System, 2/e}
-  \field{year}{1994}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.deliverables b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.deliverables
deleted file mode 100644
index 5f61d6337bc..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.deliverables
+++ /dev/null
@@ -1,30 +0,0 @@
-\deliverable{01}{1}{M{1.1}}{managementmailing}{PP}{O}{Project-internal mailing lists} {{WP1}}
-\deliverable{02}{2}{M{2.1}}{dissemwebsite}{PU}{O}{Set-up of the Project web server} {{WP2}}
-\deliverable{03}{3}{M{1.2}}{managementhandbook}{PU}{R}{Project management handbook} {{WP1}}
-\deliverable{06}{6}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{06}{6}{M{1.4}}{managementhelpdesk}{PU}{O}{{iPoWr\xspace  } Helpdesk} {{WP1}}
-\deliverable{06}{6}{M{3.1}}{classreq}{PP}{R}{Requirements analysis} {{WP3}}
-\deliverable{06}{6}{M{4.1}}{templereq}{PP}{R}{Requirements analysis} {{WP4}}
-\deliverable{08}{8}{M{2.2}}{dissemws1proc}{PU}{R}{Proceedings of the first {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{09}{9}{M{2.3}}{dissemdissem}{PP}{R}{Dissemination Plan} {{WP2}}
-\deliverable{09}{9}{M{2.4}}{dissemexploitplan}{PP}{R}{Scientific and Commercial Exploitation Plan} {{WP2}}
-\deliverable{12}{12}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{12}{12}{M{3.2}}{classspec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP3}}
-\deliverable{12}{12}{M{4.2}}{templespec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP4}}
-\deliverable{18}{18}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{18}{18}{M{3.3}}{classdemonstrator}{PU}{P}{First demonstrator ({\tt  {article.cls}} really)} {{WP3}}
-\deliverable{18}{18}{M{4.3}}{templedemonstrator}{PU}{D}{First demonstrator ({\tt  {article.cls}} really)} {{WP4}}
-\deliverable{20}{20}{M{2.5}}{dissemws2proc}{PU}{R}{Proceedings of the second {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{24}{24}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{24}{24}{M{3.4}}{classproto}{PU}{P}{First prototype} {{WP3}}
-\deliverable{24}{24}{M{4.4}}{templeproto}{PU}{P}{First prototype} {{WP4}}
-\deliverable{30}{30}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{32}{32}{M{2.6}}{dissemss1proc}{PU}{R}{Proceedings of the third {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{36}{36}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{36}{36}{M{1.5}}{managementreport6}{PU}{R}{Final plan for using and disseminating the knowledge} {{WP1}}
-\deliverable{36}{36}{M{3.5}}{classrelease}{PU}{P}{Final {\LaTeX  } class, ready for release} {{WP3}}
-\deliverable{36}{36}{M{4.5}}{templerelease}{PU}{P}{Final Template, ready for release} {{WP4}}
-\deliverable{42}{42}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{44}{44}{M{2.7}}{dissemws3proc}{PU}{R}{Proceedings of the fourth {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{48}{48}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{48}{48}{M{1.6}}{managementreport7}{PU}{R}{Final management report} {{WP1}}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.delivs b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.delivs
deleted file mode 100644
index 0f0c2568585..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.delivs
+++ /dev/null
@@ -1,30 +0,0 @@
-\deliverable{01}{1}{M{1.1}}{managementmailing}{PP}{O}{Project-internal mailing lists} {{WP1}}
-\deliverable{03}{3}{M{1.2}}{managementhandbook}{PU}{R}{Project management handbook} {{WP1}}
-\deliverable{06}{6}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{12}{12}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{18}{18}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{24}{24}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{30}{30}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{36}{36}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{42}{42}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{48}{48}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{06}{6}{M{1.4}}{managementhelpdesk}{PU}{O}{{iPoWr\xspace  } Helpdesk} {{WP1}}
-\deliverable{36}{36}{M{1.5}}{managementreport6}{PU}{R}{Final plan for using and disseminating the knowledge} {{WP1}}
-\deliverable{48}{48}{M{1.6}}{managementreport7}{PU}{R}{Final management report} {{WP1}}
-\deliverable{02}{2}{M{2.1}}{dissemwebsite}{PU}{O}{Set-up of the Project web server} {{WP2}}
-\deliverable{08}{8}{M{2.2}}{dissemws1proc}{PU}{R}{Proceedings of the first {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{09}{9}{M{2.3}}{dissemdissem}{PP}{R}{Dissemination Plan} {{WP2}}
-\deliverable{09}{9}{M{2.4}}{dissemexploitplan}{PP}{R}{Scientific and Commercial Exploitation Plan} {{WP2}}
-\deliverable{20}{20}{M{2.5}}{dissemws2proc}{PU}{R}{Proceedings of the second {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{32}{32}{M{2.6}}{dissemss1proc}{PU}{R}{Proceedings of the third {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{44}{44}{M{2.7}}{dissemws3proc}{PU}{R}{Proceedings of the fourth {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{06}{6}{M{3.1}}{classreq}{PP}{R}{Requirements analysis} {{WP3}}
-\deliverable{12}{12}{M{3.2}}{classspec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP3}}
-\deliverable{18}{18}{M{3.3}}{classdemonstrator}{PU}{P}{First demonstrator ({\tt  {article.cls}} really)} {{WP3}}
-\deliverable{24}{24}{M{3.4}}{classproto}{PU}{P}{First prototype} {{WP3}}
-\deliverable{36}{36}{M{3.5}}{classrelease}{PU}{P}{Final {\LaTeX  } class, ready for release} {{WP3}}
-\deliverable{06}{6}{M{4.1}}{templereq}{PP}{R}{Requirements analysis} {{WP4}}
-\deliverable{12}{12}{M{4.2}}{templespec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP4}}
-\deliverable{18}{18}{M{4.3}}{templedemonstrator}{PU}{D}{First demonstrator ({\tt  {article.cls}} really)} {{WP4}}
-\deliverable{24}{24}{M{4.4}}{templeproto}{PU}{P}{First prototype} {{WP4}}
-\deliverable{36}{36}{M{4.5}}{templerelease}{PU}{P}{Final Template, ready for release} {{WP4}}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdata b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdata
deleted file mode 100644
index fa0b10d2ee8..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdata
+++ /dev/null
@@ -1,232 +0,0 @@
-\@pdata@def{site}{jacu}{number}{1}
-\@pdata@def{site}{jacu}{intendedRM}{36}
-\@pdata@def{site}{efo}{number}{2}
-\@pdata@def{site}{efo}{intendedRM}{36}
-\@pdata@def{site}{bar}{number}{3}
-\@pdata@def{site}{bar}{intendedRM}{36}
-\@pdata@def{site}{baz}{number}{4}
-\@pdata@def{site}{baz}{intendedRM}{36}
-\@pdata@def{prop}{gen}{coordinator}{miko}
-\@pdata@def{prop}{gen}{acronym}{iPoWr}
-\@pdata@def{prop}{gen}{acrolong}{{\relax $\@@underline {\hbox {I}}\mathsurround \z@ $\relax ntelligent} {\relax $\@@underline {\hbox {P}}\mathsurround \z@ $\relax r\relax $\@@underline {\hbox {o}}\mathsurround \z@ $\relax sal} {\relax $\@@underline {\hbox {Wr}}\mathsurround \z@ $\relax iting}}
-\@pdata@def{prop}{gen}{title}{iPoWr\xspace  : \pnlong }
-\@pdata@def{prop}{gen}{callname}{ICT Call 1}
-\@pdata@def{prop}{gen}{callid}{FP7-???-200?-?}
-\@pdata@def{prop}{gen}{instrument}{Small or Medium-Scale Focused Research Project (STREP)}
-\@pdata@def{prop}{gen}{challengeid}{4}
-\@pdata@def{prop}{gen}{challenge}{ICT for EU Proposals}
-\@pdata@def{prop}{gen}{objectiveid}{ICT-2012.4.4}
-\@pdata@def{prop}{gen}{objective}{Technology-enhanced Documents}
-\@pdata@def{prop}{gen}{outcomeid}{b1}
-\@pdata@def{prop}{gen}{outcome}{More time for Research, not Proposal writing}
-\@pdata@def{prop}{gen}{coordinator}{miko}
-\@pdata@def{prop}{gen}{months}{24}
-\@pdata@def{all}{jacu}{RM}{16}
-\@pdata@def{all}{efo}{RM}{10}
-\@pdata@def{all}{bar}{RM}{22}
-\@pdata@def{all}{baz}{RM}{10}
-\@pdata@def{all}{total}{RM}{58}
-\@pdata@def{mile}{kickoff}{label}{M{1}}
-\@pdata@def{mile}{kickoff}{month}{1}
-\@pdata@def{mile}{kickoff}{verif}{Inspection}
-\@pdata@def{mile}{kickoff}{title}{Initial Infrastructure}
-\@pdata@def{mile}{consensus}{label}{M{2}}
-\@pdata@def{mile}{consensus}{month}{24}
-\@pdata@def{mile}{consensus}{verif}{Inspection}
-\@pdata@def{mile}{consensus}{title}{Consensus}
-\@pdata@def{mile}{exploitation}{label}{M{3}}
-\@pdata@def{mile}{exploitation}{month}{36}
-\@pdata@def{mile}{exploitation}{verif}{Inspection}
-\@pdata@def{mile}{exploitation}{title}{Exploitation}
-\@pdata@def{mile}{final}{label}{M{4}}
-\@pdata@def{mile}{final}{month}{48}
-\@pdata@def{mile}{final}{verif}{Inspection}
-\@pdata@def{mile}{final}{title}{Final Results}
-\@pdata@def{wp}{management}{type}{MGT}
-\@pdata@def{wp}{management}{wphases}{0-24!.2}
-\@pdata@def{wp}{management}{title}{Project Management}
-\@pdata@def{wp}{management}{short}{Management}
-\@pdata@def{management}{jacu}{RM}{2}
-\@pdata@def{management}{bar}{RM}{2}
-\@pdata@def{management}{efo}{RM}{2}
-\@pdata@def{management}{baz}{RM}{2}
-\@pdata@def{wp}{management}{start}{0}
-\@pdata@def{wp}{management}{end}{24}
-\@pdata@def{wp}{management}{type}{MGT}
-\@pdata@def{wp}{management}{label}{WP{1}}
-\@pdata@def{wp}{management}{number}{1}
-\@pdata@def{wp}{management}{page}{7}
-\@pdata@def{wp}{management}{num}{1}
-\@pdata@def{wp}{management}{RM}{8}
-\@pdata@def{deliv}{managementmailing}{label}{M{1.1}}
-\@pdata@def{deliv}{managementmailing}{title}{Project-internal mailing lists}
-\@pdata@def{deliv}{managementmailing}{short}{Project-internal mailing lists}
-\@pdata@def{deliv}{managementmailing}{nature}{O}
-\@pdata@def{deliv}{managementmailing}{dissem}{PP}
-\@pdata@def{deliv}{managementhandbook}{label}{M{1.2}}
-\@pdata@def{deliv}{managementhandbook}{title}{Project management handbook}
-\@pdata@def{deliv}{managementhandbook}{short}{Project management handbook}
-\@pdata@def{deliv}{managementhandbook}{nature}{R}
-\@pdata@def{deliv}{managementhandbook}{dissem}{PU}
-\@pdata@def{deliv}{managementreport2}{label}{M{1.3}}
-\@pdata@def{deliv}{managementreport2}{title}{Periodic activity report}
-\@pdata@def{deliv}{managementreport2}{short}{Periodic activity report}
-\@pdata@def{deliv}{managementreport2}{nature}{R}
-\@pdata@def{deliv}{managementreport2}{dissem}{public}
-\@pdata@def{deliv}{managementhelpdesk}{label}{M{1.4}}
-\@pdata@def{deliv}{managementhelpdesk}{title}{{iPoWr\xspace  } Helpdesk}
-\@pdata@def{deliv}{managementhelpdesk}{short}{{iPoWr\xspace  } Helpdesk}
-\@pdata@def{deliv}{managementhelpdesk}{nature}{O}
-\@pdata@def{deliv}{managementhelpdesk}{dissem}{PU}
-\@pdata@def{deliv}{managementreport6}{label}{M{1.5}}
-\@pdata@def{deliv}{managementreport6}{title}{Final plan for using and disseminating the knowledge}
-\@pdata@def{deliv}{managementreport6}{short}{Final plan for using and disseminating the knowledge}
-\@pdata@def{deliv}{managementreport6}{nature}{R}
-\@pdata@def{deliv}{managementreport6}{dissem}{PU}
-\@pdata@def{deliv}{managementreport7}{label}{M{1.6}}
-\@pdata@def{deliv}{managementreport7}{title}{Final management report}
-\@pdata@def{deliv}{managementreport7}{short}{Final management report}
-\@pdata@def{deliv}{managementreport7}{nature}{R}
-\@pdata@def{deliv}{managementreport7}{dissem}{PU}
-\@pdata@def{wp}{dissem}{type}{RTD}
-\@pdata@def{wp}{dissem}{lead}{efo}
-\@pdata@def{wp}{dissem}{wphases}{10-24!1}
-\@pdata@def{wp}{dissem}{title}{Dissemination and Exploitation}
-\@pdata@def{wp}{dissem}{short}{Dissemination}
-\@pdata@def{dissem}{efo}{RM}{8}
-\@pdata@def{dissem}{jacu}{RM}{2}
-\@pdata@def{dissem}{bar}{RM}{2}
-\@pdata@def{dissem}{baz}{RM}{2}
-\@pdata@def{wp}{dissem}{start}{10}
-\@pdata@def{wp}{dissem}{end}{24}
-\@pdata@def{wp}{dissem}{type}{RTD}
-\@pdata@def{wp}{dissem}{label}{WP{2}}
-\@pdata@def{wp}{dissem}{number}{2}
-\@pdata@def{wp}{dissem}{page}{9}
-\@pdata@def{wp}{dissem}{num}{2}
-\@pdata@def{wp}{dissem}{RM}{14}
-\@pdata@def{deliv}{dissemwebsite}{label}{M{2.1}}
-\@pdata@def{deliv}{dissemwebsite}{title}{Set-up of the Project web server}
-\@pdata@def{deliv}{dissemwebsite}{short}{Set-up of the Project web server}
-\@pdata@def{deliv}{dissemwebsite}{nature}{O}
-\@pdata@def{deliv}{dissemwebsite}{dissem}{PU}
-\@pdata@def{deliv}{dissemws1proc}{label}{M{2.2}}
-\@pdata@def{deliv}{dissemws1proc}{title}{Proceedings of the first {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws1proc}{short}{Proceedings of the first {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws1proc}{nature}{R}
-\@pdata@def{deliv}{dissemws1proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemdissem}{label}{M{2.3}}
-\@pdata@def{deliv}{dissemdissem}{title}{Dissemination Plan}
-\@pdata@def{deliv}{dissemdissem}{short}{Dissemination Plan}
-\@pdata@def{deliv}{dissemdissem}{nature}{R}
-\@pdata@def{deliv}{dissemdissem}{dissem}{PP}
-\@pdata@def{deliv}{dissemexploitplan}{label}{M{2.4}}
-\@pdata@def{deliv}{dissemexploitplan}{title}{Scientific and Commercial Exploitation Plan}
-\@pdata@def{deliv}{dissemexploitplan}{short}{Scientific and Commercial Exploitation Plan}
-\@pdata@def{deliv}{dissemexploitplan}{nature}{R}
-\@pdata@def{deliv}{dissemexploitplan}{dissem}{PP}
-\@pdata@def{deliv}{dissemws2proc}{label}{M{2.5}}
-\@pdata@def{deliv}{dissemws2proc}{title}{Proceedings of the second {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws2proc}{short}{Proceedings of the second {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws2proc}{nature}{R}
-\@pdata@def{deliv}{dissemws2proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemss1proc}{label}{M{2.6}}
-\@pdata@def{deliv}{dissemss1proc}{title}{Proceedings of the third {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemss1proc}{short}{Proceedings of the third {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemss1proc}{nature}{R}
-\@pdata@def{deliv}{dissemss1proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemws3proc}{label}{M{2.7}}
-\@pdata@def{deliv}{dissemws3proc}{title}{Proceedings of the fourth {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws3proc}{short}{Proceedings of the fourth {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws3proc}{nature}{R}
-\@pdata@def{deliv}{dissemws3proc}{dissem}{PU}
-\@pdata@def{wp}{class}{type}{RTD}
-\@pdata@def{wp}{class}{lead}{jacu}
-\@pdata@def{wp}{class}{wphases}{3-9!1}
-\@pdata@def{wp}{class}{title}{A {\LaTeX  } class for EU Proposals}
-\@pdata@def{wp}{class}{short}{Class}
-\@pdata@def{class}{jacu}{RM}{12}
-\@pdata@def{class}{bar}{RM}{12}
-\@pdata@def{wp}{class}{start}{3}
-\@pdata@def{wp}{class}{end}{9}
-\@pdata@def{wp}{class}{type}{RTD}
-\@pdata@def{wp}{class}{label}{WP{3}}
-\@pdata@def{wp}{class}{number}{3}
-\@pdata@def{wp}{class}{page}{10}
-\@pdata@def{wp}{class}{num}{3}
-\@pdata@def{wp}{class}{RM}{24}
-\@pdata@def{deliv}{classreq}{label}{M{3.1}}
-\@pdata@def{deliv}{classreq}{title}{Requirements analysis}
-\@pdata@def{deliv}{classreq}{short}{Requirements analysis}
-\@pdata@def{deliv}{classreq}{nature}{R}
-\@pdata@def{deliv}{classreq}{dissem}{PP}
-\@pdata@def{deliv}{classspec}{label}{M{3.2}}
-\@pdata@def{deliv}{classspec}{title}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{classspec}{short}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{classspec}{nature}{R}
-\@pdata@def{deliv}{classspec}{dissem}{PU}
-\@pdata@def{deliv}{classdemonstrator}{label}{M{3.3}}
-\@pdata@def{deliv}{classdemonstrator}{title}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{classdemonstrator}{short}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{classdemonstrator}{nature}{P}
-\@pdata@def{deliv}{classdemonstrator}{dissem}{PU}
-\@pdata@def{deliv}{classproto}{label}{M{3.4}}
-\@pdata@def{deliv}{classproto}{title}{First prototype}
-\@pdata@def{deliv}{classproto}{short}{First prototype}
-\@pdata@def{deliv}{classproto}{nature}{P}
-\@pdata@def{deliv}{classproto}{dissem}{PU}
-\@pdata@def{deliv}{classrelease}{label}{M{3.5}}
-\@pdata@def{deliv}{classrelease}{title}{Final {\LaTeX  } class, ready for release}
-\@pdata@def{deliv}{classrelease}{short}{Final {\LaTeX  } class, ready for release}
-\@pdata@def{deliv}{classrelease}{nature}{P}
-\@pdata@def{deliv}{classrelease}{dissem}{PU}
-\@pdata@def{wp}{temple}{type}{DEM}
-\@pdata@def{wp}{temple}{lead}{bar}
-\@pdata@def{wp}{temple}{wphases}{6-12!1}
-\@pdata@def{wp}{temple}{title}{{iPoWr\xspace  } Proposal Template}
-\@pdata@def{wp}{temple}{short}{Template}
-\@pdata@def{temple}{bar}{RM}{6}
-\@pdata@def{temple}{baz}{RM}{6}
-\@pdata@def{wp}{temple}{start}{6}
-\@pdata@def{wp}{temple}{end}{12}
-\@pdata@def{wp}{temple}{type}{DEM}
-\@pdata@def{wp}{temple}{label}{WP{4}}
-\@pdata@def{wp}{temple}{number}{4}
-\@pdata@def{wp}{temple}{page}{11}
-\@pdata@def{wp}{temple}{num}{4}
-\@pdata@def{wp}{temple}{RM}{12}
-\@pdata@def{deliv}{templereq}{label}{M{4.1}}
-\@pdata@def{deliv}{templereq}{title}{Requirements analysis}
-\@pdata@def{deliv}{templereq}{short}{Requirements analysis}
-\@pdata@def{deliv}{templereq}{nature}{R}
-\@pdata@def{deliv}{templereq}{dissem}{PP}
-\@pdata@def{deliv}{templespec}{label}{M{4.2}}
-\@pdata@def{deliv}{templespec}{title}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{templespec}{short}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{templespec}{nature}{R}
-\@pdata@def{deliv}{templespec}{dissem}{PU}
-\@pdata@def{deliv}{templedemonstrator}{label}{M{4.3}}
-\@pdata@def{deliv}{templedemonstrator}{title}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{templedemonstrator}{short}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{templedemonstrator}{nature}{D}
-\@pdata@def{deliv}{templedemonstrator}{dissem}{PU}
-\@pdata@def{deliv}{templeproto}{label}{M{4.4}}
-\@pdata@def{deliv}{templeproto}{title}{First prototype}
-\@pdata@def{deliv}{templeproto}{short}{First prototype}
-\@pdata@def{deliv}{templeproto}{nature}{P}
-\@pdata@def{deliv}{templeproto}{dissem}{PU}
-\@pdata@def{deliv}{templerelease}{label}{M{4.5}}
-\@pdata@def{deliv}{templerelease}{title}{Final Template, ready for release}
-\@pdata@def{deliv}{templerelease}{short}{Final Template, ready for release}
-\@pdata@def{deliv}{templerelease}{nature}{P}
-\@pdata@def{deliv}{templerelease}{dissem}{PU}
-\@pdata@def{all}{task}{count}{0}
-\@pdata@def{all}{wp}{ids}{management,dissem,class,temple}
-\@pdata@def{mile}{kickoff}{delivs}{managementmailing,managementhelpdesk,dissemwebsite,dissemws1proc,classreq,templereq}
-\@pdata@def{mile}{consensus}{delivs}{managementhandbook,managementreport2,classspec,classdemonstrator,templespec,templedemonstrator}
-\@pdata@def{mile}{exploitation}{delivs}{dissemexploitplan,dissemws2proc,dissemss1proc,dissemws3proc}
-\@pdata@def{mile}{final}{delivs}{managementreport2,managementreport6,managementreport7,classdemonstrator,classproto,classrelease,templedemonstrator,templeproto,templerelease}
-\@pdata@def{all}{wp}{count}{4}
-\@pdata@def{all}{deliverables}{count}{23}
-\@pdata@def{all}{milestones}{count}{4}
-\@pdata@def{prop}{page}{last}{25}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdf b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdf
deleted file mode 100644
index bf40bf6f835..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.tex
deleted file mode 100644
index af4055f4b1e..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB.tex
+++ /dev/null
@@ -1,72 +0,0 @@
-% the document class specification for the proposal writing process, add the 'submit' option
-% for submitting (switches off various draft features); add the 'public' option to exclude
-% any private parts. 
-\documentclass[noworkareas,deliverables]{euproposal}
-%\documentclass[submit,noworkareas,deliverables]{euproposal}
-%\documentclass[submit,public,noworkareas,deliverables]{euproposal}
-%% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697)
-%\usepackage[T1]{fontenc}
-%\usepackage[utf8]{inputenc}
-\bibliography{../lib/dummy}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: propB.tex 22963 2012-01-13 08:47:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/propB.tex $
-%
-\input{../lib/WApersons}% Some sections of the included files depend on this.
-
-
-\begin{document}
-\begin{center}\color{red}\huge
-This mock proposal is just an example for \texttt{euproposal.cls} it reflects the ICT
-template of May 2011
-\end{center}
-\begin{proposal}[site=jacu,jacuRM=36,
-  site=efo,efoRM=36,
-  site=bar,barRM=36,
-  site=baz,bazRM=36,
-  coordinator=miko,
-  acronym={iPoWr},
-  acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}sal} {\underline{Wr}iting},
-  title=\pn: \protect\pnlong,
-  callname = ICT Call 1,
-  callid = FP7-???-200?-?,
-  instrument= Small or Medium-Scale Focused Research Project (STREP), 
-  challengeid = 4,
-  challenge = ICT for EU Proposals,
-  objectiveid={ICT-2012.4.4}, 
-  objective = Technology-enhanced Documents,
-  outcomeid = b1,
-  outcome = {More time for Research, not Proposal writing},
-  coordinator=miko,
-  months=24,
-  compactht]
-\begin{abstract}
-  Writing grant proposals is a collaborative effort that requires the integration of
-  contributions from many individuals. The use of an ASCII-based format like {\LaTeX}
-  allows to coordinate the process via a source code control system like
-  {\textsc{Subversion}}, allowing the proposal writing team to concentrate on the contents
-  rather than the mechanics of wrangling with text fragments and revisions.
-\end{abstract}
-
-\tableofcontents
-
-\begin{todo}{from the proposal template}
-  Recommended length for the whole part B: 50--60 pages (including tables, references,
-  etc.)
-\end{todo}
-\include{quality}\newpage
-\include{implementation}\newpage
-\include{impact}\newpage
-\include{issues}
-\end{proposal}
-\end{document}
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: t
-%%% End: 
-
-% LocalWords:  efo efoRM baz bazRM miko acrolong ntelligent iting pn pnlong
-% LocalWords:  textsc newpage compactht
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB1-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB1-blx.bbl
deleted file mode 100644
index 2f6e6ae4fd7..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB1-blx.bbl
+++ /dev/null
@@ -1,338 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{CarlisleEd:MathML10}{report}{}
-  \name{author}{20}{}{%
-    {{}%
-     {Ausbrooks}{A.}%
-     {Ron}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Buswell}{B.}%
-     {Stephen}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Carlisle}{C.}%
-     {David}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Chavchanidze}{C.}%
-     {Giorgi}{G.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Dalmas}{D.}%
-     {St{\'e}phane}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Devitt}{D.}%
-     {Stan}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Diaz}{D.}%
-     {Angel}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Dooley}{D.}%
-     {Sam}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Hunter}{H.}%
-     {Roger}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ion}{I.}%
-     {Patrick}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Lazrek}{L.}%
-     {Azzeddine}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Libbrecht}{L.}%
-     {Paul}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miller}{M.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miner}{M.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sargent}{S.}%
-     {Murray}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Smith}{S.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Soiffer}{S.}%
-     {Neil}{N.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sutor}{S.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Watt}{W.}%
-     {Stephen}{S.}%
-     {}{}%
-     {}{}}%
-  }
-  \name{editor}{3}{}{%
-    {{}%
-     {Carlisle}{C.}%
-     {David}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ion}{I.}%
-     {Patrick}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miner}{M.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-  }
-  \keyw{standard}
-  \strng{namehash}{AR+1}
-  \strng{fullhash}{ARBSCDCGDSDSDADSHRIPKMLALPMBMRSMSBSNSRWS1}
-  \field{sortinit}{A}
-  \field{title}{{Mathematical} {Markup} {Language} ({MathML}) Version 3.0}
-  \verb{url}
-  \verb http://www.w3.org/TR/MathML3
-  \endverb
-  \list{institution}{1}{%
-    {World Wide Web Consortium (W3C)}%
-  }
-  \field{type}{{W3C Recommendation}}
-  \field{year}{2010}
-\endentry
-
-\entry{Kohlhase:omdoc1.2}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Springer Verlag}%
-  }
-  \strng{namehash}{KM1}
-  \strng{fullhash}{KM1}
-  \field{sortinit}{K}
-  \field{booktitle}{{\sc OMDoc} -- An open markup format for mathematical
-  documents [Version 1.2]}
-  \field{number}{4180}
-  \field{series}{LNAI}
-  \field{title}{{\sc OMDoc} -- An open markup format for mathematical documents
-  [Version 1.2]}
-  \verb{url}
-  \verb http://omdoc.org/pubs/omdoc1.2.pdf
-  \endverb
-  \field{month}{08}
-  \field{year}{2006}
-\endentry
-
-\entry{Kohlhase:pdpl10}{report}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \strng{namehash}{KM1}
-  \strng{fullhash}{KM1}
-  \field{sortinit}{K}
-  \field{title}{Preparing {DFG} Proposals in {\LaTeX} with
-  \texttt{dfgproposal.cls}}
-  \verb{url}
-  \verb https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf
-  \endverb
-  \list{institution}{1}{%
-    {KWARC Group, Jacobs University Bremen}%
-  }
-  \field{type}{Self-documenting {\LaTeX} package}
-  \field{year}{2010}
-\endentry
-
-\entry{KohDavGin:psewads11}{inproceedings}{}
-  \name{author}{10}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Corneli}{C.}%
-     {Joe}{J.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {David}{D.}%
-     {Catalin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ginev}{G.}%
-     {Deyan}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Jucovschi}{J.}%
-     {Constantin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Andrea}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Lange}{L.}%
-     {Christoph}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Matican}{M.}%
-     {Bogdan}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Mirea}{M.}%
-     {Stefan}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Zholudev}{Z.}%
-     {Vyacheslav}{V.}%
-     {}{}%
-     {}{}}%
-  }
-  \keyw{conference}
-  \strng{namehash}{KM+1}
-  \strng{fullhash}{KMCJDCGDJCKALCMBMSZV1}
-  \field{sortinit}{K}
-  \field{note}{accepted for publication at ICCS 2011 (Finalist at the
-  Executable Papers Challenge)}
-  \field{title}{The Planetary System: Web 3.0 \& Active Documents for STEM}
-  \verb{url}
-  \verb https://svn.mathweb.org/repos/planetary/doc/epc11/paper.pdf
-  \endverb
-  \field{year}{2011}
-\endentry
-
-\entry{StaKoh:tlcspx10}{article}{}
-  \name{author}{5}{}{%
-    {{}%
-     {Stamerjohanns}{S.}%
-     {Heinrich}{H.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ginev}{G.}%
-     {Deyan}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {David}{D.}%
-     {Catalin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miller}{M.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-  }
-  \name{editor}{3}{}{%
-    {{}%
-     {Autexier}{A.}%
-     {Serge}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sojka}{S.}%
-     {Petr}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Suzuki}{S.}%
-     {Masakazu}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Birkh{\"a}user}%
-  }
-  \strng{namehash}{SH+1}
-  \strng{fullhash}{SHKMGDDCMB1}
-  \field{sortinit}{S}
-  \field{issuetitle}{Special Issue on Authoring, Digitalization and Management
-  of Mathematical Knowledge}
-  \field{number}{3}
-  \field{pages}{299\bibrangedash 307}
-  \field{title}{Transforming large collections of scientific publications to
-  {XML}}
-  \verb{url}
-  \verb http://kwarc.info/kohlhase/papers/mcs10.pdf
-  \endverb
-  \field{volume}{3}
-  \field{journaltitle}{Mathematics in Computer Science}
-  \field{year}{2010}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB2-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB2-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB2-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB3-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB3-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB3-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB4-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB4-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/propB4-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/quality.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/quality.tex
deleted file mode 100644
index 242d231e298..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/quality.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\svnInfo $Id: quality.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/quality.tex $
-\chapter{Scientific and Technical Quality}\label{chap:quality}
-\begin{todo}{from the proposal template}
-  Maximum length for the whole of Section 1 –-- twenty pages, not including the tables in
-  Section 1.3
-\end{todo}
-
-\input{breakthrough}
-\input{novelty}
-\input{methodology}
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/workplan.tex b/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/workplan.tex
deleted file mode 100644
index 0c563e07db7..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/fetopenstrep/workplan.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\svnInfo $Id: workplan.tex 22929 2012-01-08 09:25:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/workplan.tex $
-
-\begin{todo}{from the proposal template}
-\begin{enumerate}
-\item Describe the overall strategy of the work plan\ednote{Maximum length – one page}
-\item Show the timing of the different WPs and their components (Gantt chart or similar).
-\end{enumerate}
-\end{todo}
-\begin{figure}
-  \caption{Work package dependencies}
-  \label{fig:wp-deps}
-\end{figure}
-
-\ganttchart[draft,xscale=.45] 
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  workplan.tex ednote wp-deps ganttchart xscale
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/lib/WApersons.tex b/Master/texmf-dist/doc/latex/proposal/examples/lib/WApersons.tex
deleted file mode 100644
index 7946c657e77..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/lib/WApersons.tex
+++ /dev/null
@@ -1,63 +0,0 @@
-\WAperson[id=miko, 
-           personaltitle=Prof. Dr.,
-           birthdate=13. September 1964,
-           academictitle=Professor of Computer Science,
-           affiliation=jacu,
-           department=case,
-           privaddress=None of your business,
-           privtel=that neither,
-           email=m.kohlhase@jacobs-university.de,
-           workaddress={Campus Ring 1, 28757 Bremen},
-           worktel=+49 421 200 3140,
-           worktelfax=+49 421 200 3140/493140,
-           workfax=+49 421 200 493140]
-           {Michael Kohlhase}
-
-\WAperson[id=gc,
-           personaltitle=Dr.,
-           academictitle=Senior Researcher,
-           birthdate=14. April 1972,
-           affiliation=pcg,
-           department=pcsa,
-           privaddress=None of your business,
-           privtel=that neither,
-           workaddress={PCG Way 7, Hooville},
-           worktel=+49 421 0815 4711,
-           workfax=+49 421 0815 4712,
-           email=gc@pcg.phony]
-           {Great Communicator}
-
-\WAinstitution[id=case,acronym=CASE,shortname=CASE,
-                url=http://jacobs-university.de/ses/case,
-                partof=jacu]
-               {Center for Advanced Systems Engineering}
-
-\WAinstitution[id=jacu,acronym=JacU,
-               url=http://jacobs-university.de,
-               streetaddress={Campus Ring 1},
-               townzip={28759 Bremen},
-               countryshort=D,
-               country=Germany,
-               type=University,
-               logo=jacobs-logo.png,
-               shortname=Jacobs University]
-               {Jacobs University Bremen}
-
-\WAinstitution[id=pcsa,
-                           url=http://pcg.phony/sa,
-                           partof=pcg,shortname=Science Affairs]
-               {Science Affairs}
-\WAinstitution[id=pcg,acronym=PCG,
-                           url=http://pcg.phony,
-                           countryshort=D,
-                           streetaddress={Seefahrtstrasse 5},
-                           townzip={23555 Hamburg},
-                           shortname=Power Consulting]
-               {Power Consulting GmbH}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% End: 
-
-% LocalWords:  WAperson miko personaltitle academictitle privaddress privtel
-% LocalWords:  workaddress worktel workfax gc
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/lib/dummy.bib b/Master/texmf-dist/doc/latex/proposal/examples/lib/dummy.bib
deleted file mode 100644
index 245b32c737b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/lib/dummy.bib
+++ /dev/null
@@ -1,23 +0,0 @@
-@PREAMLE{\usepackage{url}}
-@misc{Kohlhase:pdpl10,
-  author = {Michael Kohlhase},
-  title = {Preparing {DFG} Proposals in {\LaTeX} with \texttt{dfgproposal.cls}},
-  institution = {KWARC Group, Jacobs University Bremen},
-  howpublished = {Self-documenting {\LaTeX} package, \url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf}; ask the author for access},
-  year = 2010}
-@misc{providemore,title={\ldots}}
-@BOOK{Lamport:ladps94,
-  title = {LaTeX: A Document Preparation System, 2/e},
-  publisher = {Addison Wesley},
-  year = {1994},
-  author = {Leslie Lamport}}
-@BOOK{Knuth:ttb84,
-  title = {The {\TeX}book},
-  publisher = {Addison Wesley},
-  year = {1984},
-  author = {Donald E. Knuth}}
-@BOOK{DK:LP,
-  title = {{Literate Programming}},
-  publisher = {The University of Chicago Press},
-  year = 1992,
-  author = {Donald E. Knuth}}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/lib/jacobs-logo.png b/Master/texmf-dist/doc/latex/proposal/examples/lib/jacobs-logo.png
deleted file mode 100644
index 0bbe28c44fc..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/lib/jacobs-logo.png
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/Makefile b/Master/texmf-dist/doc/latex/proposal/examples/proposal/Makefile
deleted file mode 100644
index 1965593ba49..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# possibly customize the following variables to your setting
-PROPOSAL = proposal.tex 	# the proposal
-BIB = ../lib/dummy.bib	        # bibTeX databases
-PROP.dir = ../../..
-###########################################################################
-# the following are computed
-TARGET = $(PROPOSAL)                         	  # all pdflatex targets
-TARGET.pdf 	= $(TARGET:%.tex=%.pdf)         	  # PDFs to be produced
-TARGET.aux 	= $(TARGET:%.tex=%.aux)             # their aux files.
-PDATA 		= $(PROPOSAL:%.tex=%.pdata)       # the proposal project data
-SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
-PDFLATEX = pdflatex -interaction batchmode -file-line-error
-BBL.base = 1 
-BBL = proposal.bbl $(BBL.base:%=proposal%-blx.bbl)
-PROPCLS.dir = $(PROP.dir)/base
-PROPETC.dir = $(PROP.dir)/etc
-DFGPROPCLS.dir = $(PROP.dir)/dfg
-TEXINPUTS := .//:$(PROPCLS.dir)//:$(DFGPROPCLS.dir)//:$(PROPETC.dir)//:
-BIBINPUTS := ../lib:$(BIBINPUTS)
-PROPCLS.clssty = proposal.cls pdata.sty
-PROPETC.sty = workaddress.sty metakeys.sty sref.sty
-DFGPROPCLS.clssty = dfgproposal.cls dfgpdata.sty
-PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(DFGPROPCLS.clssty:%=$(DFGPROPCLS.dir)/%) $(PROPETC.sty:%=$(PROPETC.dir)/%)
-
-all: $(TARGET.pdf)
-
-cd: 	                                           # make cd will prepare CD for burning
-	mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD
-
-bbl: $(BBL)
-$(BBL): %.bbl: %.aux
-	bibtex -min-crossrefs=100 -terse $<
-
-$(PDATA): %.pdata: %.tex
-	$(PDFLATEX) $<
-
-$(TARGET.aux): %.aux: %.tex
-	$(PDFLATEX) $<
-
-$(TARGET.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) 
-	$(PDFLATEX) $<  || $(RM) $@
-#	sort $(PROPOSAL:%.tex=%.delivs) > $(PROPOSAL:%.tex=%.deliverables)
-	@if (test -e $(patsubst %.tex, %.idx,  $<));\
-	    then makeindex $(patsubst %.tex, %.idx,  $<); fi
-	$(MAKE) -$(MAKEFLAGS) $(BBL)
-	@if (grep "(re)run BibTeX" $(patsubst %.tex, %.log,  $<)> /dev/null);\
-	    then $(MAKE) -B $(BBL); fi
-	$(PDFLATEX)  $< || $(RM) $@
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	   then $(PDFLATEX)  $<  || $(RM) $@; fi
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	    then $(PDFLATEX)  $<  || $(RM) $@; fi
-
-clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
-
-distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
-	rm -Rf auto
-
-echo:
-	echo $(BIBINPUTS)
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/preconditions.tex b/Master/texmf-dist/doc/latex/proposal/examples/proposal/preconditions.tex
deleted file mode 100644
index 7a2c95c0eab..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/preconditions.tex
+++ /dev/null
@@ -1,107 +0,0 @@
-\svnInfo $Id: preconditions.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/preconditions.tex $
-\section{Project Requirements \deu{(Voraussetzungen f\"ur die Durchf\"uhrung des Vorhabens)}}
-
-\subsection{Employment status information \deu{(Angaben zur Dienststellung)}}
-
-\begin{todo}{from the proposal template}
-For each applicant, state the last name, first name, and employment status (including
-duration of contract and funding body, if on a fixed-term contract).
-\end{todo}
-
-\subsection{First-time proposal data \deu{(Angaben zur Erstantragstellung)}}
-
-\begin{todo}{from the proposal template}
-Only if applicable: Last name, first name of first-time applicant.
-
-If this is your first proposal, reviewers will consider this fact when assessing your pro-
-posal. Previous proposals for research fellowships, publication funding, travel allow-
-ances, or funding for scientific networks are not considered first proposals. If you are
-submitting a “first-time proposal” and it is part of a joint proposal, please note that your
-independent project must be distinct from the other projects.
-
-If you have already submitted a proposal as an applicant for a research grant and have
-received a letter informing you of the funding decision, or if you have led an independ-
-ent junior research group or project in a Collaborative Research Centre or Research
-Unit, you are no longer eligible to submit a “first proposal”. If you have submitted a
-“first-time proposal” and it was rejected, you may resubmit the application, in revised
-form, as a first-time proposal for the same project.
-\end{todo}
-
-\subsection{Composition of the project group \deu{(Zusammensetzung der Projektarbeitsgruppe)}}
-
-\begin{todo}{from the proposal template}
-List only those individuals who will work on the project but will not be paid out of the
-project funds. State each person’s name, academic title, employment status, and type
-of funding.
-
-Please list separately the individuals paid by your institution and those paid using other
-third-party funding (including fellowships).
-\end{todo}
-\begin{sitedescription}{jacu}
-The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by
-Michael Kohlhase for has the following members
-\begin{compactdesc}
-\item[Dr. N.N.] is the \ldots She has a background in\ldots.
-\end{compactdesc}
-Additionally, the group has attracted about 10 undergraduate and master's students that
-actively take part in the project work and various aspects of research.
-\end{sitedescription}
-\begin{sitedescription}{pcg}
-Power Consulting GmbH is the leading provider of semantic document solutions. Dr. Senior
-Researcher leads an applied research group consisting of 
-\begin{compactdesc}
-\item[Dr. N.N.] is the \ldots She has a background in\ldots.
-\end{compactdesc}
-The group has access to seven programming slaves specializing in web development and
-document transformation techniques
-\end{sitedescription}
-
-
-\subsection{Cooperation with other researchers \deu{(Zusammenarbeit mit anderen Wissenschaftlerinnen und Wissenschaftlern)}}
-
-\subsubsection{Researchers with whom you have agreed to cooperate on this project \deu{(Wissenschaftlerinnen und Wissenschaftler, mit denen für dieses Vorhaben eine konkrete Vereinbarung zur Zusammenarbeit besteht)}}
-
-\begin{compactdesc}
-\item[Prof. Dr. Super Akquisiteur (Uni Paderborn)] knows exactly what to do to get funding
-  with DFG, we will interview him closely and integrate all his intuitions into the
-  {\pn} templates.
-\item[Prof. Dr. Habe Nichts (Uni Hinterpfuiteufel)] has never gotten a grant proposal
-  through with DFG, we will try to avoid his mistakes.
-\item[Dr. Sach Bearbeiter (DFG)] will consult with the DFG requirements to be met in the
-  proposals.
-\item[Dr. Donald Knuth (Stanford University)] is so surprised that we want to do grant
-  proposals in {\TeX/\LaTeX} that he will help us with any problems we have in coding in
-  this wonderful programming language.
-\end{compactdesc}
-
-\subsubsection{Researchers with whom you have collaborated scientifically within the past three years \deu{(Wissenschaftlerinnen und Wissenschaftler, mit denen in den letzten drei Jahren wissenschaftlich zusammengearbeitet wurde)}}
-
-\ednote{Anmerkung Jens: Etwas unklar, was die DFG hier möchte. Die Liste der Personen kann
-  sehr lang sein, also ist es wahrscheinlich besser nur die wichtigsten Projekte und
-  Kontakte zu listen.}
-
-\begin{todo}{from the proposal template}
-This information will assist the DFG’s Head Office in avoiding potential conflicts of in-
-terest during the review process.
-\end{todo}
-
-
-\subsection{Scientific equipment \deu{(Apparative Ausstattung)}}
-
-Jacobs University provides laptops or desktop workstations for all academic
-employees. Great Consulting GmbH. is rolling in money anyways and has all of the latest
-gadgets.
-
-
-\subsection{Project-relevant interests in commercial enterprises \deu{(Projektrelevante Beteiligungen an erwerbswirtschaftlichen Unternehmen)}}
-
-Not applicable.
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "proposal"
-%%% End: 
-
-% LocalWords:  Durchf uhrung subsubsection ipower Hinterpfuiteufel Sach Aktivit
-% LocalWords:  Erkl arungen
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal-blx.bib b/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal-blx.bib
deleted file mode 100644
index 86bcc8cec2f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal-blx.bib
+++ /dev/null
@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
-}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdata b/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdata
deleted file mode 100644
index bd813000596..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdata
+++ /dev/null
@@ -1,201 +0,0 @@
-\@pdata@def{site}{jacu}{number}{1}
-\@pdata@def{site}{pcg}{number}{2}
-\@pdata@def{prop}{gen}{thema}{Intelligentes Schreiben von Antr\"agen}
-\@pdata@def{prop}{gen}{acronym}{iPoWr}
-\@pdata@def{prop}{gen}{acrolong}{{\relax $\@@underline {\hbox {I}}\mathsurround \z@ $\relax ntelligent} {\relax $\@@underline {\hbox {P}}\mathsurround \z@ $\relax r\relax $\@@underline {\hbox {o}}\mathsurround \z@ $\relax sal} {\relax $\@@underline {\hbox {Wr}}\mathsurround \z@ $\relax iting}}
-\@pdata@def{prop}{gen}{title}{iPoWr\xspace  : \pnlong }
-\@pdata@def{prop}{gen}{totalduration}{3 years}
-\@pdata@def{prop}{gen}{since}{1. Feb 2009}
-\@pdata@def{prop}{gen}{start}{1. Feb. 2010}
-\@pdata@def{prop}{gen}{months}{24}
-\@pdata@def{site}{pcg}{intendedRM}{36}
-\@pdata@def{site}{pcg}{intendedRAM}{36}
-\@pdata@def{site}{jacu}{intendedRM}{36}
-\@pdata@def{site}{jacu}{intendedRAM}{36}
-\@pdata@def{prop}{gen}{discipline}{Computer Science}
-\@pdata@def{prop}{gen}{areas}{Knowledge Management}
-\@pdata@def{obj}{firstobj}{label}{O1}
-\@pdata@def{obj}{firstobj}{title}{Supporting Authors}
-\@pdata@def{obj}{secondobj}{label}{O2}
-\@pdata@def{obj}{secondobj}{title}{Supporting Reviewers}
-\@pdata@def{mansubsus}{jacu}{RM}{2}
-\@pdata@def{mansubsus}{jacu}{RAM}{10}
-\@pdata@def{mansubsus}{pcg}{RM}{10}
-\@pdata@def{mansubsus}{pcg}{RAM}{0}
-\@pdata@def{systems}{jacu}{RM}{24}
-\@pdata@def{systems}{jacu}{RAM}{8}
-\@pdata@def{systems}{pcg}{RM}{12}
-\@pdata@def{systems}{pcg}{RAM}{2}
-\@pdata@def{all}{jacu}{RM}{26}
-\@pdata@def{all}{jacu}{RAM}{18}
-\@pdata@def{all}{pcg}{RM}{22}
-\@pdata@def{all}{pcg}{RAM}{2}
-\@pdata@def{all}{total}{RM}{48}
-\@pdata@def{all}{total}{RAM}{20}
-\@pdata@def{wa}{mansubsus}{title}{Management, Support \& Sustainability}
-\@pdata@def{wa}{mansubsus}{short}{Management}
-\@pdata@def{wa}{mansubsus}{label}{WA{1}}
-\@pdata@def{wa}{mansubsus}{number}{1}
-\@pdata@def{wa}{mansubsus}{page}{2}
-\@pdata@def{wa}{mansubsus}{num}{1}
-\@pdata@def{wa}{mansubsus}{RM}{12}
-\@pdata@def{prop}{all}{RM}{12}
-\@pdata@def{wa}{mansubsus}{RAM}{10}
-\@pdata@def{prop}{all}{RAM}{10}
-\@pdata@def{wp}{management}{lead}{jacu}
-\@pdata@def{wp}{management}{title}{Project Management}
-\@pdata@def{management}{jacu}{RM}{2}
-\@pdata@def{management}{jacu}{RAM}{8}
-\@pdata@def{management}{pcg}{RM}{2}
-\@pdata@def{wp}{management}{start}{0}
-\@pdata@def{wp}{management}{end}{0}
-\@pdata@def{wp}{management}{label}{WP{1.1}}
-\@pdata@def{wp}{management}{number}{1}
-\@pdata@def{wp}{management}{page}{2}
-\@pdata@def{wp}{management}{num}{1}
-\@pdata@def{wp}{management}{RM}{4}
-\@pdata@def{wp}{management}{RAM}{8}
-\@pdata@def{task}{management@foo}{wphases}{0-3}
-\@pdata@def{taskdep}{taskdep1}{from}{management@foo}
-\@pdata@def{taskdep}{taskdep1}{to}{dissem@t1}
-\@pdata@def{task}{management@foo}{wphases}{0-3}
-\@pdata@def{task}{management@foo}{label}{T1}
-\@pdata@def{task}{management@foo}{number}{1}
-\@pdata@def{task}{management@foo}{page}{2}
-\@pdata@def{task}{management@task2}{wphases}{13-17!.5}
-\@pdata@def{task}{management@task2}{wphases}{13-17!.5}
-\@pdata@def{task}{management@task2}{label}{T2}
-\@pdata@def{task}{management@task2}{number}{2}
-\@pdata@def{task}{management@task2}{page}{2}
-\@pdata@def{task}{management@task3}{wphases}{0-0}
-\@pdata@def{task}{management@task3}{label}{T3}
-\@pdata@def{task}{management@task3}{number}{3}
-\@pdata@def{task}{management@task3}{page}{3}
-\@pdata@def{task}{management@task4}{wphases}{0-0}
-\@pdata@def{task}{management@task4}{label}{T4}
-\@pdata@def{task}{management@task4}{number}{4}
-\@pdata@def{task}{management@task4}{page}{3}
-\@pdata@def{management}{task}{ids}{management@foo,management@task2,management@task3,management@task4}
-\@pdata@def{wp}{dissem}{lead}{pcg}
-\@pdata@def{wp}{dissem}{title}{Dissemination and Exploitation}
-\@pdata@def{dissem}{pcg}{RM}{8}
-\@pdata@def{dissem}{jacu}{RAM}{2}
-\@pdata@def{wp}{dissem}{start}{0}
-\@pdata@def{wp}{dissem}{end}{0}
-\@pdata@def{wp}{dissem}{label}{WP{1.2}}
-\@pdata@def{wp}{dissem}{number}{2}
-\@pdata@def{wp}{dissem}{page}{3}
-\@pdata@def{wp}{dissem}{num}{2}
-\@pdata@def{wp}{dissem}{RM}{8}
-\@pdata@def{wp}{dissem}{RAM}{2}
-\@pdata@def{task}{dissem@t1}{wphases}{6-7}
-\@pdata@def{task}{dissem@t1}{wphases}{6-7}
-\@pdata@def{task}{dissem@t1}{label}{T1}
-\@pdata@def{task}{dissem@t1}{number}{1}
-\@pdata@def{task}{dissem@t1}{page}{3}
-\@pdata@def{task}{dissem@task6}{wphases}{12-13}
-\@pdata@def{task}{dissem@task6}{wphases}{12-13}
-\@pdata@def{task}{dissem@task6}{label}{T2}
-\@pdata@def{task}{dissem@task6}{number}{2}
-\@pdata@def{task}{dissem@task6}{page}{3}
-\@pdata@def{task}{dissem@task7}{wphases}{18-19}
-\@pdata@def{task}{dissem@task7}{wphases}{18-19}
-\@pdata@def{task}{dissem@task7}{label}{T3}
-\@pdata@def{task}{dissem@task7}{number}{3}
-\@pdata@def{task}{dissem@task7}{page}{3}
-\@pdata@def{task}{dissem@task8}{wphases}{22-24}
-\@pdata@def{task}{dissem@task8}{wphases}{22-24}
-\@pdata@def{task}{dissem@task8}{label}{T4}
-\@pdata@def{task}{dissem@task8}{number}{4}
-\@pdata@def{task}{dissem@task8}{page}{3}
-\@pdata@def{dissem}{task}{ids}{dissem@t1,dissem@task6,dissem@task7,dissem@task8}
-\@pdata@def{mansubsus}{wp}{ids}{management,dissem}
-\@pdata@def{mansubsus}{wp}{count}{2}
-\@pdata@def{wa}{systems}{title}{System Development}
-\@pdata@def{wa}{systems}{label}{WA{2}}
-\@pdata@def{wa}{systems}{number}{2}
-\@pdata@def{wa}{systems}{page}{3}
-\@pdata@def{wa}{systems}{num}{2}
-\@pdata@def{wa}{systems}{RM}{36}
-\@pdata@def{prop}{all}{RM}{48}
-\@pdata@def{wa}{systems}{RAM}{10}
-\@pdata@def{prop}{all}{RAM}{20}
-\@pdata@def{wp}{class}{lead}{jacu}
-\@pdata@def{wp}{class}{title}{A LaTeX class for EU Proposals}
-\@pdata@def{wp}{class}{short}{Class}
-\@pdata@def{class}{jacu}{RM}{12}
-\@pdata@def{class}{jacu}{RAM}{8}
-\@pdata@def{class}{pcg}{RM}{12}
-\@pdata@def{class}{pcg}{RAM}{2}
-\@pdata@def{wp}{class}{start}{0}
-\@pdata@def{wp}{class}{end}{0}
-\@pdata@def{wp}{class}{label}{WP{2.1}}
-\@pdata@def{wp}{class}{number}{1}
-\@pdata@def{wp}{class}{page}{3}
-\@pdata@def{wp}{class}{num}{1}
-\@pdata@def{wp}{class}{RM}{24}
-\@pdata@def{wp}{class}{RAM}{10}
-\@pdata@def{task}{class@task9}{wphases}{0-2}
-\@pdata@def{task}{class@task9}{wphases}{0-2}
-\@pdata@def{task}{class@task9}{label}{T1}
-\@pdata@def{task}{class@task9}{number}{1}
-\@pdata@def{task}{class@task9}{page}{3}
-\@pdata@def{task}{class@task10}{wphases}{4-8}
-\@pdata@def{task}{class@task10}{wphases}{4-8}
-\@pdata@def{task}{class@task10}{label}{T2}
-\@pdata@def{task}{class@task10}{number}{2}
-\@pdata@def{task}{class@task10}{page}{3}
-\@pdata@def{task}{class@t3}{wphases}{10-14}
-\@pdata@def{task}{class@t3}{wphases}{10-14}
-\@pdata@def{task}{class@t3}{label}{T3}
-\@pdata@def{task}{class@t3}{number}{3}
-\@pdata@def{task}{class@t3}{page}{3}
-\@pdata@def{task}{class@task12}{wphases}{20-24}
-\@pdata@def{task}{class@task12}{wphases}{20-24}
-\@pdata@def{task}{class@task12}{label}{T4}
-\@pdata@def{task}{class@task12}{number}{4}
-\@pdata@def{task}{class@task12}{page}{3}
-\@pdata@def{class}{task}{ids}{class@task9,class@task10,class@t3,class@task12}
-\@pdata@def{wp}{temple}{lead}{pcg}
-\@pdata@def{wp}{temple}{title}{Proposal Template}
-\@pdata@def{wp}{temple}{short}{Template}
-\@pdata@def{temple}{jacu}{RM}{12}
-\@pdata@def{wp}{temple}{start}{0}
-\@pdata@def{wp}{temple}{end}{0}
-\@pdata@def{wp}{temple}{label}{WP{2.2}}
-\@pdata@def{wp}{temple}{number}{2}
-\@pdata@def{wp}{temple}{page}{3}
-\@pdata@def{wp}{temple}{num}{2}
-\@pdata@def{wp}{temple}{RM}{12}
-\@pdata@def{wp}{temple}{RAM}{0}
-\@pdata@def{task}{temple@task13}{wphases}{6-12}
-\@pdata@def{task}{temple@task13}{wphases}{6-12}
-\@pdata@def{task}{temple@task13}{label}{T1}
-\@pdata@def{task}{temple@task13}{number}{1}
-\@pdata@def{task}{temple@task13}{page}{3}
-\@pdata@def{task}{temple@temple2}{wphases}{18-24}
-\@pdata@def{taskdep}{taskdep2}{from}{temple@temple2}
-\@pdata@def{taskdep}{taskdep2}{to}{class@t3}
-\@pdata@def{task}{temple@temple2}{wphases}{18-24}
-\@pdata@def{task}{temple@temple2}{label}{T2}
-\@pdata@def{task}{temple@temple2}{number}{2}
-\@pdata@def{task}{temple@temple2}{page}{3}
-\@pdata@def{temple}{task}{ids}{temple@task13,temple@temple2}
-\@pdata@def{wp}{workphase}{title}{A work package without tasks}
-\@pdata@def{wp}{workphase}{wphases}{0-4!.5}
-\@pdata@def{wp}{workphase}{start}{0}
-\@pdata@def{wp}{workphase}{end}{4}
-\@pdata@def{wp}{workphase}{label}{WP{2.3}}
-\@pdata@def{wp}{workphase}{number}{3}
-\@pdata@def{wp}{workphase}{page}{3}
-\@pdata@def{wp}{workphase}{num}{3}
-\@pdata@def{wp}{workphase}{RM}{0}
-\@pdata@def{wp}{workphase}{RAM}{0}
-\@pdata@def{systems}{wp}{ids}{class,temple,workphase}
-\@pdata@def{systems}{wp}{count}{3}
-\@pdata@def{all}{task}{deps}{taskdep1,taskdep2}
-\@pdata@def{all}{task}{count}{14}
-\@pdata@def{all}{wa}{ids}{mansubsus,systems}
-\@pdata@def{all}{wa}{count}{2}
-\@pdata@def{all}{wp}{count}{5}
-\@pdata@def{prop}{page}{last}{7}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdf b/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdf
deleted file mode 100644
index 7108f54be43..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/proposal.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/proposal/state.tex b/Master/texmf-dist/doc/latex/proposal/examples/proposal/state.tex
deleted file mode 100644
index c01eb239de7..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/proposal/state.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-\svnInfo $Id: state.tex 22814 2011-12-20 15:00:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/state.tex $
-
-\section{State of the Art and Preliminary Work \deu{(Stand der Forschung und eigene Vorarbeiten)}}\label{stand}
-
-\subsection{List of Project-Related Publications \deu{(Projektbezogenes Publikationsverzeichnis)}}
-
-\begin{todo}{from the proposal template}
-  Please include a list of own publications that are related to the proposed project. It
-  serves as an important basis for assessing your proposal. The number of publications to
-  cite here is determined as follows:
-  \begin{compactdesc}
-    \item[Single applicant] two publications per year of the funding duration
-    \item[Multiple applicants] three publications per year of the funding duration
-    \end{compactdesc}
-    These rules refer to the proposed funding duration for new proposals and the completed
-    duration for renewal proposals.
-    
-    If you are submitting a proposal to the DFG for the first time and have therefore not
-    published in the proposed research area, please list the up to five most important
-    publications so far.
-\end{todo}
-
-\subsubsection{Peer-Reviewed Articles \deu{(Artikel mit wissenschaftlicher Qualitätssicherung)}}
-
-\dfgprojpapers{Kohlhase:pdpl10,providemore}
-
-\ednote{Anmerkung Jens: Ein nützliches Feature wäre hier, wenn das Paket eine (eventuell
-  über Optionen der Dokumentklasse unterdrückbare) Warnung ausgeben würde, wenn zu viele
-  Publikationen entsprechend DFG-Richtlinien angegeben werden. Die Anzahl ist sehr eng
-  begrenzt.}
-
-\subsubsection{Other Articles \deu{(Andere Artikel)}} None.
-
-\subsubsection{Patents \deu{(Patente)}} None.
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "proposal"
-%%% End: 
-
-% LocalWords:  subsubsections dfgprojpapers pdpl10 providemore compactdesc
-% LocalWords:  ourpubs nociteprolist KohKoh ccbssmt09 KohRabZho tmlmrsca10
-% LocalWords:  Hutter09 sifemp09
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/Makefile b/Master/texmf-dist/doc/latex/proposal/examples/report/Makefile
deleted file mode 100644
index 3408045db02..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# possibly customize the following variables to your setting
-REPORT = finalreport.tex 	# the report
-BIB = ../lib/dummy.bib	        # bibTeX databases
-PROP.dir = ../../..
-###########################################################################
-# the following are computed
-#CVP = $(shell ls CV_PubList*.tex)                # CVs of the proposers
-#TSIMP = letter_submission.tex	                  # pdflatex Targets without bibTeX
-#TSIMP.pdf 	= $(TSIMP:%.tex=%.pdf)            # PDFs to be produced
-TBIB = $(REPORT) #$(CVP)		  	  # pdflatex Targets with bibTeX
-TARGET = $(TSIMP) $(TBIB)                         # all pdflatex targets
-TBIB.pdf 	= $(TBIB:%.tex=%.pdf)         	  # PDFs to be produced
-TBIB.aux 	= $(TBIB:%.tex=%.aux)             # their aux files.
-PDATA 		= $(REPORT:%.tex=%.pdata)       # the proposal project data
-SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
-PDFLATEX = pdflatex -interaction batchmode -file-line-error
-BBL = $(REPORT:%.tex=%.bbl) $(REPORT:%.tex=%1-blx.bbl) $(REPORT:%.tex=%2-blx.bbl) #$(CVP:%.tex=%.bbl) 
-PROPCLS.dir = $(PROP.dir)/base
-PROPETC.dir = $(PROP.dir)/etc
-DFGPROPCLS.dir = $(PROP.dir)/dfg
-TEXINPUTS := .//:$(PROPCLS.dir)//:$(DFGPROPCLS.dir)//:$(PROPETC.dir)//:
-BIBINPUTS := ../lib:$(BIBINPUTS)
-PROPCLS.clssty = reporting.cls pdata.sty
-PROPETC.sty = workaddress.sty metakeys.sty sref.sty
-DFGPROPCLS.clssty = dfgreporting.cls dfgpdata.sty
-PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(DFGPROPCLS.clssty:%=$(DFGPROPCLS.dir)/%) $(PROPETC.sty:%=$(PROPETC.dir)/%)
-
-all: $(TBIB.pdf) $(TSIMP.pdf)
-
-cd: 	                                           # make cd will prepare CD for burning
-	mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD
-
-$(BBL): %.bbl: %.aux
-	bibtex -min-crossrefs=100 -terse $<
-
-$(TSIMP.pdf): %.pdf: %.tex $(PROPCLS) $(PDATA)
-	$(PDFLATEX) $< || $(RM) $@
-
-$(PDATA): %.pdata: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.aux): %.aux: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) 
-	$(PDFLATEX) $<  || $(RM) $@
-#	sort $(REPORT:%.tex=%.delivs) > $(REPORT:%.tex=%.deliverables)
-	@if (test -e $(patsubst %.tex, %.idx,  $<));\
-	    then makeindex $(patsubst %.tex, %.idx,  $<); fi
-	$(MAKE) -$(MAKEFLAGS) $(BBL)
-	@if (grep "(re)run BibTeX" $(patsubst %.tex, %.log,  $<)> /dev/null);\
-	    then $(MAKE) -B $(BBL); fi
-	$(PDFLATEX)  $< || $(RM) $@
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	   then $(PDFLATEX)  $<  || $(RM) $@; fi
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	    then $(PDFLATEX)  $<  || $(RM) $@; fi
-
-clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
-
-distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
-	rm -Rf auto
-
-echo:
-	echo $(BIBINPUTS)
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/README b/Master/texmf-dist/doc/latex/proposal/examples/report/README
deleted file mode 100644
index dabc084504d..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/README
+++ /dev/null
@@ -1,22 +0,0 @@
-An Exapmle for dfgproposal.cls
-
-proposal.tex              is a fake DFG proposal that shows all elements of 
-                          dfgproposal.cls in action.
-finalreport.tex		  does the same for dfgreporting.cls         
-CV_PubList_Kohlhase.tex   is an example of the CV and publication lists required 
-			  by the DFG
-letter_submission.tex	  is an example submission letter. 
-*.tex			  the rest are intemediate files
-doc 			  contains the DFG documentation how to write proposals and 
-			  final reports: These documents are not subject to the 
-			  package's license but (c) DFG.  They are bundled for your 
-			  convenience; up-to-date versions may be found at http://www.dfg.de.
-Makefile                  allows the automation via a unix Makefile on the author's 
-			  machine, adapt it to your needs
-
-Copyright(c) 2010 Michael Kohlhase
-The package is distributed under the terms of the LaTeX Project Public License (LPPL)
-
-The development version of this package can be found at
-https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal/ex
-
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport-blx.bib b/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport-blx.bib
deleted file mode 100644
index 86bcc8cec2f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport-blx.bib
+++ /dev/null
@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
-}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.bbl b/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.bbl
deleted file mode 100644
index 92039c565cc..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.bbl
+++ /dev/null
@@ -1,47 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\preamble{%
-\providecommand\seen{seen } \providecommand\webpageat{web page at }
-  \providecommand\homepageat{home page at }
-  \providecommand\projectpageat{project page at }
-  \providecommand\systempageat{system home page at }
-  \providecommand\svnrepoat{Subversion repository at }
-  \providecommand\January{January} \providecommand\February{February}
-  \providecommand\Feb{February} \providecommand\March{March}
-  \providecommand\April{April} \providecommand\May{May}
-  \providecommand\June{June} \providecommand\July{July}
-  \providecommand\August{August} \providecommand\September{September}
-  \providecommand\October{October} \providecommand\November{November}
-  \providecommand\December{December} \providecommand\AUSTRALIA{Australia}
-  \providecommand\ROMANIA{Romania} \providecommand\MEXICO{Mexico}
-  \providecommand\ITALY{Italy} \providecommand\USA{USA}
-  \providecommand\IRELAND{Ireland} \providecommand\HUNGARY{Hungary}
-  \providecommand\JAPAN{Japan} \providecommand\CANADA{Canada}
-  \providecommand\SPAIN{Spain} \providecommand\NETHERLANDS{Netherlands}
-  \providecommand\UK{UK} \providecommand\SWEDEN{Sweden}
-  \providecommand\GERMANY{Germany} \providecommand\openmath{OpenMath}
-  \providecommand\fc{forthcoming} \providecommand\PROC{Proceedings}
-  \providecommand\omdoc{OMDoc} \providecommand\activemath{ActiveMath}
-  \hyphenation{Wiki-Sym}
-}
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdata b/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdata
deleted file mode 100644
index f404cb7643c..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdata
+++ /dev/null
@@ -1,4 +0,0 @@
-\@pdata@def{site}{jacu}{number}{1}
-\@pdata@def{site}{pcg}{number}{2}
-\@pdata@def{prop}{gen}{thema}{Intelligentes Schreiben von Antr\"agen}
-\@pdata@def{prop}{page}{last}{4}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdf b/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdf
deleted file mode 100644
index de5311d761e..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.tex b/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.tex
deleted file mode 100644
index 4307da6b1d8..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/finalreport.tex
+++ /dev/null
@@ -1,56 +0,0 @@
-% the document class specification for the proposal writing process, add the 'submit' option
-% for submitting (switches off various draft features); add the 'public' option to exclude
-% any private parts. 
-\documentclass{dfgreporting}
-%\documentclass[submit]{dfgproposal}
-%\documentclass[submit,public]{dfgproposal}
-\bibliography{dummy,kwarc}
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: finalreport.tex 22963 2012-01-13 08:47:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/finalreport.tex $
-%
-% define the proposal acronym; 
-% use \texorpdfstring so that it can be used in section headings as well
-% tell the class that this is the proposal acronym
-\input{WApersons}
-\begin{document}
-
-\begin{center}\color{red}\huge
-  This mock proposal is just an example for \texttt{dfgreporting.cls} it reflects the
-  template valid until January 2012 (have to update soon)
-\end{center}
-
-\begin{report}[importfrom=proposal,
-  PI=miko,PI=gc,site=jacu,site=pcg,
-  key = KO 2428 99-9,
-  key = GS 4711 99-9,
-  thema=Intelligentes Schreiben von Antr\"agen, 
-  reportperiod=1. Feb. 2010 - 31. Jan. 2012,
-  % jacuemployed=Junior Researcher: 1. Feb 2010 - 31. Jan 2012,
-  % pcgemployed=Slave Worker: 1. Feb 2010 - 31. Dec 2010,
-  % pcgemployed=Lazy Bones: 1.Jan 2011 - 31. Jan 2012,
-  applareas={Knowledge Management, Document Management, Workflow Systems},
-  % coop={Acquisition Guru, Berlin, Germany},
-  % coop={Deutsche Forschnungsgemeinschaft, Bonn, Germany},
-  projpapers={Kohlhase:pdpl10,providemore}]
-  
-\include{progressreport}
-\include{progresssummary}
-\dfgprojpapers[articles,confpapers,wspapers]{Kohlhase:pdpl10,providemore,KohDavGin:psewads11,Lange:OpenMathCDLinkedData10}
-\end{report}
-\end{document}
- 
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: t
-%%% End: 
-
-% LocalWords:  empty bibflorian systems rabe institutions modal historical pub
-% LocalWords:  kwarc till formalsafe miko gc ipower ipowerlong Antr agen Beitr
-
-% LocalWords:  acrolong intellegible kollaboratives koh arenten ussen Proze
-% LocalWords:  Versionsmanagementsystem textsc unterst utzt konzentieren stex
-% LocalWords:  mechanik workplan thispagestyle newpage Principcal cvpubsmiko
-% LocalWords:  finalreport fundedperiod reportperiod progressreport
-% LocalWords:  progresssummary
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.pdf b/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.pdf
deleted file mode 100644
index d56697a35ba..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.tex b/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.tex
deleted file mode 100644
index 3660eb09546..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/letter_submission.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass{dinbrief}
-\usepackage{ngerman}
-\signature{Dr. Michael Kohlhase\hspace*{5cm} Dr. Great Communicator}
-\usepackage{pdata}\readpdata{proposal}
-\begin{document}
-
-\begin{letter}{Frau ?????\\
-Deutsche Forschungsgemeinschaft\\
-52170 Bonn}
-
-\subject{Antrag auf Sachbeihilfe}
-\opening{Sehr geehrte Frau ?????}
-
-anbei senden wir Ihnen unseren Antrag auf Sachbeihilfe f"ur das Projekt "`\pn"'
-(\pnlong) zu. Die elektronische Version des Antrags inklusive der Anlagen sowie Kopien
-der eigenen Publikationen haben wir diesem Schreiben als CD beigef"ugt. Diese beinhaltet
-die folgenden Dateien:
-\begin{center}
-  \begin{tabular}{lp{8cm}}
-    \texttt{Antrag.pdf} &  der Antrag\\
-    \texttt{CV\_Publist\_Kohlhase.pdf} & Lebenslauf Michael Kohlhase\\
-    \texttt{CV\_Publist\_Communicator.pdf} & Lebenslauf Great Communicator\\
-    Publikationen  & Ordner mit den im Antrag bzw. in den Lebensl"aufen angegebenen
-eigenen Veröffentlichungen Das projektbezogene Publikationsverzeichnis befindet sich im
-Antrag unter Abschnitt 2.2.
-\end{tabular}
-\end{center}
-
-\closing{Mit freundlichen Gr"u"sen,}
-\end{letter}
-\end{document}
-
-% LocalWords:  texttt Publist Schr
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/progressreport.tex b/Master/texmf-dist/doc/latex/proposal/examples/report/progressreport.tex
deleted file mode 100644
index c720d8910ee..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/progressreport.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-\svnInfo $Id: progressreport.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/progressreport.tex $
-\section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
-\begin{todo}{from the report template}
-This is what the reviewers read  (maximum 10 pages of A4)
-  \begin{itemize}
-  \item Project’s initial questions and objectives.
-  \item Project developments --- including deviations from the original plan, failures,
-    and problems encountered with project organisation or technical execution.
-  \item Presentation of results and discussion of the relevant research situation in this
-    context, potential perspectives for application, and conceivable follow-up research.
-  \item Statement on whether the results of the project are economically valuable and whether exploitation is already taking place or may be anticipated; if applicable, details regarding patents, industrial joint ventures, etc.
-  \item Who has contributed to the results achieved by the project (national/international partners, project staff, etc.)?
-  \item Qualification of young researchers in the context of your project (for example, first degree, doctorate, post-doctorate, etc.).
-  \end{itemize}
-  The report must be understandable without the need to consult additional literature. To
-  illustrate and enhance your presentation you may refer to your own and others’
-  publications. Make it clear whenever you are referring to other researchers’ work and
-  explain your own papers. Please list all cited publications at the end of the
-  section. This reference list is not considered your list of publications. Any
-  unpublished work must be included with the final report. However, note that reviewers
-  are not required to read any of the works you cite. Reviews will be based only on the
-  text of the actual report.
-\end{todo}
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "finalreport"
-%%% End: 
-
-% LocalWords:  finalreport progressreport.tex
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/report/progresssummary.tex b/Master/texmf-dist/doc/latex/proposal/examples/report/progresssummary.tex
deleted file mode 100644
index ecfc808849b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/report/progresssummary.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\svnInfo $Id: progresssummary.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/progresssummary.tex $
-\section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
-\begin{todo}{from the report template}
-  This is for the DFG web site and report, made available to the general public (maximum 1 page of A4)
-  \begin{itemize}
-  \item Presentation, in clearly understandable, everyday language of the key scientific
-    findings and any potential applications.
-  \item Any surprises encountered in the course of the project and in the results
-    obtained.
-  \item Reference to any articles published in the media reporting the success of the
-    project.Project’s initial questions and objectives.
-  \end{itemize}
-\end{todo}
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "finalreport"
-%%% End: 
-
-% LocalWords:  finalreport
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/README b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/README
deleted file mode 100644
index dabc084504d..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/README
+++ /dev/null
@@ -1,22 +0,0 @@
-An Exapmle for dfgproposal.cls
-
-proposal.tex              is a fake DFG proposal that shows all elements of 
-                          dfgproposal.cls in action.
-finalreport.tex		  does the same for dfgreporting.cls         
-CV_PubList_Kohlhase.tex   is an example of the CV and publication lists required 
-			  by the DFG
-letter_submission.tex	  is an example submission letter. 
-*.tex			  the rest are intemediate files
-doc 			  contains the DFG documentation how to write proposals and 
-			  final reports: These documents are not subject to the 
-			  package's license but (c) DFG.  They are bundled for your 
-			  convenience; up-to-date versions may be found at http://www.dfg.de.
-Makefile                  allows the automation via a unix Makefile on the author's 
-			  machine, adapt it to your needs
-
-Copyright(c) 2010 Michael Kohlhase
-The package is distributed under the terms of the LaTeX Project Public License (LPPL)
-
-The development version of this package can be found at
-https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal/ex
-
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/jacobs-logo.png b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/jacobs-logo.png
deleted file mode 100644
index 0bbe28c44fc..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/jacobs-logo.png
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.pdf b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.pdf
deleted file mode 100644
index 9b9e03e9b4a..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.tex b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.tex
deleted file mode 100644
index 3660eb09546..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/letter_submission.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass{dinbrief}
-\usepackage{ngerman}
-\signature{Dr. Michael Kohlhase\hspace*{5cm} Dr. Great Communicator}
-\usepackage{pdata}\readpdata{proposal}
-\begin{document}
-
-\begin{letter}{Frau ?????\\
-Deutsche Forschungsgemeinschaft\\
-52170 Bonn}
-
-\subject{Antrag auf Sachbeihilfe}
-\opening{Sehr geehrte Frau ?????}
-
-anbei senden wir Ihnen unseren Antrag auf Sachbeihilfe f"ur das Projekt "`\pn"'
-(\pnlong) zu. Die elektronische Version des Antrags inklusive der Anlagen sowie Kopien
-der eigenen Publikationen haben wir diesem Schreiben als CD beigef"ugt. Diese beinhaltet
-die folgenden Dateien:
-\begin{center}
-  \begin{tabular}{lp{8cm}}
-    \texttt{Antrag.pdf} &  der Antrag\\
-    \texttt{CV\_Publist\_Kohlhase.pdf} & Lebenslauf Michael Kohlhase\\
-    \texttt{CV\_Publist\_Communicator.pdf} & Lebenslauf Great Communicator\\
-    Publikationen  & Ordner mit den im Antrag bzw. in den Lebensl"aufen angegebenen
-eigenen Veröffentlichungen Das projektbezogene Publikationsverzeichnis befindet sich im
-Antrag unter Abschnitt 2.2.
-\end{tabular}
-\end{center}
-
-\closing{Mit freundlichen Gr"u"sen,}
-\end{letter}
-\end{document}
-
-% LocalWords:  texttt Publist Schr
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/preconditions.tex b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/preconditions.tex
deleted file mode 100644
index 971acaae5ad..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/preconditions.tex
+++ /dev/null
@@ -1,98 +0,0 @@
-\svnInfo $Id: preconditions.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/preconditions.tex $
-\section{Project Requirements \deu{(Voraussetzungen f\"ur die Durchf\"uhrung des Vorhabens)}}
-
-\subsection{Employment status information \deu{(Angaben zur Dienststellung)}}
-
-\begin{todo}{from the proposal template}
-For each applicant, state the last name, first name, and employment status (including
-duration of contract and funding body, if on a fixed-term contract).
-\end{todo}
-
-\subsection{First-time proposal data \deu{(Angaben zur Erstantragstellung)}}
-
-\begin{todo}{from the proposal template}
-Only if applicable: Last name, first name of first-time applicant.
-
-If this is your first proposal, reviewers will consider this fact when assessing your pro-
-posal. Previous proposals for research fellowships, publication funding, travel allow-
-ances, or funding for scientific networks are not considered first proposals. If you are
-submitting a “first-time proposal” and it is part of a joint proposal, please note that your
-independent project must be distinct from the other projects.
-
-If you have already submitted a proposal as an applicant for a research grant and have
-received a letter informing you of the funding decision, or if you have led an independ-
-ent junior research group or project in a Collaborative Research Centre or Research
-Unit, you are no longer eligible to submit a “first proposal”. If you have submitted a
-“first-time proposal” and it was rejected, you may resubmit the application, in revised
-form, as a first-time proposal for the same project.
-\end{todo}
-
-\subsection{Composition of the project group \deu{(Zusammensetzung der Projektarbeitsgruppe)}}
-
-\begin{todo}{from the proposal template}
-List only those individuals who will work on the project but will not be paid out of the
-project funds. State each person’s name, academic title, employment status, and type
-of funding.
-
-Please list separately the individuals paid by your institution and those paid using other
-third-party funding (including fellowships).
-\end{todo}
-\begin{sitedescription}{jacu}
-The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by
-Michael Kohlhase for has the following members
-\begin{compactdesc}
-\item[Dr. N.N.] is the \ldots She has a background in\ldots.
-\end{compactdesc}
-Additionally, the group has attracted about 10 undergraduate and master's students that
-actively take part in the project work and various aspects of research.
-\end{sitedescription}
-
-
-\subsection{Cooperation with other researchers \deu{(Zusammenarbeit mit anderen Wissenschaftlerinnen und Wissenschaftlern)}}
-
-\subsubsection{Researchers with whom you have agreed to cooperate on this project \deu{(Wissenschaftlerinnen und Wissenschaftler, mit denen für dieses Vorhaben eine konkrete Vereinbarung zur Zusammenarbeit besteht)}}
-
-\begin{compactdesc}
-\item[Prof. Dr. Super Akquisiteur (Uni Paderborn)] knows exactly what to do to get funding
-  with DFG, we will interview him closely and integrate all his intuitions into the
-  {\pn} templates.
-\item[Prof. Dr. Habe Nichts (Uni Hinterpfuiteufel)] has never gotten a grant proposal
-  through with DFG, we will try to avoid his mistakes.
-\item[Dr. Sach Bearbeiter (DFG)] will consult with the DFG requirements to be met in the
-  proposals.
-\item[Dr. Donald Knuth (Stanford University)] is so surprised that we want to do grant
-  proposals in {\TeX/\LaTeX} that he will help us with any problems we have in coding in
-  this wonderful programming language.
-\end{compactdesc}
-
-\subsubsection{Researchers with whom you have collaborated scientifically within the past three years \deu{(Wissenschaftlerinnen und Wissenschaftler, mit denen in den letzten drei Jahren wissenschaftlich zusammengearbeitet wurde)}}
-
-\ednote{Anmerkung Jens: Etwas unklar, was die DFG hier möchte. Die Liste der Personen kann
-  sehr lang sein, also ist es wahrscheinlich besser nur die wichtigsten Projekte und
-  Kontakte zu listen.}
-
-\begin{todo}{from the proposal template}
-This information will assist the DFG’s Head Office in avoiding potential conflicts of in-
-terest during the review process.
-\end{todo}
-
-
-\subsection{Scientific equipment \deu{(Apparative Ausstattung)}}
-
-Jacobs University provides laptops or desktop workstations for all academic
-employees. Great Consulting GmbH. is rolling in money anyways and has all of the latest
-gadgets.
-
-
-\subsection{Project-relevant interests in commercial enterprises \deu{(Projektrelevante Beteiligungen an erwerbswirtschaftlichen Unternehmen)}}
-
-Not applicable.
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "proposal"
-%%% End: 
-
-% LocalWords:  Durchf uhrung subsubsection ipower Hinterpfuiteufel Sach Aktivit
-% LocalWords:  Erkl arungen
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal-blx.bib b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal-blx.bib
deleted file mode 100644
index 86bcc8cec2f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal-blx.bib
+++ /dev/null
@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
-}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.bbl b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.bbl
deleted file mode 100644
index e521e1337b3..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.bbl
+++ /dev/null
@@ -1,22 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdata b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdata
deleted file mode 100644
index 910ce96b56c..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdata
+++ /dev/null
@@ -1,139 +0,0 @@
-\@pdata@def{prop}{gen}{thema}{Intelligentes Schreiben von Antr\"agen}
-\@pdata@def{prop}{gen}{acronym}{iPoWr}
-\@pdata@def{prop}{gen}{acrolong}{{\relax $\@@underline {\hbox {I}}\mathsurround \z@ $\relax ntelligent} {\relax $\@@underline {\hbox {P}}\mathsurround \z@ $\relax r\relax $\@@underline {\hbox {o}}\mathsurround \z@ $\relax sal} {\relax $\@@underline {\hbox {Wr}}\mathsurround \z@ $\relax iting}}
-\@pdata@def{prop}{gen}{title}{iPoWr\xspace  : \pnlong }
-\@pdata@def{prop}{gen}{totalduration}{3 years}
-\@pdata@def{prop}{gen}{since}{1. Feb 2009}
-\@pdata@def{prop}{gen}{start}{1. Feb. 2010}
-\@pdata@def{prop}{gen}{months}{24}
-\@pdata@def{all}{intended}{RM}{36}
-\@pdata@def{all}{intended}{RAM}{36}
-\@pdata@def{prop}{gen}{discipline}{Computer Science}
-\@pdata@def{prop}{gen}{areas}{Knowledge Management}
-\@pdata@def{obj}{firstobj}{label}{O1}
-\@pdata@def{obj}{firstobj}{title}{Supporting Authors}
-\@pdata@def{obj}{secondobj}{label}{O2}
-\@pdata@def{obj}{secondobj}{title}{Supporting Reviewers}
-\@pdata@def{all}{total}{RM}{34}
-\@pdata@def{all}{total}{RAM}{16}
-\@pdata@def{wp}{management}{title}{Project Management}
-\@pdata@def{wp}{management}{wphases}{1-24!.3}
-\@pdata@def{wp}{management}{RM}{2}
-\@pdata@def{wp}{management}{RAM}{8}
-\@pdata@def{wp}{management}{start}{1}
-\@pdata@def{wp}{management}{end}{24}
-\@pdata@def{wp}{management}{label}{WP{1}}
-\@pdata@def{wp}{management}{number}{1}
-\@pdata@def{wp}{management}{page}{1}
-\@pdata@def{wp}{management}{num}{1}
-\@pdata@def{task}{management@foo}{wphases}{0-3}
-\@pdata@def{task}{management@foo}{wphases}{0-3}
-\@pdata@def{task}{management@foo}{label}{T1}
-\@pdata@def{task}{management@foo}{number}{1}
-\@pdata@def{task}{management@foo}{page}{2}
-\@pdata@def{task}{management@bar}{wphases}{13-17!.5}
-\@pdata@def{task}{management@bar}{wphases}{13-17!.5}
-\@pdata@def{task}{management@bar}{label}{T2}
-\@pdata@def{task}{management@bar}{number}{2}
-\@pdata@def{task}{management@bar}{page}{2}
-\@pdata@def{task}{management@task3}{wphases}{0-0}
-\@pdata@def{task}{management@task3}{label}{T3}
-\@pdata@def{task}{management@task3}{number}{3}
-\@pdata@def{task}{management@task3}{page}{2}
-\@pdata@def{task}{management@task4}{wphases}{0-0}
-\@pdata@def{task}{management@task4}{label}{T4}
-\@pdata@def{task}{management@task4}{number}{4}
-\@pdata@def{task}{management@task4}{page}{2}
-\@pdata@def{management}{task}{ids}{management@foo,management@bar,management@task3,management@task4}
-\@pdata@def{wp}{dissem}{title}{Dissemination and Exploitation}
-\@pdata@def{wp}{dissem}{RM}{8}
-\@pdata@def{wp}{dissem}{start}{0}
-\@pdata@def{wp}{dissem}{end}{0}
-\@pdata@def{wp}{dissem}{label}{WP{2}}
-\@pdata@def{wp}{dissem}{number}{2}
-\@pdata@def{wp}{dissem}{page}{2}
-\@pdata@def{wp}{dissem}{num}{2}
-\@pdata@def{task}{dissem@t1}{wphases}{6-7}
-\@pdata@def{task}{dissem@t1}{wphases}{6-7}
-\@pdata@def{task}{dissem@t1}{label}{T1}
-\@pdata@def{task}{dissem@t1}{number}{1}
-\@pdata@def{task}{dissem@t1}{page}{2}
-\@pdata@def{task}{dissem@t2}{wphases}{12-13}
-\@pdata@def{task}{dissem@t2}{wphases}{12-13}
-\@pdata@def{task}{dissem@t2}{label}{T2}
-\@pdata@def{task}{dissem@t2}{number}{2}
-\@pdata@def{task}{dissem@t2}{page}{2}
-\@pdata@def{task}{dissem@t3}{wphases}{18-19}
-\@pdata@def{task}{dissem@t3}{wphases}{18-19}
-\@pdata@def{task}{dissem@t3}{label}{T3}
-\@pdata@def{task}{dissem@t3}{number}{3}
-\@pdata@def{task}{dissem@t3}{page}{2}
-\@pdata@def{task}{dissem@t4}{wphases}{22-24}
-\@pdata@def{task}{dissem@t4}{wphases}{22-24}
-\@pdata@def{task}{dissem@t4}{label}{T4}
-\@pdata@def{task}{dissem@t4}{number}{4}
-\@pdata@def{task}{dissem@t4}{page}{2}
-\@pdata@def{dissem}{task}{ids}{dissem@t1,dissem@t2,dissem@t3,dissem@t4}
-\@pdata@def{wp}{class}{title}{A LaTeX class for EU Proposals}
-\@pdata@def{wp}{class}{short}{Class}
-\@pdata@def{wp}{class}{RM}{12}
-\@pdata@def{wp}{class}{RAM}{8}
-\@pdata@def{wp}{class}{start}{0}
-\@pdata@def{wp}{class}{end}{0}
-\@pdata@def{wp}{class}{label}{WP{3}}
-\@pdata@def{wp}{class}{number}{3}
-\@pdata@def{wp}{class}{page}{2}
-\@pdata@def{wp}{class}{num}{3}
-\@pdata@def{task}{class@c1}{wphases}{0-2}
-\@pdata@def{task}{class@c1}{wphases}{0-2}
-\@pdata@def{task}{class@c1}{label}{T1}
-\@pdata@def{task}{class@c1}{number}{1}
-\@pdata@def{task}{class@c1}{page}{2}
-\@pdata@def{task}{class@c2}{wphases}{4-8}
-\@pdata@def{task}{class@c2}{wphases}{4-8}
-\@pdata@def{task}{class@c2}{label}{T2}
-\@pdata@def{task}{class@c2}{number}{2}
-\@pdata@def{task}{class@c2}{page}{3}
-\@pdata@def{task}{class@c3}{wphases}{10-14}
-\@pdata@def{task}{class@c3}{wphases}{10-14}
-\@pdata@def{task}{class@c3}{label}{T3}
-\@pdata@def{task}{class@c3}{number}{3}
-\@pdata@def{task}{class@c3}{page}{3}
-\@pdata@def{task}{class@c4}{wphases}{20-24}
-\@pdata@def{task}{class@c4}{wphases}{20-24}
-\@pdata@def{task}{class@c4}{label}{T4}
-\@pdata@def{task}{class@c4}{number}{4}
-\@pdata@def{task}{class@c4}{page}{3}
-\@pdata@def{class}{task}{ids}{class@c1,class@c2,class@c3,class@c4}
-\@pdata@def{wp}{temple}{title}{Proposal Template}
-\@pdata@def{wp}{temple}{short}{Template}
-\@pdata@def{wp}{temple}{RM}{12}
-\@pdata@def{wp}{temple}{start}{0}
-\@pdata@def{wp}{temple}{end}{0}
-\@pdata@def{wp}{temple}{label}{WP{4}}
-\@pdata@def{wp}{temple}{number}{4}
-\@pdata@def{wp}{temple}{page}{3}
-\@pdata@def{wp}{temple}{num}{4}
-\@pdata@def{task}{temple@temple1}{wphases}{6-12}
-\@pdata@def{task}{temple@temple1}{wphases}{6-12}
-\@pdata@def{task}{temple@temple1}{label}{T1}
-\@pdata@def{task}{temple@temple1}{number}{1}
-\@pdata@def{task}{temple@temple1}{page}{3}
-\@pdata@def{task}{temple@temple2}{wphases}{18-24}
-\@pdata@def{task}{temple@temple2}{wphases}{18-24}
-\@pdata@def{task}{temple@temple2}{label}{T2}
-\@pdata@def{task}{temple@temple2}{number}{2}
-\@pdata@def{task}{temple@temple2}{page}{3}
-\@pdata@def{temple}{task}{ids}{temple@temple1,temple@temple2}
-\@pdata@def{wp}{workphase}{title}{A work package without tasks}
-\@pdata@def{wp}{workphase}{wphases}{0-4!.5}
-\@pdata@def{wp}{workphase}{start}{0}
-\@pdata@def{wp}{workphase}{end}{4}
-\@pdata@def{wp}{workphase}{label}{WP{5}}
-\@pdata@def{wp}{workphase}{number}{5}
-\@pdata@def{wp}{workphase}{page}{3}
-\@pdata@def{wp}{workphase}{num}{5}
-\@pdata@def{all}{task}{count}{14}
-\@pdata@def{all}{wp}{ids}{management,dissem,class,temple,workphase}
-\@pdata@def{all}{wp}{count}{5}
-\@pdata@def{prop}{page}{last}{6}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdf b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdf
deleted file mode 100644
index bbfe9178939..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.tex b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.tex
deleted file mode 100644
index d51e4fc1f15..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal.tex
+++ /dev/null
@@ -1,92 +0,0 @@
-% the document class specification for the proposal writing process, add the 'submit' option
-% for submitting (switches off various draft features); add the 'public' option to exclude
-% any private parts. 
-\documentclass[RAM,noworkareas,nosites]{dfgproposal}
-%\documentclass[submit]{dfgproposal}
-%\documentclass[submit,public]{dfgproposal}
-\bibliography{../lib/dummy}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: proposal.tex 24155 2013-02-13 17:00:02Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/simple-proposal/proposal.tex $
-%
-\input{../lib/WApersons}
-
-
-\begin{document}
-
-\begin{center}\color{red}\huge
-  This mock proposal is just an example for \texttt{dfgproposal.cls} it reflects the 
-  current DFG template valid from October 2011.
-\end{center}
-
-\urldef{\gcpubs}\url{http://www.pcg.phony/~gc/pubs.html}
-\urldef{\mikopubs}\url{http://kwarc.info/kohlhase/publications.html}
-\begin{proposal}[PI=miko,
-  pubspage=mikopubs,
-  thema=Intelligentes Schreiben von Antr\"agen,
-  acronym={iPoWr},
-  acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}sal} {\underline{Wr}iting},
-  title=\pn: \protect\pnlong,
-  totalduration=3 years,
-  since=1. Feb 2009,
-  start=1. Feb. 2010,
-  months=24,
-  RM=36,RAM=36,
-  discipline=Computer Science, 
-  areas=Knowledge Management]
-
-\begin{Summary}
-  \begin{todo}{}
-    Summarize the relevant goals of the proposed project in generally intellegible
-    terms. Do not use more than 15 lines (max. 1600 characters).
-  \end{todo}
-  Writing grant proposals is a collaborative effort that requires the integration of
-  contributions from many individuals. The use of an ASCII-based format like LaTeX allows
-  to coordinate the process via a source code control system like Subversion, allowing the
-  proposal writing team to concentrate on the contents rather than the mechanics of
-  wrangling with text fragments and revisions.
-\end{Summary}
-
-% It is often good to separate the top-level sections into separate files. 
-% Especially in collaborative proposals. We do this here. 
-\input{state}
-\input{workplan}
-
-\section{Bibliography concerning the state of the art, the research objectives, and the
-  work programme \deu{(Literaturverzeichnis zum Stand der Forschung, zu den Zielen und dem
-    Arbeitsprogramm)}}
-
-\begin{todo}{from the proposal template}
-  In this bibliography, list only the works you cite in your presentation of the state of
-  the art, the research objectives, and the work programme. This bibliography is not the
-  list of publications. Non-published works must be included with the proposal.
-\end{todo}
-\printbibliography[heading=empty]
-% the following will not become part of the public proposal after all most of this is
-% technical or confidential.
-%\begin{private}
-\input{../proposal/funds}
-\input{../proposal/preconditions}
-\section{Additional information \deu{(Ergänzende Erklärungen)}}
-
-Funding proposal XYZ-83282 has been submitted prior to this proposal on related topic XYZ.
-\end{proposal}
-
-\end{document}
- 
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-PDF-mode:t
-%%% TeX-master: t
-%%% End: 
-
-% LocalWords:  empty bibflorian systems rabe institutions modal historical pub
-% LocalWords:  kwarc till formalsafe miko gc ipower ipowerlong Antr agen Beitr
-
-% LocalWords:  acrolong intellegible kollaboratives koh arenten ussen Proze pcg
-% LocalWords:  Versionsmanagementsystem textsc unterst utzt konzentieren stex
-% LocalWords:  mechanik workplan thispagestyle newpage Principcal cvpubsmiko pn
-% LocalWords:  ourpubs zusammenfassung printbibliography pubspage ntelligent
-% LocalWords:  iting pnlong
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal1-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal1-blx.bbl
deleted file mode 100644
index 36688805dc7..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/proposal1-blx.bbl
+++ /dev/null
@@ -1,49 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{Kohlhase:pdpl10}{misc}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \strng{namehash}{KM1}
-  \strng{fullhash}{KM1}
-  \field{sortinit}{K}
-  \field{howpublished}{Self-documenting {\LaTeX} package,
-  \url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf};
-  ask the author for access}
-  \field{title}{Preparing {DFG} Proposals in {\LaTeX} with
-  \texttt{dfgproposal.cls}}
-  \list{institution}{1}{%
-    {KWARC Group, Jacobs University Bremen}%
-  }
-  \field{year}{2010}
-\endentry
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/workplan.tex b/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/workplan.tex
deleted file mode 100644
index cd0a71a26ba..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/simple-proposal/workplan.tex
+++ /dev/null
@@ -1,149 +0,0 @@
-\svnInfo $Id: workplan.tex 23021 2012-01-19 13:30:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/simple-proposal/workplan.tex $
-\section{Objectives and Work Schedule \deu{(Ziele und Arbeitsprogramm)}}
-
-\subsection{Objectives}
-
-\begin{objective}[id=firstobj,title=Supporting Authors]
-  This is the first objective, after all we have to write proposals all the time, and we
-  would rather spend time on research. 
-\end{objective}
-
-\begin{objective}[id=secondobj,title=Supporting Reviewers]
-  They are only human too, so let's have a heart for them as well. 
-\end{objective}
-
-\subsection{Work Schedule} 
-\begin{todo}{from the proposal template}
-  Give a short high-level introduction to how the work in the project should proceed,
-  explain Tables~\ref{fig:wplist} and~\ref{fig:gantt}.
-\end{todo}
-The project is organized around \pdatacount{all}{wp} work packages, which we summarize in
-Figure~\ref{fig:wplist}. 
-
-\wpfig
-
-We ensures the dissemination and creation of the periodic integrative reports containing
-the periodic Project Management Report, the Project Management Handbook, an Knowledge
-Dissemination Plan ({\WPref{management}}), the Proceedings of the Annual {\pn} Summer
-School as well as non-public Dissemination and Exploitation plans ({\WPref{dissem}}), as
-well as a report of the {\pn} project milestones.
-
-\begin{workplan}   
-\begin{workpackage}[id=management,title=Project Management,wphases=1-24!.3,
- RM=2,RAM=8]
-  Based on the ``Bewilligungsbescheid'' of the DFG, and based on the financial and
-  administrative data agreed, the project manager will carry out the overall project
-  management, including administrative management.  A project quality handbook will be
-  defined, and a {\pn} help-desk for answering questions about the format (first
-  project-internal, and after month 12 public) will be established. The project management
-  will consist of the following tasks
-\begin{tasklist} 
-\begin{task}[id=foo,wphases=0-3]%,requires=\taskin{t1}{dissem}]
-  To perform the administrative, scientific/technical, and financial management of the
-  project 
-\end{task}
-\begin{task}[id=bar,wphases=13-17!.5]
-  To co-ordinate the contacts with the DFG and other funding bodies, building on the
-  results in \taskref{management}{foo}
-\end{task}
-\begin{task}
-  To control quality and timing of project results and to resolve conflicts
-\end{task}
-\begin{task}
-  To set up inter-project communication rules and mechanisms
-\end{task}
-\end{tasklist}
-
-\end{workpackage}
- 
-\begin{workpackage}[id=dissem,title=Dissemination and Exploitation,
-RM=8]
-Much of the activity of a project involves small groups of nodes in joint work. This work
- package is set up to ensure their best wide-scale integration, communication, and
- synergetic presentation of the results. Clearly identified means of dissemination of
- work-in-progress as well as final results will serve the effectiveness of work within the
- project and steadily improve the visibility and usage of the emerging semantic services.
-
-
- The work package members set up events for dissemination of the research and
- work-in-progress results for researchers (workshops and summer schools), and for industry
- (trade fairs). An in-depth evaluation will be undertaken of the response of test-users.
- 
- \begin{tasklist}
-  \begin{task}[id=t1,wphases=6-7]
-    sdfkj
-  \end{task}
-  \begin{task}[id=t2,wphases=12-13]
-    sdflkjsdf
-  \end{task}
-  \begin{task}[id=t3,wphases=18-19]
-    sdflkjsdf
-  \end{task}
- \begin{task}[id=t4,wphases=22-24] 
- \end{task}
-\end{tasklist}
-
-Within two months of the start of the project, a project website will go live. This
-website will have two areas: a members' area and a public area.\ldots
-\end{workpackage}
- 
-
-\begin{workpackage}[id=class,
-   title=A LaTeX class for EU Proposals,short=Class,
-  RM=12,RAM=8]
-We plan to develop a {\LaTeX} class for marking up EU Proposals
-
-We will follow strict software design principles, first comes a
-requirements analys, then \ldots
-\begin{tasklist}
-  \begin{task}[id=c1,wphases=0-2]
-    sdfsdf
-  \end{task}
-  \begin{task}[id=c2,wphases=4-8]
-    sdfsdf
-  \end{task}
-  \begin{task}[id=c3,wphases=10-14]
-    sdfsdf
-  \end{task}
-  \begin{task}[id=c4,wphases=20-24]
-    sdfsdfd
-  \end{task}
-\end{tasklist}
-\end{workpackage} 
-
-\begin{workpackage}[id=temple,title= Proposal Template,
-  short=Template,RM=12]
-
-We plan to develop a template file for {\pn} proposals
-
-We abstract an example from existing proposals
-\begin{tasklist}
-  \begin{task}[id=temple1,wphases=6-12]
-    sdfdsf 
-  \end{task}
-  \begin{task}[id=temple2,wphases=18-24]%,requires=\taskin{c3}{class}]
-    sdfsdf
-  \end{task} 
-\end{tasklist}
-\end{workpackage}
-
-\begin{workpackage}[id=workphase,title=A work package without tasks,
-  wphases=0-4!.5]
-  And finally, a work package without tasks, so we can see the effect on the gantt chart
-  in fig~\ref{fig:gantt}.
-\end{workpackage}
-\end{workplan} 
-
-\ganttchart[draft,xscale=.45] 
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "proposal"
-%%% End: 
-
-% LocalWords:  workplan.tex wplist dfgcount wa mansubsus duratio ipower wpfig
-% LocalWords:  ganttchart xscale workplan workarea pdataref dissem workpackage foo
-% LocalWords:  tasklist taskin taskref sdfkj sdflkjsdf sdfsdf sdfsdfd sdfdsf pn
-% LocalWords:  firstobj secondobj pdatacount WAref ednote OBJref wphases
-% LocalWords:  ldots OBJtref workphase gantttaskchart
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/Makefile b/Master/texmf-dist/doc/latex/proposal/examples/strep/Makefile
deleted file mode 100644
index 7cd9e01cc1b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# possibly customize the following variables to your setting
-PROPOSAL = propB.tex 		# the proposal
-BIB = ../lib/dummy.bib	        # bibTeX databases
-PROP.dir = ../../..
-###########################################################################
-# the following are computed
-TSIMP = 			                  # pdflatex Targets without bibTeX
-TSIMP.pdf 	= $(TSIMP:%.tex=%.pdf)            # PDFs to be produced
-TBIB = $(PROPOSAL) 		  	  	  # pdflatex Targets with bibTeX
-TARGET = $(TSIMP) $(TBIB)                         # all pdflatex targets
-TBIB.pdf 	= $(TBIB:%.tex=%.pdf)         	  # PDFs to be produced
-TBIB.aux 	= $(TBIB:%.tex=%.aux)             # their aux files.
-PDATA 		= $(PROPOSAL:%.tex=%.pdata)       # the proposal project data
-SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
-PDFLATEX = pdflatex -interaction batchmode -file-line-error
-BBL.base = 1 2 3 4
-BBL = propB.bbl $(BBL.base:%=propB%-blx.bbl)
-PROPCLS.dir = $(PROP.dir)/base
-PROPETC.dir = $(PROP.dir)/etc
-EUPROPCLS.dir = $(PROP.dir)/eu
-TEXINPUTS := .//:$(PROPCLS.dir)//:$(EUPROPCLS.dir)//:$(PROPETC.dir)//:
-BIBINPUTS := ../lib:$(BIBINPUTS)
-PROPCLS.clssty = proposal.cls pdata.sty
-PROPETC.sty = workaddress.sty metakeys.sty sref.sty
-EUPROPCLS.clssty = euproposal.cls
-PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS.dir)/%) $(PROPETC.sty:%=$(PROPETC.dir)/%)
-
-all: $(TBIB.pdf) $(TSIMP.pdf)
-
-cd: 	                                           # make cd will prepare CD for burning
-	mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD
-
-bbl:	$(BBL)
-$(BBL): %.bbl: %.aux
-	bibtex -min-crossrefs=100 -terse $<
-
-$(TSIMP.pdf): %.pdf: %.tex $(PROPCLS) $(PDATA)
-	$(PDFLATEX) $< || $(RM) $@
-
-$(PDATA): %.pdata: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.aux): %.aux: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) 
-	$(PDFLATEX) $<  || $(RM) $@
-	sort $(PROPOSAL:%.tex=%.delivs) > $(PROPOSAL:%.tex=%.deliverables)
-	@if (test -e $(patsubst %.tex, %.idx,  $<));\
-	    then makeindex $(patsubst %.tex, %.idx,  $<); fi
-	$(MAKE) -$(MAKEFLAGS) $(BBL)
-	@if (grep "(re)run BibTeX" $(patsubst %.tex, %.log,  $<)> /dev/null);\
-	    then $(MAKE) -B $(BBL); fi
-	$(PDFLATEX)  $< || $(RM) $@
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	   then $(PDFLATEX)  $<  || $(RM) $@; fi
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	    then $(PDFLATEX)  $<  || $(RM) $@; fi
-
-clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
-
-distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
-	rm -Rf auto
-
-echo:
-	echo $(BBL)
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/README b/Master/texmf-dist/doc/latex/proposal/examples/strep/README
deleted file mode 100644
index 72aee78682a..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/README
+++ /dev/null
@@ -1,14 +0,0 @@
-An Exapmle for euproposal.cls
-
-proposal.tex              is a fake EU proposal that shows all elements of euproposal.cls
-			  in action.
-*.tex			  the rest are intemediate files
-Makefile                  allows the automation via a unix Makefile on the author's 
-			  machine, adapt it to your needs
-
-Copyright(c) 2010 Michael Kohlhase
-The package is distributed under the terms of the LaTeX Project Public License (LPPL)
-
-The development version of this package can be found at
-https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/euproposal
-
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB-blx.bib b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB-blx.bib
deleted file mode 100644
index 86bcc8cec2f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB-blx.bib
+++ /dev/null
@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
-}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.bbl b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.bbl
deleted file mode 100644
index 1183e5ec5e6..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.bbl
+++ /dev/null
@@ -1,76 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{DK:LP}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Knuth}{K.}%
-     {Donald~E.}{D.~E.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {The University of Chicago Press}%
-  }
-  \strng{namehash}{KDE1}
-  \strng{fullhash}{KDE1}
-  \field{sortinit}{K}
-  \field{title}{{Literate Programming}}
-  \field{year}{1992}
-\endentry
-
-\entry{Knuth:ttb84}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Knuth}{K.}%
-     {Donald~E.}{D.~E.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Addison Wesley}%
-  }
-  \strng{namehash}{KDE1}
-  \strng{fullhash}{KDE1}
-  \field{sortinit}{K}
-  \field{title}{The {\TeX}book}
-  \field{year}{1984}
-\endentry
-
-\entry{Lamport:ladps94}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Lamport}{L.}%
-     {Leslie}{L.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Addison Wesley}%
-  }
-  \strng{namehash}{LL1}
-  \strng{fullhash}{LL1}
-  \field{sortinit}{L}
-  \field{title}{LaTeX: A Document Preparation System, 2/e}
-  \field{year}{1994}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.deliverables b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.deliverables
deleted file mode 100644
index 5f61d6337bc..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.deliverables
+++ /dev/null
@@ -1,30 +0,0 @@
-\deliverable{01}{1}{M{1.1}}{managementmailing}{PP}{O}{Project-internal mailing lists} {{WP1}}
-\deliverable{02}{2}{M{2.1}}{dissemwebsite}{PU}{O}{Set-up of the Project web server} {{WP2}}
-\deliverable{03}{3}{M{1.2}}{managementhandbook}{PU}{R}{Project management handbook} {{WP1}}
-\deliverable{06}{6}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{06}{6}{M{1.4}}{managementhelpdesk}{PU}{O}{{iPoWr\xspace  } Helpdesk} {{WP1}}
-\deliverable{06}{6}{M{3.1}}{classreq}{PP}{R}{Requirements analysis} {{WP3}}
-\deliverable{06}{6}{M{4.1}}{templereq}{PP}{R}{Requirements analysis} {{WP4}}
-\deliverable{08}{8}{M{2.2}}{dissemws1proc}{PU}{R}{Proceedings of the first {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{09}{9}{M{2.3}}{dissemdissem}{PP}{R}{Dissemination Plan} {{WP2}}
-\deliverable{09}{9}{M{2.4}}{dissemexploitplan}{PP}{R}{Scientific and Commercial Exploitation Plan} {{WP2}}
-\deliverable{12}{12}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{12}{12}{M{3.2}}{classspec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP3}}
-\deliverable{12}{12}{M{4.2}}{templespec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP4}}
-\deliverable{18}{18}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{18}{18}{M{3.3}}{classdemonstrator}{PU}{P}{First demonstrator ({\tt  {article.cls}} really)} {{WP3}}
-\deliverable{18}{18}{M{4.3}}{templedemonstrator}{PU}{D}{First demonstrator ({\tt  {article.cls}} really)} {{WP4}}
-\deliverable{20}{20}{M{2.5}}{dissemws2proc}{PU}{R}{Proceedings of the second {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{24}{24}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{24}{24}{M{3.4}}{classproto}{PU}{P}{First prototype} {{WP3}}
-\deliverable{24}{24}{M{4.4}}{templeproto}{PU}{P}{First prototype} {{WP4}}
-\deliverable{30}{30}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{32}{32}{M{2.6}}{dissemss1proc}{PU}{R}{Proceedings of the third {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{36}{36}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{36}{36}{M{1.5}}{managementreport6}{PU}{R}{Final plan for using and disseminating the knowledge} {{WP1}}
-\deliverable{36}{36}{M{3.5}}{classrelease}{PU}{P}{Final {\LaTeX  } class, ready for release} {{WP3}}
-\deliverable{36}{36}{M{4.5}}{templerelease}{PU}{P}{Final Template, ready for release} {{WP4}}
-\deliverable{42}{42}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{44}{44}{M{2.7}}{dissemws3proc}{PU}{R}{Proceedings of the fourth {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{48}{48}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{48}{48}{M{1.6}}{managementreport7}{PU}{R}{Final management report} {{WP1}}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.delivs b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.delivs
deleted file mode 100644
index 0f0c2568585..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.delivs
+++ /dev/null
@@ -1,30 +0,0 @@
-\deliverable{01}{1}{M{1.1}}{managementmailing}{PP}{O}{Project-internal mailing lists} {{WP1}}
-\deliverable{03}{3}{M{1.2}}{managementhandbook}{PU}{R}{Project management handbook} {{WP1}}
-\deliverable{06}{6}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{12}{12}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{18}{18}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{24}{24}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{30}{30}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{36}{36}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{42}{42}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{48}{48}{M{1.3}}{managementreport2}{public}{R}{Periodic activity report} {{WP1}}
-\deliverable{06}{6}{M{1.4}}{managementhelpdesk}{PU}{O}{{iPoWr\xspace  } Helpdesk} {{WP1}}
-\deliverable{36}{36}{M{1.5}}{managementreport6}{PU}{R}{Final plan for using and disseminating the knowledge} {{WP1}}
-\deliverable{48}{48}{M{1.6}}{managementreport7}{PU}{R}{Final management report} {{WP1}}
-\deliverable{02}{2}{M{2.1}}{dissemwebsite}{PU}{O}{Set-up of the Project web server} {{WP2}}
-\deliverable{08}{8}{M{2.2}}{dissemws1proc}{PU}{R}{Proceedings of the first {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{09}{9}{M{2.3}}{dissemdissem}{PP}{R}{Dissemination Plan} {{WP2}}
-\deliverable{09}{9}{M{2.4}}{dissemexploitplan}{PP}{R}{Scientific and Commercial Exploitation Plan} {{WP2}}
-\deliverable{20}{20}{M{2.5}}{dissemws2proc}{PU}{R}{Proceedings of the second {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{32}{32}{M{2.6}}{dissemss1proc}{PU}{R}{Proceedings of the third {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{44}{44}{M{2.7}}{dissemws3proc}{PU}{R}{Proceedings of the fourth {iPoWr\xspace  } Summer School.} {{WP2}}
-\deliverable{06}{6}{M{3.1}}{classreq}{PP}{R}{Requirements analysis} {{WP3}}
-\deliverable{12}{12}{M{3.2}}{classspec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP3}}
-\deliverable{18}{18}{M{3.3}}{classdemonstrator}{PU}{P}{First demonstrator ({\tt  {article.cls}} really)} {{WP3}}
-\deliverable{24}{24}{M{3.4}}{classproto}{PU}{P}{First prototype} {{WP3}}
-\deliverable{36}{36}{M{3.5}}{classrelease}{PU}{P}{Final {\LaTeX  } class, ready for release} {{WP3}}
-\deliverable{06}{6}{M{4.1}}{templereq}{PP}{R}{Requirements analysis} {{WP4}}
-\deliverable{12}{12}{M{4.2}}{templespec}{PU}{R}{{iPoWr\xspace  } Specification } {{WP4}}
-\deliverable{18}{18}{M{4.3}}{templedemonstrator}{PU}{D}{First demonstrator ({\tt  {article.cls}} really)} {{WP4}}
-\deliverable{24}{24}{M{4.4}}{templeproto}{PU}{P}{First prototype} {{WP4}}
-\deliverable{36}{36}{M{4.5}}{templerelease}{PU}{P}{Final Template, ready for release} {{WP4}}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdata b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdata
deleted file mode 100644
index e812a1d89ec..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdata
+++ /dev/null
@@ -1,232 +0,0 @@
-\@pdata@def{site}{jacu}{number}{1}
-\@pdata@def{site}{jacu}{intendedRM}{36}
-\@pdata@def{site}{efo}{number}{2}
-\@pdata@def{site}{efo}{intendedRM}{36}
-\@pdata@def{site}{bar}{number}{3}
-\@pdata@def{site}{bar}{intendedRM}{36}
-\@pdata@def{site}{baz}{number}{4}
-\@pdata@def{site}{baz}{intendedRM}{36}
-\@pdata@def{prop}{gen}{coordinator}{miko}
-\@pdata@def{prop}{gen}{acronym}{iPoWr}
-\@pdata@def{prop}{gen}{acrolong}{{\relax $\@@underline {\hbox {I}}\mathsurround \z@ $\relax ntelligent} {\relax $\@@underline {\hbox {P}}\mathsurround \z@ $\relax r\relax $\@@underline {\hbox {o}}\mathsurround \z@ $\relax sal} {\relax $\@@underline {\hbox {Wr}}\mathsurround \z@ $\relax iting}}
-\@pdata@def{prop}{gen}{title}{iPoWr\xspace  : \pnlong }
-\@pdata@def{prop}{gen}{callname}{ICT Call 1}
-\@pdata@def{prop}{gen}{callid}{FP7-???-200?-?}
-\@pdata@def{prop}{gen}{instrument}{Small or Medium-Scale Focused Research Project (STREP)}
-\@pdata@def{prop}{gen}{challengeid}{4}
-\@pdata@def{prop}{gen}{challenge}{ICT for EU Proposals}
-\@pdata@def{prop}{gen}{objectiveid}{ICT-2012.4.4}
-\@pdata@def{prop}{gen}{objective}{Technology-enhanced Documents}
-\@pdata@def{prop}{gen}{outcomeid}{b1}
-\@pdata@def{prop}{gen}{outcome}{More time for Research, not Proposal writing}
-\@pdata@def{prop}{gen}{coordinator}{miko}
-\@pdata@def{prop}{gen}{months}{24}
-\@pdata@def{all}{jacu}{RM}{16}
-\@pdata@def{all}{efo}{RM}{10}
-\@pdata@def{all}{bar}{RM}{22}
-\@pdata@def{all}{baz}{RM}{10}
-\@pdata@def{all}{total}{RM}{58}
-\@pdata@def{mile}{kickoff}{label}{M{1}}
-\@pdata@def{mile}{kickoff}{month}{1}
-\@pdata@def{mile}{kickoff}{verif}{Inspection}
-\@pdata@def{mile}{kickoff}{title}{Initial Infrastructure}
-\@pdata@def{mile}{consensus}{label}{M{2}}
-\@pdata@def{mile}{consensus}{month}{24}
-\@pdata@def{mile}{consensus}{verif}{Inspection}
-\@pdata@def{mile}{consensus}{title}{Consensus}
-\@pdata@def{mile}{exploitation}{label}{M{3}}
-\@pdata@def{mile}{exploitation}{month}{36}
-\@pdata@def{mile}{exploitation}{verif}{Inspection}
-\@pdata@def{mile}{exploitation}{title}{Exploitation}
-\@pdata@def{mile}{final}{label}{M{4}}
-\@pdata@def{mile}{final}{month}{48}
-\@pdata@def{mile}{final}{verif}{Inspection}
-\@pdata@def{mile}{final}{title}{Final Results}
-\@pdata@def{wp}{management}{type}{MGT}
-\@pdata@def{wp}{management}{wphases}{0-24!.2}
-\@pdata@def{wp}{management}{title}{Project Management}
-\@pdata@def{wp}{management}{short}{Management}
-\@pdata@def{management}{jacu}{RM}{2}
-\@pdata@def{management}{bar}{RM}{2}
-\@pdata@def{management}{efo}{RM}{2}
-\@pdata@def{management}{baz}{RM}{2}
-\@pdata@def{wp}{management}{start}{0}
-\@pdata@def{wp}{management}{end}{24}
-\@pdata@def{wp}{management}{type}{MGT}
-\@pdata@def{wp}{management}{label}{WP{1}}
-\@pdata@def{wp}{management}{number}{1}
-\@pdata@def{wp}{management}{page}{7}
-\@pdata@def{wp}{management}{num}{1}
-\@pdata@def{wp}{management}{RM}{8}
-\@pdata@def{deliv}{managementmailing}{label}{M{1.1}}
-\@pdata@def{deliv}{managementmailing}{title}{Project-internal mailing lists}
-\@pdata@def{deliv}{managementmailing}{short}{Project-internal mailing lists}
-\@pdata@def{deliv}{managementmailing}{nature}{O}
-\@pdata@def{deliv}{managementmailing}{dissem}{PP}
-\@pdata@def{deliv}{managementhandbook}{label}{M{1.2}}
-\@pdata@def{deliv}{managementhandbook}{title}{Project management handbook}
-\@pdata@def{deliv}{managementhandbook}{short}{Project management handbook}
-\@pdata@def{deliv}{managementhandbook}{nature}{R}
-\@pdata@def{deliv}{managementhandbook}{dissem}{PU}
-\@pdata@def{deliv}{managementreport2}{label}{M{1.3}}
-\@pdata@def{deliv}{managementreport2}{title}{Periodic activity report}
-\@pdata@def{deliv}{managementreport2}{short}{Periodic activity report}
-\@pdata@def{deliv}{managementreport2}{nature}{R}
-\@pdata@def{deliv}{managementreport2}{dissem}{public}
-\@pdata@def{deliv}{managementhelpdesk}{label}{M{1.4}}
-\@pdata@def{deliv}{managementhelpdesk}{title}{{iPoWr\xspace  } Helpdesk}
-\@pdata@def{deliv}{managementhelpdesk}{short}{{iPoWr\xspace  } Helpdesk}
-\@pdata@def{deliv}{managementhelpdesk}{nature}{O}
-\@pdata@def{deliv}{managementhelpdesk}{dissem}{PU}
-\@pdata@def{deliv}{managementreport6}{label}{M{1.5}}
-\@pdata@def{deliv}{managementreport6}{title}{Final plan for using and disseminating the knowledge}
-\@pdata@def{deliv}{managementreport6}{short}{Final plan for using and disseminating the knowledge}
-\@pdata@def{deliv}{managementreport6}{nature}{R}
-\@pdata@def{deliv}{managementreport6}{dissem}{PU}
-\@pdata@def{deliv}{managementreport7}{label}{M{1.6}}
-\@pdata@def{deliv}{managementreport7}{title}{Final management report}
-\@pdata@def{deliv}{managementreport7}{short}{Final management report}
-\@pdata@def{deliv}{managementreport7}{nature}{R}
-\@pdata@def{deliv}{managementreport7}{dissem}{PU}
-\@pdata@def{wp}{dissem}{type}{RTD}
-\@pdata@def{wp}{dissem}{lead}{efo}
-\@pdata@def{wp}{dissem}{wphases}{10-24!1}
-\@pdata@def{wp}{dissem}{title}{Dissemination and Exploitation}
-\@pdata@def{wp}{dissem}{short}{Dissemination}
-\@pdata@def{dissem}{efo}{RM}{8}
-\@pdata@def{dissem}{jacu}{RM}{2}
-\@pdata@def{dissem}{bar}{RM}{2}
-\@pdata@def{dissem}{baz}{RM}{2}
-\@pdata@def{wp}{dissem}{start}{10}
-\@pdata@def{wp}{dissem}{end}{24}
-\@pdata@def{wp}{dissem}{type}{RTD}
-\@pdata@def{wp}{dissem}{label}{WP{2}}
-\@pdata@def{wp}{dissem}{number}{2}
-\@pdata@def{wp}{dissem}{page}{9}
-\@pdata@def{wp}{dissem}{num}{2}
-\@pdata@def{wp}{dissem}{RM}{14}
-\@pdata@def{deliv}{dissemwebsite}{label}{M{2.1}}
-\@pdata@def{deliv}{dissemwebsite}{title}{Set-up of the Project web server}
-\@pdata@def{deliv}{dissemwebsite}{short}{Set-up of the Project web server}
-\@pdata@def{deliv}{dissemwebsite}{nature}{O}
-\@pdata@def{deliv}{dissemwebsite}{dissem}{PU}
-\@pdata@def{deliv}{dissemws1proc}{label}{M{2.2}}
-\@pdata@def{deliv}{dissemws1proc}{title}{Proceedings of the first {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws1proc}{short}{Proceedings of the first {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws1proc}{nature}{R}
-\@pdata@def{deliv}{dissemws1proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemdissem}{label}{M{2.3}}
-\@pdata@def{deliv}{dissemdissem}{title}{Dissemination Plan}
-\@pdata@def{deliv}{dissemdissem}{short}{Dissemination Plan}
-\@pdata@def{deliv}{dissemdissem}{nature}{R}
-\@pdata@def{deliv}{dissemdissem}{dissem}{PP}
-\@pdata@def{deliv}{dissemexploitplan}{label}{M{2.4}}
-\@pdata@def{deliv}{dissemexploitplan}{title}{Scientific and Commercial Exploitation Plan}
-\@pdata@def{deliv}{dissemexploitplan}{short}{Scientific and Commercial Exploitation Plan}
-\@pdata@def{deliv}{dissemexploitplan}{nature}{R}
-\@pdata@def{deliv}{dissemexploitplan}{dissem}{PP}
-\@pdata@def{deliv}{dissemws2proc}{label}{M{2.5}}
-\@pdata@def{deliv}{dissemws2proc}{title}{Proceedings of the second {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws2proc}{short}{Proceedings of the second {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws2proc}{nature}{R}
-\@pdata@def{deliv}{dissemws2proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemss1proc}{label}{M{2.6}}
-\@pdata@def{deliv}{dissemss1proc}{title}{Proceedings of the third {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemss1proc}{short}{Proceedings of the third {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemss1proc}{nature}{R}
-\@pdata@def{deliv}{dissemss1proc}{dissem}{PU}
-\@pdata@def{deliv}{dissemws3proc}{label}{M{2.7}}
-\@pdata@def{deliv}{dissemws3proc}{title}{Proceedings of the fourth {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws3proc}{short}{Proceedings of the fourth {iPoWr\xspace  } Summer School.}
-\@pdata@def{deliv}{dissemws3proc}{nature}{R}
-\@pdata@def{deliv}{dissemws3proc}{dissem}{PU}
-\@pdata@def{wp}{class}{type}{RTD}
-\@pdata@def{wp}{class}{lead}{jacu}
-\@pdata@def{wp}{class}{wphases}{3-9!1}
-\@pdata@def{wp}{class}{title}{A {\LaTeX  } class for EU Proposals}
-\@pdata@def{wp}{class}{short}{Class}
-\@pdata@def{class}{jacu}{RM}{12}
-\@pdata@def{class}{bar}{RM}{12}
-\@pdata@def{wp}{class}{start}{3}
-\@pdata@def{wp}{class}{end}{9}
-\@pdata@def{wp}{class}{type}{RTD}
-\@pdata@def{wp}{class}{label}{WP{3}}
-\@pdata@def{wp}{class}{number}{3}
-\@pdata@def{wp}{class}{page}{10}
-\@pdata@def{wp}{class}{num}{3}
-\@pdata@def{wp}{class}{RM}{24}
-\@pdata@def{deliv}{classreq}{label}{M{3.1}}
-\@pdata@def{deliv}{classreq}{title}{Requirements analysis}
-\@pdata@def{deliv}{classreq}{short}{Requirements analysis}
-\@pdata@def{deliv}{classreq}{nature}{R}
-\@pdata@def{deliv}{classreq}{dissem}{PP}
-\@pdata@def{deliv}{classspec}{label}{M{3.2}}
-\@pdata@def{deliv}{classspec}{title}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{classspec}{short}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{classspec}{nature}{R}
-\@pdata@def{deliv}{classspec}{dissem}{PU}
-\@pdata@def{deliv}{classdemonstrator}{label}{M{3.3}}
-\@pdata@def{deliv}{classdemonstrator}{title}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{classdemonstrator}{short}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{classdemonstrator}{nature}{P}
-\@pdata@def{deliv}{classdemonstrator}{dissem}{PU}
-\@pdata@def{deliv}{classproto}{label}{M{3.4}}
-\@pdata@def{deliv}{classproto}{title}{First prototype}
-\@pdata@def{deliv}{classproto}{short}{First prototype}
-\@pdata@def{deliv}{classproto}{nature}{P}
-\@pdata@def{deliv}{classproto}{dissem}{PU}
-\@pdata@def{deliv}{classrelease}{label}{M{3.5}}
-\@pdata@def{deliv}{classrelease}{title}{Final {\LaTeX  } class, ready for release}
-\@pdata@def{deliv}{classrelease}{short}{Final {\LaTeX  } class, ready for release}
-\@pdata@def{deliv}{classrelease}{nature}{P}
-\@pdata@def{deliv}{classrelease}{dissem}{PU}
-\@pdata@def{wp}{temple}{type}{DEM}
-\@pdata@def{wp}{temple}{lead}{bar}
-\@pdata@def{wp}{temple}{wphases}{6-12!1}
-\@pdata@def{wp}{temple}{title}{{iPoWr\xspace  } Proposal Template}
-\@pdata@def{wp}{temple}{short}{Template}
-\@pdata@def{temple}{bar}{RM}{6}
-\@pdata@def{temple}{baz}{RM}{6}
-\@pdata@def{wp}{temple}{start}{6}
-\@pdata@def{wp}{temple}{end}{12}
-\@pdata@def{wp}{temple}{type}{DEM}
-\@pdata@def{wp}{temple}{label}{WP{4}}
-\@pdata@def{wp}{temple}{number}{4}
-\@pdata@def{wp}{temple}{page}{11}
-\@pdata@def{wp}{temple}{num}{4}
-\@pdata@def{wp}{temple}{RM}{12}
-\@pdata@def{deliv}{templereq}{label}{M{4.1}}
-\@pdata@def{deliv}{templereq}{title}{Requirements analysis}
-\@pdata@def{deliv}{templereq}{short}{Requirements analysis}
-\@pdata@def{deliv}{templereq}{nature}{R}
-\@pdata@def{deliv}{templereq}{dissem}{PP}
-\@pdata@def{deliv}{templespec}{label}{M{4.2}}
-\@pdata@def{deliv}{templespec}{title}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{templespec}{short}{{iPoWr\xspace  } Specification }
-\@pdata@def{deliv}{templespec}{nature}{R}
-\@pdata@def{deliv}{templespec}{dissem}{PU}
-\@pdata@def{deliv}{templedemonstrator}{label}{M{4.3}}
-\@pdata@def{deliv}{templedemonstrator}{title}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{templedemonstrator}{short}{First demonstrator ({\tt  {article.cls}} really)}
-\@pdata@def{deliv}{templedemonstrator}{nature}{D}
-\@pdata@def{deliv}{templedemonstrator}{dissem}{PU}
-\@pdata@def{deliv}{templeproto}{label}{M{4.4}}
-\@pdata@def{deliv}{templeproto}{title}{First prototype}
-\@pdata@def{deliv}{templeproto}{short}{First prototype}
-\@pdata@def{deliv}{templeproto}{nature}{P}
-\@pdata@def{deliv}{templeproto}{dissem}{PU}
-\@pdata@def{deliv}{templerelease}{label}{M{4.5}}
-\@pdata@def{deliv}{templerelease}{title}{Final Template, ready for release}
-\@pdata@def{deliv}{templerelease}{short}{Final Template, ready for release}
-\@pdata@def{deliv}{templerelease}{nature}{P}
-\@pdata@def{deliv}{templerelease}{dissem}{PU}
-\@pdata@def{all}{task}{count}{0}
-\@pdata@def{all}{wp}{ids}{management,dissem,class,temple}
-\@pdata@def{mile}{kickoff}{delivs}{managementmailing,managementhelpdesk,dissemwebsite,dissemws1proc,classreq,templereq}
-\@pdata@def{mile}{consensus}{delivs}{managementhandbook,managementreport2,classspec,classdemonstrator,templespec,templedemonstrator}
-\@pdata@def{mile}{exploitation}{delivs}{dissemexploitplan,dissemws2proc,dissemss1proc,dissemws3proc}
-\@pdata@def{mile}{final}{delivs}{managementreport2,managementreport6,managementreport7,classdemonstrator,classproto,classrelease,templedemonstrator,templeproto,templerelease}
-\@pdata@def{all}{wp}{count}{4}
-\@pdata@def{all}{deliverables}{count}{23}
-\@pdata@def{all}{milestones}{count}{4}
-\@pdata@def{prop}{page}{last}{24}
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdf b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdf
deleted file mode 100644
index 896b132217f..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB1-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB1-blx.bbl
deleted file mode 100644
index 2f6e6ae4fd7..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB1-blx.bbl
+++ /dev/null
@@ -1,338 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{CarlisleEd:MathML10}{report}{}
-  \name{author}{20}{}{%
-    {{}%
-     {Ausbrooks}{A.}%
-     {Ron}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Buswell}{B.}%
-     {Stephen}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Carlisle}{C.}%
-     {David}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Chavchanidze}{C.}%
-     {Giorgi}{G.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Dalmas}{D.}%
-     {St{\'e}phane}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Devitt}{D.}%
-     {Stan}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Diaz}{D.}%
-     {Angel}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Dooley}{D.}%
-     {Sam}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Hunter}{H.}%
-     {Roger}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ion}{I.}%
-     {Patrick}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Lazrek}{L.}%
-     {Azzeddine}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Libbrecht}{L.}%
-     {Paul}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miller}{M.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miner}{M.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sargent}{S.}%
-     {Murray}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Smith}{S.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Soiffer}{S.}%
-     {Neil}{N.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sutor}{S.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Watt}{W.}%
-     {Stephen}{S.}%
-     {}{}%
-     {}{}}%
-  }
-  \name{editor}{3}{}{%
-    {{}%
-     {Carlisle}{C.}%
-     {David}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ion}{I.}%
-     {Patrick}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miner}{M.}%
-     {Robert}{R.}%
-     {}{}%
-     {}{}}%
-  }
-  \keyw{standard}
-  \strng{namehash}{AR+1}
-  \strng{fullhash}{ARBSCDCGDSDSDADSHRIPKMLALPMBMRSMSBSNSRWS1}
-  \field{sortinit}{A}
-  \field{title}{{Mathematical} {Markup} {Language} ({MathML}) Version 3.0}
-  \verb{url}
-  \verb http://www.w3.org/TR/MathML3
-  \endverb
-  \list{institution}{1}{%
-    {World Wide Web Consortium (W3C)}%
-  }
-  \field{type}{{W3C Recommendation}}
-  \field{year}{2010}
-\endentry
-
-\entry{Kohlhase:omdoc1.2}{book}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Springer Verlag}%
-  }
-  \strng{namehash}{KM1}
-  \strng{fullhash}{KM1}
-  \field{sortinit}{K}
-  \field{booktitle}{{\sc OMDoc} -- An open markup format for mathematical
-  documents [Version 1.2]}
-  \field{number}{4180}
-  \field{series}{LNAI}
-  \field{title}{{\sc OMDoc} -- An open markup format for mathematical documents
-  [Version 1.2]}
-  \verb{url}
-  \verb http://omdoc.org/pubs/omdoc1.2.pdf
-  \endverb
-  \field{month}{08}
-  \field{year}{2006}
-\endentry
-
-\entry{Kohlhase:pdpl10}{report}{}
-  \name{author}{1}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \strng{namehash}{KM1}
-  \strng{fullhash}{KM1}
-  \field{sortinit}{K}
-  \field{title}{Preparing {DFG} Proposals in {\LaTeX} with
-  \texttt{dfgproposal.cls}}
-  \verb{url}
-  \verb https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf
-  \endverb
-  \list{institution}{1}{%
-    {KWARC Group, Jacobs University Bremen}%
-  }
-  \field{type}{Self-documenting {\LaTeX} package}
-  \field{year}{2010}
-\endentry
-
-\entry{KohDavGin:psewads11}{inproceedings}{}
-  \name{author}{10}{}{%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Corneli}{C.}%
-     {Joe}{J.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {David}{D.}%
-     {Catalin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ginev}{G.}%
-     {Deyan}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Jucovschi}{J.}%
-     {Constantin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Andrea}{A.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Lange}{L.}%
-     {Christoph}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Matican}{M.}%
-     {Bogdan}{B.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Mirea}{M.}%
-     {Stefan}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Zholudev}{Z.}%
-     {Vyacheslav}{V.}%
-     {}{}%
-     {}{}}%
-  }
-  \keyw{conference}
-  \strng{namehash}{KM+1}
-  \strng{fullhash}{KMCJDCGDJCKALCMBMSZV1}
-  \field{sortinit}{K}
-  \field{note}{accepted for publication at ICCS 2011 (Finalist at the
-  Executable Papers Challenge)}
-  \field{title}{The Planetary System: Web 3.0 \& Active Documents for STEM}
-  \verb{url}
-  \verb https://svn.mathweb.org/repos/planetary/doc/epc11/paper.pdf
-  \endverb
-  \field{year}{2011}
-\endentry
-
-\entry{StaKoh:tlcspx10}{article}{}
-  \name{author}{5}{}{%
-    {{}%
-     {Stamerjohanns}{S.}%
-     {Heinrich}{H.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Kohlhase}{K.}%
-     {Michael}{M.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Ginev}{G.}%
-     {Deyan}{D.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {David}{D.}%
-     {Catalin}{C.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Miller}{M.}%
-     {Bruce}{B.}%
-     {}{}%
-     {}{}}%
-  }
-  \name{editor}{3}{}{%
-    {{}%
-     {Autexier}{A.}%
-     {Serge}{S.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Sojka}{S.}%
-     {Petr}{P.}%
-     {}{}%
-     {}{}}%
-    {{}%
-     {Suzuki}{S.}%
-     {Masakazu}{M.}%
-     {}{}%
-     {}{}}%
-  }
-  \list{publisher}{1}{%
-    {Birkh{\"a}user}%
-  }
-  \strng{namehash}{SH+1}
-  \strng{fullhash}{SHKMGDDCMB1}
-  \field{sortinit}{S}
-  \field{issuetitle}{Special Issue on Authoring, Digitalization and Management
-  of Mathematical Knowledge}
-  \field{number}{3}
-  \field{pages}{299\bibrangedash 307}
-  \field{title}{Transforming large collections of scientific publications to
-  {XML}}
-  \verb{url}
-  \verb http://kwarc.info/kohlhase/papers/mcs10.pdf
-  \endverb
-  \field{volume}{3}
-  \field{journaltitle}{Mathematics in Computer Science}
-  \field{year}{2010}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB2-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB2-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB2-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB3-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB3-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB3-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB4-blx.bbl b/Master/texmf-dist/doc/latex/proposal/examples/strep/propB4-blx.bbl
deleted file mode 100644
index 5be76be952b..00000000000
--- a/Master/texmf-dist/doc/latex/proposal/examples/strep/propB4-blx.bbl
+++ /dev/null
@@ -1,27 +0,0 @@
-% $ biblatex auxiliary file $
-% $ biblatex version 2.1 $
-% Do not modify the above lines!
-%
-% This is an auxiliary file used by the 'biblatex' package.
-% This file may safely be deleted. It will be recreated as
-% required.
-%
-\begingroup
-\makeatletter
-\@ifundefined{ver@biblatex.sty}
-  {\@latex@error
-     {Missing 'biblatex' package}
-     {The bibliography requires the 'biblatex' package.}
-      \aftergroup\endinput}
-  {}
-\endgroup
-
-\entry{providemore}{misc}{}
-  \field{sortinit}{L}
-  \field{title}{\ldots}
-\endentry
-
-\lossort
-\endlossort
-
-\endinput
diff --git a/Master/texmf-dist/source/latex/proposal/base/proposal.dtx b/Master/texmf-dist/source/latex/proposal/base/proposal.dtx
index 84d735b0812..d58fadbca23 100644
--- a/Master/texmf-dist/source/latex/proposal/base/proposal.dtx
+++ b/Master/texmf-dist/source/latex/proposal/base/proposal.dtx
@@ -8,14 +8,14 @@
 % Either version 1.0 or, at your option, any later version.
 %
 % The development version of this file can be found at
-% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/base/proposal.dtx $
+% https://github.com/KWARC/LaTeX-proposal
 % \fi
 %
 % \iffalse 
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{proposal}[2013/02/13 v1.4 Project Proposal]
-%<pdata>\ProvidesPackage{pdata}[2013/02/13 v1.4 Project Data]
-%<reporting>\ProvidesPackage{reporting}[2013/02/13 v1.4 Project Reporting]
+%<cls>\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal]
+%<pdata>\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data]
+%<reporting>\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting]
 %<*driver>
 \documentclass{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -28,23 +28,21 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[eso-foot,today,draft]{svninfo}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic]{biblatex}
 \bibliography{kwarc}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
  breaklinks=true, bookmarksopen=true]{hyperref}
 \makeindex
 \def\subversion{\textsc{Subversion}\xspace}
+\def\git{\textsc{Git}\xspace}
 \begin{document}
-\svnInfo $Id: proposal.dtx 24170 2013-02-19 12:06:45Z kohlhase $
-\svnKeyword $URL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/base/proposal.dtx $
 \DocInput{proposal.dtx}
 \end{document}
 %</driver>
 % \fi
 % 
-%\CheckSum{3723}
+%\CheckSum{4091}
 % 
 % \changes{v0.4}{2009/05/12}{copied over from eustrep.dtx}
 % \changes{v0.5}{2009/05/27}{added gantt charts}
@@ -66,6 +64,7 @@
 % \changes{v1.4}{2012/01/18}{various extensions for the Jan 2012 EU proposals}
 % \changes{v1.4}{2012/01/28}{some localization support}
 % \changes{v1.4}{2013/01/12}{more documentation of milestones}
+% \changes{v1.5}{2014/01/14}{many layout tweaks support for CVs, milestones in gantt}
 % 
 % \GetFileInfo{proposal.cls}
 % 
@@ -88,20 +87,38 @@
 %
 % Writing grant proposals is a collaborative effort that requires the integration of
 % contributions from many individuals. The use of an ASCII-based format like {\LaTeX}
-% allows to coordinate the process via a source code control system like
-% \subversion, allowing the proposal writing team to concentrate on the contents
-% rather than the mechanics of wrangling with text fragments and revisions.
+% allows to coordinate the process via a source code control system like \git or
+% \subversion, allowing the proposal writing team to concentrate on the contents rather
+% than the mechanics of wrangling with text fragments and revisions. In fact the
+% |proposal| package has evolved out of a series of collaborative proposal writing
+% efforts, where large teams (up to 30 individuals from up to 20 sites) have written a
+% 100-page proposal in three weeks (with over 2000 commits). Such collaborative writing
+% sprints are impossible without a revision control system and a ``semantic'' document
+% class that generates tables, charts, and deliverable lists from content markup and thus
+% takes care of many of the routine tasks of keeping information consistent.
 % 
 % The |proposal| class supports many of the generic elements of Grant Proposals. The
 % package documentation is still preliminary, fragmented and incomplete. 
 %
-% The |proposal| class is distributed under the terms of the LaTeX Project Public
-% License from CTAN archives in directory |macros/latex/base/lppl.txt|.  Either version
-% 1.0 or, at your option, any later version. The CTAN archive always contains the latest
-% stable version, the development version can be found at
-% {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal}}. For bug
-% reports please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component
-% |proposal|.
+% The |proposal| class is distributed under the terms of the LaTeX Project Public License
+% from CTAN archives in directory |macros/latex/base/lppl.txt|.  Either version 1.0 or, at
+% your option, any later version. 
+% 
+% The CTAN archive always contains the latest stable version, the development version can
+% be found on GitHub at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports
+% please use the issue tracker there. Please feel free to fork the repository and provide
+% extensions and improvements. 
+% 
+% The development version also contains example proposals and a very useful script that
+% generates GitHub issues for all the workpackages, tasks, and deliverables. This is a
+% great way of starting up a project and controlling its progress. The OpenDreamKit EU
+% project (see \url{http://opendreamkit.org}) uses this for its (very public) project
+% planning on the issue tracker at \url{https://github.com/OpenDreamKit} after (also
+% publicly) developing the proposal on GitHub.
+% 
+% Finally, the GitHub reposistory contains example project proposals and specialized
+% Makefiles that help start off the proposal development process. These are not part of
+% the CTAN/TeXLive distributions.
 %
 % \section{The User Interface}\label{sec:user-interface}
 % 
@@ -110,8 +127,8 @@
 % 
 % \subsection{Package Options}\label{sec:user:options}
 %
-% The |proposal| package takes the options |submit|, |noworkareas|, |public|, and
-% |keys|.
+% The |proposal| package takes the options |submit|, |noworkareas|, |RAM|, |deliverables|,
+% |wpsubsection|, |keys|, |svninfo|, |gitinfo|, and |public|.
 % 
 % The \DescribeMacro{submit}|submit| option will disable various proposal management decorations
 % which are enabled by default for submission.
@@ -129,6 +146,26 @@
 % The \DescribeMacro{wpsubsection}|wpsubsection| option specifies that we want to see
 % subsections headings for the WPs (and WAs, if we have them).
 % 
+% The \DescribeMacro{report}|report| option specifies that we want to use the |report.cls|
+% class as a basis for |proposal| instead of the default |article.cls|.
+%
+% The \DescribeMacro{keys}|keys| option specifies that we want to see the values of various
+% keyval arguments in the margin.
+% 
+% The \DescribeMacro{svninfo}|svninfo| option specifies specifies that we want to use the
+% |svninfo| package for displaying version control metadata in the document (except when
+% the |submit| option is also given). For this we need the |svninfo| metadata line of the
+% form 
+% \begin{verbatim}
+% \SVN $Id: proposal.tex 13610 2007-07-11 04:30:16Z kohlhase $
+% \svnKeyword $HeadURL: https://svn.kwarc.info/../proposal.tex $
+% \end{verbatim}
+% at the beginning of each file (or in the preamble). 
+% 
+% Analogously, the \DescribeMacro{gitinfo}|gitinfo| option uses the |gitinfo2| package for
+% GIT metadata. Note that you will need to install the post-commit hooks in your working
+% copy according to~\cite{gitinfo2:on} for this to work.
+%
 % Finally, the \DescribeMacro{public}|public| option allows to hide certain sensitive
 % (e.g. financial) parts of the proposal. For this, the |proposal| class provides the
 % \DescribeEnv{private}|private| environment. If the option |public| is set, the parts of
@@ -141,12 +178,6 @@
 % \DescribeMacro{\ifpublic}|\ifpublic| conditional: |\ifpublic{3}\else{5}\fi| will result
 % in ``5'' in the submitted draft and ``3'' in the public document.
 %
-% The \DescribeMacro{report}|report| option specifies that we want to use the |report.cls|
-% class as a basis for |proposal| instead of the default |article.cls|.
-%
-% The \DescribeMacro{keys}|keys| option specifies that we want to see the values of various
-% keyval arguments in the margin.
-% 
 % \subsection{Proposal Metadata and Title page}\label{sec:user:metadata}
 % 
 % The metadata of the proposal is specified in the \DescribeEnv{proposal}|proposal|
@@ -186,6 +217,15 @@
 % text. Note that these macros use |\xspace| internallly, so they do not have to be
 % enclosed in curly braces.
 % 
+% There are two ways of organizing the distribution of personnel resources when developing
+% a proposal. Either the coordinator takes a \emph{top-down approach} where she assigns
+% person months (PM) to the respective site, of she takes a \emph{bottom-up approach},
+% where the sites ``request'' personnel resources by marking them up in the CVs of the
+% researchers in the site descriptions. |proposal.cls| supports both of these. Support
+% for the first is configured via the \DescribeMacro{topdownPM}|topdownPM| key and for the
+% other via the \DescribeMacro{botupPM}|botupPM| key. They add respective lines for
+% planning in the WA/WP figure (see~\ref{sec:user:wpwa}).
+% 
 % \subsection{Proposal Appearance}\label{sec:user:appearance}
 % 
 % The |proposal| environment takes a second set of keyval arguments that allow to
@@ -230,7 +270,7 @@
 % Chart (see Section~\ref{sec:user:gantt}).
 %
 % To achieve the automation, work plan is marked up by the
-% \DescribeEnv{workplan}|workplan| environment, which setsup various internal counters and
+% \DescribeEnv{workplan}|workplan| environment, which sets up various internal counters and
 % bookeeping macros. It contains texts and |workpackage| environments for the work
 % packages.
 %
@@ -269,6 +309,9 @@
 % \item In multi-site proposals the \DescribeMacro{lead} |lead| key specifies the work
 %   package or work group lead, the value of this feature should be the short name of the
 %   respective partner.
+% \item For work packages with many prospers the \DescribeMacro{swsites}|swsites| key
+%   can be given (no value needed) to turn the site names sideways to conserve
+%   (horizontal) space. 
 % \end{compactitem}
 % 
 % It is often useful to group the work packages in a proposal further (especially for
@@ -286,8 +329,11 @@
 % In the work packages we can list tasks that need to be undertaken with the
 % \DescribeEnv{tasklist}|tasklist| environment. The individual tasks are marked up with
 % the \DescribeEnv{task}|task| environment.  This takes a keyval argument with the keys
-% |id| for identification, |title| for a title, and the workphase keys (see
-% Section~\ref{sec:user:workphase}).
+% |id| for identification, |title| for a title, and the workphase keys |wphases|,
+% |start|, |end|, and |force| (see Section~\ref{sec:user:workphase}). For planning
+% involvement we can specify the overall person months via the |PM| key, the task lead via
+% |lead|, and the partners involved via the |partners| key. Finally task dependencies can
+% be specified via the |requires| key. 
 % 
 % Tasks can be referenced by the \DescribeMacro{\taskref}|\taskref| macro that takes two
 % arguments: the work package identifier and the task identifier. As for work packages and
@@ -319,7 +365,7 @@
 % expensive to run) are carried out. Note that the value does not have to be given, so
 % |\begin{gantt}{draft,yscale=.5,step=3}| is a perfectly good invocation.
 %
-% Usually, the |gant| environment is not used however, since it is part of the
+% Usually, the |gantt| environment is not used however, since it is part of the
 % \DescribeMacro{\ganttchart} macro that takes the same keys. This generates a whole
 % Gantt chart automatically from the work phase specifications in the work packages. As
 % above we have to run {\LaTeX} two times for the work phases to show up.
@@ -342,25 +388,23 @@
 % descriptions via the \DescribeMacro{\milestone}|\milestone| macro which is invoked as
 % |\milestone[|\meta{keys}|]{|\meta{title}|}{|\meta{desc}|}|, where \meta{keys} supports
 % the keys |id| for identification |month| for specifying the milestone date (in months of
-% the project duration), and |verif| for specifying a means of
-% verification\footnote{Arguably, this set of keys is inspired by EU proposals, but can be
-% extended in class instances.} Milestones are numbered with labels whose shape can be
-% customized by redefining \DescribeMacro{\milestone@label}|\milestone@label| and
-% referenced by the \DescribeMacro{\mileref}|\mileref{|\meta{id}|}| and
-% \DescribeMacro{\miletref}|\miletref{|\meta{id}|}| for a refernece with milestone
+% the project duration). Milestones are numbered with labels whose shape can be customized
+% by redefining \DescribeMacro{\milestone@label}|\milestone@label| and referenced by the
+% \DescribeMacro{\mileref}|\mileref{|\meta{id}|}| and
+% \DescribeMacro{\miletref}|\miletref{|\meta{id}|}| for a reference with milestone
 % title. |\pdatacount{all}{miles}| gives the number of milestones.
 % 
 % Deliverables are usually defined as part of the work package descriptions (see
 % Section~\ref{sec:user:wpwa}) and listed in an overview table in a separate of the
 % proposal. As for the milestones, we use an environment
-% \DescribeMacro{wpdelivs}|wpdelivs| that contains the delirable descriptions. These are
+% \DescribeMacro{wpdelivs}|wpdelivs| that contains the deliverable descriptions. These are
 % marked up via the \DescribeMacro{wpdeliv} environment which takes an optional keyval
-% argument for the delivrable metadata a regular argument for the title and contains the
+% argument for the deliverable metadata a regular argument for the title and contains the
 % description of the deliverable as the body. For the metadata we have the keys |id| for
 % the deliverable identifier, |due| for the target date (a number that denotes the project
 % month), |nature| and |dissem| for specifying the deliverable nature and dissemination
 % status (usually as short strings prescribed by the proposal template), and |miles| for
-% the milestone this deliverable is targetted for (specified by the milestone
+% the milestone this deliverable is targeted for (specified by the milestone
 % identifier). For repeating deliverables (e.g. project reports), both |due| and |miles|
 % can contain comma-separated lists. Deliverables are numbered by labels whose shape can
 % be customized by number, where the shape of the label can be specified by redefining
@@ -368,9 +412,10 @@
 % \DescribeMacro{\delivref}|\delivref{|\meta{wp}|}{|\meta{id}|}| where \meta{wp} is the
 % work package identifier and \meta{id} that if the deliverable and
 % \DescribeMacro{\delivtref}|\delivtref{|\meta{wp}|}{|\meta{id}|}| for a reference with
-% title. |\pdatacount{|\meta{wp}|}{delivs}| gives the number of milestones of the work
-% package \meta{wp} |\pdatacount{all}{delivs}| that of all deliverables (aggregating over
-% all work packages).
+% title. \DescribeMacro{\localdelivref}|\localdelivref| can be used to reference
+% deliverables in the same work package. |\pdatacount{|\meta{wp}|}{delivs}| gives the
+% number of milestones of the work package \meta{wp} |\pdatacount{all}{delivs}| that of
+% all deliverables (aggregating over all work packages).
 % 
 % Some proposal templates ask for an overview table of the deliverables which aggregates
 % the deliverables of the respective work packages and areas ordered by due date. This can
@@ -394,26 +439,28 @@
 % includes to work packages, work groups, \ldots. Whenever these are defined using the
 % |proposal| infrastructure, the class saves the relevant information in the auxiliary
 % file \meta{proposal}|.aux|. This information can be referenced via the
-% \DescribeMacro{\pdataref}|\pdataref| macro, which takes three arguments.
+% \DescribeMacro  {\pdataref}|\pdataref| macro, which takes three arguments.
 % 
 % In a reference |\pdataref{|\meta{type}|}{|\meta{id}|}{|\meta{aspect}|}| the first argument
 % \meta{type} specifies the type of the object (currently one of |wp|, |wa|, and
 % |partner|) to be referenced, \meta{id} specifies the identifier of the referenced object
 % (it matches the identifier given in the |id| key of the object), and \meta{aspect}
 % specifies the aspect of the saved information that is referenced. 
-% 
-% For a partner \meta{aspect} can be one of |number| (partner number), |short| (partner
-% acronym), |long| (official partner name), |nationality| (partner nationality). 
+%
+% \DescribeMacro{\pdatarefFB}|\pdatarefFB{|\meta{type}|}{|\meta{id}|}{|\meta{a1}|}{|\meta{a2}|}|
+% tries first |\pdataref{|\meta{type}|}{|\meta{id}|}{|\meta{a1}|}| and if that is not
+% given |\pdataref{|\meta{type}|}{|\meta{id}|}{|\meta{a2}|}|. 
 % 
 % For a work package \meta{aspect} can be |number|, (the work package number), |label|
 % (the label {\bf{WP$n$}} where $n$ is the work package number for referencing), |title|
 % (the work package title), |lead| the work package leader, |short| (a short version of
 % the WP title for tables). For work groups we have the same aspects with analogous
 % meanings. In all cases, the referenced information carries a hyperlink to the referenced
-% object.
+% object.  
 % 
-% The \DescribeMacro{\pdataRef}|\pdataRef| macro is a variant of |\pdataref| that also carries a
-% hyperlink (if the |hyperref| package is loaded).
+% The \DescribeMacro{\pdataRef}|\pdataRef| and \DescribeMacro{\pdataRefFB}|\pdataRefFB|
+% macros are variant of |\pdataref| and |\pdataRef| that also carry a hyperlink (if the
+% |hyperref| package is loaded).
 %
 % The \DescribeMacro{\pdatacount}|\pdatacount| macro gives access to the numbers of
 % certain aspects. For instance, the number of work packages in the proposal can be cited
@@ -441,17 +488,20 @@
 % 
 % Many proposals require ways to show coherence between the partners. The |proposal| class
 % offers the macro \DescribeMacro{\coherencematrix}|\coherencematrix| for this which
-% generates a matrix of symbols specifying joint publications and joint projects by the
-% project partners that have been declared by the \DescribeMacro{\jointpub}|\jointpub|,
-% \DescribeMacro{\jointproj}|\jointproj|, and \DescribeMacro{\jointorga}|\jointorga|
-% macros before. These macros all take a comma-separated list of site identifiers as an
+% generates a matrix of symbols specifying joint publications, project organization,
+% software/resource development, and supervision of students by the project partners that
+% have been declared by the \DescribeMacro{\jointpub}|\jointpub|,
+% \DescribeMacro{\jointsub}|\jointproj|, \DescribeMacro{\jointorga}|\jointorga|
+% \DescribeMacro{\jointsoft}|\jointsoft|, and \DescribeMacro{\jointsup}|\jointsup| macros
+% before. These macros all take a comma-separated list of site identifiers as an
 % argument. Use for instance |\jointproj{a,b,c}| to specify that the sites with the
 % identifiers |a|, |b| and |c| have a joint
 % project. \DescribeMacro{\coherencetable}|\coherencetable| is a variant which packages
 % the coherence table in a table figure with label |tab:collaboration|.
 % 
 % The symbols used an be configured by redefining \DescribeMacro{\jpub}|\jpub|,
-% \DescribeMacro{\jproj}|\jproj|, and \DescribeMacro{\jorga}|\jorga|.
+% \DescribeMacro{\jproj}|\jproj|, and \DescribeMacro{\jorga}|\jorga|,
+% \DescribeMacro{\jsoft}|\jsoft|, and \DescribeMacro{\jsup}|\jsup|.
 %
 % \subsection{Localization}\label{sec:use:localization}
 %
@@ -493,8 +543,9 @@
 %
 % \section*{Acknowledgements}
 %
-% The author is indebted to Christoph Lange, Florian Rabe, and Tsanko Tsankov for
-% error reports, feature suggestions, and code snippets. 
+% The author is indebted to Jake Hartenstein, Christoph Lange, Florian Rabe, Lutz
+% Schr\"oder, and Tsanko Tsankov for error reports, feature suggestions, and code
+% snippets.
 % 
 % \StopEventually{\newpage\PrintIndex\newpage\PrintChanges\newpage\printbibliography}\newpage
 %
@@ -510,14 +561,20 @@
 %<*cls|reporting>
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
 \newif\ifwork@areas\work@areastrue
 \newif\if@RAM\@RAMfalse
+\newif\if@svninfo\@svninfofalse
+\newif\if@gitinfo\@gitinfofalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
+\DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
 \DeclareOption{RAM}{\@RAMtrue}
@@ -533,6 +590,7 @@
 %    \begin{macrocode}
 \LoadClass[a4paper,twoside]{\proposal@class}
 \RequirePackage{amssymb}
+\RequirePackage{wasysym}
 \RequirePackage{url}
 \RequirePackage{graphicx}
 \RequirePackage{colortbl}
@@ -545,14 +603,14 @@
 \AtBeginDocument{\ifpublic\excludecomment{private}\fi}
 \RequirePackage{tikz}
 \RequirePackage{paralist}
-\RequirePackage{a4wide}
+\RequirePackage[a4paper,margin=18mm]{geometry}
 \RequirePackage{boxedminipage}
 % so that ednotes in wps do not run out of symbols
 \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[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
 \RequirePackage{csquotes}
 \RequirePackage{mdframed}
 \RequirePackage{pdata}
@@ -569,15 +627,16 @@
 % the |ed| package~\cite{Kohlhase:ed:ctan} is very useful for collaborative writing and
 % passing messages between collaborators or simply reminding yourself of editing tasks, so
 % we preload it in the class. However, we only want to show the information in draft
-% mode. Furthermore, we adapt the options for the |svninfo| package.
+% mode. Furthermore, we adapt the options for the |svninfo| and |gitinfo2| packages.
 %
 %    \begin{macrocode}
 \ifsubmit
 \RequirePackage[hide]{ed}
-\RequirePackage[final,today]{svninfo}
+\if@svninfo\RequirePackage[final,today]{svninfo}\fi
 \else
 \RequirePackage[show]{ed}
-\RequirePackage[eso-foot,today]{svninfo}
+\if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi
+\if@gitinfo\RequirePackage[mark]{gitinfo2}\fi
 \fi
 \renewcommand\ednoteshape{\sl\footnotesize}
 %    \end{macrocode}
@@ -597,9 +656,22 @@
 % We specify the page headings. 
 %    \begin{macrocode}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
+\fancyhfoffset{0pt}
+\fi
+\fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 %</cls|reporting>
 %    \end{macrocode}
@@ -670,6 +742,8 @@
 \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}{proposalnumber}{\def\prop@gen@proposalnumber{#1}%
+\pdata@def{prop}{gen}{proposalnumber}{#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}%
@@ -684,15 +758,22 @@
 \pdata@def{prop}{gen}{totalduration}{#1}}
 \define@key{prop@gen}{fundsuntil}{\def\prop@gen@fundsuntil{#1}%
 \pdata@def{prop}{gen}{fundsuntil}{#1}}
+\define@key{prop@gen}{topdownPM}[true]{\def\prop@gen@topdownPM{#1}}
+\define@key{prop@gen}{botupPM}[true]{\def\prop@gen@botupPM{#1}}
+\define@key{prop@gen}{keywords}{\def\prop@gen@keywords{#1}}
 %    \end{macrocode}
 % and the default values, these will be used, if the author does not specify something
 % better.
 %
 %    \begin{macrocode}
-\newcommand\prop@gen@acro{ACRONYM}
-\newcommand\prop@gen@months{???}
-\newcommand\prop@gen@title{???Proposal Title???}
-\newcommand\prop@gen@instrument{??? Instrument ???}
+\newcommand\prop@gen@acro@default{ACRONYM}
+\def\prop@gen@acro{\prop@gen@acro@default}
+\newcommand\prop@gen@months@default{???months???}
+\def\prop@gen@months{\prop@gen@months@default}
+\newcommand\prop@gen@title@default{???Proposal Title???}
+\def\prop@gen@title{\prop@gen@title@default}
+\newcommand\prop@gen@instrument@default{??? Instrument ???}
+\def\prop@gen@instrument{\prop@gen@instrument@default}
 %    \end{macrocode}
 %
 % \begin{macro}{\prop@tl}
@@ -720,7 +801,7 @@
 %    \end{macrocode}
 % \end{environment}
 % 
-% \subsection{Title Page}\label{sec:impl:metadata}
+% \subsection{Title Page}\label{sec:impl:titlepage}
 %  
 % \begin{environment}{prop@proposal}
 %   This internal environment is called in the |proposal| environment from the |proposal|
@@ -749,12 +830,12 @@
 \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]}
+\printbibliography[heading=warnpubs]}
 %    \end{macrocode}
 % \end{environment}
 % 
 % \begin{environment}{proposal}
-%   The |proposal| environment reads the metdata keys defined above, and if there were no
+%   The |proposal| environment reads the metadata keys defined above, and if there were no
 %   |site| keys, then it defines keys |RM| and |RAM| (unless the |noRAM| package option
 %   was given) for the |workpackage| environment. Also it reads the project data file and
 %   opens up the project data file |\pdata@out|, which it also closes at the end. 
@@ -802,7 +883,7 @@
 \begin{prop@report}}
 {\end{prop@report}%
 \pdata@def{prop}{page}{last}{\thepage}\ofpagefalse\newpage
-\printbibliography[heading=warnpubs,maxnames=999]
+\printbibliography[heading=warnpubs]
 \pdata@close}
 %    \end{macrocode}
 % \end{environment}
@@ -855,8 +936,8 @@
 % \begin{environment}{objective}
 %    \begin{macrocode}
 \newenvironment{objective}[1][]
-{\let\obj@id\relax\let\obj@title\relax\let\obj@short%
-\relax\setkeys{obj}{#1}\stepcounter{objective}%
+{\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}%
@@ -870,7 +951,7 @@
 % \begin{macro}{\OBJref}
 %    \begin{macrocode}
 \newcommand\OBJref[1]{\pdataRef{obj}{#1}{label}}
-\newcommand\OBJtref[1]{\pdataRef{obj}{#1}{label}: \pdataRef{obj}{#1}{title}}
+\newcommand\OBJtref[1]{\OBJref{#1}: \pdataRefFB{obj}{#1}{short}{title}}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -889,10 +970,11 @@
 %    \begin{macrocode}
 \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}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#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}}
+\define@key{workpackage}{swsites}[true]{\def\wp@swsites{#1}}
 %    \end{macrocode}
 % We define the constructors for the work package and work group labels and titles. 
 %    \begin{macrocode}
@@ -968,6 +1050,7 @@
 \if@RAM\newcounter{wp@RAM}\fi
 \newenvironment{work@package}[1][]%
 {\def\wp@wphases{0-0}% default values
+\def\wp@swsites{false}
 \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%
@@ -1002,11 +1085,13 @@
 %    \begin{macrocode}
 \newenvironment{workpackage}[1][]%
 {\begin{work@package}[#1]%
+\ifgrantagreement\else 
 %\if@wpsubsection\subsubsection*{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}\fi
 \if@sites\goodbreak\medskip\wpheadertable%
 \else\subsubsection*{{\wptitle} (\wprm)}\fi%
 \addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
-}
+\noindent\ignorespaces%
+\fi}
 {\end{work@package}}
 %    \end{macrocode}
 %  \end{environment}
@@ -1051,14 +1136,23 @@
 \newcounter{wp@sites@num}
 \newcommand\wp@sites@efforts@lines{%
 \setcounter{wp@sites@num}{0}
-{\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax%
+{\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax\let\@sw\relax%
 \let\site\relax\let\textbf\relax\let\sum@style\relax\let\lead@style\relax%
+\let\pn\relax\let\sys\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}}%
+\if@site@contributes\@site{&%
+\ifx\wp@swsites\@true%
+\@sw{\ifx\@site\wp@lead\lead@style{\site{\@site}}\else\site{\@site}\fi}%
+\else\ifx\@site\wp@lead\lead@style{\site{\@site}}\else\site{\@site}\fi%
+\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}}}%
+\if@site@contributes\@site{&%
+\ifx\@site\wp@lead%
+\lead@style{\pdataref@safe\wp@id\@site{RM}\if@RAM+\pdataref@safe\wp@id\@site{RAM}\fi}
+\else\pdataref@safe\wp@id\@site{RM}\if@RAM+\pdataref@safe\wp@id\@site{RAM}\fi\fi}}%
+}% do
 \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}}}}}
@@ -1121,7 +1215,8 @@
 \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}}}
+\addcontentsline{toc}{subsubsection}{{\wa@mk@title\thewa}: \pdataref{wa}\wa@id{title}}%
+\ignorespaces}
 {\@ifundefined{@wps}{}{\pdata@def\wa@id{wp}{ids}\@wps}\pdata@def\wa@id{wp}{count}\thewa@wps}\fi
 %    \end{macrocode}
 % \end{environment}
@@ -1203,16 +1298,18 @@
 % 
 % \begin{macro}{\deliv@label}
 %    \begin{macrocode}
-\newcommand\deliv@label[1]{M{#1}}
+\newcommand\deliv@label[1]{D{#1}}
 %    \end{macrocode}
 % \end{macro}
 % 
-% \begin{macro}{\delivref}
+% \begin{macro}{\*deliv*ref}
 %   This macro is generally useful to put a comment at the end of the line, possibly
 %   making a new one if there is not enough space.
 %    \begin{macrocode}
 \newcommand\delivref[2]{\pdataRef{deliv}{#1#2}{label}}
-\newcommand\delivtref[2]{\pdataRef{deliv}{#1#2}{label}: \pdataRef{deliv}{#1#2}{short}}
+\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
+\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
+\newcommand\localdelivtref[1]{\delivtref{\wp@id}{#1}}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -1225,6 +1322,7 @@
 \define@key{deliv}{nature}{\def\deliv@nature{#1}}
 \define@key{deliv}{miles}{\def\deliv@miles{#1}}
 \define@key{deliv}{short}{\def\deliv@short{#1}}
+\define@key{deliv}{lead}{\def\deliv@lead{#1}}
 %    \end{macrocode}
 % The |\wpdeliv| macro cycles over the due dates and generates the relevant entries into
 % the deliverables file. The first step is to write the general metadata to the pdata
@@ -1241,11 +1339,19 @@
 \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}
+\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
 \@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@nature}
+{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv \wpg@id undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}}
+\@ifundefined{deliv@dissem}
+{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for Deliv \wpg@id undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}}
+\@ifundefined{deliv@lead}
+{\protect\G@refundefinedtrue\@latex@warning{key 'lead' for Deliv \wpg@id  undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{lead}{\deliv@lead}}
 %    \end{macrocode}
 % Then we iterate over the due dates and generate an entry for teach of them.
 %    \begin{macrocode}
@@ -1254,18 +1360,21 @@
 {\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
+{\@ifundefined{deliv@id}{??}{\wpg@id\deliv@id}}% id
+{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
+{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
 {#2}
-{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}}}}%WP
+{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}%WP
+{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}}% lead
 %    \end{macrocode}
 % And finally, we generate the entry into the deliverables table. 
 %    \begin{macrocode}
-\item[\current@label: (Month \deliv@due; nature: \deliv@nature, dissem.: \deliv@dissem)] \pdata@target{deliv}{\wpg@id\deliv@id}{\textit{#2}}
+\item[\current@label\ (%
+\delivs@legend@due: \@ifundefined{deliv@due}{??}{\deliv@due}, 
+\delivs@legend@nature: \@ifundefined{deliv@nature}{??}{\deliv@nature}, 
+\delivs@legend@dissem: \@ifundefined{deliv@dissem}{??}{\deliv@dissem}, 
+\delivs@legend@lead: \@ifundefined{deliv@lead}{??}{\site{\deliv@lead}})]
+ \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
@@ -1305,7 +1414,7 @@
 %   making a new one if there is not enough space.
 %    \begin{macrocode}
 \newcommand\mileref[1]{\pdataRef{mile}{#1}{label}}
-\newcommand\miletref[1]{\pdataRef{mile}{#1}{label}: \pdataRef{mile}{#1}{short}}
+\newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -1324,8 +1433,9 @@
 \pdata@def{mile}\mile@id{month}{\mile@month}%
 \pdata@def{mile}\mile@id{verif}{\mile@verif}%
 \pdata@def{mile}\mile@id{title}{#2}%
+\pdata@def{mile}\mile@id{description}{#3}%
 \@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
-\@milestone{#1}{#2}{#3}% presentation
+\@milestone{\mile@id}{#2}{#3}% presentation
 \else\deliv@error\fi}
 %    \end{macrocode}
 % \end{macro}
@@ -1333,72 +1443,64 @@
 % \begin{macro}{\@milestone}
 %   the corresponding presentation macro.
 %    \begin{macrocode}
-\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}
+\newcommand\@milestone[3]{% id, title, description
+\item \textbf{\miles@legend@milestone \pdataref{mile}{#1}{label} (\miles@legend@month \pdataref{mile}\mile@id{month})
+\textbf{#2}} #3}
+\newcommand\miles@legend@month{Month}
+\newcommand\miles@legend@milestone{Milestone}
 %    \end{macrocode}
 % \end{macro}
 % 
 % \begin{environment}{milestones}
+%   This does the metadata bookkeeping, the layout is delegated to the presentation
+%   environment |@milestones| and the legend macros that can be customized for specific
+%   proposals.
 %    \begin{macrocode}
-\newenvironment{milestones}{\begin{@milestones}}{\end{@milestones}}
+\newenvironment{milestones}%
+{\ifdelivs\begin{@milestones}\else\deliv@error\fi}
+{\ifdelivs\pdata@def{all}{mile}{ids}{\mile@stones}%
+\pdata@def{all}{mile}{count}{\themilestone}%
+\end{@milestones}\fi}
 %    \end{macrocode}
 % \end{environment}
 %
 % \begin{environment}{@milestones}
+% here we do the work. 
 %    \begin{macrocode}
-\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}
-%    \end{macrocode}
-% now the multilinguality support 
-%    \begin{macrocode}
-\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.}
+\newenvironment{@milestones}{\begin{enumerate}}{\end{enumerate}}
 %    \end{macrocode}
 % \end{environment}
 %
-% \begin{macro}{\prop@milesfor}
-%    the due date is the first argument to facilitate sorting
-%    \begin{macrocode}
-\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}}
-%    \end{macrocode}
-% \end{macro}
-% 
 % \begin{macro}{\deliverable}
 %    the first argument is an extended due date to facilitate sorting. 
 %    \begin{macrocode}
-\newcommand{\deliverable}[8]{\pdataRef{deliv}{#4}{label}&#7&#8&#6&#5&#2\\\hline}%sortkey,due,label,id,title,type,level
+\newcommand{\deliverable}[9]{\pdataRef{deliv}{#4}{label}&#7&#8&#9&#6&#5&#2\\\hline}%sortkey,due,label,id,title,type,level,lead
 %    \end{macrocode}
 % \end{macro}
 % 
 % \begin{environment}{deliverables}
 %    
 %    \begin{macrocode}
-\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}
+\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|l|}\hline%
+\#&\textbf{\delivs@legend@name}&%
+\textbf{\delivs@legend@wp}&%
+\textbf{\delivs@legend@lead}&%
+\textbf{\delivs@legend@nature}&%
+\textbf{\delivs@legend@level}&%
+\textbf{\delivs@legend@due}\\\hline\hline%
+\endhead%
+\else\deliv@error\fi}
 {\ifdelivs\end{longtable}\fi}
 %    \end{macrocode}
 % now the multilingual support
 %    \begin{macrocode}
 \newcommand\delivs@legend@name{Deliverable name}
 \newcommand\delivs@legend@wp{WP}
-\newcommand\delivs@legend@nature{Nature}
+\newcommand\delivs@legend@nature{Type}
 \newcommand\delivs@legend@level{Level}
 \newcommand\delivs@legend@due{Due}
+\newcommand\delivs@legend@dissem{Dissem.}
+\newcommand\delivs@legend@lead{Lead}
 %    \end{macrocode}
 % \end{environment}
 % 
@@ -1424,44 +1526,62 @@
 % \end{environment}
 % The next step is to 
 %    \begin{macrocode}
-\newcommand\task@label[1]{T#1}
+\newcommand\task@label[2]{\textbf{T#1.#2}}
 %    \end{macrocode}
 % We define the keys for the task macro
 %    \begin{macrocode}
 \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}}
+\define@key{task}{title}{\def\task@title{#1}\pdata@def{task}{\taskin\task@id\wp@id}{title}{#1}}
+\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}}
+\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}}
+\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}}
 %    \end{macrocode}
 % then we define an auxiliary function that gives them sensible defaults and sets the
 % internal macros.
 %    \begin{macrocode}
 \def\task@set#1{\edef\task@id{task\thetask@all}
-\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}
+\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
 \setkeys{task}{#1}}
 %    \end{macrocode}
 % 
+% \begin{macro}{\task@post@title@space}
+%   make the space after the title tweakable
+%    \begin{macrocode}
+\def\task@post@title@space{\;}
+%    \end{macrocode}
+% \end{macro}
+% 
 % \begin{environment}{task}
 %    \begin{macrocode}
 \newcounter{alltasks}
+\def\task@post@title@space{\quad}
+\newcommand\task@legend@partners{Sites: }
+\newcommand\task@legend@PM{PM}
 \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}%
+{\stepcounter{alltasks}%
+\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
+\@ifundefined{task@title}{}{\textbf\task@title}\task@post@title@space%
 \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}
-{}
+\let\@@sep=\relax\@for\@I:=\task@wphases%
+\do{\decode@wphase\@I%
+\@@sep\show@wphase\wphase@start\wphase@end\wphase@force%
+\let\@@sep=\sep@wphases}%
+\fi% initial
+\hfill%
+\ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi%
+\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)\fi%
+\@for\@I:=\task@partners\do{, \site\@I}\\%
+\ignorespaces}
+{\medskip}
 %    \end{macrocode}
 % now the multilingual support and presentation configuration
 %    \begin{macrocode}
 \newcommand\month@label[1]{M#1}
-\newcommand\show@wphase[3]{\def\@test{#3}\month@label{#1}-\month@label{#2}%
-\ifx\@test\@empty\@ #3}
+\newcommand\show@wphase[3]{\edef\@test{#3}\def\@one{1}%
+\month@label{#1}-\month@label{#2}%
+\ifx\@test\@empty\else\ifx\@test\@one\else @#3\fi\fi}
 \newcommand\sep@wphases{; }
 \newcommand\legend@partners{Partners}
 \newcommand\legend@lead{lead}
@@ -1478,7 +1598,7 @@
 \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}{label}{\task@label\thewp\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}}
@@ -1493,18 +1613,18 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\localtaskref}
+% \begin{macro}{\*task*ref}
 %    \begin{macrocode}
-\newcommand\localtaskref[1]{\pdataRef{task}{\wp@id @#1}{label}}
+\newcommand\taskin[2]{#2@#1}
+\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
+\newcommand\taskreflong[2]{\pdataRef{task}{#2}{label}}
+\newcommand\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
+\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
+\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
 %    \end{macrocode}
 % \end{macro}
-% 
-% \begin{macro}{\taskref}
+% now we initialize experimental infrastructure for task dependencies (not very well used/tested)
 %    \begin{macrocode}
-\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}%
@@ -1513,7 +1633,6 @@
 \update@deps\dep@id}
 %</cls>
 %    \end{macrocode}
-% \end{macro}
 %
 % \subsection{Project Data,  Referencing \& Hyperlinking}\label{sec:impl:hyperlinking} 
 % 
@@ -1542,7 +1661,7 @@
 % \end{macro}
 %  
 % \begin{macro}{\pdata@target}
-%   This internal macro makes a hypertarget:
+%   This internal macro makes a hyper-target:
 %   |\pdata@target{|\meta{cat}|}{|\meta{id}|}{|\meta{label}|}| prints \meta{label} with a
 %   target name \meta{cat}|@|\meta{id}|@target| attached to it.
 %    \begin{macrocode}
@@ -1576,6 +1695,17 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\pdatarefFB}
+% a variant with fallback field,
+%    \begin{macrocode}
+\newcommand\pdatarefFB[4]{\@ifundefined{#1@#2@#3}%
+{\@ifundefined{#1@#2@#4}%
+{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
+{\csname #1@#2@#4\endcsname}}
+{\csname #1@#2@#3\endcsname}}
+%    \end{macrocode}
+% \end{macro}
+% 
 % \begin{macro}{\pdataRef}
 %    \begin{macrocode}
 \newcommand\pdataRef[3]{\@ifundefined{#1@#2@#3}%
@@ -1584,6 +1714,17 @@
 %    \end{macrocode}
 % \end{macro}
 % 
+% \begin{macro}{\pdataRefFB}
+% a variant with fallback field,
+%    \begin{macrocode}
+\newcommand\pdataRefFB[4]{\@ifundefined{#1@#2@#3}%
+{\@ifundefined{#1@#2@#4}%
+{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
+{\hyperlink{#1@#2@target}{\csname #1@#2@#4\endcsname}}}
+{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}}
+%    \end{macrocode}
+% \end{macro}
+% 
 % \begin{macro}{\pdatacount}
 %    \begin{macrocode}
 \newcommand\prop@count[1]{\ifcase #1 zero\or one\or two\or three\or four\or five\or six\or seven \or
@@ -1602,10 +1743,10 @@
 % \begin{macro}{\W*ref}
 %    \begin{macrocode}
 \newcommand\WPref[1]{\pdataRef{wp}{#1}{label}}
-\newcommand\WPtref[1]{\pdataRef{wp}{#1}{label}: \pdataRef{wp}{#1}{short}}
+\newcommand\WPtref[1]{\WPref{#1}: \pdataRefFB{wp}{#1}{short}{title}}
 \ifwork@areas
 \newcommand\WAref[1]{\pdataRef{wa}{#1}{label}}
-\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}}
+\newcommand\WAtref[1]{\WAref{#1}: \pdataRefFB{wa}{#1}{short}{title}}
 \fi
 %</pdata>
 %    \end{macrocode}
@@ -1627,7 +1768,8 @@
 %    \begin{macrocode}
 \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}
+wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30;%
+ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
 \newcommand\sum@style[1]{\cellcolor{wagray}{\textbf{#1}}}
 \newcommand\wa@style[1]{\cellcolor{wagray}{\textbf{#1}}}
 \newcommand\wp@style[1]{#1}
@@ -1651,9 +1793,11 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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}}
+\define@key{wpfig}{label}{\def\wpfig@label{#1}}
+\define@key{wpfig}{caption}{\def\wpfig@caption{#1}}
 \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%
+\newenvironment{wp@figure}{\begin{table}[ht]\wpfig@style\begin{center}
+{\let\@sw\relax\let\textbf\relax\let\site\relax\let\pn\relax\let\sys\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%
@@ -1670,13 +1814,14 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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
+\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}}
+\@ifundefined{wpfig@label}{\caption{\wpfig@legend@caption}}{\caption{\wpfig@caption}}
+\@ifundefined{wpfig@label}{\label{fig:wplist}}{\label{\wpfig@label}}
+\end{center}\end{table}}
 %    \end{macrocode}
 % and now multilinguality support 
 %    \begin{macrocode}
@@ -1892,12 +2037,16 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %    \end{macrocode}
 % And we finally have a line for the intended totals which we use in draft mode. 
 %    \begin{macrocode}
-\gdef\intended@totals{}
+\gdef\intended@totals{}\gdef\requested@totals{}
 \if@sites
 \@for\@site:=\prop@gen@sites\do{
 \xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{site}\@site{intendedRM}}}
+\xdef\requested@totals{\requested@totals&\pdataref@safe{site}\@site{reqPM}}
 \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
+\if@RAM\xdef\intended@totals{\intended@totals&&}\else%
+\xdef\intended@totals{\intended@totals&}%
+\xdef\requested@totals{\requested@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
@@ -1909,15 +2058,22 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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
+\multicolumn{\the\local@count}{|c|}{\prop@legend@totals}\@totals\\\hline%
+\ifsubmit\else%
+\ifx\prop@gen@topdownPM\@true%
+\multicolumn{\the\local@count}{|c|}{\prop@legend@intendedtotals}\intended@totals\\\hline%
+\fi% topdownPM
+\ifx\prop@gen@botupPM\@true%
+\multicolumn{\the\local@count}{|c|}{\prop@legend@requestedtotals}\requested@totals\\\hline%
+\fi% botupPM
+\fi% submit
 \end{wp@figure}}
 %    \end{macrocode}
 % and now multilinguality support 
 %    \begin{macrocode}
 \newcommand\prop@legend@totals{\textbf{totals}}
 \newcommand\prop@legend@intendedtotals{\textbf{intended totals}}
+\newcommand\prop@legend@requestedtotals{\textbf{requested totals}}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -1930,11 +2086,13 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 % We define the keys for Gantt tables
 %    \begin{macrocode}
 \newif\ifgantt@draft\gantt@draftfalse
+\newif\ifgantt@miles\gantt@milesfalse
 \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}
+\define@key{gantt}{milestones}[true]{\gantt@milestrue}
 %    \end{macrocode}
 % Then we define an auxiliary function that provides defaults for these keys and sets the
 % internal macros.
@@ -1950,15 +2108,31 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %   for a gantt chart. The grid is |\prop@gen@months| wide and \meta{height} high. 
 %    \begin{macrocode}
 \newenvironment{gantt}[2][]
-{\gantt@set{#1}
+{\gantt@set{#1}\gdef\gantt@height{#2}
+\def\@test{\prop@gen@months@default}
+\ifx\@test\prop@gen@months
+\ClassError{proposal}{Need overall project months to draw gantt
+    chart - expect trouble;\MessageBreak specify
+    \protect\begin{proposal}[...,months=??,...] to fix}\fi
 \@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}}
+\gantt@ymonths=\gantt@height cm
+\advance\gantt@ymonths by .8cm
+\begin{tikzpicture}[xscale=\gantt@xscale,yscale=\gantt@yscale]}
+{\draw[xstep=\gantt@step,very thin] (0,0) grid (\prop@gen@months,\gantt@height);
+\foreach \x in {0,\gantt@step,...,\prop@gen@months} \node at (\x,\gantt@ymonths) {\x};
+\ifgantt@miles
+\newdimen\gantt@ymiles\gantt@ymiles=\gantt@height cm
+\advance\gantt@ymiles by 2cm
+\newdimen\gantt@ymiles@top\gantt@ymiles@top=\gantt@height cm
+%\advance\gantt@ymiles@top by 2cm
+\edef\@@miles{\pdataref@safe{all}{mile}{ids}}
+\@for\@I:=\@@miles\do{%
+\edef\@@month{\pdataref@safe{mile}{\@I}{month}}
+\draw[very thick,blue] (\@@month,\gantt@ymiles@top) -- (\@@month,0);
+\node[blue] at (\@@month,\gantt@ymiles) {\pdataref{mile}{\@I}{label}};}
+\fi %gantt@miles
+\end{tikzpicture}}
 %    \end{macrocode}
 % \end{environment}
 %
@@ -1969,13 +2143,14 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %   \meta{month} with length \meta{len} that is \meta{force} thick.
 %    \begin{macrocode}
 \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
+\newcommand{\@action}[6][]{\def\@test{#1}%
+\ifx\@test\@empty\def\@@color{ganttgray}\else\def\@@color{#1}\fi
+\gantt@ymid=#3 cm\gantt@yinc=\gantt@yscale cm
+\gantt@xend=#4 cm\advance\gantt@xend by #5 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) {};}
+\fill[\@@color] (#4,#3) rectangle +(#5,#6);
+\node (#2@left) at (#4,\gantt@ymid) {};
+\node (#2@right) at (\gantt@xend,\gantt@ymid) {};}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2024,7 +2199,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
        \@for\@@ft:=\@@wphases\do{%task-level work phases
          \decode@wphase\@@ft
          \@action\@@task\@@line\wphase@start\wphase@len\wphase@force}}}}
- \else% ifwork@ares
+ \else% ifwork@areas false
  \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
  \@for\@@wp:=\@@wps\do{% iterate over work packages
    \stepcounter{taskwps}
@@ -2040,7 +2215,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
      \@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
+ \fi% ifwork@areas end
  \edef\@@deps{\pdataref@safe{all}{task}{deps}}
  \@for\@@dep:=\@@deps\do{%
    \@dependency{\pdataref@safe{taskdep}\@@dep{from}}{\pdataref@safe{taskdep}\@@dep{to}}}
@@ -2067,7 +2242,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
           \@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);
+      \fill[ganttgray]  (\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
@@ -2081,19 +2256,22 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
           \@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);
+      \fill[ganttgray]  (\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}}
+\end{figure}\footnotetext\gantt@footnote}
 %    \end{macrocode}
 % now the multilingual support
 %    \begin{macrocode}
-\newcommand\gantt@caption@main{Overview Work Package Activities} 
+\newcommand\gantt@caption@main{Gantt Chart: 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\gantt@caption{\gantt@caption@main\ifgantt@draft\xspace
+  (\gantt@caption@lower)\fi} 
+\newcommand\gantt@footnote{Bars shown at reduced height (e.g. 50\%) indicate reduced 
+  intensity during  that work phase  (e.g. to 50\%).}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2102,24 +2280,28 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %   useful for EU projects\ednote{this should be incorporated with the gantt chart above,
 %   but I am currently to scared to do it so close to the deadline}
 %    \begin{macrocode}
-\newcommand{\gantttaskchart}[1][]{\begin{figure}[ht]\centering\gantt@set{#1}
-\def\gantt@tasks{\pdataref@num{all}{task}{count}}
-\begin{gantt}[#1]{\gantt@tasks}
+\newcommand{\gantttaskchart}[1][]{\begin{figure}[hbtp]\centering\gantt@set{#1}
+\newcounter{gantt@all@tasks}%
+\setcounter{gantt@all@tasks}{\pdataref@num{all}{task}{count}}
+\addtocounter{gantt@all@tasks}{\pdataref@num{all}{wp}{count}}
+\begin{gantt}[#1]{\thegantt@all@tasks}
   \newcounter{gantt@tasks}\newcount\@@line
   \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
    \@for\@@wp:=\@@wps\do{% iterate over work packages
+     \stepcounter{gantt@tasks}
+%     \@action[white]{}\@@line0{48}1
      \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};
+       \@@line=\thegantt@all@tasks\advance\@@line by -\thegantt@tasks
+       \node at (-.5/\gantt@xscale,\@@line) [above=-2pt] {{\footnotesize\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}
+    \caption{\gantt@caption@main{} -- \emph{\gantt@footnote}}\label{fig:gantt}
 \end{figure}}
 %    \end{macrocode}
 % \end{macro}
@@ -2128,9 +2310,11 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %
 % \begin{macro}{\j*}
 %    \begin{macrocode}
-\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\jpub{\textcolor{\prop@link@color}{\textbf{\Large{$\star$}}}}
+\newcommand\jpro{\textcolor{\prop@link@color}{\textbf{\Large{$\bullet$}}}}
+\newcommand\jsoft{\textcolor{\prop@link@color}{\textbf{@}}}
+\newcommand\jorga{\textcolor{\prop@link@color}{\textbf{\Large{$\circ$}}}}
+\newcommand\jsup{\textcolor{\prop@link@color}{\textbf{\smiley}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2157,8 +2341,10 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %   Now, some instances that use these.
 %    \begin{macrocode}
 \newcommand\jointproj[1]{\prop@joint\jpro{#1}}
-\newcommand\jointpub[1]{\prop@joint\jpro{#1}}
+\newcommand\jointpub[1]{\prop@joint\jpub{#1}}
 \newcommand\jointorga[1]{\prop@joint\jorga{#1}}
+\newcommand\jointsoft[1]{\prop@joint\jsoft{#1}}
+\newcommand\jointsup[1]{\prop@joint\jsup{#1}}
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2166,30 +2352,38 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 %    \begin{macrocode}
 \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}}}
+ \let\@sw\relax\let\jpub\relax\let\jpro\relax\let\jorga\relax% not bother
+ \let\jsoft\relax\let\jsup\relax\let\cellcolor\relax% us
+\gdef\@ct@head{}%
+\@for\@site:=\prop@gen@sites\do{\xdef\@ct@head{\@ct@head% 
+&\ifx\cht@swsites\@true\@sw{\site{\@site}}\else\site{\@site}\fi}}%
 \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
+\@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{\cellcolor{wagray}{}}\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
+      \jorga $\hat=$ organization, \jsoft $\hat=$ software/resource dev, 
+       \jsup $\hat=$ supervision}\\\hline
 \end{tabular}}
 %    \end{macrocode}
 % \end{macro}
 % 
 % \begin{macro}{\coherencetable}
 %    \begin{macrocode}
-\newcommand\coherencetable{%
-\begin{table}[ht]
-\begin{center}\small\setlength{\tabcolsep}{.5em}
-\renewcommand{\arraystretch}{.9}\coherencematrix
-\end{center}
+\define@key{coherencetable}{swsites}[true]{\def\cht@swsites{#1}}
+\define@key{coherencetable}{stretch}{\def\cht@stretch{#1}}
+\newcommand\coherencetable[1][]{%
+\def\cht@swsites{false}%
+\def\cht@stretch{1}%
+\setkeys{coherencetable}{#1}%
+\begin{table}[ht]\centering%
+\small\setlength{\tabcolsep}{.5em}%
+\renewcommand{\arraystretch}{\cht@stretch}%
+\coherencematrix%
 \caption{\coherence@caption}\label{tab:collaboration}
 \end{table}}
 %    \end{macrocode}
@@ -2214,7 +2408,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 %    \begin{macrocode}
 \newif\if@allpapers\@allpaperstrue
 \newcommand\prop@ppl[3][]{\@allpapersfalse\message{ppl processing: #2}%
-\printbibliography[heading=subbibliography,maxnames=999,type=#2,title=#3#1]%
+\printbibliography[heading=subbibliography,type=#2,title=#3#1]%
 \@ifundefined{prop@rl}{\xdef\prop@rl{#2}}{\xdef\prop@rl{\prop@rl, #2}}}
 %    \end{macrocode}
 % The following code does not work yet, it would have been nice to be able to just add a
@@ -2222,7 +2416,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 % warning instead. 
 %    \begin{macrocode}
 \newcommand\prop@prl[1]{\message{unclassified: #1}%
-\printbibliography[heading=subbibliography,maxnames=999,title=Unclassified,#1]}%
+\printbibliography[heading=subbibliography,title=Unclassified,#1]}%
 \define@key{paperlist}{unclassified}[true]{\message{unclass: \prop@rl}\prop@prl\prop@rl}
 %    \end{macrocode}
 % with this, we define a couple of keys that generate 
@@ -2237,6 +2431,14 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 \define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
 %    \end{macrocode}
 %
+% \begin{macro}{featured}
+% We introduce a new bibLaTeX category |featured| for those papers that were already
+% mentioned in |\prop@paperlist| and the macros defined from it. 
+%    \begin{macrocode}
+\DeclareBibliographyCategory{featured}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\prop@paperlist}
 %   We generate a subsection with a |refsection| (this makes a separate bibliography for
 %   this section) and activate the keys via |\nocite|. Then we just print the bibliography
@@ -2244,13 +2446,13 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 %    \begin{macrocode}
 \newcommand\prop@paperlist[2][]{%
 \begin{refsection}%
-\nocite{#2}%
+\nocite{#2}\addtocategory{featured}{#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%
+\if@allpapers\printbibliography[heading=empty]\fi%
 \let\bibfont\biboldfont%
 \end{refsection}}
 %    \end{macrocode}
@@ -2285,6 +2487,8 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 % 
 % 
 % \begin{macro}{\@dmp}
+%   The |\@dmp| macro shows metadata information about the keys in the margin if
+%   |\keystrue| is specified. This is a debugging tool.
 %    \begin{macrocode}
 \def\@dmp#1{\ifkeys\marginpar{#1}\fi}
 %    \end{macrocode}
@@ -2298,36 +2502,36 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 % \end{macro}
 % \Finale
 \endinput
-% LocalWords:  proposal dtx xkohlhase areastrue svninfo noworkareas twoside emph
-% LocalWords:  areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO
-% LocalWords:  fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne
-% LocalWords:  citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen
-% LocalWords:  hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im
-% LocalWords:  Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel
-% LocalWords:  bitabline personaltitle academictitle birthdate Dienstanschrift
-% LocalWords:  workaddress atabline workfax Privatanschrift privaddress privtel
-% LocalWords:  dt Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa
-% LocalWords:  Gesamtdauer Antragszeitraum Zusammenfassung workarea wp wps num
-% LocalWords:  refundefinedtrue lightgray gantt xstep Unterschriften Id areas
-% LocalWords:  submit hide ed public article paper today array comment wide RE
-% LocalWords:  babel true bookmarks blue LO LE page of prop sites key site RM
-% LocalWords:  def id title acronym discipline start months Proposal Erg by cls
-% LocalWords:  empty em name affiliation Applicants Work Address email The pn
-% LocalWords:  curriculum vita the applicants are enclosed appendix reference
-% LocalWords:  Research area and field work Scientific Fields Anticipated write
-% LocalWords:  duration Application period Summary short lead Package label task
-% LocalWords:  tasks deps number line Effort target ids count warning at pdata
-% LocalWords:  for undefined safe zero one two three four five six seven eight
-% LocalWords:  nine ten eleven twelve style lines totals Packages xscale yscale
-% LocalWords:  step set gray very thin grid workphase len force phase length to
-% LocalWords:  taskdep from rectangle left right width pt color red above dep
-% LocalWords:  Overview Activities Signatures Date paralist ymonths ymid yinc
-% LocalWords:  xend effort month iffalse eustrep.dtx fileversion maketitle Antr
-% LocalWords:  tableofcontents DescribeEnv ifpublic ifpublic compactitem wpfig
-% LocalWords:  wpfig workplan workplan bookeeping wissenchaftliche tasklist dmp
-% LocalWords:  tasklist taskin taskref taskref tasktref tasktref localtaskref
-% LocalWords:  localtaskref ganttchart biblatex ifx dfgproposal.dtx newpage pn
-% LocalWords:  bibtex proposal1-blx.aux pdataref WPtref WPtref WAref WAref WAtref
+% LocalWords:  proposal dtx xkohlhase areastrue svninfo noworkareas twoside emph gitinfo
+% LocalWords:  areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO OJBref sl
+% LocalWords:  fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne WPref gen
+% LocalWords:  citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen WPref
+% LocalWords:  hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im Mitarbeiter
+% LocalWords:  Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel ifsvninfo
+% LocalWords:  bitabline personaltitle academictitle birthdate Dienstanschrift Hilfskraft
+% LocalWords:  workaddress atabline workfax Privatanschrift privaddress privtel ifgitinfo
+% LocalWords:  dt Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa fancyfoot
+% LocalWords:  Gesamtdauer Antragszeitraum Zusammenfassung workarea wp wps num prop@gen
+% LocalWords:  refundefinedtrue lightgray gantt xstep Unterschriften Id areas acro Lutz
+% LocalWords:  submit hide ed public article paper today array comment wide RE tweakable
+% LocalWords:  babel true bookmarks blue LO LE page of prop sites key site RM hypertarget
+% LocalWords:  def id title acronym discipline start months Proposal Erg by cls endinput
+% LocalWords:  empty em name affiliation Applicants Work Address email The pn Hartenstein
+% LocalWords:  curriculum vita the applicants are enclosed appendix reference Schr doctex
+% LocalWords:  Research area and field work Scientific Fields Anticipated write botupPM
+% LocalWords:  duration Application period Summary short lead Package label task botupMP
+% LocalWords:  tasks deps number line Effort target ids count warning at pdata swsites
+% LocalWords:  for undefined safe zero one two three four five six seven eight swsites
+% LocalWords:  nine ten eleven twelve style lines totals Packages xscale yscale wphrases
+% LocalWords:  step set gray very thin grid workphase len force phase length to endhead
+% LocalWords:  taskdep from rectangle left right width pt color red above dep jointsub
+% LocalWords:  Overview Activities Signatures Date paralist ymonths ymid yinc jointsoft
+% LocalWords:  xend effort month iffalse eustrep.dtx fileversion maketitle Antr jointsoft
+% LocalWords:  tableofcontents DescribeEnv ifpublic ifpublic compactitem wpfig jointsup
+% LocalWords:  wpfig workplan workplan bookeeping wissenchaftliche tasklist dmp jointsup
+% LocalWords:  tasklist taskin taskref taskref tasktref tasktref localtaskref jsoft jsoft
+% LocalWords:  localtaskref ganttchart biblatex ifx dfgproposal.dtx newpage pn jsup jsup
+% LocalWords:  bibtex proposal1-blx.aux pdataref WPtref WPtref WAref WAref WAtref wasysym
 % LocalWords:  WAtref protectmacro thebibliography bibitem newblock newif inst
 % LocalWords:  ifsubmit submitfalse publicfalse ifkeys keysfalse ifwork RAMtrue
 % LocalWords:  submittrue publictrue excludecomment RAMfalse keystrue sfdefault
@@ -2351,7 +2555,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 % LocalWords:  delivstrue boxedminipage ednotes thempfootnote mpfootnote xdef
 % LocalWords:  csquotes eso-foot ednoteshape footnotesize importfrom readpdata
 % LocalWords:  pubspage newcommand jobname.pdata jobname compromized warnpubs
-% LocalWords:  maxnames reportfalse reporttrue noindent goodbreak theobjective
+% LocalWords:  maxbibnames reportfalse reporttrue noindent goodbreak theobjective
 % LocalWords:  deliv ednote wpheadertable wptitle wprm hline theprop newwrite
 % LocalWords:  delivs openout deliverables themilestone wpdelivs textwidth lec
 % LocalWords:  compactdesc wadelivs hfil nobreak hbox leadsto delivref dissem
@@ -2367,5 +2571,13 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 % LocalWords:  inproceedings wspapers notkeyword techreports techreport emphbox
 % LocalWords:  textbackslash wpsectionheadings compactht compactht emphbox sym
 % LocalWords:  dfgproposal Tsanko Tsankov mdframed newmdenv wphase thealltasks
-% LocalWords:  alltasks taskreflong definecolorset leadgray wagray thewpfig
-% LocalWords:  wpfigstyle colspan keyvals gantttaskchart baselinestretch
+% LocalWords:  alltasks taskreflong definecolorset leadgray wagray thewpfig fancyhfoffset
+% LocalWords:  wpfigstyle colspan keyvals gantttaskchart baselinestretch NeedsTeXFormat
+% LocalWords:  mileref mileref miletref backref firstinits wissenschaftlicher
+%  LocalWords:  wissenschaftliche startend@wphases addtocategory localdelivref
+
+% \endinput
+% Local Variables:
+% mode: doctex
+% TeX-master: t
+% End:
diff --git a/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx b/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx
index 0b2513e6342..53d3ecc23e8 100644
--- a/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx
+++ b/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx
@@ -8,14 +8,14 @@
 % Either version 1.0 or, at your option, any later version.
 %
 % The development version of this file can be found at
-% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/dfgproposal.dtx $
+% https://github.com/KWARC/LaTeX-proposal
 % \fi
 %
 % \iffalse 
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{dfgproposal}[2013/02/13 v1.4 DFG Proposal]
-%<pdata>\ProvidesPackage{dfgpdata}[2013/02/13 v1.4 DFG Project Data]
-%<reporting>\ProvidesPackage{dfgreporting}[2013/02/13 v1.4 DFG Project Reporting]
+%<cls>\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal]
+%<pdata>\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data]
+%<reporting>\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -28,8 +28,7 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[eso-foot,today,draft]{svninfo}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex}
 \bibliography{kwarc}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
@@ -37,14 +36,12 @@
 \makeindex
 \newcommand\subversion{\textsc{Subversion}\xspace}
 \begin{document}
-\svnInfo $Id: dfgproposal.dtx 24170 2013-02-19 12:06:45Z kohlhase $
-\svnKeyword $URL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/dfgproposal.dtx $
 \DocInput{dfgproposal.dtx}
 \end{document}
 %</driver>
 % \fi
 % 
-%\CheckSum{627}
+%\CheckSum{629}
 % 
 % \changes{v1.1}{2011/03/18}{separating out from new proposal class}
 % \changes{v1.1}{2011/12/09}{various tweaks and corrections}
@@ -93,10 +90,8 @@
 % under the terms of the LaTeX Project Public License from CTAN archives in directory
 % |macros/latex/base/lppl.txt|.  Either version 1.0 or, at your option, any later
 % version. The CTAN archive always contains the latest stable version, the development
-% version can be found at
-% {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal}}. For bug reports
-% please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component
-% |dfgproposal|.
+% version can be found at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports
+% please use the sTeX TRAC at \url{https://github.com/KWARC/LaTeX-proposal/issues}.
 %
 % \section{The User Interface}\label{sec:user-interface}
 % 
@@ -132,9 +127,6 @@
 % \item \DescribeMacro{thema}|thema| for a concise (up to 140 characters) description of
 %   the topic of the proposal. This has to be in German and will be used by the DFG in
 %   internal communications and publications.
-% \item The \DescribeMacro{pubspage}|pubspage| key can be used to give URIs of publication
-%   pages that are mentioned in the references sections as sources of publications of the
-%   proposers. Use one |pubspage| key per URI.
 % \end{compactitem}
 % 
 % \subsection{Project-Related Papers}\label{sec:user:papers}
@@ -146,7 +138,11 @@
 % you will have to run |bibtex -min-crossrefs=999 proposal1-blx.aux| to generate file
 % |proposal1.bbl| that generates the bibliography list. To automate this (at least on Unix
 % systems), we have added the field |Makefile.template|, which allows you do do any
-% necessary steps by just typing |make|.
+% necessary steps by just typing |make|. 
+% 
+% The papers listed in |\dfgprojpapers| are put into a special bib\LaTeX category
+% \DescribeMacro{featured}|featured|, and can thus be excluded from the general
+% bibliography by adding |notcategory=featured| to the final |\printbibliography|.
 % 
 % \subsection{Final Report Infrastructure}\label{sec:user:report}
 % 
@@ -348,10 +344,10 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 \WAauthorblock[aff]\prop@gen@PIs\\[2cm]
 \end{center}
 \edef\keep@tocdepth{\value{tocdepth}}
-\setcounter{tocdepth}{1}\tableofcontents
+\setcounter{tocdepth}{2}\tableofcontents
 \setcounter{tocdepth}{\keep@tocdepth}
-\newpage\thispagestyle{empty}
 \ifgeneral\setcounter{section}{-1}
+\newpage\thispagestyle{empty}
 \ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
 \section{General Information (for the ELAN system only)}\fi
 \dfg@applicants
@@ -372,14 +368,14 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 \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 Mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)}
 \ifdeutsch\else\selectlanguage{USenglish}\fi
-\newpage\fi %ifgeneral
-\setcounter{page}{1}}
+\newpage\fi%ifgeneral
+\setcounter{page}{0}}
 {}
 %    \end{macrocode}
 % \end{environment}
-% We also need to translage some of the generated parts
+% We also need to translate some of the generated parts
 %    \begin{macrocode}
 \ifdeutsch
 \def\prop@warnpubs@message{Viele der Publikationen der Antragsteller sind verf\"ugbar unter folgenden URLs:}
@@ -402,7 +398,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 \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
+\item Zitierte Publikationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe
   (nur CD)\fi
 \end{itemize}}
 %</cls>
@@ -487,12 +483,14 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 %    \begin{macrocode}
 %<*cls>
 \ifgeneral
-\newenvironment{Summary}{%
-\thispagestyle{empty}
-\ifdeutsch\subsection{Zusammenfassung}\else
-\subsection{Summary \deu{(Zusammenfassung; siehe~\ref{sec:zusammenfassung})}}\fi}
+\newenvironment{Zusammenfassung}{\thispagestyle{empty}\subsection{Zusammenfassung}\begin{otherlanguage}{ngerman}}
+{\end{otherlanguage}\newpage\setcounter{page}1}
+\newenvironment{Summary}{\thispagestyle{empty}\subsection{Summary}}
 {\newpage\setcounter{page}1}
-\else\excludecomment{Summary}\fi
+\else
+\excludecomment{Summary}
+\excludecomment{Zusammenfassung}
+\fi
 %</cls>
 %    \end{macrocode}
 %
@@ -555,54 +553,65 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 %    \end{macrocode}
 % \Finale
 \endinput
-% LocalWords:  dfgproposal dtx kohlhase areastrue svninfo noworkareas twoside
-% LocalWords:  areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO
-% LocalWords:  fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne
-% LocalWords:  citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen
-% LocalWords:  hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im
-% LocalWords:  Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel
-% LocalWords:  bitabline personaltitle academictitle birthdate Dienstanschrift
-% LocalWords:  workaddress atabline workfax Privatanschrift privaddress privtel
-% LocalWords:  dt Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa
-% LocalWords:  Gesamtdauer Antragszeitraum Zusammenfassung workarea wp wps num
-% LocalWords:  refundefinedtrue lightgray gantt xstep Unterschriften Id areas
-% LocalWords:  submit hide ed public article paper today array comment wide RE
-% LocalWords:  babel true bookmarks blue LO LE page of prop sites key site RM
-% LocalWords:  def id title acronym discipline start months Proposal Erg by cls
-% LocalWords:  DFG empty em name affiliation Applicants Work Address email The
-% LocalWords:  curriculum vita the applicants are enclosed appendix reference
-% LocalWords:  Research area and field work Scientific Fields Anticipated write
-% LocalWords:  duration Application period Summary short lead Package label task
-% LocalWords:  tasks deps number line Effort target ids aux dfg count warning at
-% LocalWords:  for undefined safe zero one two three four five six seven eight
-% LocalWords:  nine ten eleven twelve style lines totals Packages xscale yscale
-% LocalWords:  step set gray very thin grid workphase len force phase length to
-% LocalWords:  taskdep from rectangle left right width pt color red above dep
-% LocalWords:  Overview Activities Signatures Date paralist ymonths ymid yinc
-% LocalWords:  xend effort month iffalse eustrep.dtx fileversion maketitle Antr
-% LocalWords:  tableofcontents DescribeEnv ifpublic ifpublic compactitem wpfig
-% LocalWords:  wpfig workplan workplan bookeeping wissenchaftliche tasklist dmp
-% LocalWords:  tasklist taskin taskref taskref tasktref tasktref localtaskref
-% LocalWords:  localtaskref ganttchart biblatex dfgprojpapers dfgprojpapers ifx
-% LocalWords:  bibtex proposal1-blx.aux pdataref WPtref WPtref WAref WAref WAtref
-% LocalWords:  WAtref protectmacro thebibliography bibitem newblock newif inst
-% LocalWords:  ifsubmit submitfalse publicfalse ifkeys keysfalse ifwork RAMtrue
-% LocalWords:  submittrue publictrue excludecomment RAMfalse keystrue sfdefault
-% LocalWords:  renewcommand familydefault helvet includecomment subsubsections
-% LocalWords:  setcounter secnumdepth ifofpage ofpagefalse fancyhead thepage sw
-% LocalWords:  pagestyle fancyplain sitesfalse sitestrue ifundefined gdef allwp
-% LocalWords:  fundedperiod reportperiod textbf newenvironment titlepage auxout
-% LocalWords:  thispagestyle newcounter stepcounter tocdepth ofpagetrue setkeys
-% LocalWords:  finalreport orderzeitraum thewa thewp addtocounter bigskip pws
-% LocalWords:  textsf smallskip ignorespaces subsubsection thedfg theallwp req
-% LocalWords:  compactenum compactenum thetask newcount thegantt refsection tl
-% LocalWords:  nocite defbibheading ourpubs printbibliography expandafter ifnum
-% LocalWords:  csname endcsname dfgcount ifcase cellcolor wptable widehat qquad
-% LocalWords:  tabularnewline wplist ifgantt drafttrue RMdisclaimer draftfalse
-% LocalWords:  RMdisclaimerfalse RMdisclaimertrue newdimen taskwps thetaskwps
-% LocalWords:  whilenum hfill marginpar texteuro officialeuro texttt newpage cb
-% LocalWords:  pubspage pubspage min-crossrefs pdata xdef newcommand hline aff
-% LocalWords:  renewenvironment nameuse paperlist applareas applareas dfgpdata
-% LocalWords:  Gesch aftszeichen projpapers shortname sitedescription ednote
-% LocalWords:  textsc newlength setlength textwidth WAauthorblock assoc tmpop
-% LocalWords:  tmpop tmpop
+% LocalWords:  dfgproposal dtx kohlhase areastrue svninfo noworkareas twoside notcategory
+% LocalWords:  areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO Abriss Rabe
+% LocalWords:  fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne ifgeneral
+% LocalWords:  citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen ifdeutsch
+% LocalWords:  hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im generaltrue
+% LocalWords:  Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel Deutscher
+% LocalWords:  bitabline personaltitle academictitle birthdate Dienstanschrift Antrag gen
+% LocalWords:  workaddress atabline workfax Privatanschrift privaddress privtel prop@gen
+% LocalWords:  dt Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa deutschtrue
+% LocalWords:  Gesamtdauer Antragszeitraum Zusammenfassung workarea wp wps num Neuantrag
+% LocalWords:  refundefinedtrue lightgray gantt xstep Unterschriften Id areas auf deu nur
+% LocalWords:  submit hide ed public article paper today array comment wide RE Disziplin
+% LocalWords:  babel true bookmarks blue LO LE page of prop sites key site RM ur das auft
+% LocalWords:  def id title acronym discipline start months Proposal Erg by cls seit der
+% LocalWords:  DFG empty em name affiliation Applicants Work Address email The Erstantrag
+% LocalWords:  curriculum vita the applicants are enclosed appendix reference mittel der
+% LocalWords:  Research area and field work Scientific Fields Anticipated write reichen
+% LocalWords:  duration Application period Summary short lead Package label task Viele pn
+% LocalWords:  tasks deps number line Effort target ids aux dfg count warning at sind aus
+% LocalWords:  for undefined safe zero one two three four five six seven eight verf ugbar
+% LocalWords:  nine ten eleven twelve style lines totals Packages xscale yscale unter von
+% LocalWords:  step set gray very thin grid workphase len force phase length to folgenden
+% LocalWords:  taskdep from rectangle left right width pt color red above dep Literatur
+% LocalWords:  Overview Activities Signatures Date paralist ymonths ymid yinc Verzeichnis
+% LocalWords:  xend effort month iffalse eustrep.dtx fileversion maketitle Antr Ausdruck
+% LocalWords:  tableofcontents DescribeEnv ifpublic ifpublic compactitem wpfig Lebenslauf
+% LocalWords:  wpfig workplan workplan bookeeping wissenchaftliche tasklist dmp Zitierte
+% LocalWords:  tasklist taskin taskref taskref tasktref tasktref localtaskref Abschnitt
+% LocalWords:  localtaskref ganttchart biblatex dfgprojpapers dfgprojpapers ifx einem Typ
+% LocalWords:  bibtex proposal1-blx.aux pdataref WPtref WPtref WAref WAref WAtref Lebensl
+% LocalWords:  WAtref protectmacro thebibliography bibitem newblock newif inst aufe Seite
+% LocalWords:  ifsubmit submitfalse publicfalse ifkeys keysfalse ifwork RAMtrue Institut
+% LocalWords:  submittrue publictrue excludecomment RAMfalse keystrue sfdefault Lehrstuhl
+% LocalWords:  renewcommand familydefault helvet includecomment subsubsections bezahlte
+% LocalWords:  setcounter secnumdepth ifofpage ofpagefalse fancyhead thepage sw Berichts
+% LocalWords:  pagestyle fancyplain sitesfalse sitestrue ifundefined gdef allwp Summen
+% LocalWords:  fundedperiod reportperiod textbf newenvironment titlepage auxout Titel
+% LocalWords:  thispagestyle newcounter stepcounter tocdepth ofpagetrue setkeys Dauer
+% LocalWords:  finalreport orderzeitraum thewa thewp addtocounter bigskip pws DFG-Mitteln
+% LocalWords:  textsf smallskip ignorespaces subsubsection thedfg theallwp req Ende Summe
+% LocalWords:  compactenum compactenum thetask newcount thegantt refsection tl Personen
+% LocalWords:  nocite defbibheading ourpubs printbibliography expandafter ifnum Monate
+% LocalWords:  csname endcsname dfgcount ifcase cellcolor wptable widehat qquad Aufw ande
+% LocalWords:  tabularnewline wplist ifgantt drafttrue RMdisclaimer draftfalse Hilfskraft
+% LocalWords:  RMdisclaimerfalse RMdisclaimertrue newdimen taskwps thetaskwps intendierte
+% LocalWords:  whilenum hfill marginpar texteuro officialeuro texttt newpage cb grau
+% LocalWords:  min-crossrefs pdata xdef newcommand hline aff NeedsTeXFormat dfgreporting
+% LocalWords:  renewenvironment nameuse paperlist applareas applareas dfgpdata kursiv
+% LocalWords:  Gesch aftszeichen projpapers shortname sitedescription ednote generalfalse
+% LocalWords:  textsc newlength setlength textwidth WAauthorblock assoc tmpop markiert
+% LocalWords:  tmpop tmpop deutschfalse Sachbeihilfe Arbeitsgebiet Fortsetungsantrag
+%  LocalWords:  Publikationen Publikatinsverzeichnis Wissenschaftler Verwertungsfelder
+%  LocalWords:  Kooperationspartner otherlanguage Arbeitspaket Arbeitsbereich Aufwand
+%  LocalWords:  Arbeitsbereiche Personenmonaten Arbeitspaketleiter Arbeitspakete unten
+%  LocalWords:  Zeitliche Verteilung Lastverteilung Bisherige Kollaboration Leiter
+%  LocalWords:  Schritt endinput
+
+% \endinput
+% Local Variables:
+% mode: doctex
+% TeX-master: t
+% End:
diff --git a/Master/texmf-dist/source/latex/proposal/eu/euproposal.dtx b/Master/texmf-dist/source/latex/proposal/eu/euproposal.dtx
index b1aaeafe2fc..190575903b1 100644
--- a/Master/texmf-dist/source/latex/proposal/eu/euproposal.dtx
+++ b/Master/texmf-dist/source/latex/proposal/eu/euproposal.dtx
@@ -8,14 +8,14 @@
 % Either version 1.0 or, at your option, any later version.
 %
 % The development version of this file can be found at
-% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/euproposal.dtx $
+% https://github.com/KWARC/LaTeX-proposal
 % \fi
 % 
 % \iffalse
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{euproposal}[2013/01/13 v1.4 EU Proposal]
-%<pdata>\ProvidesPackage{eudata}[2013/01/13 v1.4 EU Project Data]
-%<reporting>\ProvidesPackage{eureporting}[2013/01/13 v1.4 EU Project Reporting]
+%<cls>\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal]
+%<pdata>\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data]
+%<reporting>\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -28,8 +28,7 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[eso-foot,today,draft]{svninfo}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex}
 \bibliography{kwarc}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
@@ -37,14 +36,12 @@
 \makeindex
 \newcommand\subversion{\textsc{Subversion}\xspace}
 \begin{document}
-\svnInfo $Id: euproposal.dtx 24071 2013-01-13 12:52:43Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/euproposal.dtx $
 \DocInput{euproposal.dtx}
 \end{document}
 %</driver>
 % \fi
 % 
-%\CheckSum{365}
+%\CheckSum{639}
 % 
 % \changes{v0.1}{2007/05/07}{used in the SciML proposal}
 % \changes{v0.2}{2007/05/09}{First Version with Documentation}
@@ -52,6 +49,7 @@
 % \changes{v0.3a}{2008/01/18}{error corrections and more documentation}
 % \changes{v1.3}{2011/05/18}{basing this on proposal.cls}
 % \changes{v1.4}{2012/01/18}{various tweaks for the Jan 2012 proposal deadline}
+% \changes{v1.4}{2015/01/14}{lots of tweaks}
 % 
 % \GetFileInfo{euproposal.cls}
 % 
@@ -96,10 +94,8 @@
 %   under the terms of the LaTeX Project Public License from CTAN archives in directory
 %   macros/latex/base/lppl.txt.  Either version 1.0 or, at your option, any later
 %   version. The CTAN archive always contains the latest stable version, the development
-%   version can be found at
-%   {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/euproposal}} For bug reports
-%   please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component
-%   |euproposal|.
+%   version can be found at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports
+%   please use the sTeX TRAC at \url{https://github.com/KWARC/LaTeX-proposal/issues}.
 %   
 % \section{The User Interface}\label{sec:user-interface}
 % 
@@ -114,7 +110,10 @@
 %
 % As usual in {\LaTeX}, the package is loaded by
 % |\documentclass[|\meta{options}|]{euproposal}|, where |[|\meta{options}|]| is optional
-% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}.
+% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}.  Some
+% versions EU proposals want non-standard numbering schemes (e.g. starting with
+% \textbf{B...} since we are writing Part B.), this can be reached by giving the |propB|
+% option.
 % 
 % \subsection{Proposal Metadata and Title page}\label{sec:user:metadata}
 % 
@@ -143,6 +142,8 @@
 % \item The \DescribeMacro{coordinator}|coordinator| key gives the identifier of the
 %   proposal coordinator. The |euproposal| package uses the |workaddress| package for
 %   representation of personal metadata, see~\cite{Kohlhase:workaddress:ctan} for details.
+% \item The \DescribeMacro{coordinatorsite}|coordinatorsite| key gives the identifier of
+%   the coordinating site (for the table). 
 % \item If given, the \DescribeMacro{iconrowheight}|iconrowheight| key instructs the
 %   |euproposal| class to make a line with the logos of the participants at the bottom of
 %   the title page, and specify their heights; |1.5cm| is often a good value.
@@ -156,6 +157,22 @@
 % |DEM| = Demonstration; |MGT| = Management of the consortium; |OTHER| = Other specific
 % activities, if applicable in this call.
 %
+% \subsection{Milestones and Deliverables}\label{sec:user:deliverables}
+% 
+% |euproposal.cls| adds the \DescribeMacro{verif}|verif| key to \DescribeMacro{\milestone}
+% for specifying a means of verification that the milestone has been successful.
+% 
+% With this, we can generate the milestone table that is required in many EU
+% proposals. This can simply be done via the
+% \DescribeMacro{\milestonetable}|\milestonetable| macro. It takes a keyword argument with
+% the keys \DescribeMacro{caption}|caption| for specifying a different caption, and the
+% widths \DescribeMacro{wname}|wname|, \DescribeMacro{wdeliv}|wdeliv|, and
+% \DescribeMacro{wverif}|wverif| that can be used to specify different widths for the
+% name/deliverables/verification columns in the milestone table.
+% 
+% \subsection{Risks}\label{sec:user:risks}
+% \ednote{MK: document the infrastructure, make examples}
+%
 % \begin{newpart}{MK@MK: This is new, and only partially implemented}
 % \subsection{Reporting Infrastructure}\label{sec:user:report}
 % 
@@ -191,7 +208,11 @@
 % We first set up the options for the package. 
 % 
 %    \begin{macrocode}
-%<cls>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
+%<*cls>
+\newif\ifpartB\partBfalse
+\DeclareOption{partB}{\partBtrue}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
+%</cls>
 %<reporting>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 %<cls|reporting>\ProcessOptions
 %    \end{macrocode}
@@ -199,13 +220,19 @@
 %    Then we load the packages we make use of
 % 
 %    \begin{macrocode}
-%<cls>\LoadClass[report,noRAM]{proposal}
+%<cls>\ifpartB\LoadClass[report,noRAM]{proposal}\else\LoadClass[noRAM]{proposal}\fi
 %<reporting>\LoadClass[report,noRAM]{reporting}
 %<*cls|reporting>
 \RequirePackage{longtable}
 \RequirePackage{eurosym}
 \RequirePackage{wrapfig}
 \RequirePackage{eupdata}
+%    \end{macrocode}
+% we want to change the numbering of figures and tables
+%    \begin{macrocode}
+\RequirePackage{chngcntr}
+\counterwithin{figure}{subsection}
+\counterwithin{table}{subsection}
 %</cls|reporting>
 %    \end{macrocode}
 %    
@@ -215,6 +242,7 @@
 %    \begin{macrocode}
 %<*pdata>
 \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
+\define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#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}}
@@ -244,15 +272,17 @@
 % and the default values, these will be used, if the author does not specify something
 % better.
 %
-% We need to redefine some of the internal counters and table of contents mechanisms to
-% adapt to the fact that the proposal text is just Part B. 
+% If the |propB| option is given, we need to redefine some of the internal counters and
+% table of contents mechanisms to adapt to the fact that the proposal text is just Part B.
 %
 %    \begin{macrocode}
 %<*cls>
+\ifpartB
 \def\thepart{\Alph{part}}
 \setcounter{part}{2}
 \def\thechapter{\thepart.\arabic{chapter}}
 \def\numberline#1{\hb@xt@\@tempdima{#1\hfil} }
+\fi
 %    \end{macrocode}
 % 
 % \begin{macro}{\prop@sites@table}
@@ -260,10 +290,11 @@
 \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 @name}
+\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
 \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
+\begin{tabular}{|l|p{8cm}|l|l|}\hline%|
 \# & Participant organisation name & Short name &  Country\\\hline\hline
 \@@table
 \end{tabular}}
@@ -273,28 +304,35 @@
 % \begin{environment}{prop@proposal}
 %    \begin{macrocode}
 \renewenvironment{prop@proposal}
-{\thispagestyle{empty}\begin{center}
+{\ifgrantagreement\else
+  \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]
+  {\Large\textbf\prop@gen@callname}\\[.4cm]
+  {\LARGE \prop@gen@callid}\\[.8cm]
+  {\huge\textbf\prop@gen@title}\\[.4cm]
+  {\LARGE Acronym: {\prop@gen@acronym}}\\[2cm]
 \end{center}
-{\large\prop@gen@instrument}\\
+%{\large\prop@gen@instrument}\\
 {\large\textbf{Date of Preparation: \today}}
-\ifsubmit\else\\{\large\textbf{Revision}: {\svnInfoRevision} of \svnInfoDate}\fi\\[1em]
-{\large}
+% \ifsubmit\else\if@svninfo\if@gitinfo\\
+% {\large\textbf{Revision}: 
+% \if@svninfo\svnInfoRevision\fi\if@gitinfo\gitAbbrevHash\fi
+%  of 
+% \if@svninfo\svnInfoDate\fi\if@gitinfo\gitAuthorDate\fi}
+% \fi\fi\fi
+\\[1em]
 \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[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}
+    \@ifundefined{prop@gen@keywords}{}{\item[Keywords:]  \prop@gen@keywords}
   \end{description}
 \end{large}
 \vspace*{1em}
@@ -304,6 +342,7 @@
 {\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
 \end{center}
 \newpage
+\fi% ifgrantagreement
 \setcounter{tocdepth}{2}\setcounter{part}{2}}
 {\newpage\printbibliography[heading=warnpubs,maxnames=999]}
 %    \end{macrocode}
@@ -313,28 +352,78 @@
 \def\prop@gen@instrument{Proposal Instrument (e.g. IP)}
 %    \end{macrocode}
 %
+% \subsection{Site Descriptions}\label{sec:sitedesc}
+% \ednote {this functionality should probably be refactored into proposal.dtx}
+%
 % \begin{environment}{sitedescription}
-%    \ednote{this code should probably be refactored into proposal.dtx}
+%   \ednote{document this above} |\begin{sitedescritpion}[|\meta{opt}|]{\meta{site}}|
+%     marks up the description for the site \meta{site}. It looks up the relevant metadata
+%     from the respective |\WAinstitution| declarations.  The options argument \meta{opt}
+%     is a key-value list for the keys \DescribeMacro{logo}|logo| (add the logo from
+%     |\WAinstitution| to the site description), \DescribeMacro{width}|width|,
+%     \DescribeMacro{height}|height| (intended dimensions of the logo), \ednote{more?}.
 %    \begin{macrocode}
-\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]%
+\define@key{site@desc}{box}[true]{\def\site@desc@box{#1}%
+\pdata@def{sitedesc}{\@site}{box}{#1}}
+\define@key{site@desc}{logo}[true]{\def\site@desc@logo{#1}%
+\pdata@def{sitedesc}{\@site}{logo}{#1}}
+\define@key{site@desc}{width}{\def\site@desc@width{#1}%
+\pdata@def{sitedesc}{\@site}{width}{#1}\@dmp{wd=#1}}
+\define@key{site@desc}{height}{\def\site@desc@height{#1}%
+\pdata@def{sitedesc}{\@site}{height}{#1}\@dmp{ht=#1}}
+\newenvironment{sitedescription}[2][]%
+{\def\c@site{#2}% remember the site ID
+\newcounter{site@#2@PM} % for the site PM
+\def\site@desc@box{false}% not box unless requested
+\def\site@desc@logo{false}% not logo unless requested
+\def\site@desc@height{1.3cm}% default height
+\def\site@desc@width{5cm}% default width
+\setkeys{site@desc}{#1}% read the keys to overwrite the defaults
+\ifx\@site@desc@box\@true% if we want a logo 
+\begin{wrapfigure}{r}{\site@desc@width}\vspace{-2.5ex}%
+\begin{tabular}{|p{\site@desc@width}|}\hline\vspace{1mm}%
+\ifx\@site@desc@logo\@true% if we want a logo 
+\wa@institution@logo[height=\site@desc@width]{#2}\\[1ex]%
+\fi% end logo 
 \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}%
+\fi% end box
 \pdata@target{site}{#2}%
-{\subsection{\wa@ref{institution}{#2}{acronym}:%
+{\subsubsection{\wa@ref{institution}{#2}{acronym}: % space here
 {\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}}}
-{}
+{\pdata@def{site}{\c@site}{reqPM}{\csname thesite@\c@site @PM\endcsname}}
+%    \end{macrocode}
+% \end{environment}
+% 
+% \begin{environment}{participant}
+%   \ednote{document this above} |\begin{picv}[|\meta{PM}|]{\meta{name}}| marks up the CV
+%     and metadata about a principal investigator of a site (it can only be use inside a
+%     |sitedescription| environment). The first argument \meta{PM} specifies the
+%     involvement in person months: a fair estimation this PI will spend on this specific
+%     project over its whole duration.
+%    \begin{macrocode}
+\define@key{site@part}{type}{\def\site@part@type{#1}\@dmp{type=#1}}
+\define@key{site@part}{PM}{\def\site@part@PM{#1}\@dmp{PM=#1}}
+\define@key{site@part}{salary}{\def\site@part@salary{#1}}%\@dmp{\euro=#1}}
+\define@key{site@part}{gender}{\def\site@part@gender{#1}}%\@dmp{\euro=#1}}
+\newenvironment{participant}[2][]%
+{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}\def\site@part@gender{}%
+\setkeys{site@part}{#1}%
+\ifx\site@part@PM\@empty\else\addtocounter{site@\c@site @PM}{\site@part@PM}\fi%
+\paragraph*{#2\ %
+(\ifx\site@part@type\@empty\else\site@part@type\fi%
+\ifx\site@part@gender\@empty\else, \site@part@gender\fi%
+\ifx\site@part@PM\@empty\else, \site@part@PM~PM\fi%
+)}%
+\ignorespaces}
+{\par\medskip}
 %    \end{macrocode}
 % \end{environment}
 % 
@@ -351,7 +440,7 @@
 %    
 %    \begin{macrocode}
 \renewenvironment{workpackage}[1][]
-{\begin{work@package}[#1]\subsubsection*{\wptitle}
+{\begin{work@package}[#1]\medskip\wpheadertable%
 \addcontentsline{toc}{subsubsection}{\wp@label\wp@num: \pdataref{wp}\wp@id{title}}}
 {\end{work@package}}
 %    \end{macrocode}
@@ -359,30 +448,94 @@
 % 
 % \begin{macro}{\wpheadertable}
 %   We redefine the macro that computes the default work package header table, since there
-%   are more sites in a EU proposal
+%   are more sites in a EU proposal, we do this in a tabular form as asked for in the
+%   template. We use the internal counter |@sites@po| (sites plus one) for convenience.
 %    \begin{macrocode}
 \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%
+\multicolumn{\the@sitespo}{|l|}{\textbf{\wp@mk@title{\wp@num}: }%
+\textsf{\pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}}
+&\textbf{Start: }\pdataref{wp}\wp@id{start}\\\hline%
 \wp@sites@line\\\hline%
 \wp@efforts@line\\\hline%
 \end{tabular}\smallskip\par\noindent\ignorespaces}
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsection{Milestones and Deliverables}\label{sec:impl:deliverables}
+%
 % \begin{environment}{wpdelivs}
-% \ednote{MK: boxing compactdesc does not seem to work any more}
+%   We make the deliverables boxed in EU proposals, this is simple with |mdframed.sty|.
 %    \begin{macrocode}
-%\surroundwithmdframed{wpdelivs}
+\surroundwithmdframed{wpdelivs}
 %    \end{macrocode}
 % \end{environment}
+%
+% \begin{macro}{\milestone}
+%    \begin{macrocode}
+\define@key{milestone}{verif}{\gdef\mile@verif{#1}\pdata@def{mile}\mile@id{verif}{#1}}
+%    \end{macrocode}
+% \end{macro}
+% 
+% \begin{macro}{milestonetable}
+% here we do the work. 
+%    \begin{macrocode}
+\define@key{mst}{caption}{\gdef\mst@caption{#1}}
+\define@key{mst}{wname}{\gdef\mst@wname{#1}}
+\define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}}
+\define@key{mst}{wverif}{\gdef\mst@wverif{#1}}
+\newcommand\milestonetable[1][]{%
+\def\mst@caption{Milestones, Deliverables, and Verification}%
+\def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm}
+\setkeys{mst}{#1}%
+{\gdef\mst@lines{}%initialize
+\let\tabularnewline\relax\let\hline\relax% so they 
+\let\textbf\relax\let\emph\relax% do not bother us
+\edef\@@miles{\pdataref{all}{mile}{ids}}
+\@for\@I:=\@@miles\do{
+\edef\@delivs{\pdataref@safe{mile}{\@I}{delivs}}%
+\def\@@delivs{}
+\@for\@J:=\@delivs\do{\xdef\@@delivs{\@@delivs\ \pdataref{deliv}\@J{label}}}
+\def\@@line{
+\textbf{\pdataref{mile}\@I{label}}&
+\emph{\pdataref{mile}{\@I}{title}} &
+\@@delivs&
+\pdataref{mile}\@I{month} &
+\pdataref{mile}\@I{verif}}
+\xdef\mst@lines{\mst@lines\@@line\tabularnewline\hline}}}
+\begin{table}[ht]
+\begin{tabular}{|l|p{\mst@wname}|p{\mst@wdeliv}|l|p{\mst@wverif}|}\hline
+\#&\textbf{\miles@legend@name}
+&\textbf{\miles@legend@involved}
+&\textbf{\miles@legend@mo}
+&\textbf{\miles@legend@verif}\\\hline\hline
+\mst@lines
+\end{tabular}
+\caption{\mst@caption}\label{tab:milestonetable}
+\end{table}
+\footnotetext\miles@legend@footnote}
+%    \end{macrocode}
+% now the multilinguality support 
+%    \begin{macrocode}
+\newcommand\miles@legend@name{Name}
+\newcommand\miles@legend@mo{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.}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\prop@milesfor}
+%    the due date is the first argument to facilitate sorting
+%    \begin{macrocode}
+\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}}
+%    \end{macrocode}
+% \end{macro}
 % 
 % \subsection{Risks}\label{sec:impl:risks}
 % 
@@ -408,8 +561,8 @@
 % mitigation plans for them. In the |euproposal| we use two environments to mark them up.
 % 
 % \DescribeMacro{risk}|\begin{risk}{|\meta{title}|}{|\meta{prob}|}{|\meta{grav}|}|\ldots|\end{risk}|
-% makes a paragraph no a rist \meta{title} with gravity \meta{grav} and probability
-% \meta{prob}, where the body of the environment contains a desription of the risk. The
+% makes a paragraph no a risk \meta{title} with gravity \meta{grav} and probability
+% \meta{prob}, where the body of the environment contains a description of the risk. The
 % \DescribeMacro{riskcont}|riskcont| is a variant, where \meta{title} names a risk and the
 % body is a description of the contingency plan.
 %
@@ -429,20 +582,24 @@
 %
 % \Finale
 \endinput
-% LocalWords:  iffalse cls euproposal euproposal.dtx tt maketitle newpage wpwa
-% LocalWords:  tableofcontents ednote euproposal DescribeEnv compactitem impl
-% LocalWords:  longtable eurosym pdata thepart setcounter env vfill qquad
-% LocalWords:  thechapter newcommand tabularnewline hline xdef pdataref nameuse
-% LocalWords:  countryshort rpoposal clange wrapfig wrapfigure vspace bfseries
-% LocalWords:  startsection normalfont normalsize baselinestretch callname hb
-% LocalWords:  countryshort rpoposal clange wrapfig renewenvironment worktelfax
-% LocalWords:  tocdepth wpobjectives newenvironment noindent boxedminipage fbox
-% LocalWords:  textwidth textbf wpdescription sitedescription pgfdeclareimage
-% LocalWords:  wrapfigure vspace pgfuseimage streetaddress townzip textsc xt wa
-% LocalWords:  renewcommand startsection normalfont normalsize bfseries wptitle
-% LocalWords:  workpackage subsubsection wpheadertable newcounter sitespo hfil
-% LocalWords:  newcounter sitespt addtocounter textsf smallskip ignorespaces pn
-% LocalWords:  cellcolor lightgray keypubs paperlist callname callid callid ifx
-% LocalWords:  challengeid challengeid objectiveid objectiveid outcomeid hfill
-% LocalWords:  outcomeid metakeys workaddress numberline tempdima ifsubmit
-% LocalWords:  proposal.dtx texttt paperslist workaddress.dtx
+% LocalWords:  iffalse cls euproposal euproposal.dtx tt maketitle newpage wpwa eudata dfg
+% LocalWords:  tableofcontents ednote euproposal DescribeEnv compactitem impl eureporting
+% LocalWords:  longtable eurosym pdata thepart setcounter env vfill qquad NeedsTeXFormat
+% LocalWords:  thechapter newcommand tabularnewline hline xdef pdataref nameuse SciML gen
+% LocalWords:  countryshort rpoposal clange wrapfig wrapfigure vspace bfseries eupdata wd
+% LocalWords:  startsection normalfont normalsize baselinestretch callname hb newpart wp
+% LocalWords:  countryshort rpoposal clange wrapfig renewenvironment worktelfax prop@gen
+% LocalWords:  tocdepth wpobjectives newenvironment noindent boxedminipage fbox warnpubs
+% LocalWords:  textwidth textbf wpdescription sitedescription pgfdeclareimage projpapers
+% LocalWords:  wrapfigure vspace pgfuseimage streetaddress townzip textsc xt wa maxnames
+% LocalWords:  renewcommand startsection normalfont normalsize bfseries wptitle sitedesc
+% LocalWords:  workpackage subsubsection wpheadertable newcounter sitespo hfil if@svninfo
+% LocalWords:  newcounter sitespt addtocounter textsf smallskip ignorespaces pn setkeys
+% LocalWords:  cellcolor lightgray keypubs paperlist callname callid callid ifx csname
+% LocalWords:  challengeid challengeid objectiveid objectiveid outcomeid hfill if@gitinfo
+% LocalWords:  outcomeid metakeys workaddress numberline tempdima ifsubmit iconrowheight
+% LocalWords:  proposal.dtx texttt paperslist workaddress.dtx topicsaddressed thesite
+%  LocalWords:  topicsaddressed iconrowheight finalreport.tex printbibliography endcsname
+%  LocalWords:  reportperiod organisation thispagestyle gitAbbrevHash sitedescritpion
+%  LocalWords:  WAinstitution picv medskip newmdenv frametitle wpdelivs mdframed.sty emph
+%  LocalWords:  surroundwithmdframed emph riskcont prob grav ldots endinput
diff --git a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
index a08372865b9..fb8f99c8d3a 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{pdata}[2013/02/13 v1.4 Project Data]
+\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data]
 \RequirePackage{workaddress}[2011/05/03]
 \RequirePackage{eurosym}
 \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
@@ -42,6 +42,8 @@
 \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}{proposalnumber}{\def\prop@gen@proposalnumber{#1}%
+\pdata@def{prop}{gen}{proposalnumber}{#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}%
@@ -56,10 +58,17 @@
 \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 ???}
+\define@key{prop@gen}{topdownPM}[true]{\def\prop@gen@topdownPM{#1}}
+\define@key{prop@gen}{botupPM}[true]{\def\prop@gen@botupPM{#1}}
+\define@key{prop@gen}{keywords}{\def\prop@gen@keywords{#1}}
+\newcommand\prop@gen@acro@default{ACRONYM}
+\def\prop@gen@acro{\prop@gen@acro@default}
+\newcommand\prop@gen@months@default{???months???}
+\def\prop@gen@months{\prop@gen@months@default}
+\newcommand\prop@gen@title@default{???Proposal Title???}
+\def\prop@gen@title{\prop@gen@title@default}
+\newcommand\prop@gen@instrument@default{??? Instrument ???}
+\def\prop@gen@instrument{\prop@gen@instrument@default}
 \newcommand\prop@tl[2]{\xdef\tab@line{}
 \@for\tl@ext:={#1}\do{\xdef\tab@line{\tab@line&#2}}
 \tab@line}
@@ -85,19 +94,29 @@
 \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\pdatarefFB[4]{\@ifundefined{#1@#2@#3}%
+{\@ifundefined{#1@#2@#4}%
+{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
+{\csname #1@#2@#4\endcsname}}
+{\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\pdataRefFB[4]{\@ifundefined{#1@#2@#3}%
+{\@ifundefined{#1@#2@#4}%
+{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}%
+{\hyperlink{#1@#2@target}{\csname #1@#2@#4\endcsname}}}
+{\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}}
+\newcommand\WPtref[1]{\WPref{#1}: \pdataRefFB{wp}{#1}{short}{title}}
 \ifwork@areas
 \newcommand\WAref[1]{\pdataRef{wa}{#1}{label}}
-\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}}
+\newcommand\WAtref[1]{\WAref{#1}: \pdataRefFB{wa}{#1}{short}{title}}
 \fi
 \newcommand{\signatures}[1]{\section{#1}
 \qquad\number\day. \number\month. \number\year\\[6ex]
diff --git a/Master/texmf-dist/tex/latex/proposal/base/proposal.cls b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
index 6e1b3aa39b0..94f2250ff93 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
@@ -7,17 +7,23 @@
 %% proposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{proposal}[2013/02/13 v1.4 Project Proposal]
+\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
 \newif\ifwork@areas\work@areastrue
 \newif\if@RAM\@RAMfalse
+\newif\if@svninfo\@svninfofalse
+\newif\if@gitinfo\@gitinfofalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
+\DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
 \DeclareOption{RAM}{\@RAMtrue}
@@ -28,6 +34,7 @@
 \ProcessOptions
 \LoadClass[a4paper,twoside]{\proposal@class}
 \RequirePackage{amssymb}
+\RequirePackage{wasysym}
 \RequirePackage{url}
 \RequirePackage{graphicx}
 \RequirePackage{colortbl}
@@ -40,13 +47,13 @@
 \AtBeginDocument{\ifpublic\excludecomment{private}\fi}
 \RequirePackage{tikz}
 \RequirePackage{paralist}
-\RequirePackage{a4wide}
+\RequirePackage[a4paper,margin=18mm]{geometry}
 \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[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
 \RequirePackage{csquotes}
 \RequirePackage{mdframed}
 \RequirePackage{pdata}
@@ -57,18 +64,32 @@
  breaklinks=true, bookmarksopen=true]{hyperref}
 \ifsubmit
 \RequirePackage[hide]{ed}
-\RequirePackage[final,today]{svninfo}
+\if@svninfo\RequirePackage[final,today]{svninfo}\fi
 \else
 \RequirePackage[show]{ed}
-\RequirePackage[eso-foot,today]{svninfo}
+\if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi
+\if@gitinfo\RequirePackage[mark]{gitinfo2}\fi
 \fi
 \renewcommand\ednoteshape{\sl\footnotesize}
 \ifpublic\excludecomment{private}\else\includecomment{private}\fi
 \setcounter{secnumdepth}{3}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
+\fancyhfoffset{0pt}
+\fi
+\fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 \newmdenv[settings=\large]{emphbox}
 \newenvironment{prop@proposal}
@@ -90,7 +111,7 @@
 \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]}
+\printbibliography[heading=warnpubs]}
 \newenvironment{proposal}[1][]{\readpdata\jobname
 \ofpagetrue\setkeys{prop@gen}{#1}
 \pdata@open\jobname
@@ -115,8 +136,8 @@
 \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}%
+{\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}%
@@ -125,7 +146,7 @@
 \@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}}
+\newcommand\OBJtref[1]{\OBJref{#1}: \pdataRefFB{obj}{#1}{short}{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}}
@@ -134,10 +155,11 @@
 \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}{lead}{\pdata@def{wp}\wp@id{lead}{#1}\def\wp@lead{#1}\@dmp{lead=#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}}
+\define@key{workpackage}{swsites}[true]{\def\wp@swsites{#1}}
 \newcommand\wp@mk@title[1]{Work Package {#1}}
 \newcommand\wp@label[1]{WP{#1}}
 \ifwork@areas
@@ -167,6 +189,7 @@
 \if@RAM\newcounter{wp@RAM}\fi
 \newenvironment{work@package}[1][]%
 {\def\wp@wphases{0-0}% default values
+\def\wp@swsites{false}
 \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%
@@ -190,10 +213,12 @@
 {\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
 \newenvironment{workpackage}[1][]%
 {\begin{work@package}[#1]%
+\ifgrantagreement\else
 \if@sites\goodbreak\medskip\wpheadertable%
 \else\subsubsection*{{\wptitle} (\wprm)}\fi%
 \addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
-}
+\noindent\ignorespaces%
+\fi}
 {\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}
@@ -206,14 +231,23 @@
 \newcounter{wp@sites@num}
 \newcommand\wp@sites@efforts@lines{%
 \setcounter{wp@sites@num}{0}
-{\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax%
+{\let\G@refundefinedtrue=\relax\let\@latex@warning=\relax\let\@sw\relax%
 \let\site\relax\let\textbf\relax\let\sum@style\relax\let\lead@style\relax%
+\let\pn\relax\let\sys\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}}%
+\if@site@contributes\@site{&%
+\ifx\wp@swsites\@true%
+\@sw{\ifx\@site\wp@lead\lead@style{\site{\@site}}\else\site{\@site}\fi}%
+\else\ifx\@site\wp@lead\lead@style{\site{\@site}}\else\site{\@site}\fi%
+\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}}}%
+\if@site@contributes\@site{&%
+\ifx\@site\wp@lead%
+\lead@style{\pdataref@safe\wp@id\@site{RM}\if@RAM+\pdataref@safe\wp@id\@site{RAM}\fi}
+\else\pdataref@safe\wp@id\@site{RM}\if@RAM+\pdataref@safe\wp@id\@site{RAM}\fi\fi}}%
+}% do
 \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}}}}}
@@ -260,7 +294,8 @@
 \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}}}
+\addcontentsline{toc}{subsubsection}{{\wa@mk@title\thewa}: \pdataref{wa}\wa@id{title}}%
+\ignorespaces}
 {\@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}%
@@ -295,15 +330,18 @@
 {\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\deliv@label[1]{D{#1}}
 \newcommand\delivref[2]{\pdataRef{deliv}{#1#2}{label}}
-\newcommand\delivtref[2]{\pdataRef{deliv}{#1#2}{label}: \pdataRef{deliv}{#1#2}{short}}
+\newcommand\localdelivref[1]{\delivref{\wp@id}{#1}}
+\newcommand\delivtref[2]{\delivref{#1}{#2}: \pdataRefFB{deliv}{#1#2}{short}{title}}
+\newcommand\localdelivtref[1]{\delivtref{\wp@id}{#1}}
 \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}}
+\define@key{deliv}{lead}{\def\deliv@lead{#1}}
 \newcounter{deliverable}
 \newcommand{\wpg@deliv}[3]{% keys, title, type
 \stepcounter{deliverable}
@@ -315,25 +353,36 @@
 \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}
+\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
 \@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@nature}
+{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv \wpg@id undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{nature}{\deliv@nature}}
+\@ifundefined{deliv@dissem}
+{\protect\G@refundefinedtrue\@latex@warning{key 'dissem' for Deliv \wpg@id undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{dissem}{\deliv@dissem}}
+\@ifundefined{deliv@lead}
+{\protect\G@refundefinedtrue\@latex@warning{key 'lead' for Deliv \wpg@id  undefined}}
+{\pdata@def{deliv}{\wpg@id\deliv@id}{lead}{\deliv@lead}}
 \@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
+{\@ifundefined{deliv@id}{??}{\wpg@id\deliv@id}}% id
+{\@ifundefined{deliv@dissem}{??}{\deliv@dissem}}% dissemination level
+{\@ifundefined{deliv@nature}{??}{\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}}
+{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}%WP
+{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}}% lead
+\item[\current@label\ (%
+\delivs@legend@due: \@ifundefined{deliv@due}{??}{\deliv@due},
+\delivs@legend@nature: \@ifundefined{deliv@nature}{??}{\deliv@nature},
+\delivs@legend@dissem: \@ifundefined{deliv@dissem}{??}{\deliv@dissem},
+\delivs@legend@lead: \@ifundefined{deliv@lead}{??}{\site{\deliv@lead}})]
+ \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
@@ -349,7 +398,7 @@
 \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}}
+\newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}}
 \newcounter{milestone}
 \define@key{milestone}{id}{\gdef\mile@id{#1}}
 \define@key{milestone}{month}{\gdef\mile@month{#1}}
@@ -361,41 +410,39 @@
 \pdata@def{mile}\mile@id{month}{\mile@month}%
 \pdata@def{mile}\mile@id{verif}{\mile@verif}%
 \pdata@def{mile}\mile@id{title}{#2}%
+\pdata@def{mile}\mile@id{description}{#3}%
 \@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
-\@milestone{#1}{#2}{#3}% presentation
+\@milestone{\mile@id}{#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%
+\newcommand\@milestone[3]{% id, title, description
+\item \textbf{\miles@legend@milestone \pdataref{mile}{#1}{label} (\miles@legend@month \pdataref{mile}\mile@id{month})
+\textbf{#2}} #3}
+\newcommand\miles@legend@month{Month}
+\newcommand\miles@legend@milestone{Milestone}
+\newenvironment{milestones}%
+{\ifdelivs\begin{@milestones}\else\deliv@error\fi}
+{\ifdelivs\pdata@def{all}{mile}{ids}{\mile@stones}%
+\pdata@def{all}{mile}{count}{\themilestone}%
+\end{@milestones}\fi}
+\newenvironment{@milestones}{\begin{enumerate}}{\end{enumerate}}
+\newcommand{\deliverable}[9]{\pdataRef{deliv}{#4}{label}&#7&#8&#9&#6&#5&#2\\\hline}%sortkey,due,label,id,title,type,level,lead
+\newenvironment{deliverables}[1]{\ifdelivs\begin{longtable}{|l|p{#1}|l|l|l|l|l|}\hline%
+\#&\textbf{\delivs@legend@name}&%
+\textbf{\delivs@legend@wp}&%
+\textbf{\delivs@legend@lead}&%
+\textbf{\delivs@legend@nature}&%
+\textbf{\delivs@legend@level}&%
+\textbf{\delivs@legend@due}\\\hline\hline%
+\endhead%
 \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@nature{Type}
 \newcommand\delivs@legend@level{Level}
 \newcommand\delivs@legend@due{Due}
+\newcommand\delivs@legend@dissem{Dissem.}
+\newcommand\delivs@legend@lead{Lead}
 \newcommand{\inputdelivs}[1]{%
 \begin{deliverables}{#1}%
 \IfFileExists{\jobname.deliverables}%
@@ -404,30 +451,42 @@
 \end{deliverables}}
 \newenvironment{tasklist}
 {\begin{compactenum}}{\end{compactenum}}
-\newcommand\task@label[1]{T#1}
+\newcommand\task@label[2]{\textbf{T#1.#2}}
 \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}}
+\define@key{task}{title}{\def\task@title{#1}\pdata@def{task}{\taskin\task@id\wp@id}{title}{#1}}
+\define@key{task}{lead}{\def\task@lead{#1}\pdata@def{task}{\taskin\task@id\wp@id}{lead}{#1}}
+\define@key{task}{partners}{\def\task@partners{#1}\pdata@def{task}{\taskin\task@id\wp@id}{partners}{#1}}
+\define@key{task}{PM}{\def\task@PM{#1}\pdata@def{task}{\taskin\task@id\wp@id}{PM}{#1}}
 \def\task@set#1{\edef\task@id{task\thetask@all}
-\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}
+\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}
 \setkeys{task}{#1}}
+\def\task@post@title@space{\;}
 \newcounter{alltasks}
+\def\task@post@title@space{\quad}
+\newcommand\task@legend@partners{Sites: }
+\newcommand\task@legend@PM{PM}
 \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}%
+{\stepcounter{alltasks}%
+\@task{#1}\item[\pdata@target{task}{\taskin\task@id\wp@id}{\task@label\thewp\thetask@wp}]%
+\@ifundefined{task@title}{}{\textbf\task@title}\task@post@title@space%
 \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}
-{}
+\let\@@sep=\relax\@for\@I:=\task@wphases%
+\do{\decode@wphase\@I%
+\@@sep\show@wphase\wphase@start\wphase@end\wphase@force%
+\let\@@sep=\sep@wphases}%
+\fi% initial
+\hfill%
+\ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi%
+\ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)\fi%
+\@for\@I:=\task@partners\do{, \site\@I}\\%
+\ignorespaces}
+{\medskip}
 \newcommand\month@label[1]{M#1}
-\newcommand\show@wphase[3]{\def\@test{#3}\month@label{#1}-\month@label{#2}%
-\ifx\@test\@empty\@ #3}
+\newcommand\show@wphase[3]{\edef\@test{#3}\def\@one{1}%
+\month@label{#1}-\month@label{#2}%
+\ifx\@test\@empty\else\ifx\@test\@one\else @#3\fi\fi}
 \newcommand\sep@wphases{; }
 \newcommand\legend@partners{Partners}
 \newcommand\legend@lead{lead}
@@ -437,18 +496,19 @@
 \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}{label}{\task@label\thewp\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})}
+\newcommand\taskref[2]{\pdataRef{task}{#1@#2}{label}}
+\newcommand\taskreflong[2]{\pdataRef{task}{#2}{label}}
+\newcommand\tasktref[2]{\taskref{#1}{#2}: \pdataRefFB{task}{#1@#2}{short}{title}}
+\newcommand\localtaskref[1]{\taskref{\wp@id}{#1}}
+\newcommand\localtasktref[1]{\tasktref{\wp@id}{#1}}
 \newcounter{gantt@deps}
 \def\@requires#1#2{\stepcounter{gantt@deps}%
 \edef\dep@id{taskdep\thegantt@deps}%
@@ -460,7 +520,8 @@
 {\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}
+wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30;%
+ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
 \newcommand\sum@style[1]{\cellcolor{wagray}{\textbf{#1}}}
 \newcommand\wa@style[1]{\cellcolor{wagray}{\textbf{#1}}}
 \newcommand\wp@style[1]{#1}
@@ -479,9 +540,11 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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}}
+\define@key{wpfig}{label}{\def\wpfig@label{#1}}
+\define@key{wpfig}{caption}{\def\wpfig@caption{#1}}
 \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%
+\newenvironment{wp@figure}{\begin{table}[ht]\wpfig@style\begin{center}
+{\let\@sw\relax\let\textbf\relax\let\site\relax\let\pn\relax\let\sys\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%
@@ -498,13 +561,14 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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
+\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}}
+\@ifundefined{wpfig@label}{\caption{\wpfig@legend@caption}}{\caption{\wpfig@caption}}
+\@ifundefined{wpfig@label}{\label{fig:wplist}}{\label{\wpfig@label}}
+\end{center}\end{table}}
 \newcommand\wpfig@legend@wap{\textbf{\ifwork@areas{WA/P}\else{WP}\fi}}
 \newcommand\wpfig@legend@title{\textbf{Title}}
 \newcommand\wpfig@legend@type{\textbf{type}}
@@ -682,12 +746,16 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \xdef\@totals{&\the\@@@RM\if@RAM &\the\@@@RAM\fi}
 \fi% if@sites
 \fi
-\gdef\intended@totals{}
+\gdef\intended@totals{}\gdef\requested@totals{}
 \if@sites
 \@for\@site:=\prop@gen@sites\do{
 \xdef\intended@totals{\intended@totals&\textbf{\pdataref@safe{site}\@site{intendedRM}}}
+\xdef\requested@totals{\requested@totals&\pdataref@safe{site}\@site{reqPM}}
 \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
+\if@RAM\xdef\intended@totals{\intended@totals&&}\else%
+\xdef\intended@totals{\intended@totals&}%
+\xdef\requested@totals{\requested@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
@@ -695,38 +763,63 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
 \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
+\multicolumn{\the\local@count}{|c|}{\prop@legend@totals}\@totals\\\hline%
+\ifsubmit\else%
+\ifx\prop@gen@topdownPM\@true%
+\multicolumn{\the\local@count}{|c|}{\prop@legend@intendedtotals}\intended@totals\\\hline%
+\fi% topdownPM
+\ifx\prop@gen@botupPM\@true%
+\multicolumn{\the\local@count}{|c|}{\prop@legend@requestedtotals}\requested@totals\\\hline%
+\fi% botupPM
+\fi% submit
 \end{wp@figure}}
 \newcommand\prop@legend@totals{\textbf{totals}}
 \newcommand\prop@legend@intendedtotals{\textbf{intended totals}}
+\newcommand\prop@legend@requestedtotals{\textbf{requested totals}}
 \newif\ifgantt@draft\gantt@draftfalse
+\newif\ifgantt@miles\gantt@milesfalse
 \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}
+\define@key{gantt}{milestones}[true]{\gantt@milestrue}
 \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}
+{\gantt@set{#1}\gdef\gantt@height{#2}
+\def\@test{\prop@gen@months@default}
+\ifx\@test\prop@gen@months
+\ClassError{proposal}{Need overall project months to draw gantt
+    chart - expect trouble;\MessageBreak specify
+    \protect\begin{proposal}[...,months=??,...] to fix}\fi
 \@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}}
+\gantt@ymonths=\gantt@height cm
+\advance\gantt@ymonths by .8cm
+\begin{tikzpicture}[xscale=\gantt@xscale,yscale=\gantt@yscale]}
+{\draw[xstep=\gantt@step,very thin] (0,0) grid (\prop@gen@months,\gantt@height);
+\foreach \x in {0,\gantt@step,...,\prop@gen@months} \node at (\x,\gantt@ymonths) {\x};
+\ifgantt@miles
+\newdimen\gantt@ymiles\gantt@ymiles=\gantt@height cm
+\advance\gantt@ymiles by 2cm
+\newdimen\gantt@ymiles@top\gantt@ymiles@top=\gantt@height cm
+\edef\@@miles{\pdataref@safe{all}{mile}{ids}}
+\@for\@I:=\@@miles\do{%
+\edef\@@month{\pdataref@safe{mile}{\@I}{month}}
+\draw[very thick,blue] (\@@month,\gantt@ymiles@top) -- (\@@month,0);
+\node[blue] at (\@@month,\gantt@ymiles) {\pdataref{mile}{\@I}{label}};}
+\fi %gantt@miles
+\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
+\newcommand{\@action}[6][]{\def\@test{#1}%
+\ifx\@test\@empty\def\@@color{ganttgray}\else\def\@@color{#1}\fi
+\gantt@ymid=#3 cm\gantt@yinc=\gantt@yscale cm
+\gantt@xend=#4 cm\advance\gantt@xend by #5 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) {};}
+\fill[\@@color] (#4,#3) rectangle +(#5,#6);
+\node (#2@left) at (#4,\gantt@ymid) {};
+\node (#2@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
@@ -756,7 +849,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
        \@for\@@ft:=\@@wphases\do{%task-level work phases
          \decode@wphase\@@ft
          \@action\@@task\@@line\wphase@start\wphase@len\wphase@force}}}}
- \else% ifwork@ares
+ \else% ifwork@areas false
  \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
  \@for\@@wp:=\@@wps\do{% iterate over work packages
    \stepcounter{taskwps}
@@ -772,7 +865,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
      \@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
+ \fi% ifwork@areas end
  \edef\@@deps{\pdataref@safe{all}{task}{deps}}
  \@for\@@dep:=\@@deps\do{%
    \@dependency{\pdataref@safe{taskdep}\@@dep{from}}{\pdataref@safe{taskdep}\@@dep{to}}}
@@ -796,7 +889,7 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
           \@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);
+      \fill[ganttgray]  (\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
@@ -810,77 +903,95 @@ wagray,.70/.70,.70,.70/0,0,.70/0,0,0,.30}
           \@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);
+      \fill[ganttgray]  (\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}
+\end{figure}\footnotetext\gantt@footnote}
+\newcommand\gantt@caption@main{Gantt Chart: 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}
+\newcommand\gantt@caption{\gantt@caption@main\ifgantt@draft\xspace
+  (\gantt@caption@lower)\fi}
+\newcommand\gantt@footnote{Bars shown at reduced height (e.g. 50\%) indicate reduced
+  intensity during  that work phase  (e.g. to 50\%).}
+\newcommand{\gantttaskchart}[1][]{\begin{figure}[hbtp]\centering\gantt@set{#1}
+\newcounter{gantt@all@tasks}%
+\setcounter{gantt@all@tasks}{\pdataref@num{all}{task}{count}}
+\addtocounter{gantt@all@tasks}{\pdataref@num{all}{wp}{count}}
+\begin{gantt}[#1]{\thegantt@all@tasks}
   \newcounter{gantt@tasks}\newcount\@@line
   \edef\@@wps{\pdataref@safe{all}{wp}{ids}}
    \@for\@@wp:=\@@wps\do{% iterate over work packages
+     \stepcounter{gantt@tasks}
      \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};
+       \@@line=\thegantt@all@tasks\advance\@@line by -\thegantt@tasks
+       \node at (-.5/\gantt@xscale,\@@line) [above=-2pt] {{\footnotesize\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}
+    \caption{\gantt@caption@main{} -- \emph{\gantt@footnote}}\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\jpub{\textcolor{\prop@link@color}{\textbf{\Large{$\star$}}}}
+\newcommand\jpro{\textcolor{\prop@link@color}{\textbf{\Large{$\bullet$}}}}
+\newcommand\jsoft{\textcolor{\prop@link@color}{\textbf{@}}}
+\newcommand\jorga{\textcolor{\prop@link@color}{\textbf{\Large{$\circ$}}}}
+\newcommand\jsup{\textcolor{\prop@link@color}{\textbf{\smiley}}}
 \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\jointpub[1]{\prop@joint\jpub{#1}}
 \newcommand\jointorga[1]{\prop@joint\jorga{#1}}
+\newcommand\jointsoft[1]{\prop@joint\jsoft{#1}}
+\newcommand\jointsup[1]{\prop@joint\jsup{#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}}}
+ \let\@sw\relax\let\jpub\relax\let\jpro\relax\let\jorga\relax% not bother
+ \let\jsoft\relax\let\jsup\relax\let\cellcolor\relax% us
+\gdef\@ct@head{}%
+\@for\@site:=\prop@gen@sites\do{\xdef\@ct@head{\@ct@head%
+&\ifx\cht@swsites\@true\@sw{\site{\@site}}\else\site{\@site}\fi}}%
 \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
+\@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{\cellcolor{wagray}{}}\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
+      \jorga $\hat=$ organization, \jsoft $\hat=$ software/resource dev,
+       \jsup $\hat=$ supervision}\\\hline
 \end{tabular}}
-\newcommand\coherencetable{%
-\begin{table}[ht]
-\begin{center}\small\setlength{\tabcolsep}{.5em}
-\renewcommand{\arraystretch}{.9}\coherencematrix
-\end{center}
+\define@key{coherencetable}{swsites}[true]{\def\cht@swsites{#1}}
+\define@key{coherencetable}{stretch}{\def\cht@stretch{#1}}
+\newcommand\coherencetable[1][]{%
+\def\cht@swsites{false}%
+\def\cht@stretch{1}%
+\setkeys{coherencetable}{#1}%
+\begin{table}[ht]\centering%
+\small\setlength{\tabcolsep}{.5em}%
+\renewcommand{\arraystretch}{\cht@stretch}%
+\coherencematrix%
 \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]%
+\printbibliography[heading=subbibliography,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]}%
+\printbibliography[heading=subbibliography,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}}
@@ -890,15 +1001,16 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 \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}}
+\DeclareBibliographyCategory{featured}
 \newcommand\prop@paperlist[2][]{%
 \begin{refsection}%
-\nocite{#2}%
+\nocite{#2}\addtocategory{featured}{#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%
+\if@allpapers\printbibliography[heading=empty]\fi%
 \let\bibfont\biboldfont%
 \end{refsection}}
 \def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
diff --git a/Master/texmf-dist/tex/latex/proposal/base/reporting.cls b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
index 936238b2633..4ba4de475b8 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
@@ -7,17 +7,23 @@
 %% proposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{reporting}[2013/02/13 v1.4 Project Reporting]
+\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
 \newif\ifwork@areas\work@areastrue
 \newif\if@RAM\@RAMfalse
+\newif\if@svninfo\@svninfofalse
+\newif\if@gitinfo\@gitinfofalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
+\DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
 \DeclareOption{RAM}{\@RAMtrue}
@@ -28,6 +34,7 @@
 \ProcessOptions
 \LoadClass[a4paper,twoside]{\proposal@class}
 \RequirePackage{amssymb}
+\RequirePackage{wasysym}
 \RequirePackage{url}
 \RequirePackage{graphicx}
 \RequirePackage{colortbl}
@@ -40,13 +47,13 @@
 \AtBeginDocument{\ifpublic\excludecomment{private}\fi}
 \RequirePackage{tikz}
 \RequirePackage{paralist}
-\RequirePackage{a4wide}
+\RequirePackage[a4paper,margin=18mm]{geometry}
 \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[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
 \RequirePackage{csquotes}
 \RequirePackage{mdframed}
 \RequirePackage{pdata}
@@ -57,18 +64,32 @@
  breaklinks=true, bookmarksopen=true]{hyperref}
 \ifsubmit
 \RequirePackage[hide]{ed}
-\RequirePackage[final,today]{svninfo}
+\if@svninfo\RequirePackage[final,today]{svninfo}\fi
 \else
 \RequirePackage[show]{ed}
-\RequirePackage[eso-foot,today]{svninfo}
+\if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi
+\if@gitinfo\RequirePackage[mark]{gitinfo2}\fi
 \fi
 \renewcommand\ednoteshape{\sl\footnotesize}
 \ifpublic\excludecomment{private}\else\includecomment{private}\fi
 \setcounter{secnumdepth}{3}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
+\fancyhfoffset{0pt}
+\fi
+\fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 \newif\if@report\@reportfalse
 \newenvironment{report}[1][]%
@@ -81,7 +102,7 @@
 \begin{prop@report}}
 {\end{prop@report}%
 \pdata@def{prop}{page}{last}{\thepage}\ofpagefalse\newpage
-\printbibliography[heading=warnpubs,maxnames=999]
+\printbibliography[heading=warnpubs]
 \pdata@close}
 \newenvironment{prop@report}
 {\begin{center}
@@ -99,10 +120,10 @@
 \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]%
+\printbibliography[heading=subbibliography,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]}%
+\printbibliography[heading=subbibliography,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}}
@@ -112,15 +133,16 @@
 \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}}
+\DeclareBibliographyCategory{featured}
 \newcommand\prop@paperlist[2][]{%
 \begin{refsection}%
-\nocite{#2}%
+\nocite{#2}\addtocategory{featured}{#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%
+\if@allpapers\printbibliography[heading=empty]\fi%
 \let\bibfont\biboldfont%
 \end{refsection}}
 \def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
index 8b8ee0a5ea5..214ef50ba2a 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgpdata}[2013/02/13 v1.4 DFG Project Data]
+\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data]
 \newif\ifdeutsch\deutschfalse
 \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
 \ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
index c4fd7488d0c..01dbbf9b3a1 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{dfgproposal}[2013/02/13 v1.4 DFG Proposal]
+\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal]
 \newif\ifgeneral\generalfalse
 \DeclareOption{general}{\generaltrue}
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
@@ -47,10 +47,10 @@
 \WAauthorblock[aff]\prop@gen@PIs\\[2cm]
 \end{center}
 \edef\keep@tocdepth{\value{tocdepth}}
-\setcounter{tocdepth}{1}\tableofcontents
+\setcounter{tocdepth}{2}\tableofcontents
 \setcounter{tocdepth}{\keep@tocdepth}
-\newpage\thispagestyle{empty}
 \ifgeneral\setcounter{section}{-1}
+\newpage\thispagestyle{empty}
 \ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
 \section{General Information (for the ELAN system only)}\fi
 \dfg@applicants
@@ -71,10 +71,10 @@
 \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 Mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)}
 \ifdeutsch\else\selectlanguage{USenglish}\fi
-\newpage\fi %ifgeneral
-\setcounter{page}{1}}
+\newpage\fi%ifgeneral
+\setcounter{page}{0}}
 {}
 \ifdeutsch
 \def\prop@warnpubs@message{Viele der Publikationen der Antragsteller sind verf\"ugbar unter folgenden URLs:}
@@ -92,16 +92,18 @@
 \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
+\item Zitierte Publikationen 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}
+\newenvironment{Zusammenfassung}{\thispagestyle{empty}\subsection{Zusammenfassung}\begin{otherlanguage}{ngerman}}
+{\end{otherlanguage}\newpage\setcounter{page}1}
+\newenvironment{Summary}{\thispagestyle{empty}\subsection{Summary}}
 {\newpage\setcounter{page}1}
-\else\excludecomment{Summary}\fi
+\else
+\excludecomment{Summary}
+\excludecomment{Zusammenfassung}
+\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
index c229c48734a..c0d17b3ed5a 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgreporting}[2013/02/13 v1.4 DFG Project Reporting]
+\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting]
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
index 4ba33a1f4c2..a26e81b1e36 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
@@ -7,8 +7,9 @@
 %% euproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eudata}[2013/01/13 v1.4 EU Project Data]
+\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data]
 \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
+\define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#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}}
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
index f7b592f24ca..93c3bb7febb 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
@@ -7,51 +7,59 @@
 %% euproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{euproposal}[2013/01/13 v1.4 EU Proposal]
+\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal]
+\newif\ifpartB\partBfalse
+\DeclareOption{partB}{\partBtrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
 \ProcessOptions
-\LoadClass[report,noRAM]{proposal}
+\ifpartB\LoadClass[report,noRAM]{proposal}\else\LoadClass[noRAM]{proposal}\fi
 \RequirePackage{longtable}
 \RequirePackage{eurosym}
 \RequirePackage{wrapfig}
 \RequirePackage{eupdata}
+\RequirePackage{chngcntr}
+\counterwithin{figure}{subsection}
+\counterwithin{table}{subsection}
+\ifpartB
 \def\thepart{\Alph{part}}
 \setcounter{part}{2}
 \def\thechapter{\thepart.\arabic{chapter}}
 \def\numberline#1{\hb@xt@\@tempdima{#1\hfil} }
+\fi
 \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 @name}
+\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
 \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
+\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}
+{\ifgrantagreement\else
+  \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]
+  {\Large\textbf\prop@gen@callname}\\[.4cm]
+  {\LARGE \prop@gen@callid}\\[.8cm]
+  {\huge\textbf\prop@gen@title}\\[.4cm]
+  {\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}
+\\[1em]
 \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[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}
+    \@ifundefined{prop@gen@keywords}{}{\item[Keywords:]  \prop@gen@keywords}
   \end{description}
 \end{large}
 \vspace*{1em}
@@ -61,47 +69,122 @@
 {\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
 \end{center}
 \newpage
+\fi% ifgrantagreement
 \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]%
+\define@key{site@desc}{box}[true]{\def\site@desc@box{#1}%
+\pdata@def{sitedesc}{\@site}{box}{#1}}
+\define@key{site@desc}{logo}[true]{\def\site@desc@logo{#1}%
+\pdata@def{sitedesc}{\@site}{logo}{#1}}
+\define@key{site@desc}{width}{\def\site@desc@width{#1}%
+\pdata@def{sitedesc}{\@site}{width}{#1}\@dmp{wd=#1}}
+\define@key{site@desc}{height}{\def\site@desc@height{#1}%
+\pdata@def{sitedesc}{\@site}{height}{#1}\@dmp{ht=#1}}
+\newenvironment{sitedescription}[2][]%
+{\def\c@site{#2}% remember the site ID
+\newcounter{site@#2@PM} % for the site PM
+\def\site@desc@box{false}% not box unless requested
+\def\site@desc@logo{false}% not logo unless requested
+\def\site@desc@height{1.3cm}% default height
+\def\site@desc@width{5cm}% default width
+\setkeys{site@desc}{#1}% read the keys to overwrite the defaults
+\ifx\@site@desc@box\@true% if we want a logo
+\begin{wrapfigure}{r}{\site@desc@width}\vspace{-2.5ex}%
+\begin{tabular}{|p{\site@desc@width}|}\hline\vspace{1mm}%
+\ifx\@site@desc@logo\@true% if we want a logo
+\wa@institution@logo[height=\site@desc@width]{#2}\\[1ex]%
+\fi% end logo
 \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}%
+\fi% end box
 \pdata@target{site}{#2}%
-{\subsection{\wa@ref{institution}{#2}{acronym}:%
+{\subsubsection{\wa@ref{institution}{#2}{acronym}: % space here
 {\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}}}
-{}
+{\pdata@def{site}{\c@site}{reqPM}{\csname thesite@\c@site @PM\endcsname}}
+\define@key{site@part}{type}{\def\site@part@type{#1}\@dmp{type=#1}}
+\define@key{site@part}{PM}{\def\site@part@PM{#1}\@dmp{PM=#1}}
+\define@key{site@part}{salary}{\def\site@part@salary{#1}}%\@dmp{\euro=#1}}
+\define@key{site@part}{gender}{\def\site@part@gender{#1}}%\@dmp{\euro=#1}}
+\newenvironment{participant}[2][]%
+{\def\site@part@type{}\def\site@part@PM{}\def\site@part@salary{}\def\site@part@gender{}%
+\setkeys{site@part}{#1}%
+\ifx\site@part@PM\@empty\else\addtocounter{site@\c@site @PM}{\site@part@PM}\fi%
+\paragraph*{#2\ %
+(\ifx\site@part@type\@empty\else\site@part@type\fi%
+\ifx\site@part@gender\@empty\else, \site@part@gender\fi%
+\ifx\site@part@PM\@empty\else, \site@part@PM~PM\fi%
+)}%
+\ignorespaces}
+{\par\medskip}
 \newmdenv[frametitle=Objectives]{wpobjectives}
 \newmdenv[frametitle=Description]{wpdescription}
 \renewenvironment{workpackage}[1][]
-{\begin{work@package}[#1]\subsubsection*{\wptitle}
+{\begin{work@package}[#1]\medskip\wpheadertable%
 \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%
+\multicolumn{\the@sitespo}{|l|}{\textbf{\wp@mk@title{\wp@num}: }%
+\textsf{\pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}}
+&\textbf{Start: }\pdataref{wp}\wp@id{start}\\\hline%
 \wp@sites@line\\\hline%
 \wp@efforts@line\\\hline%
 \end{tabular}\smallskip\par\noindent\ignorespaces}
+\surroundwithmdframed{wpdelivs}
+\define@key{milestone}{verif}{\gdef\mile@verif{#1}\pdata@def{mile}\mile@id{verif}{#1}}
+\define@key{mst}{caption}{\gdef\mst@caption{#1}}
+\define@key{mst}{wname}{\gdef\mst@wname{#1}}
+\define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}}
+\define@key{mst}{wverif}{\gdef\mst@wverif{#1}}
+\newcommand\milestonetable[1][]{%
+\def\mst@caption{Milestones, Deliverables, and Verification}%
+\def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm}
+\setkeys{mst}{#1}%
+{\gdef\mst@lines{}%initialize
+\let\tabularnewline\relax\let\hline\relax% so they
+\let\textbf\relax\let\emph\relax% do not bother us
+\edef\@@miles{\pdataref{all}{mile}{ids}}
+\@for\@I:=\@@miles\do{
+\edef\@delivs{\pdataref@safe{mile}{\@I}{delivs}}%
+\def\@@delivs{}
+\@for\@J:=\@delivs\do{\xdef\@@delivs{\@@delivs\ \pdataref{deliv}\@J{label}}}
+\def\@@line{
+\textbf{\pdataref{mile}\@I{label}}&
+\emph{\pdataref{mile}{\@I}{title}} &
+\@@delivs&
+\pdataref{mile}\@I{month} &
+\pdataref{mile}\@I{verif}}
+\xdef\mst@lines{\mst@lines\@@line\tabularnewline\hline}}}
+\begin{table}[ht]
+\begin{tabular}{|l|p{\mst@wname}|p{\mst@wdeliv}|l|p{\mst@wverif}|}\hline
+\#&\textbf{\miles@legend@name}
+&\textbf{\miles@legend@involved}
+&\textbf{\miles@legend@mo}
+&\textbf{\miles@legend@verif}\\\hline\hline
+\mst@lines
+\end{tabular}
+\caption{\mst@caption}\label{tab:milestonetable}
+\end{table}
+\footnotetext\miles@legend@footnote}
+\newcommand\miles@legend@name{Name}
+\newcommand\miles@legend@mo{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}}
 \newenvironment{risk}[3]
 {\paragraph{Risk: #1}\hfill\emph{probability}: #2, \emph{gravity}: #3\par\noindent\ignorespaces}
 {}
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
index dd37cc4c9c7..9195aec875c 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eureporting}[2013/01/13 v1.4 EU Project Reporting]
+\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting]
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
 \LoadClass[report,noRAM]{reporting}
@@ -15,6 +15,9 @@
 \RequirePackage{eurosym}
 \RequirePackage{wrapfig}
 \RequirePackage{eupdata}
+\RequirePackage{chngcntr}
+\counterwithin{figure}{subsection}
+\counterwithin{table}{subsection}
 \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}}}
author	Karl Berry <karl@freefriends.org>	2015-11-23 23:03:44 +0000
committer	Karl Berry <karl@freefriends.org>	2015-11-23 23:03:44 +0000
commit	a30f052f895d1f1fd9f112c555d360a2f5845929 (patch)
tree	75e851693ac839f7510674f192badb317e43d87b
parent	17317dd1f84901e202fb95e31a0eee9c51e50d74 (diff)