diff --git a/base/proposal.dtx b/base/proposal.dtx index 763ae37..14820dd 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1533,6 +1533,8 @@ \define@key{deliv}{short}{\def\deliv@short{#1}} \define@key{deliv}{lead}{\def\deliv@lead{#1}} \define@key{deliv}{issue}{\def\deliv@issue{#1}} +\define@key{deliv}{status}{\def\deliv@status{#1}} +\define@key{deliv}{blog}{\def\deliv@blog{#1}} % \end{macrocode} % The |\wpdeliv| macro cycles over the due dates and generates the relevant entries into % the deliverables file. The first step is to write the general metadata to the pdata @@ -1562,11 +1564,14 @@ \@ifundefined{deliv@lead} {\protect\G@refundefinedtrue\@latex@warning{key 'lead' for Deliv \wpg@id undefined}} {\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{lead}{\deliv@lead}} +\@ifundefined{deliv@due}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{due}{\deliv@due}} +\@ifundefined{deliv@issue}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{issue}{\deliv@issue}} +\@ifundefined{deliv@status}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{status}{\deliv@status}} +\@ifundefined{deliv@blog}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{blog}{\deliv@blog}} % \end{macrocode} % Then we iterate over the due dates and generate an entry for teach of them. % \begin{macrocode} \@ifundefined{deliv@due}{}{% -\@ifundefined{deliv@issue}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{issue}{\deliv@issue}} \@for\@I:=\deliv@due\do{\protected@write\wpg@delivs{}{\string\deliverable% {\ifnum\@I<10 0\@I\else\@I\fi}% sort key {\@I}% due date @@ -2470,16 +2475,24 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % % \begin{macro}{\coherencetable} % \begin{macrocode} +\newskip\@bigflushglue \@bigflushglue = -100pt plus 1fil +\def\bigcenter{\trivlist \bigcentering\item\relax} +\def\bigcentering{\let\\\@centercr\rightskip\@bigflushglue% +\leftskip\@bigflushglue +\parindent\z@\parfillskip\z@skip} +\def\endbigcenter{\endtrivlist} \define@key{coherencetable}{swsites}[true]{\def\cht@swsites{#1}} \define@key{coherencetable}{stretch}{\def\cht@stretch{#1}} \newcommand\coherencetable[1][]{% \def\cht@swsites{false}% \def\cht@stretch{1}% \setkeys{coherencetable}{#1}% -\begin{table}[ht]\centering% +\begin{table}[ht]% \small\setlength{\tabcolsep}{.5em}% \renewcommand{\arraystretch}{\cht@stretch}% +\begin{bigcenter}% \coherencematrix% +\end{bigcenter}% \caption{\coherence@caption}\label{tab:collaboration} \end{table}} % \end{macrocode} diff --git a/base/proposal.pdf b/base/proposal.pdf index 4cd06fb..49f02e6 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/proposal.sty b/base/proposal.sty index ec0950a..805657b 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -986,15 +986,12 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje \jorga $\hat=$ organization, \jsoft $\hat=$ software/resource dev, \jsup $\hat=$ supervision}\\\hline \end{tabular}} - \newskip\@bigflushglue \@bigflushglue = -100pt plus 1fil - \def\bigcenter{\trivlist \bigcentering\item\relax} \def\bigcentering{\let\\\@centercr\rightskip\@bigflushglue% \leftskip\@bigflushglue \parindent\z@\parfillskip\z@skip} \def\endbigcenter{\endtrivlist} - \define@key{coherencetable}{swsites}[true]{\def\cht@swsites{#1}} \define@key{coherencetable}{stretch}{\def\cht@stretch{#1}} \newcommand\coherencetable[1][]{% diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index efd0845..4861c46 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -400,12 +400,12 @@ \def\site@desc@height{1.3cm}% default height \def\site@desc@width{5cm}% default width \setkeys{site@desc}{#1}% read the keys to overwrite the defaults -\ifx\@site@desc@box\@true% if we want a logo +\ifx\@site@desc@box\@true% if we want a logo \begin{wrapfigure}{r}{\site@desc@width}\vspace{-2.5ex}% \begin{tabular}{|p{\site@desc@width}|}\hline\vspace{1mm}% -\ifx\@site@desc@logo\@true% if we want a logo +\ifx\@site@desc@logo\@true% if we want a logo \wa@institution@logo[height=\site@desc@width]{#2}\\[1ex]% -\fi% end logo +\fi% end logo \textbf{\wa@ref3{institution}{#2}{type}.\hfill \wa@ref3{institution}{#2}{country}}\\% \small\wa@ref3{institution}{#2}{streetaddress}, \wa@ref3{institution}{#2}{townzip}\\\hline% \end{tabular}\vspace{-2.5ex}% @@ -513,7 +513,7 @@ \def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm} \setkeys{mst}{#1}% {\gdef\mst@lines{}%initialize -\let\tabularnewline\relax\let\hline\relax% so they +\let\tabularnewline\relax\let\hline\relax% so they \let\textbf\relax\let\emph\relax% do not bother us \edef\@@miles{\pdataref{all}{mile}{ids}} \@for\@I:=\@@miles\do{ diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index b7a4dc7..b97e8f9 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 b6c0dbd..05b5371 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ