font handling in dfgproposal.cls

This commit is contained in:
Michael Kohlhase 2020-09-09 07:02:56 +02:00
parent e20ba54f87
commit 96e95045e8
5 changed files with 21 additions and 9 deletions

View File

@ -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}}}

View File

@ -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}
%<cls>\newif\ifgeneral\generalfalse
%<cls>\DeclareOption{general}{\generaltrue}
%<cls|reporting>\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
%<cls|reporting>\PassOptionsToClass{11pt}{article}
%<cls>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
%<reporting>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
%<pdata>\newif\ifdeutsch\deutschfalse
@ -211,7 +213,7 @@
%<cls|reporting|pdata>\ProcessOptions
% \end{macrocode}
%
% Then we load the packages we make use of
% Then we load the packages we make use of.
%
% \begin{macrocode}
%<cls>\LoadClass{proposal}
@ -221,6 +223,13 @@
\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}
%</cls|reporting>
% \end{macrocode}
%

Binary file not shown.

View File

@ -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}%

View File

@ -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