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

fixing reporting (thanks to Erik Bitzek)

Browse Source
This commit is contained in:
Michael Kohlhase 2021-03-08 11:51:36 +01:00
parent b1735ffaef
commit bd1e8c0f60
9 changed files with 71 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dfg/dfgpdata.sty
View File

@ -18,10 +18,10 @@
\renewcommand\prop@gen@instrument{Neuantrag auf Sachbeihilfe}
\newcommand\prop@gen@thema{??? Thema ???}
\newcommand\deu[1]{#1}
\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic \deu{(Thema)}\fi}\prop@gen@thema}
\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic\fi}\prop@gen@thema}
\newcommand\dfg@area@field{%
\ifdeutsch\subsection{Fachgebiet und Arbeitsrichtung}\else
\subsection{Research area and field of work \deu{(Fachgebiet und Arbeitsrichtung)}}\fi
\subsection{Research area and field of work }\fi
\ifdeutsch Disziplin\else Scientific discipline\fi: \prop@gen@discipline\\
\ifdeutsch Arbeitsgebiet\else Fields of work\fi: \prop@gen@areas}
\newcommand\dfgprojpapers[2][]{\prop@paperlist[#1]{#2}}

8
dfg/dfgproposal.cls
View File

@ -33,6 +33,8 @@
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\edef\the@PIs{\pdataref{all}{PI}{count}}
\edef\prop@gen@PIs{\pdataref{all}{PI}{ids}}
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
@ -51,7 +53,7 @@
\dfg@topic
\dfg@area@field
\ifdeutsch\subsection{Voraussichtliche Gesamtdauer}\else
\subsection{Anticipated total duration \deu{(Voraussichtliche Gesamtdauer)}}
\subsection{Anticipated total duration}
\fi% ifdeutsch
\@ifundefined{prop@gen@totalduration}{????}{\prop@gen@totalduration};
\ifdeutsch
@ -66,7 +68,7 @@
\else\subsection{Keywords}\prop@gen@keywords
\fi
\ifdeutsch\subsection{Antragszeitraum}\else
\subsection{Application period \deu{(Antragszeitraum)}}\fi
\subsection{Application period}\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)}
@ -80,7 +82,7 @@
\def\prop@warnpubs@title{Literatur}
\fi
\newcommand\attachments{\ifdeutsch\section{Verzeichnis der Anlagen}\else
\section{List of Attachments \deu{(Verzeichnis der Anlagen)}}\fi
\section{List of Attachments}\fi
\begin{itemize}
\@for\@I:=\prop@gen@PIs\do{%
\item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else Curriculum Vitae and list of publications for \fi

80
dfg/dfgproposal.dtx
View File

@ -265,18 +265,17 @@
%<*pdata>
\renewcommand\prop@gen@instrument{Neuantrag auf Sachbeihilfe}
\newcommand\prop@gen@thema{??? Thema ???}
\newcommand\deu[1]{#1}
% \end{macrocode}
%
% Now, we can build the title page and general information.
% \begin{macrocode}
\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic \deu{(Thema)}\fi}\prop@gen@thema}
\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic\fi}\prop@gen@thema}
% \end{macrocode}
%
% \begin{macrocode}
\newcommand\dfg@area@field{%
\ifdeutsch\subsection{Fachgebiet und Arbeitsrichtung}\else
\subsection{Research area and field of work \deu{(Fachgebiet und Arbeitsrichtung)}}\fi
\subsection{Research area and field of work }\fi
\ifdeutsch Disziplin\else Scientific discipline\fi: \prop@gen@discipline\\
\ifdeutsch Arbeitsgebiet\else Fields of work\fi: \prop@gen@areas}
%</pdata>
@ -307,6 +306,8 @@
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\edef\the@PIs{\pdataref{all}{PI}{count}}
\edef\prop@gen@PIs{\pdataref{all}{PI}{ids}}
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
@ -325,7 +326,7 @@
\dfg@topic
\dfg@area@field
\ifdeutsch\subsection{Voraussichtliche Gesamtdauer}\else
\subsection{Anticipated total duration \deu{(Voraussichtliche Gesamtdauer)}}
\subsection{Anticipated total duration}
\fi% ifdeutsch
\@ifundefined{prop@gen@totalduration}{????}{\prop@gen@totalduration};
\ifdeutsch
@ -340,7 +341,7 @@
\else\subsection{Keywords}\prop@gen@keywords
\fi
\ifdeutsch\subsection{Antragszeitraum}\else
\subsection{Application period \deu{(Antragszeitraum)}}\fi
\subsection{Application period}\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)}
@ -363,7 +364,7 @@
% \ednote{MK: this is deprecated (no longer useful with the ELAN system), delete at some time}
% \begin{macrocode}
\newcommand\attachments{\ifdeutsch\section{Verzeichnis der Anlagen}\else
\section{List of Attachments \deu{(Verzeichnis der Anlagen)}}\fi
\section{List of Attachments}\fi
\begin{itemize}
\@for\@I:=\prop@gen@PIs\do{%
\item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else Curriculum Vitae and list of publications for \fi
@ -377,73 +378,46 @@
%
% The |prop@report| environment is similar, but somewhat simpler.
%
% \begin{macro}{\dfg@applicants@table}
% Now, we can build the title page and general information, we first start with the
% applicants table:
% \begin{macrocode}
%<*reporting>
\newcommand\dfg@applicants@table%
{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
\dfg@applicants@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
\dfg@applicants@private@lines\hline
\end{tabular}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\dfg@institute@table}
% Now, we can build the title page and general information, we first start with the
% applicants table:
% \begin{macrocode}
\newcommand\dfg@institute@table%
{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
\dfg@applicants@institute@lines\hline
\end{tabular}}
% \end{macrocode}
% \end{macro}
%
% \begin{environment}{prop@report}
% \begin{macrocode}
%<*reporting>
\newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}}
\newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}}
\renewenvironment{prop@report}
{\selectlanguage{english}
\thispagestyle{empty}%
{\ifsubmit\setcounter{page}{1}\else\thispagestyle{empty}\fi%
\begin{center}
{\LARGE Final Project Report}\\[.2cm]
{\LARGE \prop@gen@instrument}\\[.2cm]
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large Reference number(s): \show@prop@gen@keys}\\[.2cm]
{\large\today}\\[1em]
\edef\the@PIs{\pdataref{all}{PI}{count}}
\edef\prop@gen@PIs{\pdataref{all}{PI}{ids}}
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{1}\tableofcontents\newpage\setcounter{page}{1}
\section{General Information \deu{(Allgemeine Angaben)}}
\subsection{Reference Numbers \deu{(DFG Gesch\"aftszeichen)}}
\setcounter{section}{-1}
\edef\keep@tocdepth{\value{tocdepth}}
\setcounter{tocdepth}{2}\tableofcontents
\setcounter{tocdepth}{\keep@tocdepth}
\newpage\thispagestyle{empty}
\ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
\section{General Information (for the ELAN system only)}\fi
\subsection{Reference Numbers}
\show@prop@gen@keys
\dfg@applicants
\subsection{Institute/Chair \deu{(Institut/Lehrstuhl)}}\dfg@institute@table
\dfg@topic
% no longer necessary
% \subsection{DFG-Funded Researchers \deu{(Aus DFG-Mitteln bezahlte Wissenschaftler)}}
% \begin{tabular}{|l|l|}\hline
% Partner & Employee/Period\\\hline\hline
% \prop@gen@employed@lines
% \end{tabular}
\subsection{Report and Funding Period \deu{(Berichts- und F\"orderzeitraum)}}
\subsection{Report and Funding Period}
\prop@gen@reportperiod
\dfg@area@field
\subsection{Application Areas \deu{(Verwertungsfelder)}}\prop@gen@applareas
\subsection{Application Areas}\prop@gen@applareas
% no longer necessary
% \subsection{Cooperation Partners \deu{(Kooperationspartner)}}
% \subsection{Cooperation Partners}
% \begin{compactitem}
% \@for\@I:=\prop@gen@coops\do{\item \@I}
% \end{compactitem}
\dfgprojpapers\prop@gen@projpapers}
{\signatures{Signatures \deu{(Unterschriften)}}}
{}
%</reporting>
% \end{macrocode}
% \end{environment}

BIN
dfg/dfgproposal.pdf
View File

Binary file not shown.

43
dfg/dfgreporting.cls
View File

@ -26,45 +26,38 @@
\define@key{prop@gen}{coop}{\@dmp{coop=#1}%
\@ifundefined{prop@gen@coops}{\xdef\prop@gen@coops{{#1}}}{\xdef\prop@gen@coops{\prop@gen@coops,{#1}}}}
\define@key{prop@gen}{projpapers}{\def\prop@gen@projpapers{#1}}
\newcommand\dfg@applicants@table%
{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
\dfg@applicants@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
\dfg@applicants@private@lines\hline
\end{tabular}}
\newcommand\dfg@institute@table%
{\begin{tabular}{|l|*{\the@PIs}{l|}}\hline
\dfg@applicants@institute@lines\hline
\end{tabular}}
\newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}}
\newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}}
\renewenvironment{prop@report}
{\selectlanguage{english}
\thispagestyle{empty}%
{\ifsubmit\setcounter{page}{1}\else\thispagestyle{empty}\fi%
\begin{center}
{\LARGE Final Project Report}\\[.2cm]
{\LARGE \prop@gen@instrument}\\[.2cm]
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large Reference number(s): \show@prop@gen@keys}\\[.2cm]
{\large\today}\\[1em]
\edef\the@PIs{\pdataref{all}{PI}{count}}
\edef\prop@gen@PIs{\pdataref{all}{PI}{ids}}
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{1}\tableofcontents\newpage\setcounter{page}{1}
\section{General Information \deu{(Allgemeine Angaben)}}
\subsection{Reference Numbers \deu{(DFG Gesch\"aftszeichen)}}
\setcounter{section}{-1}
\edef\keep@tocdepth{\value{tocdepth}}
\setcounter{tocdepth}{2}\tableofcontents
\setcounter{tocdepth}{\keep@tocdepth}
\newpage\thispagestyle{empty}
\ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
\section{General Information (for the ELAN system only)}\fi
\subsection{Reference Numbers}
\show@prop@gen@keys
\dfg@applicants
\subsection{Institute/Chair \deu{(Institut/Lehrstuhl)}}\dfg@institute@table
\dfg@topic
\subsection{Report and Funding Period \deu{(Berichts- und F\"orderzeitraum)}}
\subsection{Report and Funding Period}
\prop@gen@reportperiod
\dfg@area@field
\subsection{Application Areas \deu{(Verwertungsfelder)}}\prop@gen@applareas
\subsection{Application Areas}\prop@gen@applareas
\dfgprojpapers\prop@gen@projpapers}
{\signatures{Signatures \deu{(Unterschriften)}}}
{}
\endinput
%%
%% End of file `dfgreporting.cls'.

2
examples/dfg/proposal/proposal.tex
View File

@ -30,7 +30,7 @@
mikodept=Computer Science,
mikotitle=Prof. Dr.,
PI=gc,
gcname=Michael Kohlhase,
gcname=Great Communicator,
gcaffiliation=Power Consulting GmbH,
gcdept=Science Affairs,
gctitle=Dr.,

22
examples/dfg/report/finalreport.tex
View File

@ -7,27 +7,23 @@
\addbibresource{../lib/dummy.bib}
\renewcommand{\familydefault}{\sfdefault}
\usepackage[scaled=.90]{helvet}
% 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{../lib/WApersons}
% temporary fix due to http://tex.stackexchange.com/questions/311426/bibliography-error-use-of-blxbblverbaddi-doesnt-match-its-definition-ve
\begin{document}
\providecommand\ifprefchar[2]{}% fix biblatex
\makeatletter\def\blx@maxline{77}\makeatother
\begin{center}\color{red}\huge
This mock proposal is just an example for \texttt{dfgreporting.cls} it reflects the
This mock report 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/proposal,
PI=miko,PI=gc,site=fau,site=pcg,
\begin{report}[
importfrom=../proposal/proposal,
key = KO 2428 99-9,
key = GS 4711 99-9,
thema=Intelligentes Schreiben von Antr\"agen,
reportperiod=1. Feb. 2010 - 31. Jan. 2012,
instrument=Final Project Report,
% 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,
@ -38,7 +34,6 @@
discipline={Elektrotechnik},
areas={Ingenieurwissenschaften},
projpapers={Kohlhase:pdpl10,providemore}]
\include{progressreport}
\include{progresssummary}
\dfgprojpapers[articles,confpapers,wspapers]{Kohlhase:pdpl10,providemore,KohDavGin:psewads11,Lange:OpenMathCDLinkedData10}
@ -49,12 +44,3 @@
%%% 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

2
examples/dfg/report/progressreport.tex
View File

@ -1,4 +1,4 @@
\section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
\section{Final Progress Report}
\begin{todo}{from the report template}
This is what the reviewers read (maximum 10 pages of A4)
\begin{itemize}

2
examples/dfg/report/progresssummary.tex
View File

@ -1,4 +1,4 @@
\section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
\section{Final Progress Report}
\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}