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
frama-c-book.cls frama-c-book.cls
frama-c-cover.pdf
frama-c-left.pdf
frama-c-right.pdf
frama-c-affiliation.tex
cealistlogo.jpg
feedback feedback
/html /html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
FRAMAC_DOC= .make-class .make-images .make-icons VERSION VERSION_CODENAME 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_BULLETS=never_tried.png unknown.png valid_under_hyp.png surely_valid.png
FRAMAC_IMAGES=cealistlogo.jpg FRAMAC_IMAGES=cealistlogo.jpg
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
......
/VERSION
/VERSION_CODENAME
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
\usepackage{pifont} \usepackage{pifont}
\usepackage{coq2latex} \usepackage{coq2latex}
\input{./frama-c-affiliation.tex}
\begin{document} \begin{document}
\coverpage{WP Coq Handbook} \coverpage{WP Coq Handbook}
\begin{titlepage} \begin{titlepage}
...@@ -11,9 +13,9 @@ ...@@ -11,9 +13,9 @@
\vfill \vfill
\title{WP Coq Handbook}% \title{WP Coq Handbook}%
{Version 0.7 for Oxygen-20120901+dev} {Version 0.7 for Oxygen-20120901+dev}
\author{Patrick Baudin, Loïc Correnson, Zaynah Dargaye} \author{Patrick Baudin, Loc Correnson, Zaynah Dargaye}
\begin{center} \begin{center}
CEA LIST, Software Safety Laboratory \fcaffiliationen
\end{center} \end{center}
\vfill \vfill
\begin{flushleft} \begin{flushleft}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
\usepackage{longtable} \usepackage{longtable}
\usepackage{pifont} \usepackage{pifont}
\input{./frama-c-affiliation.tex}
%\anticopyCEA{} % To comments for public version. %\anticopyCEA{} % To comments for public version.
\begin{document} \begin{document}
\newcommand{\FCVERSION}{\input{VERSION}(\input{VERSION_CODENAME}\unskip)} \newcommand{\FCVERSION}{\input{VERSION}(\input{VERSION_CODENAME}\unskip)}
...@@ -23,7 +25,7 @@ ...@@ -23,7 +25,7 @@
{\tt Frama-C \FCVERSION} {\tt Frama-C \FCVERSION}
\author{Patrick Baudin, François Bobot, Loïc Correnson, Zaynah Dargaye, Allan Blanchard} \author{Patrick Baudin, François Bobot, Loïc Correnson, Zaynah Dargaye, Allan Blanchard}
\begin{center} \begin{center}
CEA LIST, Software Safety 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