Skip to content
Snippets Groups Projects
Commit 793e9663 authored by Allan Blanchard's avatar Allan Blanchard
Browse files

Merge branch 'feature/basile/doc-affiliation' into 'master'

[doc] Update CEA affiliation in manuals

Closes #987

See merge request frama-c/frama-c!2967
parents e76c7779 64dc9a46
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 12 deletions
FRAMAC_DOC_ROOT_DIR?=.. FRAMAC_DOC_ROOT_DIR?=..
FRAMAC_MODERN=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf FRAMAC_MODERN=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf frama-c-affiliation.tex
frama-c-book.cls: $(FRAMAC_DOC_ROOT_DIR)/frama-c-book.cls frama-c-book.cls: $(FRAMAC_DOC_ROOT_DIR)/frama-c-book.cls
@rm -f $@ @rm -f $@
...@@ -24,3 +24,9 @@ frama-c-left.pdf: $(FRAMAC_DOC_ROOT_DIR)/frama-c-left.pdf ...@@ -24,3 +24,9 @@ frama-c-left.pdf: $(FRAMAC_DOC_ROOT_DIR)/frama-c-left.pdf
@cp $< . @cp $< .
@chmod a-w $@ @chmod a-w $@
@echo "import $<" @echo "import $<"
frama-c-affiliation.tex: $(FRAMAC_DOC_ROOT_DIR)/frama-c-affiliation.tex
@rm -f $@
@cp $< .
@chmod a-w $@
@echo "import $<"
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
/frama-c-cover.pdf /frama-c-cover.pdf
/frama-c-left.pdf /frama-c-left.pdf
/frama-c-right.pdf /frama-c-right.pdf
/frama-c-affiliation.tex
/hello_world/ /hello_world/
/tutorial/viewcfg/generated/ /tutorial/viewcfg/generated/
/tutorial/hello/generated/ /tutorial/hello/generated/
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\input{./macros.sty} \input{./macros.sty}
\input{./frama-c-affiliation.tex}
\makeindex \makeindex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
\author{Julien~Signoles with Thibaud~Antignac, Loïc~Correnson, Matthieu~Lemerre \author{Julien~Signoles with Thibaud~Antignac, Loïc~Correnson, Matthieu~Lemerre
and Virgile~Prevosto} and Virgile~Prevosto}
\begin{center} \begin{center}
CEA LIST, Software Security Laboratory, Saclay,F-91191 \fcaffiliationen
\end{center} \end{center}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
\newcommand{\fcaffiliationen}{CEA-List, Université Paris-Saclay\\ Software Safety and Security Lab\xspace}
\newcommand{\fcaffiliationfr}{CEA-List, Université Paris-Saclay\\ Laboratoire de Sûreté et Sécurité des Logiciels\xspace}
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
/frama-c-cover.pdf /frama-c-cover.pdf
/frama-c-left.pdf /frama-c-left.pdf
/frama-c-right.pdf /frama-c-right.pdf
/frama-c-affiliation.tex
/metrics.pdf /metrics.pdf
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
\usepackage{amsmath} \usepackage{amsmath}
\newcommand{\framacversion}% \newcommand{\framacversion}%
{\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)} {\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)}
\input{./frama-c-affiliation.tex}
\begin{document} \begin{document}
\coverpage{Metrics} \coverpage{Metrics}
...@@ -15,7 +16,7 @@ ...@@ -15,7 +16,7 @@
\title{Frama-C's metrics plug-in}{\framacversion} \title{Frama-C's metrics plug-in}{\framacversion}
\author{Richard Bonichon \& Boris Yakobowski} \author{Richard Bonichon \& Boris Yakobowski}
\begin{tabular}{l} \begin{tabular}{l}
CEA LIST, Software Reliability Laboratory, Saclay, F-91191 \\ \fcaffiliationen
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -3,4 +3,5 @@ frama-c-book.cls ...@@ -3,4 +3,5 @@ frama-c-book.cls
frama-c-cover.pdf frama-c-cover.pdf
frama-c-left.pdf frama-c-left.pdf
frama-c-right.pdf frama-c-right.pdf
frama-c-affiliation.tex
main.pdf main.pdf
\documentclass[a4paper,11pt,twoside,openright,web,lang=french]{frama-c-book} \documentclass[a4paper,11pt,twoside,openright,web,lang=french]{frama-c-book}
\input{macros_pdg.tex} \input{macros_pdg.tex}
\input{./frama-c-affiliation.tex}
%============================================================================== %==============================================================================
\begin{document} \begin{document}
...@@ -14,8 +15,7 @@ ...@@ -14,8 +15,7 @@
\title{Documentation du greffon PDG}{Calcul de dépendances dans un programme C} \title{Documentation du greffon PDG}{Calcul de dépendances dans un programme C}
\author{Anne Pacalet et Patrick Baudin} \author{Anne Pacalet et Patrick Baudin}
\begin{tabular}{l} \begin{tabular}{l}
CEA-List, Université Paris-Saclay \\ \fcaffiliationfr
Laboratoire de Sûreté et Sécurité des Logiciels \\
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
/frama-c-left.pdf /frama-c-left.pdf
/frama-c-right.pdf /frama-c-right.pdf
/framacversion.tex /framacversion.tex
/frama-c-affiliation.tex
/main.pdf /main.pdf
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)} {\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)}
%%\usepackage{microtype} %%\usepackage{microtype}
\input{macros_modern} \input{macros_modern}
\input{./frama-c-affiliation.tex}
%%modern \usepackage{pslatex} %%modern \usepackage{pslatex}
%%modern \usepackage{a4wide} %%modern \usepackage{a4wide}
...@@ -60,7 +61,7 @@ ...@@ -60,7 +61,7 @@
\title{Frama-C's RTE plug-in}{for Frama-C \framacversion} \title{Frama-C's RTE plug-in}{for Frama-C \framacversion}
\author{Philippe Herrmann and Julien Signoles} \author{Philippe Herrmann and Julien Signoles}
\begin{tabular}{l} \begin{tabular}{l}
CEA LIST, Software Safety Laboratory, Saclay, F-91191 \\ \fcaffiliationen
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -3,6 +3,7 @@ frama-c-book.cls ...@@ -3,6 +3,7 @@ frama-c-book.cls
frama-c-cover.pdf frama-c-cover.pdf
frama-c-left.pdf frama-c-left.pdf
frama-c-right.pdf frama-c-right.pdf
frama-c-affiliation.tex
main.pdf main.pdf
call.pdf call.pdf
choose_call.pdf choose_call.pdf
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
%\usepackage[french]{babel} %\usepackage[french]{babel}
\input{macros_slicing.tex} \input{macros_slicing.tex}
\input{./frama-c-affiliation.tex}
%============================================================================== %==============================================================================
\begin{document} \begin{document}
...@@ -16,8 +17,7 @@ ...@@ -16,8 +17,7 @@
\title{Documentation du greffon Slicing}{Conception d'un outil de Slicing} \title{Documentation du greffon Slicing}{Conception d'un outil de Slicing}
\author{Anne Pacalet et Patrick Baudin} \author{Anne Pacalet et Patrick Baudin}
\begin{tabular}{l} \begin{tabular}{l}
CEA-List, Université Paris-Saclay \\ \fcaffiliationfr
Laboratoire de Sûreté et Sécurité des Logiciels \\
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -2,6 +2,7 @@ frama-c-book.cls ...@@ -2,6 +2,7 @@ frama-c-book.cls
frama-c-cover.pdf frama-c-cover.pdf
frama-c-left.pdf frama-c-left.pdf
frama-c-right.pdf frama-c-right.pdf
frama-c-affiliation.tex
userman.idx userman.idx
userman.out userman.out
userman.pdf userman.pdf
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
\usepackage{calc} \usepackage{calc}
\include{macros} \include{macros}
\input{./frama-c-affiliation.tex}
\makeindex \makeindex
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
Maroneze, Virgile Prevosto, Armand Puccetti, Julien Signoles and Boris Maroneze, Virgile Prevosto, Armand Puccetti, Julien Signoles and Boris
Yakobowski} Yakobowski}
\begin{tabular}{l} \begin{tabular}{l}
CEA LIST, Software Safety Laboratory, Saclay, F-91191 \\ \fcaffiliationen
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
/frama-c-cover.pdf /frama-c-cover.pdf
/frama-c-left.pdf /frama-c-left.pdf
/frama-c-right.pdf /frama-c-right.pdf
/frama-c-affiliation.tex
/main.pdf /main.pdf
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
\newcommand{\Eva}{\textsf{Eva}} \newcommand{\Eva}{\textsf{Eva}}
\input{./frama-c-affiliation.tex}
\lstset{literate=% \lstset{literate=%
{}{{$\in$ }}1 {}{{$\in$ }}1
} }
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
With Matthieu Lemerre, André Maroneze, With Matthieu Lemerre, André Maroneze,
Valentin Perrelle and Virgile Prevosto} Valentin Perrelle and Virgile Prevosto}
\begin{tabular}{l} \begin{tabular}{l}
CEA LIST, Software Reliability Laboratory, Saclay, F-91191 \\ \fcaffiliationen
\end{tabular} \end{tabular}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
...@@ -2,6 +2,7 @@ frama-c-book.cls ...@@ -2,6 +2,7 @@ frama-c-book.cls
frama-c-cover.pdf frama-c-cover.pdf
frama-c-left.pdf frama-c-left.pdf
frama-c-right.pdf frama-c-right.pdf
frama-c-affiliation.tex
e-acsl.pdf e-acsl.pdf
e-acsl-implementation.pdf e-acsl-implementation.pdf
eacslversion.tex eacslversion.tex
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
\usepackage{ifthen} \usepackage{ifthen}
\input{./macros_modern} \input{./macros_modern}
\input{./frama-c-affiliation.tex}
\input{eacslversion.tex} \input{eacslversion.tex}
%Do not touch the following line. It is used in a Makefile hack to %Do not touch the following line. It is used in a Makefile hack to
%produce the ACSL documents for the ACSL working group. %produce the ACSL documents for the ACSL working group.
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
\author{Julien Signoles} \author{Julien Signoles}
CEA LIST, Software Reliability Laboratory\\ \fcaffiliationen
\vfill \vfill
\begin{flushleft} \begin{flushleft}
\textcopyright 2011-2018 CEA LIST \textcopyright 2011-2018 CEA LIST
......
...@@ -2,4 +2,5 @@ frama-c-book.cls ...@@ -2,4 +2,5 @@ frama-c-book.cls
frama-c-cover.pdf frama-c-cover.pdf
frama-c-left.pdf frama-c-left.pdf
frama-c-right.pdf frama-c-right.pdf
frama-c-affiliation.tex
main.pdf main.pdf
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
\include{macros} \include{macros}
\include{eacslversion} \include{eacslversion}
\input{./frama-c-affiliation.tex}
\makeindex \makeindex
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
\\[1em] compatible with \framac \fcversion}} \\[1em] compatible with \framac \fcversion}}
\author{Julien Signoles, Basile Desloges and Kostyantyn Vorobyov} \author{Julien Signoles, Basile Desloges and Kostyantyn Vorobyov}
\begin{center} \begin{center}
CEA LIST\\ Software Reliability \& Security Laboratory \fcaffiliationen
\end{center} \end{center}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment