From bbe4221a5a900e68bc71e63d40602e713e6a2a63 Mon Sep 17 00:00:00 2001
From: Basile Desloges <basile.desloges@cea.fr>
Date: Mon, 30 Nov 2020 10:45:18 +0100
Subject: [PATCH] [doc] Use common CEA affiliation in the manuals
---
doc/developer/.gitignore | 1 +
doc/developer/developer.tex | 3 ++-
doc/metrics/.gitignore | 1 +
doc/metrics/metrics.tex | 3 ++-
doc/pdg/.gitignore | 1 +
doc/pdg/main.tex | 4 ++--
doc/rte/.gitignore | 1 +
doc/rte/main.tex | 3 ++-
doc/slicing/.gitignore | 1 +
doc/slicing/main.tex | 4 ++--
doc/userman/.gitignore | 1 +
doc/userman/userman.tex | 3 ++-
doc/value/.gitignore | 1 +
doc/value/main.tex | 4 +++-
src/plugins/e-acsl/doc/refman/.gitignore | 1 +
src/plugins/e-acsl/doc/refman/main.tex | 3 ++-
src/plugins/e-acsl/doc/userman/.gitignore | 1 +
src/plugins/e-acsl/doc/userman/main.tex | 3 ++-
src/plugins/wp/doc/.gitignore | 1 +
src/plugins/wp/doc/MakeDoc | 2 +-
src/plugins/wp/doc/coqdoc/wpcoq.tex | 6 ++++--
src/plugins/wp/doc/manual/wp.tex | 4 +++-
22 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/doc/developer/.gitignore b/doc/developer/.gitignore
index 467e4f7ba1e..a8469496d26 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 a8551f1f9cb..bfbcff35c7c 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 b090424f988..06c1c792c58 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 37139b90cc2..11b1f4ada00 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 144038366c7..e9b8c334540 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 ca47e607056..3cf6f09d404 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 b1a70f5efef..92f50e6b35d 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 1e2da481423..f1582267f5d 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 91ebc66bd3c..1913f75af09 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 84b6368ed1a..817f8ce0d0b 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 123e8688a45..f7fe0b37113 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 14e4cb255bb..f78664bfc94 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 99df3ceaf82..a15bb914b73 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 73eabe27d0a..a1e9c8363d9 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 af1f84a1f2f..b4014d51222 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 f64b135dd8f..6991b746d98 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 671d4c89b27..3ffa44f89d7 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 746d1444a18..e09b1f89183 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 e195051b602..fb69883f1c1 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 6ff81f5081a..b646e4383b9 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 a21ba54eaf2..a6e95271c09 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 b80b0af7ed8..f843fe3c40b 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}
--
GitLab