diff options
author | Karl Berry <karl@freefriends.org> | 2015-11-23 23:03:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-11-23 23:03:44 +0000 |
commit | a30f052f895d1f1fd9f112c555d360a2f5845929 (patch) | |
tree | 75e851693ac839f7510674f192badb317e43d87b /Master/texmf-dist/tex/latex/proposal/dfg | |
parent | 17317dd1f84901e202fb95e31a0eee9c51e50d74 (diff) |
proposal (23nov15)
git-svn-id: svn://tug.org/texlive/trunk@38923 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/proposal/dfg')
3 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty index 8b8ee0a5ea5..214ef50ba2a 100644 --- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty +++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgpdata}[2013/02/13 v1.4 DFG Project Data] +\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data] \newif\ifdeutsch\deutschfalse \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}} \ProcessOptions diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls index c4fd7488d0c..01dbbf9b3a1 100644 --- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls +++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{dfgproposal}[2013/02/13 v1.4 DFG Proposal] +\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal] \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} @@ -47,10 +47,10 @@ \WAauthorblock[aff]\prop@gen@PIs\\[2cm] \end{center} \edef\keep@tocdepth{\value{tocdepth}} -\setcounter{tocdepth}{1}\tableofcontents +\setcounter{tocdepth}{2}\tableofcontents \setcounter{tocdepth}{\keep@tocdepth} -\newpage\thispagestyle{empty} \ifgeneral\setcounter{section}{-1} +\newpage\thispagestyle{empty} \ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else \section{General Information (for the ELAN system only)}\fi \dfg@applicants @@ -71,10 +71,10 @@ \subsection{Application period \deu{(Antragszeitraum)}}\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)} +{ (\ifdeutsch Mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)} \ifdeutsch\else\selectlanguage{USenglish}\fi -\newpage\fi %ifgeneral -\setcounter{page}{1}} +\newpage\fi%ifgeneral +\setcounter{page}{0}} {} \ifdeutsch \def\prop@warnpubs@message{Viele der Publikationen der Antragsteller sind verf\"ugbar unter folgenden URLs:} @@ -92,16 +92,18 @@ \ifdeutsch \item Publications either cited in section~\ref{sec:ourpubs} or occurring in one of the curricula vitae (CD only)\else -\item Zitierte Publicationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe +\item Zitierte Publikationen aus Abschnitt~\ref{sec:ourpubs} oder einem der Lebensl\"aufe (nur CD)\fi \end{itemize}} \ifgeneral -\newenvironment{Summary}{% -\thispagestyle{empty} -\ifdeutsch\subsection{Zusammenfassung}\else -\subsection{Summary \deu{(Zusammenfassung; siehe~\ref{sec:zusammenfassung})}}\fi} +\newenvironment{Zusammenfassung}{\thispagestyle{empty}\subsection{Zusammenfassung}\begin{otherlanguage}{ngerman}} +{\end{otherlanguage}\newpage\setcounter{page}1} +\newenvironment{Summary}{\thispagestyle{empty}\subsection{Summary}} {\newpage\setcounter{page}1} -\else\excludecomment{Summary}\fi +\else +\excludecomment{Summary} +\excludecomment{Zusammenfassung} +\fi \endinput %% %% End of file `dfgproposal.cls'. diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls index c229c48734a..c0d17b3ed5a 100644 --- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls +++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgreporting}[2013/02/13 v1.4 DFG Project Reporting] +\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions |