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

more robust references

Browse Source
This commit is contained in:
Michael Kohlhase 2020-08-25 08:36:43 +02:00
parent a8382a2970
commit 4111b03908
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eu/euproposal.cls
View File

@ -32,10 +32,10 @@
\fi% ifpartB \fi% ifpartB
\newcommand\prop@sites@table{\def\@@table{} \newcommand\prop@sites@table{\def\@@table{}
{\let\tabularnewline\relax\let\hline\relax {\let\tabularnewline\relax\let\hline\relax
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref{site}\@I{number}} \@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref@safe{site}\@I{number}}
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{acronym}}
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{countryshort}\tabularnewline\hline}}}
\begin{tabular}{|l|p{8cm}|l|l|}\hline%| \begin{tabular}{|l|p{8cm}|l|l|}\hline%|
\# & Participant organisation name & Short name & Country\\\hline\hline \# & Participant organisation name & Short name & Country\\\hline\hline
\@@table \@@table
@ -69,7 +69,7 @@
\begin{center} \begin{center}
\prop@sites@table\vfill \prop@sites@table\vfill
\@ifundefined{prop@gen@iconrowheight}{} \@ifundefined{prop@gen@iconrowheight}{}
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}} {\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref@safe{site}\@site{logo}}\qquad}}
\end{center} \end{center}
\newpage \newpage
\fi% ifgrantagreement \fi% ifgrantagreement
@ -104,14 +104,14 @@
\ifx\@site@desc@logo\@true% if we want a logo \ifx\@site@desc@logo\@true% if we want a logo
\includegraphics[height=\site@desc@width]{#2}\\[1ex]% \includegraphics[height=\site@desc@width]{#2}\\[1ex]%
\fi% end logo \fi% end logo
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\% \textbf{\pdataref@safe{site}{#2}{type}.\hfill \pdataref@safe{site}{#2}{country}}\\%
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline% \small\pdataref@safe{site}{#2}{streetaddress}, \pdataref@safe{site}{#2}{townzip}\\\hline%
\end{tabular}\vspace{-2.5ex}% \end{tabular}\vspace{-2.5ex}%
\end{wrapfigure}% \end{wrapfigure}%
\fi% end box \fi% end box
\pdata@target{site}{#2}% \pdata@target{site}{#2}%
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here {\subsubsection{\pdataref@safe{site}{#2}{acronym}: % space here
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}% {\textsc{\pdataref@safe{site}{#2}{shortname}} (\pdataref@safe{site}{#2}{countryshort})}}}%
\small% \small%
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{0.25ex \@plus1ex \@minus.2ex}% {0.25ex \@plus1ex \@minus.2ex}%

18
eu/euproposal.dtx
View File

@ -342,10 +342,10 @@
% \begin{macrocode} % \begin{macrocode}
\newcommand\prop@sites@table{\def\@@table{} \newcommand\prop@sites@table{\def\@@table{}
{\let\tabularnewline\relax\let\hline\relax {\let\tabularnewline\relax\let\hline\relax
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref{site}\@I{number}} \@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref@safe{site}\@I{number}}
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{acronym}}
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}} \xdef\@@table{\@@table&\pdataref@safe{site}\@I{countryshort}\tabularnewline\hline}}}
\begin{tabular}{|l|p{8cm}|l|l|}\hline%| \begin{tabular}{|l|p{8cm}|l|l|}\hline%|
\# & Participant organisation name & Short name & Country\\\hline\hline \# & Participant organisation name & Short name & Country\\\hline\hline
\@@table \@@table
@ -391,7 +391,7 @@
\begin{center} \begin{center}
\prop@sites@table\vfill \prop@sites@table\vfill
\@ifundefined{prop@gen@iconrowheight}{} \@ifundefined{prop@gen@iconrowheight}{}
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}} {\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref@safe{site}\@site{logo}}\qquad}}
\end{center} \end{center}
\newpage \newpage
\fi% ifgrantagreement \fi% ifgrantagreement
@ -442,14 +442,14 @@
\ifx\@site@desc@logo\@true% if we want a logo \ifx\@site@desc@logo\@true% if we want a logo
\includegraphics[height=\site@desc@width]{#2}\\[1ex]% \includegraphics[height=\site@desc@width]{#2}\\[1ex]%
\fi% end logo \fi% end logo
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\% \textbf{\pdataref@safe{site}{#2}{type}.\hfill \pdataref@safe{site}{#2}{country}}\\%
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline% \small\pdataref@safe{site}{#2}{streetaddress}, \pdataref@safe{site}{#2}{townzip}\\\hline%
\end{tabular}\vspace{-2.5ex}% \end{tabular}\vspace{-2.5ex}%
\end{wrapfigure}% \end{wrapfigure}%
\fi% end box \fi% end box
\pdata@target{site}{#2}% \pdata@target{site}{#2}%
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here {\subsubsection{\pdataref@safe{site}{#2}{acronym}: % space here
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}% {\textsc{\pdataref@safe{site}{#2}{shortname}} (\pdataref@safe{site}{#2}{countryshort})}}}%
\small% \small%
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{0.25ex \@plus1ex \@minus.2ex}% {0.25ex \@plus1ex \@minus.2ex}%

BIN
eu/euproposal.pdf
View File

Binary file not shown.