diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 70e1610..99e88af 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -11,6 +11,7 @@ \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} +\PassOptionsToClass{11pt}{article} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} \ProcessOptions \LoadClass{proposal} @@ -18,6 +19,8 @@ \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} \else\RequirePackage[ngerman,english]{babel}\fi +\RequirePackage[scaled=.90]{helvet} +\renewcommand{\familydefault}{\sfdefault} \newenvironment{sitedescription}[2][]% {\def\@test{#1}\def\@@title{\ifx\@test\@empty\pdataref{site}{#2}{acronym}\else #1\fi: \textsc{\pdataref{site}{#2}{name}}} diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index adb7ea7..eee089f 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -198,12 +198,14 @@ % % \subsection{Package Options and Format Initialization}\label{sec:impl:options} % -% We first set up the options for the package. +% We first set up the options for the package. In particular, we set the font size 11pt +% that DFG wants. % % \begin{macrocode} %\newif\ifgeneral\generalfalse %\DeclareOption{general}{\generaltrue} %\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} +%\PassOptionsToClass{11pt}{article} %\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} %\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} %\newif\ifdeutsch\deutschfalse @@ -211,7 +213,7 @@ %\ProcessOptions % \end{macrocode} % -% Then we load the packages we make use of +% Then we load the packages we make use of. % % \begin{macrocode} %\LoadClass{proposal} @@ -221,9 +223,16 @@ \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} \else\RequirePackage[ngerman,english]{babel}\fi -% % \end{macrocode} % +% In particular, we set the font Helvetica (as a substitute for the Arial font DFG wants). +% +% \begin{macrocode} +\RequirePackage[scaled=.90]{helvet} +\renewcommand{\familydefault}{\sfdefault} +% +% \end{macrocode} +% % \subsection{Proposal Metadata}\label{sec:impl:metadata} % % We extend the metadata keys from the |proposal| class. diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 3f36e03..7624bdc 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index a4db70e..5a98c15 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -9,6 +9,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} +\\PassOptionsToClass{11pt}{article} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions \LoadClass{reporting} @@ -16,6 +17,8 @@ \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} \else\RequirePackage[ngerman,english]{babel}\fi +\RequirePackage[scaled=.90]{helvet} +\renewcommand{\familydefault}{\sfdefault} \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}% diff --git a/examples/dfg/simple-proposal/proposal.tex b/examples/dfg/simple-proposal/proposal.tex index 813a151..86a4373 100644 --- a/examples/dfg/simple-proposal/proposal.tex +++ b/examples/dfg/simple-proposal/proposal.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,general} % to be overwritten in variants -\documentclass[ % the options control the appearance, see the documentation +\documentclass[% the options control the appearance, see the documentation gitinfo, % show GIT information noworkareas, % do not generate work areas, this is a simple proposal RAM, % also manage research assistant (HiWi) months @@ -11,8 +11,6 @@ \classoptions] % the other class options from above, they can be overwritten e.g. in submit/final,tex {dfgproposal} \addbibresource{../lib/dummy.bib} -\renewcommand{\familydefault}{\sfdefault} -\usepackage[scaled=.90]{helvet} \usepackage[utf8]{inputenc} \begin{document} @@ -51,8 +49,7 @@ \input{workplan} \section{Bibliography concerning the state of the art, the research objectives, and the - work programme \deu{(Literaturverzeichnis zum Stand der Forschung, zu den Zielen und dem - Arbeitsprogramm)}} + work programme} \begin{todo}{from the proposal template} In this bibliography, list only the works you cite in your presentation of the state of @@ -66,7 +63,7 @@ \input{../proposal/funds} \input{preconditions} -\section{Additional information \deu{(Ergänzende Erklärungen)}} +\section{Additional Information} Funding proposal XYZ-83282 has been submitted prior to this proposal on related topic XYZ. \fi %ifpublic