summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/proposal
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-15 21:38:41 +0000
committerKarl Berry <karl@freefriends.org>2016-04-15 21:38:41 +0000
commit5e77de80c3619d378c8a85ab0e2413086a57a8a5 (patch)
tree485e88bc2ff057b1286d2d244b8c6afb2ac16fd8 /Master/texmf-dist/tex/latex/proposal
parentdac3dfcfa52f854fa71354a5f4c8c8bb3aa4bc43 (diff)
proposal (15apr16)
git-svn-id: svn://tug.org/texlive/trunk@40538 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/proposal')
-rw-r--r--Master/texmf-dist/tex/latex/proposal/base/pdata.sty6
-rw-r--r--Master/texmf-dist/tex/latex/proposal/base/proposal.cls21
-rw-r--r--Master/texmf-dist/tex/latex/proposal/base/reporting.cls12
-rw-r--r--Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty16
-rw-r--r--Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls2
-rw-r--r--Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls2
-rw-r--r--Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty2
-rw-r--r--Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls2
-rw-r--r--Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls2
9 files changed, 32 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
index fb8f99c8d3a..445364676bd 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty
@@ -7,7 +7,7 @@
%% proposal.dtx (with options: `pdata')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data]
+\ProvidesPackage{pdata}[2016/04/15 v1.5 Project Data]
\RequirePackage{workaddress}[2011/05/03]
\RequirePackage{eurosym}
\newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
@@ -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}}%
-\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
+\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}
\define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}%
-\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
+\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}
\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@ref{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
diff --git a/Master/texmf-dist/tex/latex/proposal/base/proposal.cls b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
index 94f2250ff93..625ca4af6de 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/base/proposal.cls
@@ -7,7 +7,7 @@
%% proposal.dtx (with options: `cls')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal]
+\ProvidesClass{proposal}[2016/04/15 v1.5 Project Proposal]
\newif\if@wpsubsection\@wpsubsectionfalse
\newif\ifsubmit\submitfalse
\newif\ifgrantagreement\grantagreementfalse
@@ -53,7 +53,7 @@
\renewcommand{\familydefault}{\sfdefault}
\RequirePackage[scaled=.90]{helvet}
\RequirePackage{textcomp}
-\RequirePackage[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
+\RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
\RequirePackage{csquotes}
\RequirePackage{mdframed}
\RequirePackage{pdata}
@@ -109,15 +109,15 @@
\begin{itemize}
\@for\@I:=\prop@gen@PIs\do{%
\item Curriculum Vitae and list of publications for
- \wa@ref{person}\@I{personaltitle} \wa@ref{person}\@I{name}
-\end{itemize}}\newpage
+ \wa@ref{person}\@I{personaltitle} \wa@ref{person}\@I{name}}
+\end{itemize}\newpage
\printbibliography[heading=warnpubs]}
\newenvironment{proposal}[1][]{\readpdata\jobname
\ofpagetrue\setkeys{prop@gen}{#1}
\pdata@open\jobname
\if@sites\else
\define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}}
-\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi
+\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}
\fi
\newcounter{@PIs}
\@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}}
@@ -564,8 +564,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40}
\else\begin{tabular}{|l|l|*{\thewpfig@options}{r|}|*{\the@sites}{r|}|r|}\hline\fi%|
\wpfig@headline\\\hline\hline}
{\end{tabular}\smallskip\\
-\wpfig@legend@RAM@expl
-\if@sites; \wpfig@legend@lead@expl\fi
+\wpfig@legend@RAM@expl\if@sites; \wpfig@legend@lead@expl\fi
\@ifundefined{wpfig@label}{\caption{\wpfig@legend@caption}}{\caption{\wpfig@caption}}
\@ifundefined{wpfig@label}{\label{fig:wplist}}{\label{\wpfig@label}}
\end{center}\end{table}}
@@ -1003,16 +1002,14 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
\DeclareBibliographyCategory{featured}
\newcommand\prop@paperlist[2][]{%
-\begin{refsection}%
-\nocite{#2}\addtocategory{featured}{#2}%
\let\biboldfont\bibfont%
\renewcommand{\bibfont}{\footnotesize}%
\renewcommand{\baselinestretch}{.9}
+\def\do##1{\addtocategory{featured}{##1}}\docsvlist{#2}%
\setkeys{paperlist}{#1}
\@ifundefined{prop@rl}{}{\@latex@warning{some papers are not classified!}}
-\if@allpapers\printbibliography[heading=empty]\fi%
-\let\bibfont\biboldfont%
-\end{refsection}}
+\if@allpapers\printbibliography[category=featured,heading=empty]\fi%
+\let\bibfont\biboldfont}
\def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
\def\prop@warnpubs@title{References}
\defbibheading{warnpubs}{\section*{\prop@warnpubs@title}%
diff --git a/Master/texmf-dist/tex/latex/proposal/base/reporting.cls b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
index 4ba4de475b8..f9ce0159ff3 100644
--- a/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/base/reporting.cls
@@ -7,7 +7,7 @@
%% proposal.dtx (with options: `reporting')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting]
+\ProvidesPackage{reporting}[2016/04/15 v1.5 Project Reporting]
\newif\if@wpsubsection\@wpsubsectionfalse
\newif\ifsubmit\submitfalse
\newif\ifgrantagreement\grantagreementfalse
@@ -53,7 +53,7 @@
\renewcommand{\familydefault}{\sfdefault}
\RequirePackage[scaled=.90]{helvet}
\RequirePackage{textcomp}
-\RequirePackage[hyperref=auto,style=numeric,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
+\RequirePackage[hyperref=auto,style=alphabetic,defernumbers=true,backend=bibtex,backref=true,firstinits=true,maxbibnames=6]{biblatex}[2010/11-19]
\RequirePackage{csquotes}
\RequirePackage{mdframed}
\RequirePackage{pdata}
@@ -135,16 +135,14 @@
\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
\DeclareBibliographyCategory{featured}
\newcommand\prop@paperlist[2][]{%
-\begin{refsection}%
-\nocite{#2}\addtocategory{featured}{#2}%
\let\biboldfont\bibfont%
\renewcommand{\bibfont}{\footnotesize}%
\renewcommand{\baselinestretch}{.9}
+\def\do##1{\addtocategory{featured}{##1}}\docsvlist{#2}%
\setkeys{paperlist}{#1}
\@ifundefined{prop@rl}{}{\@latex@warning{some papers are not classified!}}
-\if@allpapers\printbibliography[heading=empty]\fi%
-\let\bibfont\biboldfont%
-\end{refsection}}
+\if@allpapers\printbibliography[category=featured,heading=empty]\fi%
+\let\bibfont\biboldfont}
\def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
\def\prop@warnpubs@title{References}
\defbibheading{warnpubs}{\section*{\prop@warnpubs@title}%
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
index 214ef50ba2a..4dd09dc729c 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgpdata.sty
@@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `pdata')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data]
+\ProvidesPackage{dfgpdata}[2016/04/15 v1.4 DFG Project Data]
\newif\ifdeutsch\deutschfalse
\DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
\ProcessOptions
@@ -40,6 +40,8 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}%
\ifdeutsch Arbeitsgebiet\else Fields of work\fi: \prop@gen@areas}
\newcommand\dfgprojpapers[2][]{\prop@paperlist[#1]{#2}}
\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}}
@@ -62,9 +64,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}
@@ -73,11 +75,13 @@ 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\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
\endinput
%%
%% End of file `dfgpdata.sty'.
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
index 01dbbf9b3a1..a4abe627164 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgproposal.cls
@@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `cls')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal]
+\ProvidesClass{dfgproposal}[2016/04/15 v1.4 DFG Proposal]
\newif\ifgeneral\generalfalse
\DeclareOption{general}{\generaltrue}
\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
diff --git a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
index c0d17b3ed5a..9165baf1830 100644
--- a/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/dfg/dfgreporting.cls
@@ -7,7 +7,7 @@
%% dfgproposal.dtx (with options: `reporting')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting]
+\ProvidesPackage{dfgreporting}[2016/04/15 v1.4 DFG Project Reporting]
\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
\ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
index a26e81b1e36..bc761c73fdb 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eupdata.sty
@@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `pdata')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data]
+\ProvidesPackage{eupdata}[2016/04/15 v1.5 EU Project Data]
\define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
\define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
\def\prop@gen@challenge{??}\def\prop@gen@challengeid{??}
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
index 93c3bb7febb..0a168c882b6 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
+++ b/Master/texmf-dist/tex/latex/proposal/eu/euproposal.cls
@@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `cls')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal]
+\ProvidesClass{euproposal}[2016/04/15 v1.5 EU Proposal]
\newif\ifpartB\partBfalse
\DeclareOption{partB}{\partBtrue}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}}
diff --git a/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
index 9195aec875c..7d2bec442cc 100644
--- a/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
+++ b/Master/texmf-dist/tex/latex/proposal/eu/eureporting.cls
@@ -7,7 +7,7 @@
%% euproposal.dtx (with options: `reporting')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting]
+\ProvidesPackage{eureporting}[2016/04/15 v1.5 EU Project Reporting]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
\ProcessOptions
\LoadClass[report,noRAM]{reporting}