diff --git a/doc/MakeLaTeXModern b/doc/MakeLaTeXModern index 71107267b78246501afda730da7418313338c647..3ce60c391f19c7c56ae4c73e94dd7c02865343f4 100644 --- a/doc/MakeLaTeXModern +++ b/doc/MakeLaTeXModern @@ -1,5 +1,5 @@ FRAMAC_DOC_ROOT_DIR?=.. -FRAMAC_MODERN=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf frama-c-affiliation.tex +FRAMAC_MODERN=frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf frama-c-right.pdf frama-c-affiliation.tex eu-flag.jpg anr-logo.png frama-c-book.cls: $(FRAMAC_DOC_ROOT_DIR)/frama-c-book.cls @rm -f $@ @@ -30,3 +30,15 @@ frama-c-affiliation.tex: $(FRAMAC_DOC_ROOT_DIR)/frama-c-affiliation.tex @cp $< . @chmod a-w $@ @echo "import $<" + +eu-flag.jpg: $(FRAMAC_DOC_ROOT_DIR)/eu-flag.jpg + @rm -f $@ + @cp $< . + @chmod a-w $@ + @echo "import $<" + +anr-logo.png: $(FRAMAC_DOC_ROOT_DIR)/anr-logo.png + @rm -f $@ + @cp $< . + @chmod a-w $@ + @echo "import $<" diff --git a/doc/anr-logo.png b/doc/anr-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ccdb43a8e595eff510c6d06b6ebe14aa54721efe Binary files /dev/null and b/doc/anr-logo.png differ diff --git a/doc/developer/.gitignore b/doc/developer/.gitignore index a8469496d265792a2f0949dad390b0c1dc398303..092d8112a268d78e22984f9c0bf676a00feb4ab5 100644 --- a/doc/developer/.gitignore +++ b/doc/developer/.gitignore @@ -1,4 +1,6 @@ +/anr-logo.png /developer.pdf +/eu-flag.jpg /frama-c-book.cls /frama-c-cover.pdf /frama-c-left.pdf @@ -8,12 +10,6 @@ /tutorial/viewcfg/generated/ /tutorial/hello/generated/ /examples/generated/ -developer.pdf -frama-c-book.cls -frama-c-cover.pdf -frama-c-left.pdf -frama-c-right.pdf -hello_world/ *.idx *.out developer.fdb_latexmk diff --git a/doc/eu-flag.jpg b/doc/eu-flag.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d59420b9cdcd1ff44ef33c9860fb93f068e5ebd5 Binary files /dev/null and b/doc/eu-flag.jpg differ diff --git a/doc/frama-c-book.cls b/doc/frama-c-book.cls index 19ad2e9fa2ac7f17d054c1c755083042203d245d..2dce074dba3e88dfbdcbf4accf40649dc42ece9e 100644 --- a/doc/frama-c-book.cls +++ b/doc/frama-c-book.cls @@ -128,6 +128,40 @@ prefix=framacbook@, \medskip \ifusecc\doclicenseThis\else\fi } + +% \acknowledge{<flag image file>}{<text inside box>} +\newcommand{\acknowledge}[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}{ + \acknowledge{anr-logo.png}{the French ANR projects + CAT~(ANR-05-RNTL-00301) and U3CAT~(08-SEGI-021-01) + } +} + +\newcommand{\acknowledgeEU}{ + \acknowledge{eu-flag.jpg}{the + European Union's Seventh Framework Programme (FP7/2007-2013) + under grant agreement N$^\circ$\,317753 (\mbox{STANCE}).\\ + It has also received funding from the Horizon 2020 research + and innovation programme, under grant agreements + N$^\circ$\,731453~(\mbox{VESSEDIA}), + N$^\circ$\,824231~(\mbox{DECODER}), + N$^\circ$\,830892~(\mbox{SPARTA}), + and N$^\circ$\,883242~(\mbox{ENSURESEC}) + } +} + % -------------------------------------------------------------------------- % --- Sectionning --- % -------------------------------------------------------------------------- diff --git a/doc/metrics/.gitignore b/doc/metrics/.gitignore index 06c1c792c58efdabbee5c308a8da223fa4e5e78d..58acfccd3f95d479e49545c1041c63d0f4fbcef6 100644 --- a/doc/metrics/.gitignore +++ b/doc/metrics/.gitignore @@ -1,3 +1,5 @@ +/anr-logo.png +/eu-flag.jpg /frama-c-book.cls /frama-c-cover.pdf /frama-c-left.pdf diff --git a/doc/pdg/.gitignore b/doc/pdg/.gitignore index e9b8c33454088763484eba5e7f1613510710dbf6..62322591627fb455e5a5b654bb774d0a77856b8f 100644 --- a/doc/pdg/.gitignore +++ b/doc/pdg/.gitignore @@ -1,4 +1,6 @@ +anr-logo.png biblio.bib +eu-flag.jpg frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf diff --git a/doc/release/.gitignore b/doc/release/.gitignore index f5569bd78614424dfbe8379088183f6e1a5f4956..8590f2c47f97ebace19b519fd9329e39501fc4bc 100644 --- a/doc/release/.gitignore +++ b/doc/release/.gitignore @@ -1,3 +1,5 @@ +/anr-logo.png +/eu-flag.jpg /frama-c-book.cls /frama-c-cover.pdf /frama-c-left.pdf diff --git a/doc/rte/.gitignore b/doc/rte/.gitignore index 92f50e6b35d68a2b554aa3e2ff3783d0daf47760..77ccbb7eaf92e390d1162ea9f3af03b698423f9a 100644 --- a/doc/rte/.gitignore +++ b/doc/rte/.gitignore @@ -1,3 +1,5 @@ +/anr-logo.png +/eu-flag.jpg /frama-c-book.cls /frama-c-cover.pdf /frama-c-left.pdf diff --git a/doc/slicing/.gitignore b/doc/slicing/.gitignore index 1913f75af091fc85fd9142f3bab9583ee9561490..ed79c64d8ff52e771af67d7d1de8186cc5956922 100644 --- a/doc/slicing/.gitignore +++ b/doc/slicing/.gitignore @@ -1,4 +1,6 @@ +anr-logo.png biblio.bib +eu-flag.jpg frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf diff --git a/doc/userman/.gitignore b/doc/userman/.gitignore index f7fe0b371139f1dac67e7449fabe7c0b52a17614..a2dae99658f6339db386901d057bf1f5368eccf6 100644 --- a/doc/userman/.gitignore +++ b/doc/userman/.gitignore @@ -1,3 +1,5 @@ +anr-logo.png +eu-flag.jpg frama-c-book.cls frama-c-cover.pdf frama-c-left.pdf diff --git a/doc/userman/macros.tex b/doc/userman/macros.tex index 508f439cb76b5dd2fc05ff7744c7f083843c0157..89afeea7155d1c80625056be00277497f3a0a9fb 100644 --- a/doc/userman/macros.tex +++ b/doc/userman/macros.tex @@ -1,5 +1,5 @@ \newcommand{\framacversion}% - {\input{../../VERSION} (\input{../../VERSION_CODENAME}\unskip)} + {\input{../../VERSION}\unskip{} (\input{../../VERSION_CODENAME}\unskip)} \newcommand{\nextframacversion}{Frama-C+dev} \newcommand{\tool}[1]{\textsf{#1}\xspace} diff --git a/doc/userman/userman.tex b/doc/userman/userman.tex index c013f5d22206a09a28e3232eae538819647a8286..10199add7097a71e65b778ad15a12674277ea48b 100644 --- a/doc/userman/userman.tex +++ b/doc/userman/userman.tex @@ -30,9 +30,6 @@ \vfill \begin{flushleft} \textcopyright 2009-2021 CEA LIST - -This work has been supported by the ANR project CAT (ANR-05-RNTL-00301) and by -the ANR project U3CAT (08-SEGI-021-01). \end{flushleft} \end{titlepage} @@ -45,15 +42,18 @@ the ANR project U3CAT (08-SEGI-021-01). \addcontentsline{toc}{chapter}{Foreword} This is the user manual of \FramaC\footnote{\url{http://frama-c.com}}. The -content of this document corresponds to the version \framacversion (\today) of -\FramaC. However the development of \FramaC is still ongoing: features -described here may still evolve in the future. +content of this document corresponds to the version \framacversion, on \today, of +\FramaC. \section*{Acknowledgements} We gratefully thank all the people who contributed to this document: Patrick Baudin, Mickaël Delahaye, Philippe Hermann, Benjamin Monate and Dillon Pariente. +\acknowledgeANR + +\acknowledgeEU + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \include{user-intro} diff --git a/doc/value/.gitignore b/doc/value/.gitignore index a15bb914b73364a99358ebb658fc07b6832ca571..4cb469371c39fba5dc990341e237f39aab91592c 100644 --- a/doc/value/.gitignore +++ b/doc/value/.gitignore @@ -1,3 +1,5 @@ +/anr-logo.png +/eu-flag.jpg /frama-c-book.cls /frama-c-cover.pdf /frama-c-left.pdf