Index: anr/anr.sty
===================================================================
--- anr/anr.sty	(revision 36)
+++ anr/anr.sty	(revision 49)
@@ -32,5 +32,4 @@
 \let\ALL\disable%
 \let\IRISA\disable%
-\let\CITI\disable%
 \let\LIP\disable%
 \let\TIMA\disable%
@@ -41,9 +40,9 @@
 \let\BULL\disable%
 \let\THALES\disable%
+\let\NAVTEL\disable%
 \let\ZIED\disable%
 }{%
 \ifx\ALL\enable%
   \ifx\IRISA\disable\let\IRISA\enable\fi%
-  \ifx\CITI\disable\let\CITI\enable\fi%
   \ifx\LIP\disable\let\LIP\enable\fi%
   \ifx\UPMC\disable\let\UPMC\enable\fi%
@@ -54,4 +53,5 @@
   \ifx\BULL\disable\let\BULL\enable\fi%
   \ifx\THALES\disable\let\THALES\enable\fi%
+  \ifx\NAVTEL\disable\let\NAVTEL\enable\fi%
   \ifx\ZIED\disable\let\ZIED\enable\fi%
 \fi%
@@ -59,5 +59,4 @@
 \def\@partner{\begin{small}\textcolor{blue}{part.}\end{small}}
 \def\@IRISA{\ifx\IRISA\disable{}\else\ifx\IRISA\enable{\@partner}\else{\@leader}\fi\fi}%
-\def\@CITI{\ifx\CITI\disable{}\else\ifx\CITI\enable{\@partner}\else{\@leader}\fi\fi}%
 \def\@LIP{\ifx\LIP\disable{}\else\ifx\LIP\enable{\@partner}\else{\@leader}\fi\fi}%
 \def\@UPMC{\ifx\UPMC\disable{}\else\ifx\UPMC\enable{\@partner}\else{\@leader}\fi\fi}%
@@ -68,8 +67,9 @@
 \def\@BULL{\ifx\BULL\disable{}\else\ifx\BULL\enable{\@partner}\else{\@leader}\fi\fi}%
 \def\@THALES{\ifx\THALES\disable{}\else\ifx\THALES\enable{\@partner}\else{\@leader}\fi\fi}%
+\def\@NAVTEL{\ifx\NAVTEL\disable{}\else\ifx\NAVTEL\enable{\@partner}\else{\@leader}\fi\fi}%
 \def\@ZIED{\ifx\ZIED\disable{}\else\ifx\ZIED\enable{\@partner}\else{\@leader}\fi\fi}%
 \begin{tabular}{|c|c|c|c|c|c|c|c|c|c|c|}\hline
-\Sirisa  & \Sciti  & \Slip  & \Stima  & \Subs  & \Supmc  & \Saltera & \Sxilinx & \Sbull  & \Sthales & \Szied \\\hline
-\@IRISA  & \@CITI  & \@LIP  & \@TIMA  & \@UBS  & \@UPMC  & \@ALTERA & \@XILINX & \@BULL  & \@THALES & \@ZIED \\\hline
+\Sirisa  & \Slip  & \Stima  & \Subs  & \Supmc  & \Saltera & \Sxilinx & \Sbull  & \Sthales & \Snavtel & \Szied \\\hline
+\@IRISA  & \@LIP  & \@TIMA  & \@UBS  & \@UPMC  & \@ALTERA & \@XILINX & \@BULL  & \@THALES & \@NAVTEL & \@ZIED \\\hline
 \end{tabular}\par
 }
@@ -99,11 +99,23 @@
 \newenvironment{livrable}%
 {%
+ \newif\ifLivrableTopLine\LivrableTopLinetrue
+ \newif\ifLivrableStart\LivrableStarttrue
+ \def\livrableTableDef{\begin{tabular}{|c|c|c|c|p{.625\linewidth}|}\hline}
+ \def\livrableTableLine##1##2##3##4{%
+    \makebox[3.5em]{\begin{small}##1\end{small}} &
+    \makebox[2.2em]{\begin{small}##2\end{small}} &
+    \makebox[1.5em]{\begin{small}##3\end{small}} &
+    \makebox[2.2em]{\begin{small}##4\end{small}} &
+ }
+ \def\livrableTableTopLine{%
+   \livrableTableLine{number}{date}{type}{resp.} description
+ }
  \livrablecnt-1
- \ifvmode\else\\\fi
+ \ifvmode\else\vspace{.75ex}\\\fi
  \def\item##1##2##3##4##5##6{%
 	\def\tmpa{##1}\def\vers{}
-	\def\tmp{}  \ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{VF}\fi%
-    \def\tmp{1} \ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{V1}\fi%
-    \def\tmp{V1}\ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{V1}\fi%
+	\def\tmp{}  \ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{VF}\global\LivrableStarttrue\fi%
+    \def\tmp{1} \ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{V1}\global\LivrableStarttrue\fi%
+    \def\tmp{V1}\ifx\tmp\tmpa\global\advance\livrablecnt1\def\vers{V1}\global\LivrableStarttrue\fi%
     \def\tmp{2} \ifx\tmp\tmpa\def\vers{V2}\fi%
     \def\tmp{V2}\ifx\tmp\tmpa\def\vers{V2}\fi%
@@ -117,6 +129,15 @@
       \let\xcoach\relax
       \let\xcoachplus\relax
-      \let\xilinx\relax
-      \let\altera\relax
+      \let\irisa\relax    \let\Sirisa\relax
+      \let\lip\relax      \let\Slip\relax
+      \let\tima\relax     \let\Stima\relax
+      \let\ubs\relax      \let\Subs\relax
+      \let\upmc\relax     \let\Supmc\relax
+      \let\altera\relax   \let\Saltera\relax
+      \let\xilinx\relax   \let\Sxilinx\relax
+      \let\bull\relax     \let\Sbull\relax
+      \let\thales\relax   \let\Sthales\relax
+      \let\zied\relaxe    \let\Szied\relax
+      \let\navtel\relax   \let\Snavtel\relax
       \immediate\write\ganttdata{%
         T=\the\taskcnt\space S=\the\subtaskcnt\space%
@@ -125,14 +146,24 @@
     }
     \\\hline
-    \begin{small}\textsc{\name}\end{small} &
-    \begin{small}\textsc{T0+##3}\end{small} &
-    \begin{small}\textsc{##4}\end{small} &
-    \begin{small}\textsc{##5}\end{small} &
+    \ifLivrableTopLine
+      \ifLivrableStart\hline\hline\fi
+    \else
+      \ifLivrableStart\end{tabular}\\\livrableTableDef\fi
+    \fi
+    \global\LivrableTopLinefalse
+    \global\LivrableStartfalse
+    \livrableTableLine%
+        {\textsc{\name}}%
+        {\textsc{T0+##3}}%
+        {\textsc{##4}}%
+        {\textsc{##5}}%
  }
 % \begin{small}
- \begin{tabular}{|c|c|c|c|p{.55\linewidth}|}\hline%
- \makebox[5em]{number} & \makebox[3em]{date} & type & resp. & description 
+ \livrableTableDef
+ \livrableTableTopLine
+ %\begin{tabular}{|c|c|c|c|p{.55\linewidth}|}\hline%
+ %\makebox[3.5em]{number} & \makebox[1.5em]{date} & type & resp. & description 
 }
-{\\\hline\end{tabular}%
+{\\\hline\end{tabular}\\%
 %\end{small}\\%
 }
