diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-15 21:38:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-15 21:38:41 +0000 |
commit | 5e77de80c3619d378c8a85ab0e2413086a57a8a5 (patch) | |
tree | 485e88bc2ff057b1286d2d244b8c6afb2ac16fd8 /Master/texmf-dist/source/latex/proposal/dfg | |
parent | dac3dfcfa52f854fa71354a5f4c8c8bb3aa4bc43 (diff) |
proposal (15apr16)
git-svn-id: svn://tug.org/texlive/trunk@40538 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/proposal/dfg')
-rw-r--r-- | Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx b/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx index 53d3ecc23e8..63e6a46eadc 100644 --- a/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx +++ b/Master/texmf-dist/source/latex/proposal/dfg/dfgproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%<cls>\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal] -%<pdata>\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data] -%<reporting>\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting] +%<cls>\ProvidesClass{dfgproposal}[2016/04/15 v1.4 DFG Proposal] +%<pdata>\ProvidesPackage{dfgpdata}[2016/04/15 v1.4 DFG Project Data] +%<reporting>\ProvidesPackage{dfgreporting}[2016/04/15 v1.4 DFG Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} @@ -28,8 +28,8 @@ \RecordChanges \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} -\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex} -\bibliography{kwarc} +\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex} +\addbibresource{../lib/proposal.bib} \usepackage[bookmarks=true,linkcolor=blue, citecolor=blue,urlcolor=blue,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} @@ -72,10 +72,10 @@ % \subversion, allowing the proposal writing team to concentrate on the contents % rather than the mechanics of wrangling with text fragments and revisions. % -% The |dfgproposal| class extends the |proposal| class~\cite{Kohlhase:pplp:svn} and +% The |dfgproposal| class extends the |proposal| class~\cite{Kohlhase:pplp:ctan} and % supports many of the specific elements of a DFG Proposal. The package documentation % is still preliminary, fragmented and incomplete and only dwells on the particulars of -% DFG proposals, so we treat~\cite{Kohlhase:pplp:svn} as a prerequisite. Please consult +% DFG proposals, so we treat~\cite{Kohlhase:pplp:ctan} as a prerequisite. Please consult % the example proposal |dfg/proposal.tex|, which comes with the package and shows the usage of % the class in action. It is intended as a template for your proposal, but please bear in % mind that the DFG guidelines may change, if in doubt, please consult the DFG guide for @@ -106,7 +106,7 @@ % % As usual in {\LaTeX}, the package is loaded by % |\documentclass[|\meta{options}|]{dfgproposal}|, where |[|\meta{options}|]| is optional -% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}. The +% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:ctan}. The % |dfgproposal| class adds the two options % \begin{compactenum} % \item \DescribeMacro{general}|general|, which allows generates a first section with @@ -507,9 +507,12 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % \subsection{German Reports}\label{sec:impl:german} % % We have to redefine some macros for German reports. +% % \begin{macrocode} %<*pdata> \ifdeutsch +\renewcommand\prop@count[1]{\ifcase #1 null\or ein\or zwei\or drei\or vier\or f"unf\or sechs\or sieben\or + acht\or neun\or zehn\or elf\or zw"olf\else#1\fi} \renewcommand\prop@of@pages[2]{Seite~#1\ifofpage~von~#2\fi} \renewcommand\wp@mk@title[1]{Arbeitspaket {#1}} \renewcommand\wp@label[1]{AP{#1}} @@ -532,9 +535,9 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \renewcommand\wpfig@legend@totalRAM{Summe HM} \renewcommand\wpfig@legend@RM{PM} \renewcommand\wpfig@legend@RAM{HM} -\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate;\else\ Aufw\"ande in Personenmonaten\\\fi} -\renewcommand\wpfig@legend@lead@expl{(Arbeitspaketleiter sind \wp@lead@style@explained} -\renewcommand\wp@lead@style@explained{grau und kursiv markiert)} +\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate\else\ Aufw\"ande in Personenmonaten\fi} +\renewcommand\wpfig@legend@lead@expl{Arbeitspaketleiter sind \wp@lead@style@explained} +\renewcommand\wp@lead@style@explained{grau und kursiv markiert} \renewcommand\wpfig@legend@caption{{\ifwork@areas Arbeitsbereiche und \fi}Arbeitspakete} \renewcommand\wp@legend@site{Partner} \renewcommand\wp@legend@effort{Aufwand\if@RAM{ (PM+HM)}\fi} @@ -543,12 +546,14 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \renewcommand\gantt@caption@lower{draft: unten die Lastverteilung} \renewcommand\coherence@caption{Bisherige Kollaboration der {\pn} Partner} \renewcommand\objective@label[1]{Z#1} -\renewcommand\task@label[1]{S#1} +\renewcommand\task@label[2]{S#1.#2} % \renewcommand\month@label[1]{M#1} \renewcommand\legend@partners{Partner} \renewcommand\legend@lead{Leiter} \renewcommand\task@label@long{Schritt} -\fi +\renewcommand\task@legend@partners{MA: } +\renewcommand\task@legend@PM{PM} +\fi%ifdeutsch %</pdata> % \end{macrocode} % \Finale |