diff --git a/doc/developer/.gitignore b/doc/developer/.gitignore
index 467e4f7ba1e8c3035d4eb5cb489cf74b3cacbbae..a8469496d265792a2f0949dad390b0c1dc398303 100644
--- a/doc/developer/.gitignore
+++ b/doc/developer/.gitignore
@@ -3,6 +3,7 @@
/frama-c-cover.pdf
/frama-c-left.pdf
/frama-c-right.pdf
+/frama-c-affiliation.tex
/hello_world/
/tutorial/viewcfg/generated/
/tutorial/hello/generated/
diff --git a/doc/developer/developer.tex b/doc/developer/developer.tex
index a8551f1f9cba789e688fbcb579b579f7bec66fbf..bfbcff35c7c874f3c1f4c29b8f560be6bd19c43f 100644
--- a/doc/developer/developer.tex
+++ b/doc/developer/developer.tex
@@ -29,6 +29,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\input{./macros.sty}
+\input{./frama-c-affiliation.tex}
\makeindex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -47,7 +48,7 @@
\author{Julien~Signoles with Thibaud~Antignac, Loïc~Correnson, Matthieu~Lemerre
and Virgile~Prevosto}
\begin{center}
-CEA LIST, Software Security Laboratory, Saclay,F-91191
+ \fcaffiliationen
\end{center}
\vfill
\begin{flushleft}
diff --git a/doc/metrics/.gitignore b/doc/metrics/.gitignore
index b090424f9881164cba1a32e5044ef1b1363f77a4..06c1c792c58efdabbee5c308a8da223fa4e5e78d 100644
--- a/doc/metrics/.gitignore
+++ b/doc/metrics/.gitignore
@@ -2,4 +2,5 @@
/frama-c-cover.pdf
/frama-c-left.pdf
/frama-c-right.pdf
+/frama-c-affiliation.tex
/metrics.pdf
diff --git a/doc/metrics/metrics.tex b/doc/metrics/metrics.tex
index 37139b90cc2c5c8847cde229f7ebf47b3c51824b..11b1f4ada005edcff0f2e4660c999e36440640df 100644
--- a/doc/metrics/metrics.tex
+++ b/doc/metrics/metrics.tex
@@ -3,6 +3,7 @@
\usepackage{amsmath}
\newcommand{\framacversion}%
{\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)}
+\input{./frama-c-affiliation.tex}
\begin{document}
\coverpage{Metrics}
@@ -15,7 +16,7 @@
\title{Frama-C's metrics plug-in}{\framacversion}
\author{Richard Bonichon \& Boris Yakobowski}
\begin{tabular}{l}
-CEA LIST, Software Reliability Laboratory, Saclay, F-91191 \\
+ \fcaffiliationen
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/doc/pdg/.gitignore b/doc/pdg/.gitignore
index 144038366c79af13135b3357ed21da6c83ac23a1..e9b8c33454088763484eba5e7f1613510710dbf6 100644
--- a/doc/pdg/.gitignore
+++ b/doc/pdg/.gitignore
@@ -3,4 +3,5 @@ frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
+frama-c-affiliation.tex
main.pdf
diff --git a/doc/pdg/main.tex b/doc/pdg/main.tex
index ca47e607056375c04fe2cd5f00a980bdc09c3f60..3cf6f09d404672b752373e4173fd65c837b63ff2 100644
--- a/doc/pdg/main.tex
+++ b/doc/pdg/main.tex
@@ -1,6 +1,7 @@
\documentclass[a4paper,11pt,twoside,openright,web,lang=french]{frama-c-book}
\input{macros_pdg.tex}
+\input{./frama-c-affiliation.tex}
%==============================================================================
\begin{document}
@@ -14,8 +15,7 @@
\title{Documentation du greffon PDG}{Calcul de dépendances dans un programme C}
\author{Anne Pacalet et Patrick Baudin}
\begin{tabular}{l}
- CEA-List, Université Paris-Saclay \\
- Laboratoire de Sûreté et Sécurité des Logiciels \\
+ \fcaffiliationfr
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/doc/rte/.gitignore b/doc/rte/.gitignore
index b1a70f5efeffc6dad9d6868751dfaea6ece0b0ab..92f50e6b35d68a2b554aa3e2ff3783d0daf47760 100644
--- a/doc/rte/.gitignore
+++ b/doc/rte/.gitignore
@@ -3,4 +3,5 @@
/frama-c-left.pdf
/frama-c-right.pdf
/framacversion.tex
+/frama-c-affiliation.tex
/main.pdf
diff --git a/doc/rte/main.tex b/doc/rte/main.tex
index 1e2da4814231b171fcd0a3a4ea3ca85e90ff28ef..f1582267f5d792036d0e425fc8b69ac95780f7bf 100644
--- a/doc/rte/main.tex
+++ b/doc/rte/main.tex
@@ -4,6 +4,7 @@
{\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)}
%%\usepackage{microtype}
\input{macros_modern}
+\input{./frama-c-affiliation.tex}
%%modern \usepackage{pslatex}
%%modern \usepackage{a4wide}
@@ -60,7 +61,7 @@
\title{Frama-C's RTE plug-in}{for Frama-C \framacversion}
\author{Philippe Herrmann and Julien Signoles}
\begin{tabular}{l}
-CEA LIST, Software Safety Laboratory, Saclay, F-91191 \\
+ \fcaffiliationen
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/doc/slicing/.gitignore b/doc/slicing/.gitignore
index 91ebc66bd3c739930507edb3c2f09a066b922fbf..1913f75af091fc85fd9142f3bab9583ee9561490 100644
--- a/doc/slicing/.gitignore
+++ b/doc/slicing/.gitignore
@@ -3,6 +3,7 @@ frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
+frama-c-affiliation.tex
main.pdf
call.pdf
choose_call.pdf
diff --git a/doc/slicing/main.tex b/doc/slicing/main.tex
index 84b6368ed1a84dba5be85e2d8a4dad3d82692fca..817f8ce0d0b860c0703cf04241a512d877f21582 100644
--- a/doc/slicing/main.tex
+++ b/doc/slicing/main.tex
@@ -3,6 +3,7 @@
%\usepackage[french]{babel}
\input{macros_slicing.tex}
+\input{./frama-c-affiliation.tex}
%==============================================================================
\begin{document}
@@ -16,8 +17,7 @@
\title{Documentation du greffon Slicing}{Conception d'un outil de Slicing}
\author{Anne Pacalet et Patrick Baudin}
\begin{tabular}{l}
- CEA-List, Université Paris-Saclay \\
- Laboratoire de Sûreté et Sécurité des Logiciels \\
+ \fcaffiliationfr
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/doc/userman/.gitignore b/doc/userman/.gitignore
index 123e8688a45628ae0ed64486b4c7558e200633ed..f7fe0b371139f1dac67e7449fabe7c0b52a17614 100644
--- a/doc/userman/.gitignore
+++ b/doc/userman/.gitignore
@@ -2,6 +2,7 @@ frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
+frama-c-affiliation.tex
userman.idx
userman.out
userman.pdf
diff --git a/doc/userman/userman.tex b/doc/userman/userman.tex
index 14e4cb255bb86c581c303c71df2b53a06afb9918..f78664bfc948f7e5908c1149f94756b2e8560e2b 100644
--- a/doc/userman/userman.tex
+++ b/doc/userman/userman.tex
@@ -5,6 +5,7 @@
\usepackage{calc}
\include{macros}
+\input{./frama-c-affiliation.tex}
\makeindex
@@ -22,7 +23,7 @@
Maroneze, Virgile Prevosto, Armand Puccetti, Julien Signoles and Boris
Yakobowski}
\begin{tabular}{l}
-CEA LIST, Software Safety Laboratory, Saclay, F-91191 \\
+ \fcaffiliationen
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/doc/value/.gitignore b/doc/value/.gitignore
index 99df3ceaf82a7b06d45a948914548ee6eb87bfad..a15bb914b73364a99358ebb658fc07b6832ca571 100644
--- a/doc/value/.gitignore
+++ b/doc/value/.gitignore
@@ -2,5 +2,6 @@
/frama-c-cover.pdf
/frama-c-left.pdf
/frama-c-right.pdf
+/frama-c-affiliation.tex
/main.pdf
diff --git a/doc/value/main.tex b/doc/value/main.tex
index 73eabe27d0a04b4fff6431e8c30cd12d9764ebe2..a1e9c8363d968adcd504324032e94b471bb1bc52 100644
--- a/doc/value/main.tex
+++ b/doc/value/main.tex
@@ -35,6 +35,8 @@
\newcommand{\Eva}{\textsf{Eva}}
+\input{./frama-c-affiliation.tex}
+
\lstset{literate=%
{∈}{{$\in$ }}1
}
@@ -70,7 +72,7 @@
With Matthieu Lemerre, André Maroneze,
Valentin Perrelle and Virgile Prevosto}
\begin{tabular}{l}
-CEA LIST, Software Reliability Laboratory, Saclay, F-91191 \\
+ \fcaffiliationen
\end{tabular}
\vfill
\begin{flushleft}
diff --git a/src/plugins/e-acsl/doc/refman/.gitignore b/src/plugins/e-acsl/doc/refman/.gitignore
index af1f84a1f2fe63f47eb92d0d937027e16a6870b6..b4014d512227c85fcc1877d8a66393172faeb8b8 100644
--- a/src/plugins/e-acsl/doc/refman/.gitignore
+++ b/src/plugins/e-acsl/doc/refman/.gitignore
@@ -2,6 +2,7 @@ frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
+frama-c-affiliation.tex
e-acsl.pdf
e-acsl-implementation.pdf
eacslversion.tex
diff --git a/src/plugins/e-acsl/doc/refman/main.tex b/src/plugins/e-acsl/doc/refman/main.tex
index f64b135dd8fbdb26c3847218c9196aebe3fd4971..6991b746d9895195da18ac1abcf598439bea00f0 100644
--- a/src/plugins/e-acsl/doc/refman/main.tex
+++ b/src/plugins/e-acsl/doc/refman/main.tex
@@ -4,6 +4,7 @@
\usepackage{ifthen}
\input{./macros_modern}
+\input{./frama-c-affiliation.tex}
\input{eacslversion.tex}
%Do not touch the following line. It is used in a Makefile hack to
%produce the ACSL documents for the ACSL working group.
@@ -52,7 +53,7 @@
\author{Julien Signoles}
-CEA LIST, Software Reliability Laboratory\\
+\fcaffiliationen
\vfill
\begin{flushleft}
\textcopyright 2011-2018 CEA LIST
diff --git a/src/plugins/e-acsl/doc/userman/.gitignore b/src/plugins/e-acsl/doc/userman/.gitignore
index 671d4c89b275efe0a0340cb7031bff9ec005da2e..3ffa44f89d754052b750df77ee3ef0975b691b4d 100644
--- a/src/plugins/e-acsl/doc/userman/.gitignore
+++ b/src/plugins/e-acsl/doc/userman/.gitignore
@@ -2,4 +2,5 @@ frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
+frama-c-affiliation.tex
main.pdf
diff --git a/src/plugins/e-acsl/doc/userman/main.tex b/src/plugins/e-acsl/doc/userman/main.tex
index 746d1444a183830b0a0579fa2694c3697e0d7f74..e09b1f891832af3bdce652e3a6396aaebe8888c6 100644
--- a/src/plugins/e-acsl/doc/userman/main.tex
+++ b/src/plugins/e-acsl/doc/userman/main.tex
@@ -5,6 +5,7 @@
\include{macros}
\include{eacslversion}
+\input{./frama-c-affiliation.tex}
\makeindex
@@ -22,7 +23,7 @@
\\[1em] compatible with \framac \fcversion}}
\author{Julien Signoles, Basile Desloges and Kostyantyn Vorobyov}
\begin{center}
-CEA LIST\\ Software Reliability \& Security Laboratory
+\fcaffiliationen
\end{center}
\vfill
\begin{flushleft}
diff --git a/src/plugins/wp/doc/.gitignore b/src/plugins/wp/doc/.gitignore
index e195051b60210ec0669af77b336478afbeb0e052..fb69883f1c12df2485661e790fe77671c0f97e40 100644
--- a/src/plugins/wp/doc/.gitignore
+++ b/src/plugins/wp/doc/.gitignore
@@ -1,3 +1,4 @@
frama-c-book.cls
+frama-c-affiliation.tex
feedback
/html
diff --git a/src/plugins/wp/doc/MakeDoc b/src/plugins/wp/doc/MakeDoc
index 6ff81f5081a408126359af289823c2e404ec4c89..b646e4383b9812cac2fde373dbbb3679487199d8 100644
--- a/src/plugins/wp/doc/MakeDoc
+++ b/src/plugins/wp/doc/MakeDoc
@@ -3,7 +3,7 @@
# --------------------------------------------------------------------------
FRAMAC_DOC= .make-class .make-images .make-icons VERSION VERSION_CODENAME
# --------------------------------------------------------------------------
-FRAMAC_CLASS=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf
+FRAMAC_CLASS=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf frama-c-affiliation.tex
FRAMAC_BULLETS=never_tried.png unknown.png valid_under_hyp.png surely_valid.png
FRAMAC_IMAGES=cealistlogo.jpg
# --------------------------------------------------------------------------
diff --git a/src/plugins/wp/doc/coqdoc/wpcoq.tex b/src/plugins/wp/doc/coqdoc/wpcoq.tex
index a21ba54eaf2fd0cab314a58e8f1b26887b1f7f49..a6e95271c094fe91633b0d02451e303e67857e81 100644
--- a/src/plugins/wp/doc/coqdoc/wpcoq.tex
+++ b/src/plugins/wp/doc/coqdoc/wpcoq.tex
@@ -3,6 +3,8 @@
\usepackage{pifont}
\usepackage{coq2latex}
+\input{./frama-c-affiliation.tex}
+
\begin{document}
\coverpage{WP Coq Handbook}
\begin{titlepage}
@@ -11,9 +13,9 @@
\vfill
\title{WP Coq Handbook}%
{Version 0.7 for Oxygen-20120901+dev}
-\author{Patrick Baudin, Loïc Correnson, Zaynah Dargaye}
+\author{Patrick Baudin, Lo�c Correnson, Zaynah Dargaye}
\begin{center}
-CEA LIST, Software Safety Laboratory
+ \fcaffiliationen
\end{center}
\vfill
\begin{flushleft}
diff --git a/src/plugins/wp/doc/manual/wp.tex b/src/plugins/wp/doc/manual/wp.tex
index b80b0af7ed8433e30119fb309e4cb68f21cc2283..f843fe3c40bbf4075410b24b52e4029d39f6a183 100644
--- a/src/plugins/wp/doc/manual/wp.tex
+++ b/src/plugins/wp/doc/manual/wp.tex
@@ -11,6 +11,8 @@
\usepackage{longtable}
\usepackage{pifont}
+\input{./frama-c-affiliation.tex}
+
%\anticopyCEA{} % To comments for public version.
\begin{document}
\newcommand{\FCVERSION}{\input{VERSION}(\input{VERSION_CODENAME}\unskip)}
@@ -23,7 +25,7 @@
{\tt Frama-C \FCVERSION}
\author{Patrick Baudin, François Bobot, Loïc Correnson, Zaynah Dargaye, Allan Blanchard}
\begin{center}
-CEA LIST, Software Safety Laboratory
+ \fcaffiliationen
\end{center}
\vfill
\begin{flushleft}