Changeset 356 for anr/anr.tex

Timestamp:

Feb 6, 2011, 2:29:09 PM (13 years ago)

Author:

coach

Message:

1ere Pre-release

File:

• anr/anr.tex (modified) (8 diffs)

anr/anr.tex

@@ -42 +42 @@
 \pagestyle{fancy}
 \lhead{\begin{minipage}{1.5cm}\includegraphics[width=\linewidth]{logo-anr}\vspace*{1mm}\end{minipage}}
-\chead{\begin{minipage}{8cm}\small\center Programme Ing\'enierie num\'erique \& s\'ecurit\'e\\Edition 2010\vspace*{1mm}\end{minipage}}
-\rhead{\begin{minipage}{5cm}\small\raggedleft Project COACH\\Scientific document\vspace*{1mm}\end{minipage}}
+\chead{\begin{minipage}{8cm}\small\center Programme Ing\'enierie num\'erique
+\& s\'ecurit\'e\\Edition 2011\vspace*{1mm}\end{minipage}}
+\rhead{\begin{minipage}{5cm}\small\raggedleft Project COACH\\Document
+scientifique\vspace*{1mm}\end{minipage}}
 \lfoot{\begin{minipage}{7cm}\small ANR-GUI-AAP-04 – Doc Scientifique 2011\end{minipage}}
 \cfoot{\begin{minipage}{5cm}\end{minipage}}
@@ -53 +55 @@
 \def\backbone{backbone infrastructure\xspace}
 \def\Backbone{Backbone infrastructure\xspace}
-\def\hommemois{men*months\xspace}
+\def\hommemoislong{men$\ast$months\xspace}
+\def\hommemois{m.m\xspace}
 \def\xilinxcpu{ARM\xspace}
 \def\xilinxbus{AMBA\xspace}
@@ -74 +77 @@
 \def\inria{INRIA\xspace}          \def\Sinria{\Sformat{INRIA}\xspace}
 %\def\irisa{INRIA/\-CAIRN\xspace}    \def\Sirisa{\Sformat{INRI}\xspace}
-\def\lip{ENS Lyon/LIP/Compsys\xspace}     \def\Slip{\Sformat{LIP}\xspace}
+\def\liplong{ENS Lyon/LIP/Compsys\xspace}
+\def\lip{ENS Lyon\xspace}         \def\Slip{\Sformat{LIP}\xspace}
 \def\tima{TIMA\xspace}            \def\Stima{\Sformat{TIMA}\xspace}
 \def\ubs{LAB-STICC\xspace}        \def\Subs{\Sformat{UBS}\xspace}
@@ -155 +159 @@
 \end{tabular}
 %
-\setcounter{tocdepth}{1}
+\setcounter{tocdepth}{2}
 \tableofcontents
 
@@ -220 +224 @@
 \begin{description}
   \item[partner]
-    \Sinria for \inria, \Slip for \lip, \Stima for \tima, \Subs for \ubs, 
-    \Supmc for \upmc, \Sxilinx for \xilinx, \Sbull for \bull, \Sthales for \thales, 
+    \Sinria for \inria, \Slip for \liplong, \Stima for \tima, \Subs for \ubs, 
+    \Supmc for \upmc, \Sbull for \bull, \Sthales for \thales, 
     and \Smds for \mds.
   \item[kind of the deliverable]
@@ -269 +273 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\appendix
+%\appendix
 \newpage
-\section{Bibliography}
+\section{Annexes}
+% % % % % % % % % % % % % % % % % % % % % % % % 
+\subsection{Bibliography}
 %\subsection{References}
 \anrdoc{Inclure la liste des références bibliographiques utilisées dans la
@@ -279 +285 @@
 \bibliography{anr}
 
-\newpage\section{CV, resume}\input{annexe-cv.tex}
-
-\newpage\section{Staff involvement in other contracts}\input{annexe-autre-participation.tex}
-
-\newpage\section{Man power by partners and by deliverables}
-  \subsection{Partner 1: \mds}   \label{table-livrables-mds}   \input{table_mds_full.tex}
-  \subsection{Partner 2: \upmc}  \label{table-livrables-upmc}  \input{table_upmc_full.tex}
-  \subsection{Partner 3: \ubs}   \label{table-livrables-usb}   \input{table_ubs_full.tex}
-  \subsection{Partner 4: \lip}   \label{table-livrables-lip}   \input{table_inria_compsys_full.tex}
-  \subsection{Partner 5: \tima}  \label{table-livrables-tima}  \input{table_tima_full.tex}
-  \subsection{Partner 6: \inria} \label{table-livrables-inria} \input{table_inria_cairn_full.tex}
-  \subsection{Partner 7: \bull}  \label{table-livrables-bull}  \input{table_bull_full.tex}
-  \subsection{Partner 8: \thales}\label{table-livrables-thales}\input{table_thales_full.tex}
-
-\newpage\section{Effort tables}
+% % % % % % % % % % % % % % % % % % % % % % % % 
+\newpage\subsection{CV, resume}\input{annexe-cv.tex}
+\begin{landscape}
+\newpage\subsection{Staff involvement in other contracts}\input{annexe-autre-participation.tex}
+\end{landscape}
+\newpage\subsection{Man power by partners and by deliverables}
+\label{effort:by:partner:livrable}
+  \subsubsection{Partner 1: \mds}      \label{table-livrables-mds}            \input{table_mds_full.tex}
+  \subsubsection{Partner 2: \upmc}     \label{table-livrables-upmc}           \input{table_upmc_full.tex}
+  \subsubsection{Partner 3: \ubs}      \label{table-livrables-ubs}            \input{table_ubs_full.tex}
+  \subsubsection{Partner 4: \liplong}  \label{table-livrables-inria_compsys}  \input{table_inria_compsys_full.tex}
+  \subsubsection{Partner 5: \tima}     \label{table-livrables-tima}           \input{table_tima_full.tex}
+  \subsubsection{Partner 6: \inria}    \label{table-livrables-inria_cairn}    \input{table_inria_cairn_full.tex}
+  \subsubsection{Partner 7: \bull}     \label{table-livrables-bull}           \input{table_bull_full.tex}
+  \subsubsection{Partner 8: \thales}   \label{table-livrables-thales}         \input{table_thales_full.tex}
+\newpage\subsection{Effort tables}
+\label{effort:by:livrable}
 %\begin{small}
 \noindent\input{tmp/effort-par-livrable-1.tex}
@@ -301 +309 @@
 %\end{small}
 
-\newpage\section{Prise en compte de l'évaluation 2010}
-\input{annexe-reponse.tex}
-
-\newpage\section{Letters of interest}
+\newpage\subsection{Letters of interest}
 \label{lettre-soutien}
 \input{tmp/anr-supporter.tex}
 
+\newpage\subsection{Prise en compte de l'évaluation 2010}
+\input{annexe-reponse.tex}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \end{document}