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

1 files changed, 10 insertions, 9 deletions

diff --git a/doc/faq/FAQ.tex b/doc/faq/FAQ.tex
index 5fcee708f8..f4adc6e9c2 100644
--- a/doc/faq/FAQ.tex
+++ b/doc/faq/FAQ.tex
@@ -1,7 +1,8 @@
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-\documentclass[a4paper]{article}
-\else
+\RequirePackage{ifpdf}
+\ifpdf   % si on est en pdflatex
 \documentclass[a4paper,pdftex]{article}
+\else
+\documentclass[a4paper]{article}
 \fi
 \pagestyle{plain}
 
@@ -15,10 +16,10 @@
 \usepackage[latin1]{inputenc}
 \usepackage[english]{babel}
 
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-  \usepackage[dvips]{graphicx}
-\else
+\ifpdf   % si on est en pdflatex
   \usepackage[pdftex]{graphicx}
+\else
+  \usepackage[dvips]{graphicx}
 \fi
 
 %\input{../macros.tex}
@@ -475,10 +476,10 @@ proofs can be found in directory {\tt Logic} of the standard library.
 
 %HEVEA\imgsrc{axioms.png}
 %BEGIN LATEX
-\ifx\pdfoutput\undefined   % si on est pas en pdflatex
-\includegraphics[width=1.0\textwidth]{axioms.eps}
-\else
+\ifpdf   % si on est en pdflatex
 \includegraphics[width=1.0\textwidth]{axioms.png}
+\else
+\includegraphics[width=1.0\textwidth]{axioms.eps}
 \fi
 %END LATEX