diff --git a/base/pdata.sty b/base/pdata.sty index e591f59..11d854a 100644 --- a/base/pdata.sty +++ b/base/pdata.sty @@ -16,9 +16,9 @@ \stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}% \@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}% \define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}% -\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}} +\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi \define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}% -\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}} +\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi \define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax% \@ifundefined{prop@gen@employed@lines}% {\xdef\prop@gen@employed@lines{\wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}% diff --git a/base/proposal.cls b/base/proposal.cls index b37b0e0..9de7786 100644 --- a/base/proposal.cls +++ b/base/proposal.cls @@ -117,7 +117,7 @@ \pdata@open\jobname \if@sites\else \define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}} -\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}} +\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi \fi \newcounter{@PIs} \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}} diff --git a/base/proposal.dtx b/base/proposal.dtx index fdae372..0abdb9b 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -4,7 +4,7 @@ % Copyright (c) 2011 Michael Kohlhase, all rights reserved % % This file is distributed under the terms of the LaTeX Project Public -% License from CTAN archives in directory macros/latex/base/lppl.txt.la +% License from CTAN archives in directory macros/latex/base/lppl.txt. % Either version 1.0 or, at your option, any later version. % % The development version of this file can be found at @@ -701,9 +701,9 @@ \stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}% \@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}% \define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}% -\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}} +\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi \define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}% -\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}} +\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi \define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax% \@ifundefined{prop@gen@employed@lines}% {\xdef\prop@gen@employed@lines{\wa@ref3{institution}{#1}{shortname} & ##1\tabularnewline\hline}}% @@ -850,7 +850,7 @@ \pdata@open\jobname \if@sites\else \define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}} -\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}} +\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi \fi \newcounter{@PIs} \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}} diff --git a/base/proposal.pdf b/base/proposal.pdf index 3a22b01..cc586d2 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index ce653f3..d5efaa1 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index 2612497..167bca9 100644 Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index e3aa58f..94420f6 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf index 468ca7b..56b3fb2 100644 Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index ee9c05d..025dec2 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index 8611d97..faf44ca 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ diff --git a/eu/examples/strep/propB.tex b/eu/examples/strep/propB.tex index 13afd61..8dc1c24 100644 --- a/eu/examples/strep/propB.tex +++ b/eu/examples/strep/propB.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} % to be overwritten in variants -\documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal} +\documentclass[noworkareas,deliverables,gitinfo,report,propB\classoptions]{euproposal} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \addbibresource{../lib/dummy}