From d2a6d5a88b847e78d626e19a46fa025f4e02f958 Mon Sep 17 00:00:00 2001 From: Michael Kohlhase Date: Thu, 13 Aug 2020 14:32:32 +0200 Subject: [PATCH] fixes --- examples/dfg/lib/WApersons.tex | 39 ++++++++----------- examples/dfg/proposal/preconditions.tex | 2 +- examples/dfg/proposal/proposal.tex | 6 +-- examples/dfg/proposal/workplan.tex | 12 +++--- examples/dfg/report/finalreport.tex | 4 +- .../dfg/simple-proposal/preconditions.tex | 2 +- 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/examples/dfg/lib/WApersons.tex b/examples/dfg/lib/WApersons.tex index 98952f7..7b31880 100644 --- a/examples/dfg/lib/WApersons.tex +++ b/examples/dfg/lib/WApersons.tex @@ -1,18 +1,17 @@ \WAperson[id=miko, personaltitle=Prof. Dr., birthdate=13. September 1964, - academictitle=Professor of Computer Science, - affiliation=jacu, - department=case, + academictitle=Professor f\"ur Wissensrepr\"asentation und -verarbeitung, + affiliation=fau, 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] + email=michael.kohlhase@fau.de, + workaddress={Martenstr. 3, 91058 Erlangen}, + worktel=+49 9131-85-64052, + worktelfax=+49 9131-85-64052/55, + workfax=+49 9131-85-64055] {Michael Kohlhase} - + \WAperson[id=gc, personaltitle=Dr., academictitle=Senior Researcher, @@ -27,27 +26,23 @@ 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}, +\WAinstitution[id=fau,acronym=FAU, + url=http://fau.de, + streetaddress={Schlossplatz 1}, + townzip={91058 Erlangen}, countryshort=D, country=Germany, type=University, - logo=jacobs-logo.png, - shortname=Jacobs University] - {Jacobs University Bremen} + logo=fau-logo.png, + 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=pcg,acronym=PCG, + + \WAinstitution[id=pcg,acronym=PCG, url=http://pcg.phony, countryshort=D, streetaddress={Seefahrtstrasse 5}, diff --git a/examples/dfg/proposal/preconditions.tex b/examples/dfg/proposal/preconditions.tex index 39c7968..5e08f50 100644 --- a/examples/dfg/proposal/preconditions.tex +++ b/examples/dfg/proposal/preconditions.tex @@ -37,7 +37,7 @@ other third-party funding (including fellowships). \end{todo} -\begin{sitedescription}{jacu} +\begin{sitedescription}{fau} The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by Michael Kohlhase for has the following members \begin{compactdesc} diff --git a/examples/dfg/proposal/proposal.tex b/examples/dfg/proposal/proposal.tex index d546923..2f19847 100644 --- a/examples/dfg/proposal/proposal.tex +++ b/examples/dfg/proposal/proposal.tex @@ -2,7 +2,7 @@ % 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 +\providecommand{\classoptions}{,keys,general} % to be overwritten in variants \documentclass[RAM,gitinfo\classoptions]{dfgproposal} \addbibresource{../lib/dummy.bib} \renewcommand{\familydefault}{\sfdefault} @@ -22,7 +22,7 @@ \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, +\begin{proposal}[PI=miko,PI=gc,site=fau,site=pcg, thema=Intelligentes Schreiben von Antr\"agen, acronym={iPoWr}, acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}posal} {\underline{Wr}iting}, @@ -31,7 +31,7 @@ since=1. Feb 2009, start=1. Feb. 2010, months=24, - pcgRM=36, pcgRAM=36, jacuRM=36, jacuRAM=36, + pcgRM=36, pcgRAM=36, fauRM=36, fauRAM=36, discipline=Computer Science, areas=Knowledge Management] diff --git a/examples/dfg/proposal/workplan.tex b/examples/dfg/proposal/workplan.tex index 3c98f0d..ca7c5d0 100644 --- a/examples/dfg/proposal/workplan.tex +++ b/examples/dfg/proposal/workplan.tex @@ -74,9 +74,9 @@ loops. 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{workpackage}[id=management,lead=jacu, +\begin{workpackage}[id=management,lead=fau, title=Project Management, - jacuRM=2,jacuRAM=8,pcgRM=2] + fauRM=2,fauRAM=8,pcgRM=2] 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 @@ -104,7 +104,7 @@ loops. \begin{workpackage}[id=dissem,lead=pcg, title=Dissemination and Exploitation, -pcgRM=8,jacuRAM=2] +pcgRM=8,fauRAM=2] 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 @@ -143,9 +143,9 @@ website will have two areas: a members' area and a public area.\ldots This work group coordinates the system development. -\begin{workpackage}[id=class,lead=jacu, +\begin{workpackage}[id=class,lead=fau, title=A LaTeX class for EU Proposals,short=Class, - jacuRM=12,jacuRAM=8,pcgRM=12,pcgRAM=2] + fauRM=12,fauRAM=8,pcgRM=12,pcgRAM=2] We plan to develop a {\LaTeX} class for marking up EU Proposals We will follow strict software design principles, first comes a @@ -167,7 +167,7 @@ requirements analys, then \ldots \end{workpackage} \begin{workpackage}[id=temple,lead=pcg, - title= Proposal Template,short=Template,jacuRM=12] + title= Proposal Template,short=Template,fauRM=12] We plan to develop a template file for {\pn} proposals diff --git a/examples/dfg/report/finalreport.tex b/examples/dfg/report/finalreport.tex index 6723f3d..8ebdde2 100644 --- a/examples/dfg/report/finalreport.tex +++ b/examples/dfg/report/finalreport.tex @@ -23,12 +23,12 @@ \end{center} \begin{report}[importfrom=../proposal/proposal, - PI=miko,PI=gc,site=jacu,site=pcg, + PI=miko,PI=gc,site=fau,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, + % fauemployed=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}, diff --git a/examples/dfg/simple-proposal/preconditions.tex b/examples/dfg/simple-proposal/preconditions.tex index 881c3c1..9165316 100644 --- a/examples/dfg/simple-proposal/preconditions.tex +++ b/examples/dfg/simple-proposal/preconditions.tex @@ -36,7 +36,7 @@ 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} +\begin{sitedescription}{fau} The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by Michael Kohlhase for has the following members \begin{compactdesc}