[Python-checkins] r66079 - in doctools/trunk: doc/conf.py sphinx/__init__.py sphinx/texinputs/sphinx.sty

[georg.brandl]

Author: georg.brandl
Date: Sat Aug 30 23:56:43 2008
New Revision: 66079

Log:
Merged revisions 66061,66069 via svnmerge from 
svn+ssh://pythondev@svn.python.org/doctools/branches/0.4.x

........
  r66061 | georg.brandl | 2008-08-30 11:43:20 +0200 (Sat, 30 Aug 2008) | 2 lines
  
  Show last released version in built docs.
........
  r66069 | georg.brandl | 2008-08-30 15:21:40 +0200 (Sat, 30 Aug 2008) | 2 lines
  
  XeTeX fix by Markus Gritsch.
........


Modified:
   doctools/trunk/   (props changed)
   doctools/trunk/doc/conf.py
   doctools/trunk/sphinx/__init__.py
   doctools/trunk/sphinx/texinputs/sphinx.sty

Modified: doctools/trunk/doc/conf.py
==============================================================================
--- doctools/trunk/doc/conf.py	(original)
+++ doctools/trunk/doc/conf.py	Sat Aug 30 23:56:43 2008
@@ -41,7 +41,7 @@
 #
 # The short X.Y version.
 import sphinx
-version = sphinx.__version__
+version = sphinx.__released__
 # The full version, including alpha/beta/rc tags.
 release = version
 

Modified: doctools/trunk/sphinx/__init__.py
==============================================================================
--- doctools/trunk/sphinx/__init__.py	(original)
+++ doctools/trunk/sphinx/__init__.py	Sat Aug 30 23:56:43 2008
@@ -21,6 +21,7 @@
 
 __revision__ = '$Revision$'
 __version__ = '0.5'
+__released__ = '0.5'
 
 
 def usage(argv, msg=None):

Modified: doctools/trunk/sphinx/texinputs/sphinx.sty
==============================================================================
--- doctools/trunk/sphinx/texinputs/sphinx.sty	(original)
+++ doctools/trunk/sphinx/texinputs/sphinx.sty	Sat Aug 30 23:56:43 2008
@@ -61,6 +61,17 @@
   \pdfcompresslevel=9
 \fi\fi
 
+% Detect if we're using XeLaTeX
+\IfFileExists{ifxetex.sty}{%
+  \RequirePackage{ifxetex}
+}{% not using xelatex
+  \newif\ifxetex\xetexfalse
+}
+\ifxetex
+  \def\py at NormalColor{\color[rgb]{0.0,0.0,0.0}}
+  \def\py at TitleColor{\color{TitleColor}}
+\fi
+
 % Increase printable page size (copied from fullpage.sty)
 \topmargin 0pt
 \advance \topmargin by -\headheight