Correction d'un problème lié à une interaction entre hyperref et

latex, qui empechait de produire des fichiers .dvi à partir des .tex
générés par coqdoc.

 --Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    trunk/tools/coqdoc/coqdoc.sty
M    branches/v8.2/tools/coqdoc/coqdoc.sty


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11120 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 19 insertions, 10 deletions

diff --git a/tools/coqdoc/coqdoc.sty b/tools/coqdoc/coqdoc.sty
index ca454d852..d31314c5e 100644
--- a/tools/coqdoc/coqdoc.sty
+++ b/tools/coqdoc/coqdoc.sty
@@ -68,22 +68,34 @@
 % macro for typesetting the title of a module implementation
 \newcommand{\coqdocmodule}[1]{\chapter{Module #1}\markboth{Module #1}{}
 }
-
-\usepackage[pdftex]{hyperref}
-\hypersetup{raiselinks=true,colorlinks=true,linkcolor=black}
-\usepackage[all]{hypcap}
+\usepackage{ifpdf}
+\ifpdf
+  \usepackage[pdftex]{hyperref}
+  \hypersetup{raiselinks=true,colorlinks=true,linkcolor=black}
+  \usepackage[all]{hypcap}
+
+  \newcommand{\coqdef}[3]{\phantomsection\hypertarget{coq:#1}{#3}}
+  \newcommand{\coqref}[2]{\hyperlink{coq:#1}{#2}}
+  \newcommand{\identref}[2]{\hyperlink{coq:#1}{\textsf {#2}}}
+  \newcommand{\coqlibrary}[2]{\cleardoublepage\phantomsection
+    \hypertarget{coq:#1}{\chapter{Library \coqdoccst{#2}}}}
+\else
+  \newcommand{\coqdef}[3]{#3}
+  \newcommand{\coqref}[2]{#2}
+  \newcommand{\identref}[2]{\textsf {#2}}
+  \newcommand{\coqlibrary}[2]{\cleardoublepage\chapter{Library \coqdoccst{#2}}}
+\fi
 \usepackage{xr}
+
 %\usepackage{color}
 %\usepackage{multind}
 %\newcommand{\coqdef}[3]{\hypertarget{coq:#1}{\index{coq}{#1@#2|hyperpage}#3}}
 
-\newcommand{\coqdef}[3]{\phantomsection\hypertarget{coq:#1}{#3}}
-\newcommand{\coqref}[2]{\hyperlink{coq:#1}{#2}}
+  
 
 \newcommand{\coqdocvar}[1]{{\textit{#1}}}
 \newcommand{\coqdoctac}[1]{{\texttt{#1}}}
 
-\newcommand{\identref}[2]{\hyperlink{coq:#1}{\textsf {#2}}}
 
 \newcommand{\coqdefinition}[2]{\coqdef{#1}{#2}{\coqdoccst{#2}}}
 \newcommand{\coqdefinitionref}[2]{\coqref{#1}{\coqdoccst{#2}}}
@@ -128,9 +140,6 @@
   
 %\newcommand{\coqlibraryref}[2]{\ref{coq:#1}}
 
-\newcommand{\coqlibrary}[2]{\cleardoublepage\phantomsection
-  \hypertarget{coq:#1}{\chapter{Library \coqdoccst{#2}}}}
-  
 \newcommand{\coqlibraryref}[2]{\coqref{#1}{\coqdoccst{#2}}}
 
 \newcommand{\coqaxiom}[2]{\coqdef{#1}{#2}{\coqdocax{#2}}}