[Python-checkins] r66968 - in doctools/trunk/sphinx/texinputs: howto.cls manual.cls sphinx.sty

[georg.brandl]

Author: georg.brandl
Date: Sat Oct 18 20:07:29 2008
New Revision: 66968

Log:
Fix for systems where hyperref doesn't invoke ifpdf.sty.


Modified:
   doctools/trunk/sphinx/texinputs/howto.cls
   doctools/trunk/sphinx/texinputs/manual.cls
   doctools/trunk/sphinx/texinputs/sphinx.sty

Modified: doctools/trunk/sphinx/texinputs/howto.cls
==============================================================================
--- doctools/trunk/sphinx/texinputs/howto.cls	(original)
+++ doctools/trunk/sphinx/texinputs/howto.cls	Sat Oct 18 20:07:29 2008
@@ -20,7 +20,7 @@
 %
 \renewcommand{\maketitle}{
   \rule{\textwidth}{1pt}
-  \ifpdf
+  \ifsphinxpdfoutput
     \begingroup
     % This \def is required to deal with multi-line authors; it
     % changes \\ to ', ' (comma-space), making it pass muster for

Modified: doctools/trunk/sphinx/texinputs/manual.cls
==============================================================================
--- doctools/trunk/sphinx/texinputs/manual.cls	(original)
+++ doctools/trunk/sphinx/texinputs/manual.cls	Sat Oct 18 20:07:29 2008
@@ -24,7 +24,7 @@
     \let\footnotesize\small
     \let\footnoterule\relax
     \rule{\textwidth}{1pt}%
-    \ifpdf
+    \ifsphinxpdfoutput
       \begingroup
       % This \def is required to deal with multi-line authors; it
       % changes \\ to ', ' (comma-space), making it pass muster for

Modified: doctools/trunk/sphinx/texinputs/sphinx.sty
==============================================================================
--- doctools/trunk/sphinx/texinputs/sphinx.sty	(original)
+++ doctools/trunk/sphinx/texinputs/sphinx.sty	Sat Oct 18 20:07:29 2008
@@ -42,10 +42,12 @@
 \fi
 
 % for PDF output, use colors and maximal compression
+\newif\ifsphinxpdfoutput\sphinxpdfoutputfalse
 \ifx\pdfoutput\undefined\else\ifcase\pdfoutput
   \let\py at NormalColor\relax
   \let\py at TitleColor\relax
 \else
+  \sphinxpdfoutputtrue
   \input{pdfcolor}
   \def\py at NormalColor{\color[rgb]{0.0,0.0,0.0}}
   \def\py at TitleColor{\color{TitleColor}}