diff --git a/base/proposal.dtx b/base/proposal.dtx index ef07ecd..cb82b53 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -2714,7 +2714,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % LocalWords: subbibliography,title featured,heading renewbibmacro iffieldundef showit % LocalWords: proposal dtx xkohlhase areastrue svninfo noworkareas twoside emph gitinfo % LocalWords: areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO OJBref sl -% LocalWords: fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne WPref gen +% LocalWords: fancyhdr keyval eurosym tikz calc ngerman linkcolor ne WPref gen % LocalWords: citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen WPref doi % LocalWords: hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im Mitarbeiter % LocalWords: Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel ifsvninfo diff --git a/base/proposal.pdf b/base/proposal.pdf index e8d2ef4..dfe8d96 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 43c13bd..dafba8e 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -15,9 +15,9 @@ \ProcessOptions \LoadClass{proposal} \RequirePackage{eurosym} -\RequirePackage{LaTeX-proposal/dfg/dfgpdata} +\RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman]{babel}\fi +\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}}} @@ -74,7 +74,7 @@ \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\else\selectlanguage{USenglish}\fi +\ifdeutsch\else\selectlanguage{english}\fi \newpage \setcounter{page}{0}% \fi\fi}% ifsubmit ifgeneral diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index 296f2d6..fedb6d0 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -220,7 +220,7 @@ \RequirePackage{eurosym} \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman,USenglish]{babel}\fi +\else\RequirePackage[ngerman,english]{babel}\fi % % \end{macrocode} % @@ -382,7 +382,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \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\else\selectlanguage{USenglish}\fi +\ifdeutsch\else\selectlanguage{english}\fi \newpage \setcounter{page}{0}% \fi\fi}% ifsubmit ifgeneral @@ -453,7 +453,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}} \newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}} \renewenvironment{prop@report} -{\selectlanguage{USenglish} +{\selectlanguage{english} \thispagestyle{empty}% \begin{center} {\LARGE Final Project Report}\\[.2cm] @@ -576,7 +576,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \endinput % LocalWords: dfgproposal dtx kohlhase areastrue svninfo noworkareas twoside notcategory % LocalWords: areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO Abriss Rabe -% LocalWords: fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne ifgeneral +% LocalWords: fancyhdr keyval eurosym tikz calc english ngerman linkcolor ne ifgeneral % LocalWords: citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen ifdeutsch % LocalWords: hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im generaltrue % LocalWords: Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel Deutscher @@ -636,6 +636,6 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % mode: doctex % TeX-master: t % End: -% LocalWords: localized sec:implementation Initialization ngerman,USenglish itemize +% LocalWords: localized sec:implementation Initialization ngerman itemize % LocalWords: selectlanguage sec:ourpubs confpapers inproceedings wspapers techreports % LocalWords: books,articles,inproceedings diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index a3bcb14..005e90b 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index f8e56f7..ea20abf 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -15,7 +15,7 @@ \RequirePackage{eurosym} \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman,USenglish]{babel}\fi +\else\RequirePackage[ngerman,english]{babel}\fi \define@key{prop@gen}{reportperiod}{\def\prop@gen@reportperiod{#1}} \define@key{prop@gen}{applareas}{\def\prop@gen@applareas{#1}} \define@key{prop@gen}{key}{\@dmp{key=#1}% @@ -36,7 +36,7 @@ \newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}} \newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}} \renewenvironment{prop@report} -{\selectlanguage{USenglish} +{\selectlanguage{english} \thispagestyle{empty}% \begin{center} {\LARGE Final Project Report}\\[.2cm] diff --git a/examples/dfg/proposal/proposal.pdf b/examples/dfg/proposal/proposal.pdf index 40b0460..6a920c2 100644 Binary files a/examples/dfg/proposal/proposal.pdf and b/examples/dfg/proposal/proposal.pdf differ diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf index 2a76490..d96b8c2 100644 Binary files a/examples/eu/strep/propB.pdf and b/examples/eu/strep/propB.pdf differ