diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/proposal/base/pdata.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/proposal/base/pdata.sty | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/proposal/base/pdata.sty b/Master/texmf-dist/tex/latex/proposal/base/pdata.sty index a08372865b9..fb8f99c8d3a 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}[2013/02/13 v1.4 Project Data] +\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data] \RequirePackage{workaddress}[2011/05/03] \RequirePackage{eurosym} \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax% @@ -42,6 +42,8 @@ \pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}} \define@key{prop@gen}{acrolong}{\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}% \pdata@def{prop}{gen}{discipline}{#1}} \define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}% @@ -56,10 +58,17 @@ \pdata@def{prop}{gen}{totalduration}{#1}} \define@key{prop@gen}{fundsuntil}{\def\prop@gen@fundsuntil{#1}% \pdata@def{prop}{gen}{fundsuntil}{#1}} -\newcommand\prop@gen@acro{ACRONYM} -\newcommand\prop@gen@months{???} -\newcommand\prop@gen@title{???Proposal Title???} -\newcommand\prop@gen@instrument{??? Instrument ???} +\define@key{prop@gen}{topdownPM}[true]{\def\prop@gen@topdownPM{#1}} +\define@key{prop@gen}{botupPM}[true]{\def\prop@gen@botupPM{#1}} +\define@key{prop@gen}{keywords}{\def\prop@gen@keywords{#1}} +\newcommand\prop@gen@acro@default{ACRONYM} +\def\prop@gen@acro{\prop@gen@acro@default} +\newcommand\prop@gen@months@default{???months???} +\def\prop@gen@months{\prop@gen@months@default} +\newcommand\prop@gen@title@default{???Proposal Title???} +\def\prop@gen@title{\prop@gen@title@default} +\newcommand\prop@gen@instrument@default{??? Instrument ???} +\def\prop@gen@instrument{\prop@gen@instrument@default} \newcommand\prop@tl[2]{\xdef\tab@line{} \@for\tl@ext:={#1}\do{\xdef\tab@line{\tab@line}} \tab@line} @@ -85,19 +94,29 @@ \newcommand\pdataref@aux[3]{\@ifundefined{#1@#2@#3}{??}{\csname #1@#2@#3\endcsname}}% \newcommand\pdataref@num[3]{\@ifundefined{#1@#2@#3}{0}{\csname #1@#2@#3\endcsname}}% \newcommand\pdataref@safe[3]{\@ifundefined{#1@#2@#3}{}{\csname #1@#2@#3\endcsname}}% +\newcommand\pdatarefFB[4]{\@ifundefined{#1@#2@#3}% +{\@ifundefined{#1@#2@#4}% +{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}% +{\csname #1@#2@#4\endcsname}} +{\csname #1@#2@#3\endcsname}} \newcommand\pdataRef[3]{\@ifundefined{#1@#2@#3}% {\protect\G@refundefinedtrue\@latex@warning{#3 for #1 #2 undefined}??}% {\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}} +\newcommand\pdataRefFB[4]{\@ifundefined{#1@#2@#3}% +{\@ifundefined{#1@#2@#4}% +{\protect\G@refundefinedtrue\@latex@warning{both #3 and its fallback #4 undefined for #1 #2}??}% +{\hyperlink{#1@#2@target}{\csname #1@#2@#4\endcsname}}} +{\hyperlink{#1@#2@target}{\csname #1@#2@#3\endcsname}}} \newcommand\prop@count[1]{\ifcase #1 zero\or one\or two\or three\or four\or five\or six\or seven \or eight\or nine\or ten\or eleven \or twelve\else#1\fi} \newcommand\pdatacount[2]{\prop@count{\pdataref@num{#1}{#2}{count}}} \newcommand\pn{\pdataref{prop}{gen}{acronym}\xspace} \newcommand\pnlong{\pdataref{prop}{gen}{acrolong}\xspace} \newcommand\WPref[1]{\pdataRef{wp}{#1}{label}} -\newcommand\WPtref[1]{\pdataRef{wp}{#1}{label}: \pdataRef{wp}{#1}{short}} +\newcommand\WPtref[1]{\WPref{#1}: \pdataRefFB{wp}{#1}{short}{title}} \ifwork@areas \newcommand\WAref[1]{\pdataRef{wa}{#1}{label}} -\newcommand\WAtref[1]{\pdataRef{wa}{#1}{label}: \pdataRef{wa}{#1}{title}} +\newcommand\WAtref[1]{\WAref{#1}: \pdataRefFB{wa}{#1}{short}{title}} \fi \newcommand{\signatures}[1]{\section{#1} \qquad\number\day. \number\month. \number\year\\[6ex] |