merge with 0.6

CHANGES

@@ -17,6 +17,9 @@ Release 1.0 (in development)
 Release 0.6.2 (in development)
 ==============================
 
+* #150: Fix display of the "sphinxdoc" theme on Internet Explorer
+  versions 6 and 7.
+
 * #146: Don't fail to generate LaTeX when the user has an active
   ``.docutils`` configuration.
 

Makefile

@@ -9,7 +9,7 @@ all: clean-pyc check test
 check:
 	@$(PYTHON) utils/check_sources.py -i sphinx/style/jquery.js \
 		-i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py \
-		-i doc/_build -i ez_setup.py -i tests/path.py .
+		-i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py .
 
 clean: clean-pyc clean-patchfiles
 

sphinx/themes/basic/static/basic.css

@@ -5,15 +5,6 @@
 
 /* -- main layout ----------------------------------------------------------- */
 
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 230px;
-}
-
 div.clearer {
     clear: both;
 }

sphinx/themes/default/static/default.css_t

@@ -20,6 +20,15 @@ div.document {
     background-color: {{ theme_sidebarbgcolor }};
 }
 
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
 div.body {
     background-color: {{ theme_bgcolor }};
     color: {{ theme_textcolor }};

sphinx/themes/sphinxdoc/static/sphinxdoc.css

@@ -25,10 +25,6 @@ body {
     min-width: 740px;
 }
 
-div.documentwrapper {
-    float: none;
-}
-
 div.document {
     background-color: white;
     text-align: left;

sphinx/writers/html.py

@@ -472,7 +472,8 @@ class HTMLTranslator(BaseTranslator):
                                  u'title="%s">\u00B6</a>' %
                                  _('Permalink to this headline'))
             elif close_tag.startswith('</a></h'):
-                self.body.append(u'</a><a class="headerlink" href="#%s" ' % aname +
+                self.body.append(u'</a><a class="headerlink" href="#%s" ' %
+                                 aname +
                                  u'title="%s">\u00B6' %
                                  _('Permalink to this headline'))
 

tests/test_markup.py

@@ -111,8 +111,8 @@ def test_inline():
 
 def test_latex_escaping():
     # correct escaping in normal mode
-    yield verify, u'Γ\\\\∞$', None, \
-          ur'\(\Gamma\)\textbackslash{}\(\infty\)\$'
+    yield (verify, u'Γ\\\\∞$', None,
+           ur'\(\Gamma\)\textbackslash{}\(\infty\)\$')
     # in verbatim code fragments
     yield (verify, u'::\n\n @Γ\\∞$[]', None,
            u'\\begin{Verbatim}[commandchars=@\\[\\]]\n'