diff --git a/base/pdata.sty b/base/pdata.sty index a080a0d..27ef749 100644 --- a/base/pdata.sty +++ b/base/pdata.sty @@ -96,8 +96,8 @@ \newwrite\pdata@out \newcommand\pdata@open[1]{\immediate\openout\pdata@out=#1.pdata} \newcommand\pdata@close{\closeout\pdata@out} -\newcommand\readpdata[1]{\IfFileExists{#1.pdata} -{\message{proposal: Reading Project Data}\makeatletter\input{#1.pdata}\makeatother} +\newcommand\readpdata[1]{\IfFileExists{./#1.pdata} +{\message{proposal: Reading Project Data}\makeatletter\input{./#1.pdata}\makeatother} {proposal: No Project Data found, (forward) references may be compromized}} \newcommand\pdata@target[3]{\hypertarget{#1@#2@target}{#3}} \newcommand\pdata@def[4]{%\@pdata@def{#1}{#2}{#3}{#4}% diff --git a/base/proposal.dtx b/base/proposal.dtx index e90e7bb..37c22ba 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1830,8 +1830,8 @@ % \begin{macro}{\readpdata} % This macro reads the project data file and its error handling % \begin{macrocode} -\newcommand\readpdata[1]{\IfFileExists{#1.pdata} -{\message{proposal: Reading Project Data}\makeatletter\input{#1.pdata}\makeatother} +\newcommand\readpdata[1]{\IfFileExists{./#1.pdata} +{\message{proposal: Reading Project Data}\makeatletter\input{./#1.pdata}\makeatother} {proposal: No Project Data found, (forward) references may be compromized}} % \end{macrocode} % \end{macro} diff --git a/base/proposal.pdf b/base/proposal.pdf index e369721..59ff181 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 178171e..5efdaca 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -30,6 +30,7 @@ {\LARGE\textbf{\prop@gen@title}}\\[.3cm] \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi {\large\today}\\[1em] +\message{XXXXXX PIs: \the@PIs} \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}}\\ @@ -58,8 +59,10 @@ \@ifundefined{prop@gen@since}{initial proposal}{continuation proposal, the project started \prop@gen@since.} \fi%ifdeutsch -\ifdeutsch\else\subsection{Keywords}\prop@gen@keywords\fi +\ifdeutsch \subsection{Schl\"usselw\"orter}\prop@gen@Dkeywords +\else\subsection{Keywords}\prop@gen@keywords +\fi \ifdeutsch\subsection{Antragszeitraum}\else \subsection{Application period \deu{(Antragszeitraum)}}\fi \prop@gen@months\quad Months starting \prop@gen@start @@ -78,16 +81,8 @@ \section{List of Attachments \deu{(Verzeichnis der Anlagen)}}\fi \begin{itemize} \@for\@I:=\prop@gen@PIs\do{% - \item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else - Curriculum Vitae and list of publications for \fi - \@nameuse{wa@person@\@I @personaltitle} - \@nameuse{wa@person@\@I @name} - (CD + \ifdeutsch Ausdruck\else printed version\fi)} -\ifdeutsch -\item Publications either cited in section~\ref{sec:ourpubs} or occurring in one of the - curricula vitae (CD only)\else -\item Zitierte Publikationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe - (nur CD)\fi + \item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else Curriculum Vitae and list of publications for \fi + \pdataref{PI}\@I{title}\pdataref{PI}\@I{name}} \end{itemize}} \ifgeneral \newenvironment{Zusammenfassung}{\thispagestyle{empty}\subsection{Zusammenfassung}\begin{otherlanguage}{ngerman}} diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index e56dfd0..5a33c4a 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -325,8 +325,10 @@ \@ifundefined{prop@gen@since}{initial proposal}{continuation proposal, the project started \prop@gen@since.} \fi%ifdeutsch -\ifdeutsch\else\subsection{Keywords}\prop@gen@keywords\fi +\ifdeutsch \subsection{Schl\"usselw\"orter}\prop@gen@Dkeywords +\else\subsection{Keywords}\prop@gen@keywords +\fi \ifdeutsch\subsection{Antragszeitraum}\else \subsection{Application period \deu{(Antragszeitraum)}}\fi \prop@gen@months\quad Months starting \prop@gen@start @@ -354,16 +356,8 @@ \section{List of Attachments \deu{(Verzeichnis der Anlagen)}}\fi \begin{itemize} \@for\@I:=\prop@gen@PIs\do{% - \item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else - Curriculum Vitae and list of publications for \fi - \@nameuse{wa@person@\@I @personaltitle} - \@nameuse{wa@person@\@I @name} - (CD + \ifdeutsch Ausdruck\else printed version\fi)} -\ifdeutsch -\item Publications either cited in section~\ref{sec:ourpubs} or occurring in one of the - curricula vitae (CD only)\else -\item Zitierte Publikationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe - (nur CD)\fi + \item\ifdeutsch Lebenslauf und Publikatinsverzeichnis\else Curriculum Vitae and list of publications for \fi + \pdataref{PI}\@I{title}\pdataref{PI}\@I{name}} \end{itemize}} % % \end{macrocode} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 175b89c..967d115 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index 4e9313b..3c0cb7b 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/examples/dfg/proposal/public.pdf b/examples/dfg/proposal/public.pdf index 3d49aea..2f63821 100644 Binary files a/examples/dfg/proposal/public.pdf and b/examples/dfg/proposal/public.pdf differ diff --git a/examples/dfg/proposal/submit.pdf b/examples/dfg/proposal/submit.pdf index 4a8522b..65bbd38 100644 Binary files a/examples/dfg/proposal/submit.pdf and b/examples/dfg/proposal/submit.pdf differ diff --git a/examples/dfg/simple-proposal/preconditions.tex b/examples/dfg/simple-proposal/preconditions.tex index 9165316..79445cb 100644 --- a/examples/dfg/simple-proposal/preconditions.tex +++ b/examples/dfg/simple-proposal/preconditions.tex @@ -36,7 +36,6 @@ 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}{fau} The KWARC (Knowledge Adaptation and Reasoning for Content) research group headed by Michael Kohlhase for has the following members \begin{compactdesc} @@ -44,7 +43,6 @@ Michael Kohlhase for has the following members \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)}} @@ -71,8 +69,7 @@ actively take part in the project work and various aspects of research. 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. +This information will assist the DFG’s Head Office in avoiding potential conflicts of interest during the review process. \end{todo} diff --git a/examples/dfg/simple-proposal/proposal.pdf b/examples/dfg/simple-proposal/proposal.pdf index 58d19a9..268eaa8 100644 Binary files a/examples/dfg/simple-proposal/proposal.pdf and b/examples/dfg/simple-proposal/proposal.pdf differ diff --git a/examples/dfg/simple-proposal/proposal.tex b/examples/dfg/simple-proposal/proposal.tex index c649aaf..813a151 100644 --- a/examples/dfg/simple-proposal/proposal.tex +++ b/examples/dfg/simple-proposal/proposal.tex @@ -64,7 +64,8 @@ % technical or confidential. \ifpublic\else \input{../proposal/funds} -\input{../proposal/preconditions} +\input{preconditions} + \section{Additional information \deu{(Ergänzende Erklärungen)}} Funding proposal XYZ-83282 has been submitted prior to this proposal on related topic XYZ. diff --git a/examples/dfg/simple-proposal/public.pdf b/examples/dfg/simple-proposal/public.pdf index 2c9e43a..69a45cd 100644 Binary files a/examples/dfg/simple-proposal/public.pdf and b/examples/dfg/simple-proposal/public.pdf differ diff --git a/examples/dfg/simple-proposal/submit.pdf b/examples/dfg/simple-proposal/submit.pdf deleted file mode 100644 index 9fee253..0000000 Binary files a/examples/dfg/simple-proposal/submit.pdf and /dev/null differ diff --git a/examples/dfg/simple-proposal/submit.tex b/examples/dfg/simple-proposal/submit.tex index 5d92f93..3f1c606 100644 --- a/examples/dfg/simple-proposal/submit.tex +++ b/examples/dfg/simple-proposal/submit.tex @@ -1,4 +1,4 @@ -\newcommand{\classoptions}{submit} +\newcommand{\classoptions}{,submit} \input{proposal} %%% Local Variables: diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf index a643acc..c75d9bf 100644 Binary files a/examples/eu/strep/propB.pdf and b/examples/eu/strep/propB.pdf differ diff --git a/examples/eu/strep/submit.pdf b/examples/eu/strep/submit.pdf index 106594c..3dde0c9 100644 Binary files a/examples/eu/strep/submit.pdf and b/examples/eu/strep/submit.pdf differ