r8637@thot: notin | 2006-03-14 16:00:49 +0100

 
 - intégration de doc dans le Makefile principal
 - correction d'une incompatibilité avec Tetex 3.0
 


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

2 files changed, 16 insertions, 12 deletions

diff --git a/doc/refman/RefMan-ide.tex b/doc/refman/RefMan-ide.tex
index d1497f1620..ea19f3de45 100644
--- a/doc/refman/RefMan-ide.tex
+++ b/doc/refman/RefMan-ide.tex
@@ -19,10 +19,10 @@ obviously no meaning for \CoqIDE{} being ignored.
 \begin{center}
 %HEVEA\imgsrc{coqide.png}
 %BEGIN LATEX
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-\includegraphics[width=1.0\textwidth]{coqide.eps}
-\else
+\ifpdf   % si on est en pdflatex
 \includegraphics[width=1.0\textwidth]{coqide.png}
+\else
+\includegraphics[width=1.0\textwidth]{coqide.eps}
 \fi
 %END LATEX
 \end{center}
@@ -124,10 +124,10 @@ arguments.
 \begin{center}
 %HEVEA\imgsrc{coqide-queries.png}
 %BEGIN LATEX
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-\includegraphics[width=1.0\textwidth]{coqide-queries.eps}
-\else
+\ifpdf  % si on est en pdflatex
 \includegraphics[width=1.0\textwidth]{coqide-queries.png}
+\else
+\includegraphics[width=1.0\textwidth]{coqide-queries.eps}
 \fi
 %END LATEX
 \end{center}
diff --git a/doc/refman/Reference-Manual.tex b/doc/refman/Reference-Manual.tex
index ddc4b46ffb..b125720d34 100644
--- a/doc/refman/Reference-Manual.tex
+++ b/doc/refman/Reference-Manual.tex
@@ -1,8 +1,10 @@
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-\documentclass[11pt,a4paper]{book}
+\RequirePackage{ifpdf}
+\ifpdf
+  \documentclass[11pt,a4paper,pdftex]{book}
 \else
-\documentclass[11pt,a4paper,pdftex]{book}
+  \documentclass[11pt,a4paper]{book}
 \fi
+
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{times}
@@ -13,11 +15,13 @@
 \usepackage{alltt}
 \usepackage{hevea}
 
+\usepackage{ifpdf}
+
 % for coqide
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-  \usepackage[dvips]{graphicx}
-\else
+\ifpdf   % si on est pas en pdflatex
   \usepackage[pdftex]{graphicx}
+\else
+  \usepackage[dvips]{graphicx}
 \fi