No workaddress (#50)

The proposal class used to depend on the sTeX workaddress style, this caused problems, which I have now resolved.
This commit is contained in:
Michael Kohlhase 2020-08-24 10:51:49 +02:00 committed by GitHub
parent d9b6452992
commit d58847ae8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 324 additions and 986 deletions

View File

@ -8,12 +8,20 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data]
\RequirePackage{workaddress}[2016/07/06]
\RequirePackage{eurosym}
\newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
\newcounter{@site}%
\define@key{prop@gen}{site}{\@sitestrue\@dmp{site=#1}%
\stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}%
\define@key{prop@gen}{#1name}{\pdata@def{site}{#1}{name}{##1}}
\define@key{prop@gen}{#1acronym}{\pdata@def{site}{#1}{acronym}{##1}}
\define@key{prop@gen}{#1country}{\pdata@def{site}{#1}{country}{##1}}
\define@key{prop@gen}{#1countryshort}{\pdata@def{site}{#1}{countryshort}{##1}}
\define@key{prop@gen}{#1streetaddress}{\pdata@def{site}{#1}{streetaddress}{##1}}
\define@key{prop@gen}{#1townzip}{\pdata@def{site}{#1}{townzip}{##1}}
\define@key{prop@gen}{#1url}{\pdata@def{site}{#1}{url}{##1}}
\define@key{prop@gen}{#1logo}{\pdata@def{site}{#1}{logo}{##1}}
\define@key{prop@gen}{#1type}{\pdata@def{site}{#1}{type}{##1}}
\@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}%
\define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}%
\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
@ -21,10 +29,11 @@
\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
\define@key{task}{#1RM}{\pdata@def{\wp@id @\task@id}{#1}{RM}{##1}}%
\if@RAM\define@key{task}{#1RAM}{\pdata@def{\wp@id @\task@id}{#1}{RAM}{##1}}\fi
\define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax%
\define@key{prop@gen}{#1shortname}{\pdata@def{site}{#1}{shortname}{##1}}
\define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let%
\@ifundefined{prop@gen@employed@lines}%
{\xdef\prop@gen@employed@lines{\wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
{\xdef\prop@gen@employed@lines{\prop@gen@employed@lines \wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}}}}
{\xdef\prop@gen@employed@lines{\pdataref{site}{#1}{shortname} & ##1\tabularnewline\hline}}%
{\xdef\prop@gen@employed@lines{\prop@gen@employed@lines\ \pdataref{site}{#1}{shortname} & ##1\tabularnewline\hline}}}}}
\define@key{prop@gen}{RM}{\@dmp{RM=#1}\if@sites%
\PackageWarning{Do not use the RM key in the presence of sites}\else%
\pdata@def{all}{intended}{RM}{#1}\fi}
@ -32,6 +41,10 @@
\PackageWarning{Do not use the RAM key in the presence of sites}\else%
\pdata@def{all}{intended}{RAM}{#1}\fi}
\define@key{prop@gen}{PI}{\@dmp{PI=#1}%
\define@key{prop@gen}{#1name}{\pdata@def{PI}{#1}{name}{##1}}%
\define@key{prop@gen}{#1title}{\pdata@def{PI}{#1}{title}{##1}}%
\define@key{prop@gen}{#1affiliation}{\pdata@def{PI}{#1}{affiliation}{##1}}%
\define@key{prop@gen}{#1dept}{\pdata@def{PI}{#1}{dept}{##1}}%
\@ifundefined{prop@gen@PIs}{\xdef\prop@gen@PIs{#1}}{\xdef\prop@gen@PIs{\prop@gen@PIs,#1}}}
\define@key{prop@gen}{pubspage}{\@ifundefined{prop@gen@pubspages}%
{\xdef\prop@gen@pubspages{#1}}{\xdef\prop@gen@pubspages{\prop@gen@pubspages,#1}}}
@ -83,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}%
@ -123,7 +136,7 @@
\newcommand{\signatures}[1]{\section{#1}
\qquad\number\day. \number\month. \number\year\\[6ex]
\strut\qquad Date\hfill\@for\@p:=\prop@gen@PIs\do{%
\wa@ref3{person}\@p{personaltitle}~\wa@ref3{person}\@p{name}\hfill}}
\pdataref{PI}\@p{title}~\pdataref{PI}\@p{name}\hfill}}
\def\@dmp#1{\ifkeys\marginpar{\small #1}\fi}
\renewcommand\euro{\officialeuro\xspace}

View File

@ -213,14 +213,12 @@
% \item \DescribeMacro{discipline}|discipline| for the academic discipline and |areas| for
% the research areas in that discipline.
% \item \DescribeMacro{PI}|PI| to declare the principal investigator. For collaborative
% proposals we can use the |PI| key multiple times. The |proposal| package uses the
% |workaddress| package for representation of personal metadata,
% see~\cite{Kohlhase:workaddress:ctan} or the file |proposal.tex| for details.
% proposals we can use the |PI| key multiple times. \ednote{document the generated keys}
% \item Many collaborative proposals are shared between two institutions, which we can
% declare with the \DescribeMacro{site}|site| key. As this changes the interface this
% should not be used for single-institution proposals. We will describe the setup for a
% single-site proposal below and point out the differences. The example |proposal.tex|
% is a two-site proposal.
% is a two-site proposal. \ednote{document the generated keys}
% \item Sometimes it makes sense to document the proposal number in the metadata, e.g. to
% use the generated metadata file \meta{main}|.pdata| for project reports. The
% |proposalnumber| can be used for that.
@ -753,11 +751,9 @@
% \subsection{Proposal Metadata}\label{sec:impl:metadata}
%
% Most of the metadata functionality is encapsulated into the \DescribeMacro{pdata}|pdata|
% package, which is shared by the proposal and report classes. |pdata.sty| first loads the
% |workaddress| package from sTeX and supplies the Euro symbol.
% package, which is shared by the proposal and report classes. |pdata.sty| first supplies the Euro symbol.
% \begin{macrocode}
%<*pdata>
\RequirePackage{workaddress}[2016/07/06]
\RequirePackage{eurosym}
% \end{macrocode}
% We define the keys for metadata declarations in the |proposal| environment, they park
@ -771,6 +767,15 @@
\newcounter{@site}%
\define@key{prop@gen}{site}{\@sitestrue\@dmp{site=#1}%
\stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}%
\define@key{prop@gen}{#1name}{\pdata@def{site}{#1}{name}{##1}}
\define@key{prop@gen}{#1acronym}{\pdata@def{site}{#1}{acronym}{##1}}
\define@key{prop@gen}{#1country}{\pdata@def{site}{#1}{country}{##1}}
\define@key{prop@gen}{#1countryshort}{\pdata@def{site}{#1}{countryshort}{##1}}
\define@key{prop@gen}{#1streetaddress}{\pdata@def{site}{#1}{streetaddress}{##1}}
\define@key{prop@gen}{#1townzip}{\pdata@def{site}{#1}{townzip}{##1}}
\define@key{prop@gen}{#1url}{\pdata@def{site}{#1}{url}{##1}}
\define@key{prop@gen}{#1logo}{\pdata@def{site}{#1}{logo}{##1}}
\define@key{prop@gen}{#1type}{\pdata@def{site}{#1}{type}{##1}}
\@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}%
\define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}%
\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
@ -778,10 +783,11 @@
\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
\define@key{task}{#1RM}{\pdata@def{\wp@id @\task@id}{#1}{RM}{##1}}%
\if@RAM\define@key{task}{#1RAM}{\pdata@def{\wp@id @\task@id}{#1}{RAM}{##1}}\fi
\define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax%
\define@key{prop@gen}{#1shortname}{\pdata@def{site}{#1}{shortname}{##1}}
\define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let%
\@ifundefined{prop@gen@employed@lines}%
{\xdef\prop@gen@employed@lines{\wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
{\xdef\prop@gen@employed@lines{\prop@gen@employed@lines \wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}}}}
{\xdef\prop@gen@employed@lines{\pdataref{site}{#1}{shortname} & ##1\tabularnewline\hline}}%
{\xdef\prop@gen@employed@lines{\prop@gen@employed@lines\ \pdataref{site}{#1}{shortname} & ##1\tabularnewline\hline}}}}}
% \end{macrocode}
% If there are no sites, then we have to define keys |RM| and |RAM| that store the
% intended research (assistant months). Unfortunately, we cannot just include this in the
@ -797,6 +803,10 @@
% similarly, the |PI| keys are registered in |\prop@gen@PIs|.
% \begin{macrocode}
\define@key{prop@gen}{PI}{\@dmp{PI=#1}%
\define@key{prop@gen}{#1name}{\pdata@def{PI}{#1}{name}{##1}}%
\define@key{prop@gen}{#1title}{\pdata@def{PI}{#1}{title}{##1}}%
\define@key{prop@gen}{#1affiliation}{\pdata@def{PI}{#1}{affiliation}{##1}}%
\define@key{prop@gen}{#1dept}{\pdata@def{PI}{#1}{dept}{##1}}%
\@ifundefined{prop@gen@PIs}{\xdef\prop@gen@PIs{#1}}{\xdef\prop@gen@PIs{\prop@gen@PIs,#1}}}
% \end{macrocode}
% and the |pubspage| keys in |\prop@gen@pubspages|.
@ -853,7 +863,7 @@
% \end{macrocode}
%
% \begin{macro}{\prop@tl}
% An auxiliary macro that is handy for making tables of WorkAddress data.
% An auxiliary macro that is handy for making tables of metadata.
% \begin{macrocode}
\newcommand\prop@tl[2]{\xdef\tab@line{}
\@for\tl@ext:={#1}\do{\xdef\tab@line{\tab@line&#2}}
@ -892,8 +902,9 @@
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\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{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
@ -904,7 +915,7 @@
\begin{itemize}
\@for\@I:=\prop@gen@PIs\do{%
\item Curriculum Vitae and list of publications for
\wa@ref3{person}\@I{personaltitle} \wa@ref3{person}\@I{name}}
\pdataref{PI\@I}{title} \pdataref{PI}\@I{name}}
\end{itemize}\newpage
\printbibliography[heading=warnpubs]}
% \end{macrocode}
@ -977,8 +988,9 @@
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\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{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
@ -990,8 +1002,8 @@
% \begin{macro}{\site*}
% \begin{macrocode}
%<*sty>
\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{acronym}}}}
\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{name}}}}
\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\pdataref{site}{#1}{acronym}}}}
\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\pdataref{site}{#1}{name}}}}
% \end{macrocode}
% \end{macro}
%
@ -1818,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}
@ -2684,7 +2696,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
\newcommand{\signatures}[1]{\section{#1}
\qquad\number\day. \number\month. \number\year\\[6ex]
\strut\qquad Date\hfill\@for\@p:=\prop@gen@PIs\do{%
\wa@ref3{person}\@p{personaltitle}~\wa@ref3{person}\@p{name}\hfill}}
\pdataref{PI}\@p{title}~\pdataref{PI}\@p{name}\hfill}}
% \end{macrocode}
% \end{macro}
%
@ -2721,8 +2733,8 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
% 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: atabline workfax Privatanschrift privaddress privtel ifgitinfo
% LocalWords: 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

Binary file not shown.

View File

@ -81,8 +81,9 @@
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\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{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
@ -90,7 +91,7 @@
\begin{itemize}
\@for\@I:=\prop@gen@PIs\do{%
\item Curriculum Vitae and list of publications for
\wa@ref3{person}\@I{personaltitle} \wa@ref3{person}\@I{name}}
\pdataref{PI\@I}{title} \pdataref{PI}\@I{name}}
\end{itemize}\newpage
\printbibliography[heading=warnpubs]}
\newenvironment{proposal}[1][]{\readpdata\jobname
@ -113,8 +114,8 @@
{\end{prop@proposal}
\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse%
\pdata@close}
\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{acronym}}}}
\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{name}}}}
\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\pdataref{site}{#1}{acronym}}}}
\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\pdataref{site}{#1}{name}}}}
\newcommand\objective@label[1]{O#1}
\define@key{obj}{id}{\def\obj@id{#1}\@dmp{id=#1}}
\define@key{obj}{title}{\def\obj@title{#1}}

View File

@ -58,8 +58,9 @@
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\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{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}

View File

@ -13,27 +13,11 @@
\ProcessOptions
\define@key{prop@gen}{thema}{\def\prop@gen@thema{#1}\pdata@def{prop}{gen}{thema}{#1}}
\def\prop@gen@Dkeywords{kommt noch}
\def\prop@gen@keywords{to be added}
\define@key{prop@gen}{Dkeywords}{\def\prop@gen@Dkeywords{#1}}
\renewcommand\prop@gen@instrument{Neuantrag auf Sachbeihilfe}
\newcommand\prop@gen@thema{??? Thema ???}
\newcommand\deu[1]{#1}
\newcommand\dfg@applicants@lines{%
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{personaltitle} \wa@ref3{person}\tl@ext{name}}\\
\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{\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}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{email}}\\}
\newcommand\dfg@applicants@private@lines{%
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{privaddress}}\\
\prop@tl\prop@gen@PIs{Tel: \wa@ref3{person}\tl@ext{privtel}}\\}
\newcommand\dfg@applicants{%
\subsection{\if@sites\ifnum\the@sites>1 Joint Proposal; \fi\fi%
Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\dfg@applicants@table}
\newcommand\dfg@topic{\subsection{\ifdeutsch Thema\else Topic \deu{(Thema)}\fi}\prop@gen@thema}
\newcommand\dfg@area@field{%
\ifdeutsch\subsection{Fachgebiet und Arbeitsrichtung}\else

View File

@ -19,24 +19,10 @@
\ifdeutsch\RequirePackage[ngerman]{babel}
\else\RequirePackage[ngerman,english]{babel}\fi
\newenvironment{sitedescription}[2][]%
{\def\@test{#1}\def\@@title{\ifx\@test\@empty\wa@ref3{institution}{#2}{acronym}\else #1\fi:
\textsc{\wa@ref3{institution}{#2}{name}}}
{\def\@test{#1}\def\@@title{\ifx\@test\@empty\pdataref{site}{#2}{acronym}\else #1\fi:
\textsc{\pdataref{site}{#2}{name}}}
\@for\@I:=#2\do{\pdata@target{site}\@I{}}\subsubsection\@@title}
{}
\newlength\applicants@table@columnwidth
\newcommand\dfg@applicants@table%
{\setlength\applicants@table@columnwidth\textwidth
\advance\applicants@table@columnwidth by -6em
\divide\applicants@table@columnwidth by \the@PIs
\ifnum\the@PIs>2\begin{tabular}{|l|*{\the@PIs}{p{\applicants@table@columnwidth}|}}
\else\begin{tabular}{|l|*{\the@PIs}{l|}}\fi
\hline
\dfg@applicants@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Work Address\deu{ (Dienstanschrift)}:}}\\\hline
\dfg@applicants@institute@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
\dfg@applicants@private@lines\hline
\end{tabular}}
\renewenvironment{prop@proposal}
{\ifsubmit\setcounter{page}{1}\else\thispagestyle{empty}\fi
\begin{center}
@ -44,7 +30,12 @@
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\WAauthorblock[aff]\prop@gen@PIs\\[2cm]
\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}}\\
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\ifgeneral
\ifsubmit\else
@ -55,7 +46,6 @@
\newpage\thispagestyle{empty}
\ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
\section{General Information (for the ELAN system only)}\fi
\dfg@applicants
\dfg@topic
\dfg@area@field
\ifdeutsch\subsection{Voraussichtliche Gesamtdauer}\else
@ -69,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
@ -89,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}}

View File

@ -231,6 +231,7 @@
%<*pdata>
\define@key{prop@gen}{thema}{\def\prop@gen@thema{#1}\pdata@def{prop}{gen}{thema}{#1}}
\def\prop@gen@Dkeywords{kommt noch}
\def\prop@gen@keywords{to be added}
\define@key{prop@gen}{Dkeywords}{\def\prop@gen@Dkeywords{#1}}
%</pdata>
% \end{macrocode}
@ -257,41 +258,7 @@
\newcommand\deu[1]{#1}
% \end{macrocode}
%
% Now, we can build the title page and general information, we first start with the
% applicants table. The following macros build up the lines to be used in the table
% eventually.
% \begin{macro}{\dfg@applicants@*}
% the macros use the |\prop@tl| macro from the base |proposal| package which iterates
% over the first argument (the PIs here) building up lines with the material from the
% second argument (where |\tl@ext| is the current PI).
% \begin{macrocode}
\newcommand\dfg@applicants@lines{%
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{personaltitle} \wa@ref3{person}\tl@ext{name}}\\
\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{\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}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{email}}\\}
\newcommand\dfg@applicants@private@lines{%
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{privaddress}}\\
\prop@tl\prop@gen@PIs{Tel: \wa@ref3{person}\tl@ext{privtel}}\\}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\dfg@applicants}
% We automatically make it plurals if there is more than one PI and we indicate a joint
% proposal if there is more than one site.
% \begin{macrocode}
\newcommand\dfg@applicants{%
\subsection{\if@sites\ifnum\the@sites>1 Joint Proposal; \fi\fi%
Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\dfg@applicants@table}
% \end{macrocode}
% \end{macro}
%
% 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}
% \end{macrocode}
@ -310,38 +277,14 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
% \begin{macrocode}
%<*cls>
\newenvironment{sitedescription}[2][]%
{\def\@test{#1}\def\@@title{\ifx\@test\@empty\wa@ref3{institution}{#2}{acronym}\else #1\fi:
\textsc{\wa@ref3{institution}{#2}{name}}}
{\def\@test{#1}\def\@@title{\ifx\@test\@empty\pdataref{site}{#2}{acronym}\else #1\fi:
\textsc{\pdataref{site}{#2}{name}}}
\@for\@I:=#2\do{\pdata@target{site}\@I{}}\subsubsection\@@title}
{}
% \end{macrocode}
% \end{environment}
%
% \subsection{Proposal Title Page}\label{sec:impl:proptitlepage}
%
% \begin{macro}{\dfg@applicants@table}
% Now, we can build the title page and general information, we first start with the
% applicants table: We first compute the width of the columns for the case where we have
% more than two PIs. Then we add the lines we compute with the auxiliary macros
% |\dfg@applicants@lines|, |\dfg@applicants@institute@lines| and
% |\dfg@applicants@private@lines|
% \begin{macrocode}
\newlength\applicants@table@columnwidth
\newcommand\dfg@applicants@table%
{\setlength\applicants@table@columnwidth\textwidth
\advance\applicants@table@columnwidth by -6em
\divide\applicants@table@columnwidth by \the@PIs
\ifnum\the@PIs>2\begin{tabular}{|l|*{\the@PIs}{p{\applicants@table@columnwidth}|}}
\else\begin{tabular}{|l|*{\the@PIs}{l|}}\fi
\hline
\dfg@applicants@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Work Address\deu{ (Dienstanschrift)}:}}\\\hline
\dfg@applicants@institute@lines\hline
&\multicolumn{\the@PIs}{|l|}{\textbf{Private Address\deu{ (Privatanschrift)}:}}\\\hline
\dfg@applicants@private@lines\hline
\end{tabular}}
% \end{macrocode}
% \end{macro}
%
% \begin{environment}{prop@proposal}
% This internal environment is called in the |proposal| environment from the |proposal|
@ -354,7 +297,11 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
{\LARGE\textbf{\prop@gen@title}}\\[.3cm]
\ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
{\large\today}\\[1em]
\WAauthorblock[aff]\prop@gen@PIs\\[2cm]
\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{PI}\tl@ext{dept}}\\
\end{tabular}\\[2cm]
\end{center}
\ifgeneral
\ifsubmit\else
@ -365,7 +312,6 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\newpage\thispagestyle{empty}
\ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
\section{General Information (for the ELAN system only)}\fi
\dfg@applicants
\dfg@topic
\dfg@area@field
\ifdeutsch\subsection{Voraussichtliche Gesamtdauer}\else
@ -379,8 +325,10 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\@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
@ -408,16 +356,8 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\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}}
%</cls>
% \end{macrocode}
@ -466,8 +406,8 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
{\large Reference number(s): \show@prop@gen@keys}\\[.2cm]
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{1}\tableofcontents\newpage\setcounter{page}{1}
@ -585,7 +525,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
% 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: 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
@ -626,7 +566,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
% LocalWords: whilenum hfill marginpar texteuro officialeuro texttt newpage cb grau wprm
% 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: Gesch aftszeichen projpapers sitedescription ednote generalfalse
% LocalWords: textsc newlength setlength textwidth WAauthorblock assoc tmpop markiert
% LocalWords: tmpop tmpop deutschfalse Sachbeihilfe Arbeitsgebiet Fortsetungsantrag
% LocalWords: Publikationen Publikatinsverzeichnis Wissenschaftler Verwertungsfelder

Binary file not shown.

View File

@ -45,8 +45,8 @@
{\large Reference number(s): \show@prop@gen@keys}\\[.2cm]
{\large\today}\\[1em]
\begin{tabular}{c*{\the@PIs}{c}}
\prop@tl\prop@gen@PIs{\wa@ref3{person}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\wa@ref3{institution}{\wa@ref3{person}\tl@ext{affiliation}}{name}}
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}
\end{tabular}\\[2cm]
\end{center}
\setcounter{tocdepth}{1}\tableofcontents\newpage\setcounter{page}{1}

View File

@ -1,63 +0,0 @@
%%
%% This is file `metakeys.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% metakeys.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{metakeys}[2011/07/03 v0.9 Framework for Metadata Keys]
\newif\ifmetakeys@showmeta\metakeys@showmetafalse
\DeclareOption{showmeta}{\metakeys@showmetatrue}
\ProcessOptions
\RequirePackage{keyval}[1997/11/10]
\newcommand\addmetakey{\@ifstar\addmetakey@star\addmetakey@nostar}
\newcommand\addmetakey@star[3][]%
{\@ifnextchar[{\addmetakey@star@aux[#1]{#2}{#3}}{\addmetakey@star@aux[#1]{#2}{#3}[]}}
\def\addmetakey@star@aux[#1]#2#3[#4]{\metakeys@ext@clear@keys{#2}{#3}{#1}%
\metakeys@initialize@showkeys{#2}%
\define@key{#2}{#3}[#4]{\expandafter\gdef\csname #2@#3\endcsname{##1}}}
\newcommand\addmetakey@nostar[3][]%
{\metakeys@ext@showkeys{#2}{#3}\addmetakey@star[#1]{#2}{#3}}
\newcommand\metasetkeys[2]{\@nameuse{clear@#1@keys}\setkeys{#1}{#2}%
\ifmetakeys@showmeta%
\edef\@@keys{\@nameuse{#1@showkeys}}%
\metakeys@show@keys{#1}{\@for\@I:=\@@keys\do{\metakeys@show@keyval{#1}{\@I}}}%
\fi}
\newcommand\metakeys@ext@clear@keys[3]{\@metakeys@ext@clear@keys{#1}{#1@#2}{#3}}
\newcommand\@metakeys@ext@clear@keys[3]{\@ifundefined{clear@#1@keys}%
{\expandafter\gdef\csname clear@#1@keys\endcsname%
{\expandafter\gdef\csname #2\endcsname{#3}}}%
{\expandafter\g@addto@macro\csname clear@#1@keys\endcsname%
{\expandafter\gdef\csname #2\endcsname{#3}}}}
\newcommand\addmetalistkey{\@ifstar\addmetalistkey@star\addmetalistkey@nostar}
\newcommand\addmetalistkey@star[3][]{\metakeys@ext@clear@keys{#2}{#3}{#1}%
\metakeys@initialize@showkeys{#2}%
\expandafter\gdef\csname #2@#3s\endcsname{}
\define@key{#2}{#3}[#1]{%
\expandafter\ifx\csname #2@#3s\endcsname\@empty\expandafter\gdef\csname #2@#3s\endcsname{##1}%
\else\expandafter\xdef\csname #2@#3s\endcsname{\csname #2@#3s\endcsname,##1}%
\fi}}
\newcommand\addmetalistkey@nostar[3][]%
{\metakeys@ext@showkeys{#2}{#3}\addmetalistkey@star[#1]{#2}{#3}}
\newcommand\metakeys@initialize@showkeys[1]%
{\@ifundefined{#1@showkeys}{\expandafter\def\csname #1@showkeys\endcsname{}}{}}%
\newcommand\metakeys@ext@showkeys[2]{\@ifundefined{#1@showkeys}%
{\expandafter\def\csname #1@showkeys\endcsname{#2}}%
{\expandafter\edef\csname #1@showkeys\endcsname{\csname #1@showkeys\endcsname,#2}}}
\newcommand\@metakeys@show@key[2]{\metakeys@show@key{#2}{#1}}
\newcommand\metakeys@show@key[2]{\edef\@test{#2}\ifx\@test\@empty\else #1:#2\quad\fi}
\newcommand\metakeys@show@keys[2]{\marginpar{{\scriptsize #2}}}
\newcommand\metakeys@show@keyval[2]%
{\expandafter\@metakeys@show@key\csname #1@#2\endcsname{#2}}
\newcommand\showmetakeys{\metakeys@showmetatrue}
\newcommand\hidemetakeys{\metakeys@showmetafalse}
\newcommand\addmetakeynew[3][]{\metakeys@ext@clear@keys{#2}{#3}{#1}%
\define@key{#2}{#3}{\expandafter\gdef\csname #2@#3\endcsname{##1}}}
\newcommand\metakeys@unspecified{an metakeys-defined key left unspecified}
\newcommand\metakeysifus[4]{\message{testing #1@#2=\csname#1@#2\endcsname}%
\expandafter\ifx\csname #1@#2\endcsname\metakeys@unspecified{#3}\else{#4}\fi}
\endinput
%%
%% End of file `metakeys.sty'.

View File

@ -1,244 +0,0 @@
%%
%% This is file `sref.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% sref.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{sref}[2016/04/07 v1.2 Semantic Cross-References]
\newif\ifextrefs\extrefsfalse
\DeclareOption{extrefs}{\extrefstrue}
\ProcessOptions
\RequirePackage{metakeys}
\RequirePackage{xspace}
\RequirePackage{etoolbox}
\addmetakey{sref}{linktext}
\addmetakey{sref}{fallback}
\addmetakey{sref}{pre}
\addmetakey{sref}{post}
\newcommand\sref[2][]{%
\metasetkeys{sref}{#1}%
\ifcsundef{sref@part}{%
\sref@hlink[\sref@linktext]{#2}{\sref@fallback}{\sref@pre}{\sref@post}%
}{%
\sref@hlink[\sref@linktext]{\sref@part @#2}{\sref@fallback}{\sref@pre}{\sref@post}%
}%
\xspace%
}%
\newcommand\srefs[3][]{%
\def\@test{#1}%
\ifx\@test\@empty%
\sref{#2} and \sref{#3}%
\else%
#1%
\fi%
}%
\newcommand\srefl[3][]{%
\def\@test{#1}%
\ifx\@test\@empty%
\sref{#2} to \sref{#3}%
\else%
#1%
\fi%
}%
\newcommand\spageref[1]{%
\ifcsundef{sref@part}{%
\sref@pageref{#1}%
}{%
\sref@pageref{\sref@part @#1}%
}%
}%
\newif\ifhref\hreffalse%
\AtBeginDocument{%
\@ifpackageloaded{hyperref}{%
\hreftrue%
}{%
\hreffalse%
}%
}%
\newcommand\sref@href@ifh[2]{%
\ifhref%
\href{#1}{#2}%
\else%
#2%
\fi%
}%
\newcommand\sref@hlink@ifh[2]{%
\ifhref%
\hyperlink{#1}{#2}%
\else%
#2%
\fi%
}%
\newcommand\sref@target@ifh[2]{%
\ifhref%
\hypertarget{#1}{#2}%
\else%
#2%
\fi%
}%
\def\sref@target{%
\ifx\sref@id\@empty%
\relax%
\else%
\edef\@target{sref@\ifcsundef{sref@part}{}{\sref@part @}\sref@id @target}%
\sref@target@ifh\@target{}%
\fi%
}%
\newcommand\@sref@def[3]{\csgdef{sref@#1@#2}{#3}}
\ifextrefs%
\newwrite\refs@file%
\else%
\def\refs@file{\@auxout}%
\fi%
\newcommand\sref@def[3]{%
%\@sref@def{#1}{#2}{#3}%
\protected@write\refs@file{}{\string\@sref@def{#1}{#2}{#3}}%
}%
\addmetakey{srefaddidkey}{prefix}
\newcommand\srefaddidkey[2][]{%
\metasetkeys{srefaddidkey}{#1}%
\@metakeys@ext@clear@keys{#2}{sref@id}{}% id cannot have a default
\metakeys@ext@clear@keys{#2}{id}{}%
\metakeys@ext@showkeys{#2}{id}%
\define@key{#2}{id}{%
\edef\sref@id{\srefaddidkey@prefix ##1}%
%\expandafter\edef\csname #2@id\endcsname{\srefaddidkey@prefix ##1}%
\csedef{#2@id}{\srefaddidkey@prefix ##1}%
}%
}%
\newcommand\makeextrefs[1]{%
\gdef\sref@part{#1}%
\makeatletter%
\IfFileExists{\jobname.refs}{\input{\jobname.refs}}{}%
\immediate\openout\refs@file=\jobname.refs
\makeatother%
}%
\newcommand\sref@label[2]{%
\sref@def{\ifcsundef{sref@part}{}{\sref@part @}#2}{page}{\thepage}%
\sref@def{\ifcsundef{sref@part}{}{\sref@part @}#2}{label}{#1}%
}%
\newcommand\sreflabel[2]{\sref@label{#1 \@currentlabel}{#2}}
\newcommand\sref@label@id[1]{%
\ifx\sref@id\@empty%
\relax%
\else%
\sref@label{#1}{\sref@id}%
\fi%
}%
\newcommand\sref@label@id@arg[2]{%
\def\@@id{#2}
\ifx\@@id\@empty%
\relax%
\else%
\sref@label{#1}{\@@id}%
\fi%
}%
\newcommand\sref@hlink[5][]{%
\edef\@linktext{#1}%
\edef\@fallback{#3}%
\ifcsundef{sref@#2@label}{%
\ifx\@fallback\@empty% warn about undefined links and show a substitute
\protect\G@refundefinedtrue\@latex@warning{reference #2 undefined}%
\ifx\@linktext\@empty%
?#2?%
\else%
\@linktext%
\fi%
\else%
\protect\G@refundefinedtrue\@latex@warning{using fallback for undefined reference #2}%
\@fallback%
\fi
}{%
\edef\@link{#4\@nameuse{sref@#2@label}#5}% retrieve the reference label and prepost it
\ifx\@linktext\@empty%
\sref@hlink@ifh{sref@#2@target}{\@link}%
\else%
\sref@hlink@ifh{sref@#2@target}{\@linktext}%
\fi%
}%
}%
\newcommand\sref@page@label[1]{p.~{#1}}
\newcommand\sref@pageref[1]{%
\ifcsundef{sref@#1@page}{%
\protect\G@refundefinedtrue\@latex@warning{reference #1 undefined}\sref@page@label{??}%
}{%
\sref@hlink@ifh{sref@#1@target}{\sref@page@label{\@nameuse{sref@#1@page}}}%
}%
}%
\newcommand\sref@href[3][]{%
\edef\@linktext{#1}%
\ifcsundef{sref@#2@label}{%
\protect\G@refundefinedtrue\@latex@warning{reference #2 undefined}??%
}{%
\ifcsundef{sref@#3@URI}{%
\protect\G@refundefinedtrue\@latex@warning{external refs of type #3 undefined}??%
}{%
\edef\@uri{\@nameuse{sref@#3@URI}.pdf\#sref@#2@target}%
\edef\@label{\ifx\@linktext\@empty\@nameuse{sref@#2@label}\else\@linktext\fi}%
\sref@href@ifh\@uri\@label%
}%
}%
}%
\ifextrefs%
\newcommand\extref[3][]{%
\def\theextref{\sref@href[#1]{#2@#3}{#2}}%
\csname doextref@#2\endcsname%
}%
\else%
\newcommand\extref[3][]{\sref[#1]{#3}}%
\fi%
\ifextrefs%
\newcommand\extpageref[3][]{%
\def\theextref{\sref@pageref{#2@#3}}%
\csname doextpageref@#2\endcsname%
}%
\else%
\newcommand\extpageref[3][]{\spageref{#3}}%
\fi%
\newcommand\extrefstyle[2]{\csgdef{doextref@#1}{#2}}%
\newcommand\extpagerefstyle[2]{\csgdef{doextpageref@#1}{#2}}%
\newcommand\inputrefs[2]{%
%\@namedef{sref@#1@URI}{#2}%
\csdef{sref@#1@URI}{#2}%
\extrefstyle{#1}{\theextref}\extpagerefstyle{#1}{\theextref}%
\makeatletter%
\IfFileExists{#2.refs}{%
\message{Reading external references: #2.refs}\input{#2.refs}%
}{%
\PackageError{sref}{Reference file #2.refs does not exist}%
{Maybe you have to run LaTeX on #2.tex first}}%
\makeatother%
}%
\srefaddidkey{sequation}%
\def\sref@sequation@heading{equation}%
\newenvironment{sequation}[1][]{%
\metasetkeys{sequation}{#1}%
\ifx\sref@id\@empty%
\begin{displaymath}%
\else% no id, using equation*
\begin{equation}%
\sref@target\sref@label@id{\sref@sequation@heading~(\theequation)}%
\fi%
}{%
\ifx\sref@id\@empty%
\end{displaymath}%
\else%
\end{equation}%
\fi%
}%
\newenvironment{seqnarray}[1][]{%
\metasetkeys{sequation}{#1}%
\begin{eqnarray*}%
\sref@target%
\sref@label@id{\sref@sequation@heading~(\theequation)}%
}{%
\end{eqnarray*}%
}%
\newcommand\withcite[2]{#2~\cite{#1}}%
\newenvironment{withcitation}[1]{\def\citeit{\cite{#1}}}{}%
\endinput
%%
%% End of file `sref.sty'.

View File

@ -1,177 +0,0 @@
%%
%% This is file `workaddress.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% workaddress.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{workaddress}[2016/07/06 v0.5 WorkAddress]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sref}}
\ProcessOptions
\RequirePackage{sref}
\addmetakey*{wa@person}{id}
\addmetakey*{wa@person}{birthdate}
\addmetakey*{wa@person}{email}
\addmetakey*{wa@person}{url}
\addmetakey*{wa@person}{affiliation}
\addmetakey*{wa@person}{personaltitle}
\addmetakey*{wa@person}{academictitle}
\addmetakey*{wa@person}{department}
\addmetakey*{wa@person}{workaddress}
\addmetakey*{wa@person}{privaddress}
\addmetakey*{wa@person}{worktel}
\addmetakey*{wa@person}{privtel}
\addmetakey*{wa@person}{workfax}
\addmetakey*{wa@person}{privfax}
\addmetakey*{wa@person}{worktelfax}
\addmetakey*{wa@person}{privtelfax}
\def\wa@def#1#2#3#4{\expandafter\xdef\csname wa@#1@#2@#3\endcsname{#4}}
\def\wa@ref@test#1#2#3{%
\@ifundefined{wa@#1@#2@#3}{%
\PackageError{workaddress}{reference to undefined #3 of #1 #2}%
{you must define a #1 with #2=#3\MessageBreak%
via the macro \protect\WA#1, before you can use it!}
}{}%
}%
\newcommand\wa@ref[4]{%
\@ifundefined{wa@#2@#3@#4}{%
\ifcase#1 {}\or%
\PackageWarning{workaddress}{reference to undefined #4 of #2 #3\MessageBreak%
you must define a #2 with #3=#4\MessageBreak%
via the macro \protect\WA#2, before you can use it!}%
\or
\PackageWarning{workaddress}{reference to undefined #4 of #2 #3\MessageBreak%
you must define a #2 with #3=#4\MessageBreak%
via the macro \protect\WA#2, before you can use it!}%
?#2?#3?#4?
\or
\PackageError{workaddress}{reference to undefined #4 of #2 #3}%
{you must define a #2 with #3=#4\MessageBreak%
via the macro \protect\WA#2, before you can use it!}
\else\PackageError{workaddress}{\protect\wa@ref#1 not defined}
\fi
}{\csname wa@#2@#3@#4\endcsname}}%
\let\wa@persons=\relax
\newcommand\WAperson[2][]{%
\metasetkeys{wa@person}{#1}%
\ifx\wa@person@id\@empty%
\@latex@warning{key 'id' undefined in WAperson}%
\else%
\wa@def{person}\wa@person@id{id}{\wa@person@id}% redundant, but useful for checking
\wa@def{person}\wa@person@id{name}{#2}
\wa@def{person}\wa@person@id{email}{\wa@person@email}
\wa@def{person}\wa@person@id{birthdate}{\wa@person@birthdate}
\wa@def{person}\wa@person@id{url}{\wa@person@url}
\wa@def{person}\wa@person@id{affiliation}{\wa@person@affiliation}
\wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
\wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
\wa@def{person}\wa@person@id{personaltitle}{\wa@person@personaltitle}
\wa@def{person}\wa@person@id{academictitle}{\wa@person@academictitle}
\wa@def{person}\wa@person@id{department}{\wa@person@department}
\wa@def{person}\wa@person@id{workaddress}{\wa@person@workaddress}
\wa@def{person}\wa@person@id{privaddress}{\wa@person@privaddress}
\wa@def{person}\wa@person@id{worktel}{\wa@person@worktel}
\wa@def{person}\wa@person@id{privtel}{\wa@person@privtel}
\wa@def{person}\wa@person@id{workfax}{\wa@person@workfax}
\wa@def{person}\wa@person@id{privfax}{\wa@person@privfax}
\wa@def{person}\wa@person@id{worktelfax}{\wa@person@worktelfax}
\wa@def{person}\wa@person@id{privtelfax}{\wa@person@privtelfax}
\@ifundefined{wa@persons}{%
\xdef\wa@persons{\wa@person@id}%
}{%
\xdef\wa@persons{\wa@persons,\wa@person@id}%
}%
\fi%
}%
\newcommand\DCMperson[2][]{%
\WAperson[#1]{#2}%
\PackageWarning{workaddress}{\protect\DCMperson\space is deprecated, use \protect\WAperson\space instead}
}%
\addmetakey*{wa@institution}{id}
\addmetakey*{wa@institution}{shortname}
\addmetakey*{wa@institution}{acronym}
\addmetakey*{wa@institution}{url}
\addmetakey*{wa@institution}{partof}
\addmetakey*{wa@institution}{countryshort}
\addmetakey*{wa@institution}{logo}
\addmetakey*{wa@institution}{streetaddress}
\addmetakey*{wa@institution}{townzip}
\addmetakey*{wa@institution}{type}
\addmetakey*{wa@institution}{country}
\let\wa@institutions=\relax
\newcommand\WAinstitution[2][]{%
\metasetkeys{wa@institution}{#1}%
\ifx\wa@institution@id\@empty%
\@latex@warning{key 'id' undefined in WAinstitution}%
\else%
\wa@def{institution}\wa@institution@id{id}{\wa@institution@id}% redundant, but useful for checking
\wa@def{institution}\wa@institution@id{name}{#2}
\wa@def{institution}\wa@institution@id{shortname}{\wa@institution@shortname}
\wa@def{institution}\wa@institution@id{acronym}{\wa@institution@acronym}
\wa@def{institution}\wa@institution@id{url}{\wa@institution@url}
\wa@def{institution}\wa@institution@id{partof}{\wa@institution@partof}
\wa@def{institution}\wa@institution@id{countryshort}{\wa@institution@countryshort}
\wa@def{institution}\wa@institution@id{logo}{\wa@institution@logo}
\wa@def{institution}\wa@institution@id{townzip}{\wa@institution@townzip}
\wa@def{institution}\wa@institution@id{streetaddress}{\wa@institution@streetaddress}
\wa@def{institution}\wa@institution@id{country}{\wa@institution@country}
\wa@def{institution}\wa@institution@id{type}{\wa@institution@type}
\@ifundefined{wa@institutions}{%
\xdef\wa@institutions{\wa@institution@id}%
}{%
\xdef\wa@institutions{\wa@institutions,\wa@institution@id}%
}%
\fi%
}%
\newcommand\DCMinstitution[2][]{%
\WAinstitution[#1]{#2}%
\PackageWarning{workaddress}{\protect\DCMinstitution\space is deprecated, use \protect\WAinstitution\space instead}%
}%
\addmetakey[false]{WAauthorblock}{dept}[true]
\addmetakey[false]{WAauthorblock}{aff}[true]
\addmetakey[false]{WAauthorblock}{url}[true]
\def\@true{true}
\newcounter{authors}
\newcommand\WAauthorblock[2][]{%
\metasetkeys{WAauthorblock}{#1}
{\let\tabularnewline\relax
\@for\@I:=#2\do{\stepcounter{authors}}
\def\@authors{}%
\def\@affs{}%
\def\@depts{}%
\def\@urls{}%
\@for\@I:=#2\do{%
\xdef\@authors{\@authors&\wa@ref2{person}\@I{name}}
\xdef\@@dept{\wa@ref1{person}\@I{department}}
\xdef\@shortname{\csname wa@institution@\@@dept @shortname\endcsname}
\xdef\@dept{\ifx\@shortname\@empty\wa@ref0{institution}\@@dept{name}\else\@shortname\fi}
\xdef\@depts{\@depts&\@dept}
\xdef\@@aff{\wa@ref0{person}\@I{affiliation}}
\xdef\@shortname{\csname wa@institution@\@@aff @shortname\endcsname}
\xdef\@aff{\ifx\@shortname\@empty\wa@ref0{institution}\@@aff{name}\else\@shortname\fi}
\xdef\@affs{\@affs&\@aff}
\xdef\@urls{\@urls&\wa@ref0{person}\@I{url}}
}%
\message{\theauthors authors: \@authors}%
}%
\begin{tabular}[t]{l*{\theauthors}{c}}
\@authors\\
\ifx\WAauthorblock@dept\@true\@depts\\\fi
\ifx\WAauthorblock@aff\@true\@affs\\\fi
\ifx\WAauthorblock@url\@true\@urls\\\fi
\end{tabular}
}%
\newcommand\wapname[1]{\wa@ref3{person}{#1}{name}}
\newcommand\waptname[1]{\wa@ref3{person}{#1}{personaltitle} \wa@ref3{person}{#1}{name}}
\newcommand\wa@institution@logo[2][]{%
\IfFileExists{\wa@ref2{institution}{#2}{logo}}{%
\includegraphics{\wa@ref2{institution}{#2}{logo}}%
}{%
\fbox{#2 logo}\message{still need logo for #2}%
}%
}%
\endinput
%%
%% End of file `workaddress.sty'.

View File

@ -9,7 +9,9 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{eupdata}[2019/03/21 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}}
\define@key{prop@gen}{Csite}{\def\prop@gen@Csite{#1}\pdata@def{prop}{gen}{Csite}{#1}}
\define@key{prop@gen}{Cemail}{\def\prop@gen@Cemail{#1}\pdata@def{prop}{gen}{Cemail}{#1}}
\define@key{prop@gen}{Ctelfax}{\def\prop@gen@Ctelfax{#1}\pdata@def{prop}{gen}{Ctelfax}{#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}}

View File

@ -33,10 +33,9 @@
\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}
\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}}}
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}}
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}}
\begin{tabular}{|l|p{8cm}|l|l|}\hline%|
\# & Participant organisation name & Short name & Country\\\hline\hline
\@@table
@ -60,9 +59,9 @@
% \textbf{Objective \prop@gen@objectiveid}: \prop@gen@objective,
% \textbf{target outcome \prop@gen@outcomeid}) \prop@gen@outcome.
% {\prop@gen@topicsaddressed}\\[1em]
\item[Coordinator:] \wa@ref3{person}\prop@gen@coordinator{name}
\item[e-mail:] \wa@ref3{person}\prop@gen@coordinator{email}
\item[tel/fax:] \wa@ref3{person}\prop@gen@coordinator{worktelfax}
\item[Coordinator:] \prop@gen@coordinator
\item[e-mail:] \prop@gen@Cemail
\item[tel/fax:] \prop@gen@Ctelfax
\@ifundefined{prop@gen@keywords}{}{\item[Keywords:] \prop@gen@keywords}
\end{description}
\end{large}
@ -70,7 +69,7 @@
\begin{center}
\prop@sites@table\vfill
\@ifundefined{prop@gen@iconrowheight}{}
{\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}}
\end{center}
\newpage
\fi% ifgrantagreement
@ -103,16 +102,16 @@
\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]%
\includegraphics[height=\site@desc@width]{#2}\\[1ex]%
\fi% end logo
\textbf{\wa@ref3{institution}{#2}{type}.\hfill \wa@ref3{institution}{#2}{country}}\\%
\small\wa@ref3{institution}{#2}{streetaddress}, \wa@ref3{institution}{#2}{townzip}\\\hline%
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\%
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline%
\end{tabular}\vspace{-2.5ex}%
\end{wrapfigure}%
\fi% end box
\pdata@target{site}{#2}%
{\subsubsection{\wa@ref3{institution}{#2}{acronym}: % space here
{\textsc{\wa@ref3{institution}{#2}{name}} (\wa@ref3{institution}{#2}{countryshort})}}}%
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}%
\small%
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{0.25ex \@plus1ex \@minus.2ex}%

View File

@ -142,11 +142,11 @@
% metakeys support.}
% \item \DescribeMacro{topicsaddressed}|topicsaddressed| allows to enter free-form text
% instead of specifying the |challenge*|, |objective*|, and |outcome*| keys.
% \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 The \DescribeMacro{coordinator}|coordinator| key full name of the proposal
% coordinator.
% \item The \DescribeMacro{Csite}|Csite|, \DescribeMacro{Cemail}|Cemail|, and
% \DescribeMacro{Ctelfax}|Ctelfax| keys give further metadata of the coordinator (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.
@ -293,7 +293,9 @@
% \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}}
\define@key{prop@gen}{Csite}{\def\prop@gen@Csite{#1}\pdata@def{prop}{gen}{Csite}{#1}}
\define@key{prop@gen}{Cemail}{\def\prop@gen@Cemail{#1}\pdata@def{prop}{gen}{Cemail}{#1}}
\define@key{prop@gen}{Ctelfax}{\def\prop@gen@Ctelfax{#1}\pdata@def{prop}{gen}{Ctelfax}{#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}}
@ -341,10 +343,9 @@
\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}
\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}}}
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}}
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}}
\begin{tabular}{|l|p{8cm}|l|l|}\hline%|
\# & Participant organisation name & Short name & Country\\\hline\hline
\@@table
@ -380,9 +381,9 @@
% \textbf{Objective \prop@gen@objectiveid}: \prop@gen@objective,
% \textbf{target outcome \prop@gen@outcomeid}) \prop@gen@outcome.
% {\prop@gen@topicsaddressed}\\[1em]
\item[Coordinator:] \wa@ref3{person}\prop@gen@coordinator{name}
\item[e-mail:] \wa@ref3{person}\prop@gen@coordinator{email}
\item[tel/fax:] \wa@ref3{person}\prop@gen@coordinator{worktelfax}
\item[Coordinator:] \prop@gen@coordinator
\item[e-mail:] \prop@gen@Cemail
\item[tel/fax:] \prop@gen@Ctelfax
\@ifundefined{prop@gen@keywords}{}{\item[Keywords:] \prop@gen@keywords}
\end{description}
\end{large}
@ -390,7 +391,7 @@
\begin{center}
\prop@sites@table\vfill
\@ifundefined{prop@gen@iconrowheight}{}
{\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}}
\end{center}
\newpage
\fi% ifgrantagreement
@ -414,8 +415,7 @@
%
% \begin{environment}{sitedescription}
% \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}
% marks up the description for the site \meta{site}. 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?}.
@ -440,16 +440,16 @@
\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]%
\includegraphics[height=\site@desc@width]{#2}\\[1ex]%
\fi% end logo
\textbf{\wa@ref3{institution}{#2}{type}.\hfill \wa@ref3{institution}{#2}{country}}\\%
\small\wa@ref3{institution}{#2}{streetaddress}, \wa@ref3{institution}{#2}{townzip}\\\hline%
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\%
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline%
\end{tabular}\vspace{-2.5ex}%
\end{wrapfigure}%
\fi% end box
\pdata@target{site}{#2}%
{\subsubsection{\wa@ref3{institution}{#2}{acronym}: % space here
{\textsc{\wa@ref3{institution}{#2}{name}} (\wa@ref3{institution}{#2}{countryshort})}}}%
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}%
\small%
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{0.25ex \@plus1ex \@minus.2ex}%
@ -630,6 +630,17 @@
%
% \Finale
\endinput
% Local Variables:
% mode: doctex
% TeX-master: t
% End:
%
% LocalWords: coordinatorsite coordinatorsite verif verif milestonetable milestonetable
% LocalWords: wname wname wdeliv wdeliv wverif wverif biblatex notcategory newif gdef
% LocalWords: grantagreement Initialization ifpartB partBfalse partBtrue report openout
% LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs
% LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex
% LocalWords: secnumdepth newwrite thepage jobname.deliverables
% 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
@ -645,20 +656,9 @@
% 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 mst
% LocalWords: outcomeid metakeys numberline tempdima ifsubmit iconrowheight
% LocalWords: proposal.dtx texttt paperslist topicsaddressed thesite mst
% LocalWords: topicsaddressed iconrowheight finalreport.tex printbibliography endcsname
% LocalWords: reportperiod organisation thispagestyle gitAbbrevHash sitedescritpion WPs
% LocalWords: WAinstitution picv medskip newmdenv frametitle wpdelivs mdframed.sty emph
% LocalWords: surroundwithmdframed emph riskcont prob grav ldots endinput optimized
% Local Variables:
% mode: doctex
% TeX-master: t
% End:
% LocalWords: coordinatorsite coordinatorsite verif verif milestonetable milestonetable
% LocalWords: wname wname wdeliv wdeliv wverif wverif biblatex notcategory newif gdef
% LocalWords: grantagreement Initialization ifpartB partBfalse partBtrue report openout
% LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs
% LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex
% LocalWords: secnumdepth newwrite thepage jobname.deliverables

Binary file not shown.

View File

@ -1,71 +0,0 @@
\WAperson[id=miko,
personaltitle=Prof. Dr.,
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,
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,