diff --git a/dfg/Makefile b/dfg/Makefile index 0ab2c9f..3c48bde 100644 --- a/dfg/Makefile +++ b/dfg/Makefile @@ -3,7 +3,7 @@ PACKAGE = dfg TDSCOLL = proposal DTX.cls.base = dfgproposal TDS.tex = dfgreporting.cls dfgpdata.sty -TDS.exdirs = examples/proposal +TDS.exdirs = examples/proposal examples/report CTAN = $(TDS.tex) EXDIRS = examples diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index b53558c..3a66728 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 610e0a1..8231056 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -149,7 +149,7 @@ % the title page, and specify their heights; |1.5cm| is often a good value. % \end{compactitem} % -% \subsection{Work Packages and Work Areas}\label{sec:wpwa} +% \subsection{Work Packages and Work Areas}\label{sec:user:wpwa} % % \DescribeMacro{type} The |type| key specifies the activity type of the work package: % |RTD| = Research and technological development (including any activities to prepare for @@ -171,7 +171,14 @@ % name/deliverables/verification columns in the milestone table. % % \subsection{Risks}\label{sec:user:risks} -% \ednote{MK: document the infrastructure, make examples} +% In some EU proposals (e.g. FET), we need to identify risks and contingency and specify +% mitigation plans for them. In the |euproposal| we use two environments to mark them up. +% +% \DescribeMacro{risk}|\begin{risk}{|\meta{title}|}{|\meta{prob}|}{|\meta{grav}|}|\ldots|\end{risk}| +% makes a paragraph no a risk \meta{title} with gravity \meta{grav} and probability +% \meta{prob}, where the body of the environment contains a description of the risk. The +% \DescribeMacro{riskcont}|riskcont| is a variant, where \meta{title} names a risk and the +% body is a description of the contingency plan. % % \begin{newpart}{MK@MK: This is new, and only partially implemented} % \subsection{Reporting Infrastructure}\label{sec:user:report} @@ -427,7 +434,7 @@ % \end{macrocode} % \end{environment} % -% \subsection{Work Packages, Work Areas, and Deliverables}\label{sec:wpwa} +% \subsection{Work Packages, Work Areas, and Deliverables}\label{sec::impl:wpwa} % % \begin{environment}{wp*} % \begin{macrocode} @@ -555,17 +562,6 @@ % \end{macrocode} % \end{environment} % -% \subsection{Risks}\label{sec:impl:risks} -% -% In some EU proposals (e.g. FET), we need to identify risks and contingency and specify -% mitigation plans for them. In the |euproposal| we use two environments to mark them up. -% -% \DescribeMacro{risk}|\begin{risk}{|\meta{title}|}{|\meta{prob}|}{|\meta{grav}|}|\ldots|\end{risk}| -% makes a paragraph no a risk \meta{title} with gravity \meta{grav} and probability -% \meta{prob}, where the body of the environment contains a description of the risk. The -% \DescribeMacro{riskcont}|riskcont| is a variant, where \meta{title} names a risk and the -% body is a description of the contingency plan. -% % \subsection{Relevant Papers}\label{sec:impl:papers} % % \begin{macro}{\keypubs} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index e051696..fe7cd30 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf index a96f153..e05e337 100644 Binary files a/eu/examples/fetopenstrep/propB.pdf and b/eu/examples/fetopenstrep/propB.pdf differ diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index e55e371..b2dc20f 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ