From 4d3e9dd21cab72732c75d423caa68a4639113d74 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 8 Sep 2023 08:48:35 +0200
Subject: [PATCH] [userman] revert back to pure Frama-C's frama-c-book.cls

---
 doc/userman/frama-c-book.cls | 44 +++++++++++++-----------------------
 doc/userman/main.tex         |  5 ++--
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/doc/userman/frama-c-book.cls b/doc/userman/frama-c-book.cls
index ea7d7d1d..305ef01a 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 005e04f1..dd88919b 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)}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-- 
GitLab