From 87a05a41cb13934e261f73cc1061cd0be9dbcd15 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 30 Aug 2008 21:56:43 +0000 Subject: [PATCH] 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. ........ --- doc/conf.py | 2 +- sphinx/__init__.py | 1 + sphinx/texinputs/sphinx.sty | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 3838cad7a..885ba8cf2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -41,7 +41,7 @@ copyright = '2008, Georg Brandl' # # The short X.Y version. import sphinx -version = sphinx.__version__ +version = sphinx.__released__ # The full version, including alpha/beta/rc tags. release = version diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 9b83faca1..91abcdc49 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -21,6 +21,7 @@ from sphinx.util.console import darkred, nocolor __revision__ = '$Revision$' __version__ = '0.5' +__released__ = '0.5' def usage(argv, msg=None): diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 5eff6f8d5..4f776ca19 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -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@NormalColor{\color[rgb]{0.0,0.0,0.0}} + \def\py@TitleColor{\color{TitleColor}} +\fi + % Increase printable page size (copied from fullpage.sty) \topmargin 0pt \advance \topmargin by -\headheight