making acronym optional (fully; bugfix) and allowing numericciets

2017-05-31 08:33:14 +02:00 · 2017-05-31 08:33:14 +02:00 · b1be9513f9
commit b1be9513f9
parent b2f5beabd1
9 changed files with 16 additions and 2 deletions
--- a/base/proposal.cls
+++ b/base/proposal.cls
@ -18,11 +18,13 @@
 \newif\if@RAM\@RAMfalse
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
+\newif\if@numericcites\@numericcitesfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
 \DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{numericcites}{\@numericcitestrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@ -605,11 +605,13 @@
 \newif\if@RAM\@RAMfalse
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
+\newif\if@numericcites\@numericcitesfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
 \DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{numericcites}{\@numericcitestrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
@ -649,7 +651,11 @@
 \renewcommand{\familydefault}{\sfdefault}
 \RequirePackage[scaled=.90]{helvet}
 \RequirePackage{textcomp}
-\RequirePackage[hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\if@numericcites
+\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\else
+\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\fi
 \RequirePackage{csquotes}
 \RequirePackage{mdframed}
 %    \end{macrocode}
--- a/base/proposal.pdf
+++ b/base/proposal.pdf
--- a/base/proposal.sty
+++ b/base/proposal.sty
@ -28,7 +28,11 @@
 \renewcommand{\familydefault}{\sfdefault}
 \RequirePackage[scaled=.90]{helvet}
 \RequirePackage{textcomp}
-\RequirePackage[hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\if@numericcites
+\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\else
+\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19]
+\fi
 \RequirePackage{csquotes}
 \RequirePackage{mdframed}
 \RequirePackage{pdata}
--- a/base/reporting.cls
+++ b/base/reporting.cls
@ -18,11 +18,13 @@
 \newif\if@RAM\@RAMfalse
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
+\newif\if@numericcites\@numericcitesfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
 \DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
+\DeclareOption{numericcites}{\@numericcitestrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
 \DeclareOption{noworkareas}{\work@areasfalse\PassOptionsToClass{\CurrentOption}{pdata}}
--- a/dfg/examples/proposal/proposal.pdf
+++ b/dfg/examples/proposal/proposal.pdf
--- a/dfg/examples/report/finalreport.pdf
+++ b/dfg/examples/report/finalreport.pdf
--- a/dfg/examples/simple-proposal/proposal.pdf
+++ b/dfg/examples/simple-proposal/proposal.pdf
--- a/eu/examples/strep/propB.pdf
+++ b/eu/examples/strep/propB.pdf