Index: anr/section-7.tex
===================================================================
--- anr/section-7.tex	(revision 87)
+++ anr/section-7.tex	(revision 99)
@@ -31,4 +31,5 @@
 costs. The requested funding for non permanent personnels is 100\% of
 the total ANR requested funding.
+    \begin{center}\input{table_lip_short.tex}\end{center}
 
 \item [Subcontracting]
@@ -41,5 +42,4 @@
 The costs justified by internal invoicing procedures are evaluated to 4\%
 of the total requested ANR funding.\\
-    \begin{center}\input{table_lip_short.tex}\end{center}
 \end{description}
 
@@ -74,4 +74,5 @@
 The requested funding for non permanent personnels is 82\% of the total ANR
 requested funding.
+\begin{center}\input{table_tima_short.tex}\end{center}
 \item [Subcontracting]
 No subcontracting costs.
@@ -83,43 +84,38 @@
 The costs justified by internal invoicing procedures are evaluated to 4\%
 of the total requested ANR funding.\\
-    \begin{center}\input{table_tima_short.tex}\end{center}
-%FIXME comment on rajoute les hommes-ans sur le WP7 pour la dissemination ?
 \end{description}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Partner 4: \ubs}
+\begin{figure}\leavevmode\center
+\input{table_ubs_full.tex}
+\caption{\label{ress-detail-ubs}Man power in $mm$ for the delivrables of \ubs.}
+\end{figure}
 
 \begin {description}
 \item [Equipment]
-\par
 In order to validate the design flow project, the LabSTICC  laboratory will buy FPGA developpement boards. 
 The cost for these FPGA boards is estimated to 3\% of the total ANR funding.
 \item [Personnel costs]
-\par
 The faculty members involved in the project are 
 associate professors (Philippe COUSSY, Cyrille CHAVET) or research ingeneers (Dominique HELLER).
 All non-permanent personnel costs are estimated in men*months
 for senior researchers (post-doc or research engineers).
+
 The table below sumarizes the man power by task for both permanent and non-permanent
-personnels. The detail by delivrables is given in figure~\ref {detail-lip6}.
+personnels. The detail by delivrables is given in figure~\ref {ress-detail-ubs}.
 The non-permanent personnels costs represent 50\% of the personnal costs.
 The requested funding for non permanent personnels is about 83\% of the total ANR
 requested funding.
+\begin{center}\input{table_ubs_short.tex}\end{center}
 \item [Subcontracting]
-\par
 No subcontracting costs.
 \item [Travel]
-\par
 The travel costs are associated to management and meeting as
 well as participation to conferences. The travel costs are estimated
 to 10\% of the total requested ANR funding.
 \item [Expenses for inward billing]
-\par
 The costs justified by internal invoicing procedures are evaluated to 4\%
 of the total requested ANR funding.
-\mustbecompleted{FIXME: LIP6 :: Comment peut-on modifier automatiquement le contenu du tableau (sans modifier directement le
-fichier)}
-\\
-%\input{table_ubs.tex}
 \end {description}
 
@@ -160,25 +156,42 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 6: \altera}
+\subsection{Partner 6: \xilinx}
+\ressourcehelp
+\begin{figure}\leavevmode\center
+\input{table_xilinx_full.tex}
+\caption{\label{ress-detail-xilinx}Man power in $mm$ for the delivrables of \xilinx.}
+\end{figure}
+\begin{description}
+\item[Equipment]
+    No specific equipment acquisition is required for this project. 
+\item[Personnel costs]
+    \xilinx employees involved in the project are permanent Software Engineers.
+    The detail by delivrables is given in figure~\ref{ress-detail-xilinx} and
+    summarizes by task in the following table.
+    \begin{center}\input{table_xilinx_short.tex}\end{center}
+\item[Subcontracting]
+    No subcontracting costs.
+\item[Travel]
+    The travel costs are associated to project meeting as well as participation to
+    conferences. The travel costs are estimated to
+    \mustbecompleted{FIXME:\xilinx: XX\%} of the total requested ANR funding.
+\item[Expenses for inward billing] none
+\item[Other working costs] none
+\end{description}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Partner 7: \bull}
 \ressourcehelp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 7: \xilinx}
+\subsection{Partner 8: \thales}
 \ressourcehelp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 8: \bull}
+\subsection{Partner 9: \zied}
 \ressourcehelp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 9: \thales}
+\subsection{Partner 10: \navtel}
 \ressourcehelp
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 10: \zied}
-\ressourcehelp
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Partner 11: \navtel}
-\ressourcehelp
-
