Index: /anr/section-7.tex
===================================================================
--- /anr/section-7.tex	(revision 151)
+++ /anr/section-7.tex	(revision 152)
@@ -18,8 +18,7 @@
   and good knowledge in computer architecture.
 
-The table below summarizes the manpower by task for both permanent and
-non-permanent personnels. The detail by delivrables is given in
-figure~\ref{ress-detail-irisa}. 
-The non-permanent personnels costs represent ??\% of the personnal
+The table below summarizes the manpower by tasks for both permanent and non-permanent
+personnels. The detail by delivrables is given in figure~\ref{ress-detail-irisa}.
+The non-permanent personnels costs represent \mustbecompleted{??\%} of the personnal
 costs. The requested funding for non permanent personnels is 100\% of
 the total ANR requested funding.
@@ -31,5 +30,5 @@
 The travel costs are associated to project meeting as
 well as participation to conferences. The travel costs are estimated
-to ??\% of the total requested ANR funding.
+to \mustbecompleted{??\%} of the total requested ANR funding.
 \item [Expenses for inward billing]
 The costs justified by internal invoicing procedures are evaluated to 4\%
@@ -39,9 +38,4 @@
 
 \subsection{Partner 2: \lip}
-
-\begin{figure}\leavevmode\center
-\input{table_lip_full.tex}
-\caption{\label{ress-detail-lip}Man power in $mm$ for the delivrables of \lip.}
-\end{figure}
 
 \begin{description}
@@ -58,11 +52,10 @@
 techniques and to produce a working implementation.
 
-The table below summarizes the man power by task for both permanent and
-non-permanent personnels. The detail by delivrables is given in
-figure~\ref{ress-detail-lip}. 
-The non-permanent personnels costs represent ??\% of the personnal
+The table below summarizes the man power by delivrables and tasks for both permanent and
+non-permanent personnels.
+The non-permanent personnels costs represent \mustbecompleted{??\%} of the personnal
 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}
+    \begin{center}\input{table_inria_compsys_full.tex}\end{center}
 
 \item [Subcontracting]
@@ -71,5 +64,5 @@
 The travel costs are associated to project meeting as
 well as participation to conferences. The travel costs are estimated
-to ??\% of the total requested ANR funding.
+to \mustbecompleted{??\%} of the total requested ANR funding.
 \item [Expenses for inward billing]
 The costs justified by internal invoicing procedures are evaluated to 4\%
Index: /anr/task-1.tex
===================================================================
--- /anr/task-1.tex	(revision 151)
+++ /anr/task-1.tex	(revision 152)
@@ -67,5 +67,5 @@
         taking into account the corrections and modifications that the
         developers of HAS tools suggested.
-    \itemL{12}{18}{d+x}{\Slip}{\xcoach format specification}{0:0:0}
+    \itemL{12}{18}{d+x}{\Slip}{\xcoach format specification}{9.0:4.5:0}
         \setMacroInAuxFile{specXcoachDoc}
         Last release of XML specification of the \xcoach format enhanced with
Index: /anr/task-3.tex
===================================================================
--- /anr/task-3.tex	(revision 151)
+++ /anr/task-3.tex	(revision 152)
@@ -26,10 +26,10 @@
   instructions definitions along with their occurrence in the application.
     \begin{livrable}
-      \itemV{0}{18}{X}{\Sirisa}{ASIP compilation flow}
+      \itemV{0}{18}{x}{\Sirisa}{ASIP compilation flow}
         In this first version of the software, the computations patterns corresponding to
         custom instructions are specified by the user, and then automatically extracted (when
         beneficial) from the application intermediate representation. 
         %\mustbecompleted{FIXME .....}
-      \itemL{18}{24}{X}{\Sirisa}{ASIP compilation flow}{6:9:0}
+      \itemL{18}{24}{x}{\Sirisa}{ASIP compilation flow}{6:9:0}
         In this second version, the software will also be able to automatically identify 
         interesting pattern candidates in the application code, and use them as custom 
@@ -42,18 +42,18 @@
  of the architecture, along with its architectural extensions 
     \begin{livrable}
-      \itemV{0}{12}{X}{\Sirisa}{SystemC for extensible MIPS }
+      \itemV{0}{12}{x}{\Sirisa}{SystemC for extensible MIPS }
       { A SystemC simulation model for a simple extensible MIPS architectural template }
-      \itemL{12}{20}{X}{\Sirisa}{SystemC for extensible MIPS}{2:3:0}
+      \itemL{12}{20}{x}{\Sirisa}{SystemC for extensible MIPS}{2:3:0}
       {A SystemC simulation model for an extensible MIPS with a tight architectural integration of
       its instruction set extensions}
-      \itemL{0}{12}{X}{\Sirisa}{SystemC for NIOS processor}{2:0:0}
+      \itemL{0}{12}{x}{\Sirisa}{SystemC for NIOS processor}{2:0:0}
 	  { A SystemC simulation model for an extensible NIOS processor template, the VHDL model being
 	  already available from \altera}
-      \itemV{12}{18}{H}{\Sirisa}{VHDL for an extensible MIPS}
+      \itemV{12}{18}{h}{\Sirisa}{VHDL for an extensible MIPS}
       {A synthesizable VHDL model for a simple extensible MIPS architectural template}
-      \itemL{18}{24}{H}{\Sirisa}{VHDL for an extensible MIPS}{9:12:0}
+      \itemL{18}{24}{h}{\Sirisa}{VHDL for an extensible MIPS}{9:12:0}
       {A synthesizable VHDL model for an extensible MIPS with a tight architectural integration of
       its instruction set extensions}
-      \itemL{24}{36}{D}{\Sirisa}{Evaluation report }{0:0:2}
+      \itemL{24}{36}{d}{\Sirisa}{Evaluation report }{0:0:2}
       {An evaluation report with quantitative analysis of the performance/area trade-off induced by
       the different approaches}
@@ -67,5 +67,5 @@
       polyhedral loops. User manual. 
       \mustbecompleted{ FIXME :: User manual ou Specification. Si user manual alors le mettre en dissemination}
-    \itemL{30}{36}{d}{\Slip}{Process generation method}{0:0:0}
+    \itemL{30}{36}{d}{\Slip}{Process generation method}{4.5:0.0:10.5}
       Final assessment of the method and improved version of the user manual.
       \mustbecompleted {FIXME :: User manual ou Specification. Si user manual alors le mettre en dissemination}
@@ -79,5 +79,5 @@
       Extension of automatic parallelization and array contraction
       to non-polyhedral loops. Implementation in the Bee framework.
-    \itemL{30}{36}{x}{\Slip} {Process and FIFO construction}{0:0:0}
+    \itemL{30}{36}{x}{\Slip} {Process and FIFO construction}{4.5:12.0:15.0}
       Final release taking into account the feedbacks from the 
       demonstrator \STs.
Index: /anr/task-7.tex
===================================================================
--- /anr/task-7.tex	(revision 151)
+++ /anr/task-7.tex	(revision 152)
@@ -27,10 +27,10 @@
         setup, wiki) and secondly in defining the site map and finally in writting and
         installing the pages.
-      \itemL{6}{36}{}{\Supmc}{dissemination WEB site}{1:.5:.5}
+      \itemL{6}{36}{d}{\Supmc}{dissemination WEB site}{1:.5:.5}
         This deliverable corresponds to the standard management of a WEB site (modifying,
         adding, suppressing, replacing pages).
         Especialy the user reference manuals provided in the other tasks will be published
         on this site. The published articles will be also be installed in this site.
-      \itemL{6}{36}{}{\Supmc}{release handling}{1:.5:.5}
+      \itemL{6}{36}{d+x}{\Supmc}{release handling}{1:.5:.5}
         This deliverable deals with the elaboration of the COACH software milestones and
         final releases with their installation manuals and to publish then into the WEB
