fixing options and examples

dfg/dfgproposal.cls

@@ -38,22 +38,20 @@
 \dfg@applicants@private@lines\hline
 \end{tabular}}
 \renewenvironment{prop@proposal}
-{
+{\ifgeneral
+\ifsubmit\setcounter{page}{1}\else
+\thispagestyle{empty}%
 \begin{center}
-{\LARGE \prop@gen@instrument}\\[.75cm]
+{\LARGE \prop@gen@instrument}\\[.2cm]
-\WAauthorblock[aff]\prop@gen@PIs\\[1em]
 {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
 \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
-\ifgeneral{\large\today}\\[2cm]\fi
+{\large\today}\\[1em]
+\WAauthorblock[aff]\prop@gen@PIs\\[2cm]
 \end{center}
-\ifsubmit
+\setcounter{section}{-1}
-\setcounter{page}{1}\else
-\thispagestyle{empty}%
-\ifgeneral\setcounter{section}{-1}\fi
 \edef\keep@tocdepth{\value{tocdepth}}
 \setcounter{tocdepth}{2}\tableofcontents
 \setcounter{tocdepth}{\keep@tocdepth}
-\ifgeneral
 \newpage\thispagestyle{empty}
 \ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else
 \section{General Information (for the ELAN system only)}\fi
@@ -79,7 +77,7 @@
 \ifdeutsch\else\selectlanguage{english}\fi
 \newpage
 \setcounter{page}{0}%
-\clearpage\fi\fi}% ifsubmit ifgeneral
+\fi\fi}% ifsubmit ifgeneral
 {}
 \ifdeutsch
 \def\prop@warnpubs@message{Viele der Publikationen der Antragsteller sind verf\"ugbar unter folgenden URLs:}

eu/euproposal.cls

@@ -29,7 +29,7 @@
 \setcounter{part}{2}
 \def\thechapter{\thepart.\arabic{chapter}}
 \def\numberline#1{\hb@xt@\@tempdima{#1\hfil} }
-\fi
+\fi% ifpartB
 \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}}
@@ -158,7 +158,7 @@
 \define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}}
 \define@key{mst}{wverif}{\gdef\mst@wverif{#1}}
 \newcommand\milestonetable[1][]{%
-\IfFileExists{./\jobname.deliverables}{% to avoid errros
+\IfFileExists{./\jobname.deliverables}{% to avoid errors
 \message{euproposal.cls: Generating Milestones Table}%
 \def\mst@caption{Milestones, Deliverables, and Verification}%
 \def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm}

eu/euproposal.dtx

@@ -112,7 +112,7 @@
 % |\documentclass[|\meta{options}|]{euproposal}|, where |[|\meta{options}|]| is optional
 % and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}.  Some
 % versions EU proposals want non-standard numbering schemes (e.g. starting with
-% \textbf{B...} since we are writing Part B.), this can be reached by giving the |propB|
+% \textbf{B...} since we are writing Part B.), this can be reached by giving the |partB|
 % option. Finally the |split| option cases the |euproposal| to write a file |SPLIT.at|
 % that can be used in the |Makefile| to split the final proposal |final.pdf| into a files
 % |final123.pdf| and |final45.pdf| for submission in the EU system (often this has to be
@@ -286,6 +286,7 @@
 \setcounter{secnumdepth}{4}
 %</cls|reporting>
 %    \end{macrocode}
+%
 % \subsection{Proposal Metadata and Title Page}\label{sec:impl:metadata}
 %  
 % We extend the metadata keys from the |proposal| class.
@@ -322,7 +323,7 @@
 % and the default values, these will be used, if the author does not specify something
 % better.
 %
-% If the |propB| option is given, we need to redefine some of the internal counters and
+% If the |partB| option is given, we need to redefine some of the internal counters and
 % table of contents mechanisms to adapt to the fact that the proposal text is just Part B.
 %
 %    \begin{macrocode}
@@ -332,7 +333,7 @@
 \setcounter{part}{2}
 \def\thechapter{\thepart.\arabic{chapter}}
 \def\numberline#1{\hb@xt@\@tempdima{#1\hfil} }
-\fi
+\fi% ifpartB 
 %    \end{macrocode}
 % 
 % \begin{macro}{\prop@sites@table}

examples/eu/strep/propB.tex

@@ -3,7 +3,7 @@
 % - 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
-\documentclass[noworkareas,deliverables,gitinfo,report,propB\classoptions]{euproposal}
+\documentclass[noworkareas,deliverables,gitinfo,report\classoptions]{euproposal}
 \usepackage{nimbusserif}
 \addbibresource{../lib/dummy.bib}
 \input{../lib/WApersons}% Some sections of the included files depend on this.

examples/eu/strep/submit.tex

@@ -1,4 +1,4 @@
-\newcommand{\classoptions}{submit,split}
+\newcommand{\classoptions}{,submit,split}
 \input{propB}
 %%% Local Variables:
 %%% mode: latex