Index: /anr/anr.sty
===================================================================
--- /anr/anr.sty	(revision 294)
+++ /anr/anr.sty	(revision 295)
@@ -18,11 +18,20 @@
 \let\specXilinxOptimization\relax
 
+\def\eoa{end-of-args}
+\def\@@novers#1-#2\eoa{#1}
+\def\@novers#1{\ifx\relax#1\def\next{{\color{red}FIXME}}\else\def\next{\expandafter\@@novers#1\eoa}\fi\next}
+
 \def\setMacroInAuxFile#1{%
-    \global\expandafter\edef\csname#1\endcsname{\name}
-    \expandafter\immediate\expandafter\write\@auxout\expandafter{\expandafter\string\expandafter\gdef\expandafter\string\csname #1\endcsname{\name}}
-}
-\def\eoa{end-of-args}
-\def\@novers#1-#2\eoa{#1}
-\def\novers#1{\ifx\relax#1\def\next{{\color{red}FIXME}}\else\def\next{\expandafter\@novers#1\eoa}\fi\next}
+	\hypertarget{#1}{}\vspace{-1.5ex}%
+	\let\@novers\relax%
+    \global\expandafter\edef\csname NOLNK#1\endcsname{\name}%
+    \global\expandafter\edef\csname #1\endcsname{\noexpand\hyperlink{#1}{\name}}%
+    \global\expandafter\edef\csname NOVERS#1\endcsname{\noexpand\hyperlink{#1}{\@novers{\name}}}%
+    \global\expandafter\edef\csname NOVL#1\endcsname{\@novers{\name}}%
+    \immediate\write\@auxout{\expandafter\string\expandafter\gdef\expandafter\string\csname NOLNK#1\endcsname{\name}}%
+    \immediate\write\@auxout{\expandafter\string\expandafter\gdef\expandafter\string\csname #1\endcsname{\string\hyperlink{#1}{\name}}}%
+    \immediate\write\@auxout{\expandafter\string\expandafter\gdef\expandafter\string\csname NOVERS#1\endcsname{\string\hyperlink{#1}{\@novers{\name}}}}%
+    \immediate\write\@auxout{\expandafter\string\expandafter\gdef\expandafter\string\csname NOVL#1\endcsname{\@novers{\name}}}%
+}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: /anr/anr.tex
===================================================================
--- /anr/anr.tex	(revision 294)
+++ /anr/anr.tex	(revision 295)
@@ -18,4 +18,13 @@
 \geometry{verbose,a4paper,tmargin=3cm,bmargin=2cm,lmargin=2cm,rmargin=2cm}
 \usepackage{hyperref}
+\hypersetup{
+    %backref=true,
+    %pagebackref=true,
+    %hyperindex=true,
+    colorlinks=true, %colorise les liens
+    breaklinks=true, %permet le retour à la ligne dans les lien
+    urlcolor= blue,  %couleur des hyperliens
+    linkcolor= blue  %couleur des liens internes
+}
 
 \usepackage{anr}
Index: /anr/section-project-task-schedule.tex
===================================================================
--- /anr/section-project-task-schedule.tex	(revision 294)
+++ /anr/section-project-task-schedule.tex	(revision 295)
@@ -18,23 +18,24 @@
 \def\gantttitlestyle#1{\begin{scriptsize}\textit{#1}\end{scriptsize}}
 
+\begin{figure}\leavevmode\center
+\hspace*{-.6cm}
+\input{gantt.tex}
+\caption{\label{gantt}Gantt diagram of deliverables}
+\end{figure}
+
 %\begin{figure}\leavevmode\center
-%\hspace*{-.6cm}
-%\input{gantt.tex}
-%\caption{\label{gantt}Gantt diagram of deliverables}
+%\hspace*{-.4cm}%\vspace{-1.5cm}
+%\input{gantt1.tex}
+%\caption{\label{gantt1}Gantt diagram of deliverables (task-1 to task-6)}
+%\end{figure}
+%
+%\begin{figure}\leavevmode\center
+%\hspace*{-.4cm}%\vspace{-1.5cm}
+%\input{gantt2.tex}
+%\caption{\label{gantt2}Gantt diagram of deliverables (task-7 and task-8)}
 %\end{figure}
 
-\begin{figure}\leavevmode\center
-\hspace*{-.4cm}%\vspace{-1.5cm}
-\input{gantt1.tex}
-\caption{\label{gantt1}Gantt diagram of deliverables (task-1 to task-6)}
-\end{figure}
-
-\begin{figure}\leavevmode\center
-\hspace*{-.4cm}%\vspace{-1.5cm}
-\input{gantt2.tex}
-\caption{\label{gantt2}Gantt diagram of deliverables (task-7 and task-8)}
-\end{figure}
-
-The figures~\ref{gantt1}~\&~\ref{gantt2} present the Gantt diagram of the project.
+The figure~\ref{gantt} presents the Gantt diagram of the project.
+%The figures~\ref{gantt1}~\&~\ref{gantt2} present the Gantt diagram of the project.
 Before the final release (T0+36), there are 4 milestones (red lines on the figures) at
 $T0+6$, $T0+12$, $T0+18$ and $T0+24$ that are rendez-vous points of the precedent
@@ -71,5 +72,5 @@
 The risks that have been identified at the beginning of the project are the following:
 \begin{description}
-\item[\xcoach format (\novers{\specXcoachDoc}, \novers{\specXcoachToCA})]
+\item[\xcoach format ({\NOVERSspecXcoachDoc}, {\NOVERSspecXcoachToCA})]
 	Partners have to agree on a convenient exchange format for all tools involved.
 	Because all the HAS tools rely on it, the \xcoach format specification is a
@@ -84,5 +85,5 @@
 %	Our experience with UGH and GAUT give us confidence in the succes of this
 %	task.
-\item[Virtual prototyping of \altera \& \xilinx architectural templates (\novers{\csgImplementation})]
+\item[Virtual prototyping of \altera \& \xilinx architectural templates ({\NOVERScsgImplementation})]
      The SoCLib component library contains several SystemC models used for the virtual
      prototyping of the \altera and \xilinx architectural templates (NIOS and Microblaze processor cores).
@@ -92,5 +93,5 @@
 	 The three architectural templates being quite similar, the virtual
 	 prototyping will use the neutral architectural template.
-\item[VCI/AVALON \& VCI/PLB bridges (\novers{\hpcAvalonBridge}, \novers{\hpcPlbBridge})]
+\item[VCI/AVALON \& VCI/PLB bridges ({\NOVERShpcAvalonBridge}, {\NOVERShpcPlbBridge})]
      If one of these tasks is impossible or too important or leads to inefficiency,
      it will be abandoned.
Index: /anr/task-backend.tex
===================================================================
--- /anr/task-backend.tex	(revision 294)
+++ /anr/task-backend.tex	(revision 295)
@@ -27,10 +27,10 @@
     This adaptation will be done incrementally in three steps:
     \begin{enumerate}
-      \item Make tools to read \xcoach format defined in \novers{\specXcoachDoc} deliverable. 
+      \item Make tools to read \xcoach format defined in {\NOVERSspecXcoachDoc} deliverable. 
       \item Make tools to recognize the API of task communication defined in
-        \novers{\useModelSpecification} deliverable.
+        {\NOVERSuseModelSpecification} deliverable.
       \item Make tools to write \xcoachplus format to let
-        \novers{\specXcoachToSystemC} deliverable generate the SystemC model and
-        \novers{\specXcoachToVhdl} deliverable generate the synthesizable VHDL description.
+        {\NOVERSspecXcoachToSystemC} deliverable generate the SystemC model and
+        {\NOVERSspecXcoachToVhdl} deliverable generate the synthesizable VHDL description.
     \end{enumerate}
     \begin{livrable}
Index: /anr/task-demonstrator.tex
===================================================================
--- /anr/task-demonstrator.tex	(revision 294)
+++ /anr/task-demonstrator.tex	(revision 295)
@@ -25,5 +25,5 @@
       \itemV{6}{12}{x}{\Sbull}{\bull demonstrator}
         The deliverable is the specification of the demonstrator in COACH input format
-        defined in the \novers{\useModelSpecification} deliverable.
+        defined in the {\NOVERSuseModelSpecification} deliverable.
       \itemL{12}{36}{d}{\Sbull}{\bull demonstrator}{2:6:10}
         \setMacroInAuxFile{bullAppSpecification}