[Python-checkins] r66916 - doctools/trunk/sphinx/texinputs/sphinx.sty

[georg.brandl]

Author: georg.brandl
Date: Thu Oct 16 21:05:26 2008
New Revision: 66916

Log:
This should fix compatibility with XeTeX *and* prevent issues like #3909.


Modified:
   doctools/trunk/sphinx/texinputs/sphinx.sty

Modified: doctools/trunk/sphinx/texinputs/sphinx.sty
==============================================================================
--- doctools/trunk/sphinx/texinputs/sphinx.sty	(original)
+++ doctools/trunk/sphinx/texinputs/sphinx.sty	Thu Oct 16 21:05:26 2008
@@ -49,29 +49,23 @@
   \usepackage[pdftex]{graphicx}
 \fi
 
-% for PDF output, use maximal compression
-\newif\ifpdf\pdffalse
+% for PDF output, use colors and maximal compression
 \ifx\pdfoutput\undefined\else\ifcase\pdfoutput
   \let\py at NormalColor\relax
   \let\py at TitleColor\relax
 \else
-  \pdftrue
   \input{pdfcolor}
-  \let\py at NormalColor=\Black
+  \def\py at NormalColor{\color[rgb]{0.0,0.0,0.0}}
   \def\py at TitleColor{\color{TitleColor}}
   \pdfcompresslevel=9
 \fi\fi
 
-% Detect if we're using XeLaTeX
-\IfFileExists{ifxetex.sty}{%
-  \RequirePackage{ifxetex}
-}{% not using xelatex
-  \newif\ifxetex\xetexfalse
-}
-\ifxetex
+% XeLaTeX can do colors, too
+\IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}}{}
+\ifx\ifxetex\undefined\else\ifxetex
   \def\py at NormalColor{\color[rgb]{0.0,0.0,0.0}}
   \def\py at TitleColor{\color{TitleColor}}
-\fi
+\fi\fi
 
 % Increase printable page size (copied from fullpage.sty)
 \topmargin 0pt