draining just to be sure for CTAN distribution
This commit is contained in:
parent
351746cb68
commit
e686a48976
@ -42,6 +42,8 @@
|
|||||||
\pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}}
|
\pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}}
|
||||||
\define@key{prop@gen}{acrolong}{\def\prop@gen@acrolong{#1}%
|
\define@key{prop@gen}{acrolong}{\def\prop@gen@acrolong{#1}%
|
||||||
\pdata@def{prop}{gen}{acrolong}{#1}}
|
\pdata@def{prop}{gen}{acrolong}{#1}}
|
||||||
|
\define@key{prop@gen}{proposalnumber}{\def\prop@gen@proposalnumber{#1}%
|
||||||
|
\pdata@def{prop}{gen}{proposalnumber}{#1}}
|
||||||
\define@key{prop@gen}{discipline}{\def\prop@gen@discipline{#1}%
|
\define@key{prop@gen}{discipline}{\def\prop@gen@discipline{#1}%
|
||||||
\pdata@def{prop}{gen}{discipline}{#1}}
|
\pdata@def{prop}{gen}{discipline}{#1}}
|
||||||
\define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}%
|
\define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}%
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
\ProvidesClass{proposal}[2015/01/14 v1.5 Project Proposal]
|
\ProvidesClass{proposal}[2015/01/14 v1.5 Project Proposal]
|
||||||
\newif\if@wpsubsection\@wpsubsectionfalse
|
\newif\if@wpsubsection\@wpsubsectionfalse
|
||||||
\newif\ifsubmit\submitfalse
|
\newif\ifsubmit\submitfalse
|
||||||
|
\newif\ifgrantagreement\grantagreementfalse
|
||||||
\newif\ifpublic\publicfalse
|
\newif\ifpublic\publicfalse
|
||||||
\newif\ifkeys\keysfalse
|
\newif\ifkeys\keysfalse
|
||||||
\newif\ifdelivs\delivsfalse
|
\newif\ifdelivs\delivsfalse
|
||||||
@ -20,6 +21,7 @@
|
|||||||
\def\proposal@class{article}
|
\def\proposal@class{article}
|
||||||
\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
|
\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
|
||||||
\DeclareOption{submit}{\submittrue}
|
\DeclareOption{submit}{\submittrue}
|
||||||
|
\DeclareOption{grantagreement}{\grantagreementtrue}
|
||||||
\DeclareOption{gitinfo}{\@gitinfotrue}
|
\DeclareOption{gitinfo}{\@gitinfotrue}
|
||||||
\DeclareOption{svninfo}{\@svninfotrue}
|
\DeclareOption{svninfo}{\@svninfotrue}
|
||||||
\DeclareOption{public}{\publictrue}
|
\DeclareOption{public}{\publictrue}
|
||||||
@ -72,11 +74,22 @@
|
|||||||
\ifpublic\excludecomment{private}\else\includecomment{private}\fi
|
\ifpublic\excludecomment{private}\else\includecomment{private}\fi
|
||||||
\setcounter{secnumdepth}{3}
|
\setcounter{secnumdepth}{3}
|
||||||
\newif\ifofpage\ofpagefalse
|
\newif\ifofpage\ofpagefalse
|
||||||
|
\ifgrantagreement
|
||||||
|
\fancyhead{}
|
||||||
|
\renewcommand{\headrulewidth}{0pt}
|
||||||
|
\renewcommand{\footrulewidth}{0.4pt}
|
||||||
|
\else
|
||||||
\fancyhead[RE,LO]{\prop@gen@acronym}
|
\fancyhead[RE,LO]{\prop@gen@acronym}
|
||||||
\fancyhfoffset{0pt}
|
\fancyhfoffset{0pt}
|
||||||
|
\fi
|
||||||
\fancyfoot[C]{}
|
\fancyfoot[C]{}
|
||||||
\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
|
\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
|
||||||
|
\ifgrantagreement
|
||||||
|
\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
|
||||||
|
\fancyfoot[R]{\thepage}
|
||||||
|
\else
|
||||||
\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
|
\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
|
||||||
|
\fi
|
||||||
\pagestyle{fancyplain}
|
\pagestyle{fancyplain}
|
||||||
\newmdenv[settings=\large]{emphbox}
|
\newmdenv[settings=\large]{emphbox}
|
||||||
\newenvironment{prop@proposal}
|
\newenvironment{prop@proposal}
|
||||||
@ -200,10 +213,12 @@
|
|||||||
{\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
|
{\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
|
||||||
\newenvironment{workpackage}[1][]%
|
\newenvironment{workpackage}[1][]%
|
||||||
{\begin{work@package}[#1]%
|
{\begin{work@package}[#1]%
|
||||||
|
\ifgrantagreement\else
|
||||||
\if@sites\goodbreak\medskip\wpheadertable%
|
\if@sites\goodbreak\medskip\wpheadertable%
|
||||||
\else\subsubsection*{{\wptitle} (\wprm)}\fi%
|
\else\subsubsection*{{\wptitle} (\wprm)}\fi%
|
||||||
\addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
|
\addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
|
||||||
\noindent\ignorespaces}
|
\noindent\ignorespaces%
|
||||||
|
\fi}
|
||||||
{\end{work@package}}
|
{\end{work@package}}
|
||||||
\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
|
\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
|
||||||
\newcommand\wprm{\pdataref@safe{wp}\wp@id{RM}\if@RAM\ RM+\pdataref{wp}\wp@id{RAM} RAM\fi}
|
\newcommand\wprm{\pdataref@safe{wp}\wp@id{RM}\if@RAM\ RM+\pdataref{wp}\wp@id{RAM} RAM\fi}
|
||||||
@ -338,6 +353,7 @@
|
|||||||
\else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
|
\else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
|
||||||
\pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
|
\pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
|
||||||
\pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
|
\pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
|
||||||
|
\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
|
||||||
\@ifundefined{deliv@short}
|
\@ifundefined{deliv@short}
|
||||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
|
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
|
||||||
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
|
{\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
|
||||||
@ -386,11 +402,13 @@
|
|||||||
\newcounter{milestone}
|
\newcounter{milestone}
|
||||||
\define@key{milestone}{id}{\gdef\mile@id{#1}}
|
\define@key{milestone}{id}{\gdef\mile@id{#1}}
|
||||||
\define@key{milestone}{month}{\gdef\mile@month{#1}}
|
\define@key{milestone}{month}{\gdef\mile@month{#1}}
|
||||||
|
\define@key{milestone}{verif}{\gdef\mile@verif{#1}}
|
||||||
\newcommand\milestone[3][]{%
|
\newcommand\milestone[3][]{%
|
||||||
\ifdelivs%
|
\ifdelivs%
|
||||||
\setkeys{milestone}{#1}\stepcounter{milestone}%
|
\setkeys{milestone}{#1}\stepcounter{milestone}%
|
||||||
\pdata@def{mile}\mile@id{label}{\milestone@label{\themilestone}}%
|
\pdata@def{mile}\mile@id{label}{\milestone@label{\themilestone}}%
|
||||||
\pdata@def{mile}\mile@id{month}{\mile@month}%
|
\pdata@def{mile}\mile@id{month}{\mile@month}%
|
||||||
|
\pdata@def{mile}\mile@id{verif}{\mile@verif}%
|
||||||
\pdata@def{mile}\mile@id{title}{#2}%
|
\pdata@def{mile}\mile@id{title}{#2}%
|
||||||
\pdata@def{mile}\mile@id{description}{#3}%
|
\pdata@def{mile}\mile@id{description}{#3}%
|
||||||
\@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
|
\@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
|
||||||
|
Binary file not shown.
@ -10,6 +10,7 @@
|
|||||||
\ProvidesPackage{reporting}[2015/01/14 v1.5 Project Reporting]
|
\ProvidesPackage{reporting}[2015/01/14 v1.5 Project Reporting]
|
||||||
\newif\if@wpsubsection\@wpsubsectionfalse
|
\newif\if@wpsubsection\@wpsubsectionfalse
|
||||||
\newif\ifsubmit\submitfalse
|
\newif\ifsubmit\submitfalse
|
||||||
|
\newif\ifgrantagreement\grantagreementfalse
|
||||||
\newif\ifpublic\publicfalse
|
\newif\ifpublic\publicfalse
|
||||||
\newif\ifkeys\keysfalse
|
\newif\ifkeys\keysfalse
|
||||||
\newif\ifdelivs\delivsfalse
|
\newif\ifdelivs\delivsfalse
|
||||||
@ -20,6 +21,7 @@
|
|||||||
\def\proposal@class{article}
|
\def\proposal@class{article}
|
||||||
\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
|
\DeclareOption{wpsubsection}{\@wpsubsectiontrue}
|
||||||
\DeclareOption{submit}{\submittrue}
|
\DeclareOption{submit}{\submittrue}
|
||||||
|
\DeclareOption{grantagreement}{\grantagreementtrue}
|
||||||
\DeclareOption{gitinfo}{\@gitinfotrue}
|
\DeclareOption{gitinfo}{\@gitinfotrue}
|
||||||
\DeclareOption{svninfo}{\@svninfotrue}
|
\DeclareOption{svninfo}{\@svninfotrue}
|
||||||
\DeclareOption{public}{\publictrue}
|
\DeclareOption{public}{\publictrue}
|
||||||
@ -72,11 +74,22 @@
|
|||||||
\ifpublic\excludecomment{private}\else\includecomment{private}\fi
|
\ifpublic\excludecomment{private}\else\includecomment{private}\fi
|
||||||
\setcounter{secnumdepth}{3}
|
\setcounter{secnumdepth}{3}
|
||||||
\newif\ifofpage\ofpagefalse
|
\newif\ifofpage\ofpagefalse
|
||||||
|
\ifgrantagreement
|
||||||
|
\fancyhead{}
|
||||||
|
\renewcommand{\headrulewidth}{0pt}
|
||||||
|
\renewcommand{\footrulewidth}{0.4pt}
|
||||||
|
\else
|
||||||
\fancyhead[RE,LO]{\prop@gen@acronym}
|
\fancyhead[RE,LO]{\prop@gen@acronym}
|
||||||
\fancyhfoffset{0pt}
|
\fancyhfoffset{0pt}
|
||||||
|
\fi
|
||||||
\fancyfoot[C]{}
|
\fancyfoot[C]{}
|
||||||
\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
|
\newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
|
||||||
|
\ifgrantagreement
|
||||||
|
\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
|
||||||
|
\fancyfoot[R]{\thepage}
|
||||||
|
\else
|
||||||
\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
|
\fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
|
||||||
|
\fi
|
||||||
\pagestyle{fancyplain}
|
\pagestyle{fancyplain}
|
||||||
\newif\if@report\@reportfalse
|
\newif\if@report\@reportfalse
|
||||||
\newenvironment{report}[1][]%
|
\newenvironment{report}[1][]%
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
@Comment{$ biblatex control file $}
|
@Comment{$ biblatex control file $}
|
||||||
@Comment{$ biblatex version 2.4 $}
|
@Comment{$ biblatex version 2.5 $}
|
||||||
Do not modify this file!
|
Do not modify this file!
|
||||||
|
|
||||||
This is an auxiliary file used by the 'biblatex' package.
|
This is an auxiliary file used by the 'biblatex' package.
|
||||||
@ -7,5 +7,5 @@ This file may safely be deleted. It will be recreated as
|
|||||||
required.
|
required.
|
||||||
|
|
||||||
@Control{biblatex-control,
|
@Control{biblatex-control,
|
||||||
options = {2.4:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
|
options = {2.5:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -38,7 +38,8 @@
|
|||||||
\@@table
|
\@@table
|
||||||
\end{tabular}}
|
\end{tabular}}
|
||||||
\renewenvironment{prop@proposal}
|
\renewenvironment{prop@proposal}
|
||||||
{\thispagestyle{empty}\begin{center}
|
{\ifgrantagreement\else
|
||||||
|
\thispagestyle{empty}\begin{center}
|
||||||
{\Large \prop@gen@instrument}\\[.2cm]
|
{\Large \prop@gen@instrument}\\[.2cm]
|
||||||
{\Large\textbf\prop@gen@callname}\\[.4cm]
|
{\Large\textbf\prop@gen@callname}\\[.4cm]
|
||||||
{\LARGE \prop@gen@callid}\\[.8cm]
|
{\LARGE \prop@gen@callid}\\[.8cm]
|
||||||
@ -68,6 +69,7 @@
|
|||||||
{\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
|
{\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
|
||||||
\end{center}
|
\end{center}
|
||||||
\newpage
|
\newpage
|
||||||
|
\fi% ifgrantagreement
|
||||||
\setcounter{tocdepth}{2}\setcounter{part}{2}}
|
\setcounter{tocdepth}{2}\setcounter{part}{2}}
|
||||||
{\newpage\printbibliography[heading=warnpubs,maxnames=999]}
|
{\newpage\printbibliography[heading=warnpubs,maxnames=999]}
|
||||||
\def\prop@gen@instrument{Proposal Instrument (e.g. IP)}
|
\def\prop@gen@instrument{Proposal Instrument (e.g. IP)}
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user