diff --git a/doc/userman/frama-c-book.cls b/doc/userman/frama-c-book.cls index ea7d7d1d67e24521da5f5a3a269c8db64c356728..305ef01afb2165e01d1a5edfcd57dc28a998c22d 100644 --- a/doc/userman/frama-c-book.cls +++ b/doc/userman/frama-c-book.cls @@ -262,16 +262,6 @@ \listadd{\@people}{#1} } -\def\@anrprojects{} -\newcommand{\acknowledgeANRproject}[1]{ - \listadd{\@anrprojects}{#1} -} - -\def\@euprojects{} -\newcommand{\acknowledgeEUproject}[1]{ - \listadd{\@euprojects}{#1} -} - \newcommand{\commaorandlist}[1]{% \count255=0 \def\do##1{\advance\count255 1 \chardef\finalitem=\count255 }% @@ -292,28 +282,26 @@ }} -% \acknowledgeprogram{<flag image file>}{<text inside box>} -\newcommand{\acknowledgeprogram}[5]{ - \noindent\fbox{% - \parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{% - \begin{minipage}{1.2cm}% - \includegraphics[width=\textwidth]{#1}% - \end{minipage}% - \hfill% - \begin{minipage}{0.9\textwidth}% - This work has been partially funded by #2 as part of the #3 program, - through the #4 project, under grant agreement No #5.% - \end{minipage}% - }% - }% +% \acknowledge{<flag image file>}{<text inside box>} +\newcommand{\acknowledgeprogram}[2]{ + \fbox{ + \begin{minipage}{0.97\textwidth} + \begin{minipage}{1.2cm} + \includegraphics[width=\linewidth]{#1} + \end{minipage} + \begin{minipage}{0.90\textwidth} + This project has received funding from #2. + \end{minipage} + \end{minipage} + } } -\newcommand{\acknowledgeANR}[3]{ - \acknowledgeprogram{anr-logo.png}{ANR}{#1}{#2}{#3} +\newcommand{\acknowledgeANR}[1]{ + \acknowledgeprogram{anr-logo.png}{#1} } -\newcommand{\acknowledgeEU}[3]{ - \acknowledgeprogram{eu-flag.jpg}{European Union}{#1}{#2}{#3} +\newcommand{\acknowledgeEU}[1]{ + \acknowledgeprogram{eu-flag.jpg}{#1} } % -------------------------------------------------------------------------- diff --git a/doc/userman/main.tex b/doc/userman/main.tex index 005e04f100f74368b53d3960860ac43b68571116..dd88919b16f5da4de5179eb08c53d6aa37acfa87 100644 --- a/doc/userman/main.tex +++ b/doc/userman/main.tex @@ -42,7 +42,7 @@ This is the user manual for the \FramaC plug-in \framaclang.\footnote{\url{https://frama-c.com/frama-clang.html}} The contents of this document correspond to version \fclangversion of the plug-in compatible with the -\framacversion version of \FramaC~\cite{userman,fac15}. The development of +\framacversion version of \FramaC~\cite{userman,baudinCACM21}. The development of the \framaclang plug-in is still ongoing. Features described by this document will certainly evolve in the future. @@ -50,7 +50,8 @@ evolve in the future. \insertpeople \\[1em] -\acknowledgeEU{Horizon 2020}{VESSEDIA}{731453} +\acknowledgeEU{the European Union's Horizon 2020 Programme + under grant agreement N°\,731453 (VESSEDIA)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%