draining

dfg/dfgpdata.sty

@@ -22,7 +22,10 @@
 \prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{academictitle}}\\
 \prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{birthdate}}\\}
 \newcommand\dfg@applicants@institute@lines{%
-\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{shortname}}\\
+\prop@tl\prop@gen@PIs{
+  \xdef\@@@aff {\wa@ref3{person}\tl@ext{affiliation}}
+  \message{AFF \tl@ext: \@@@aff}
+  \wa@ref3{institution}\@@@aff{shortname}}\\
 \prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{workaddress}}\\
 \prop@tl\prop@gen@PIs{Tel: \wa@ref3{person}\tl@ext{worktel}}\\
 \prop@tl\prop@gen@PIs{Fax: \wa@ref3{person}\tl@ext{workfax}}\\

dfg/dfgproposal.cls

@@ -38,9 +38,7 @@
 \dfg@applicants@private@lines\hline
 \end{tabular}}
 \renewenvironment{prop@proposal}
-{\ifgeneral
-\ifsubmit\setcounter{page}{1}\else
-\thispagestyle{empty}%
+{\ifsubmit\setcounter{page}{1}\else\thispagestyle{empty}\fi
 \begin{center}
 {\LARGE \prop@gen@instrument}\\[.2cm]
 {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
@@ -48,6 +46,8 @@
 {\large\today}\\[1em]
 \WAauthorblock[aff]\prop@gen@PIs\\[2cm]
 \end{center}
+\ifgeneral
+\ifsubmit\else
 \setcounter{section}{-1}
 \edef\keep@tocdepth{\value{tocdepth}}
 \setcounter{tocdepth}{2}\tableofcontents

dfg/dfgproposal.dtx

@@ -348,9 +348,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 %   class.
 %    \begin{macrocode}
 \renewenvironment{prop@proposal}
-{\ifgeneral
-\ifsubmit\setcounter{page}{1}\else
-\thispagestyle{empty}%
+{\ifsubmit\setcounter{page}{1}\else\thispagestyle{empty}\fi
 \begin{center}
 {\LARGE \prop@gen@instrument}\\[.2cm]
 {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
@@ -358,6 +356,8 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
 {\large\today}\\[1em]
 \WAauthorblock[aff]\prop@gen@PIs\\[2cm]
 \end{center}
+\ifgeneral 
+\ifsubmit\else
 \setcounter{section}{-1}
 \edef\keep@tocdepth{\value{tocdepth}}
 \setcounter{tocdepth}{2}\tableofcontents

examples/dfg/lib/WApersons.tex

@@ -3,6 +3,7 @@
            birthdate=13. September 1964,
            academictitle=Professor f\"ur Wissensrepr\"asentation und -verarbeitung,
            affiliation=fau,
+           department=fauinf,
            privaddress=None of your business,
            privtel=that neither,
            email=michael.kohlhase@fau.de,
@@ -26,7 +27,8 @@
            email=gc@pcg.phony]
            {Great Communicator}
 
-\WAinstitution[id=fau,acronym=FAU,
+\WAinstitution[id=fau,
+               acronym=FAU,
                url=http://fau.de,
                streetaddress={Schlossplatz 1},
                townzip={91058 Erlangen},
@@ -37,12 +39,16 @@
                shortname=FAU Erlangen-N\"urnberg]
                {FAU Erlangen-N\"urnberg}
 
-\WAinstitution[id=pcsa,
-                           url=http://pcg.phony/sa,
-                           partof=pcg,shortname=Science Affairs]
-               {Science Affairs}
+\WAinstitution[id=fauinf,acronym=INF,
+               url=http://cs.fau.de,
+               streetaddress={Martenstr. 3},
+               townzip={91058 Erlangen},
+               countryshort=D,
+               country=Germany,
+               shortname=Informatik]
+               {Informatik}
 
-               \WAinstitution[id=pcg,acronym=PCG,
+\WAinstitution[id=pcg,acronym=PCG,
                            url=http://pcg.phony,
                            countryshort=D,
                            streetaddress={Seefahrtstrasse 5},
@@ -50,6 +56,13 @@
                            shortname=Power Consulting]
                {Power Consulting GmbH}
 
+\WAinstitution[id=pcsa,
+                        url=http://pcg.phony/sa,
+                        partof=pcg,
+                        shortname=Science Affairs]
+               {Science Affairs}
+
+
 %%% Local Variables: 
 %%% mode: latex
 %%% End: 

examples/dfg/proposal/proposal.tex

@@ -8,10 +8,7 @@
 \renewcommand{\familydefault}{\sfdefault}
 \usepackage[scaled=.90]{helvet}
 \usepackage[utf8]{inputenc}
-\input{../lib/WApersons}
-% temporary fix for biblatex in TeXLive 2016, 
-% see  http://tex.stackexchange.com/questions/311426/bibliography-error-use-of-blxbblverbaddi-doesnt-match-its-definition-ve
-\makeatletter\def\blx@maxline{77}\makeatother
+\input{WApersons}
 
 \begin{document}
 
@@ -20,9 +17,10 @@
   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,PI=gc,site=fau,site=pcg,
+% \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=fau,site=pcg,
+  PI=ad,PI=miko,site=jf,site=tf,
   thema=Intelligentes Schreiben von Antr\"agen,
   acronym={iPoWr},
   acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}posal} {\underline{Wr}iting},
@@ -31,9 +29,11 @@
   since=1. Feb 2009,
   start=1. Feb. 2010,
   months=24,
-  pcgRM=36, pcgRAM=36, fauRM=36, fauRAM=36,
+%  pcgRM=36, pcgRAM=36, fauRM=36, fauRAM=36,
+  jfRM=36, tfRAM=36, jfRM=36, tfRAM=36, 
   discipline=Computer Science, 
-  areas=Knowledge Management]
+  areas=Knowledge Management,
+  keywords={LaTeX Active Documents}]
 
 % It is often good to separate the top-level sections into separate files. 
 % Especially in collaborative proposals. We do this here. 

examples/dfg/simple-proposal/proposal.tex

@@ -22,7 +22,6 @@
   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,