merge with 0.6

CHANGES

@@ -40,6 +40,8 @@ Release 1.0 (in development)
 Release 0.6.3 (in development)
 ==============================
 
+* #201: Make ``centered`` directive work in LaTeX output.
+
 * #206: Refuse to overwrite an existing master document in
   sphinx-quickstart.
 

sphinx/ext/graphviz.py

@@ -95,7 +95,7 @@ def render_dot(self, code, options, format, prefix='graphviz'):
 
     if hasattr(self.builder, '_graphviz_warned_dot') or \
        hasattr(self.builder, '_graphviz_warned_ps2pdf'):
-        return None
+        return None, None
 
     ensuredir(path.dirname(outfn))
 
@@ -114,7 +114,7 @@ def render_dot(self, code, options, format, prefix='graphviz'):
                           'output), check the graphviz_dot setting' %
                           self.builder.config.graphviz_dot)
         self.builder._graphviz_warned_dot = True
-        return None
+        return None, None
     # graphviz expects UTF-8 by default
     if isinstance(code, unicode):
         code = code.encode('utf-8')

sphinx/writers/latex.py

@@ -791,9 +791,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
         self.body.append('\n')
 
     def visit_centered(self, node):
-        self.body.append('\n\\begin{centering}')
+        self.body.append('\n\\begin{center}')
     def depart_centered(self, node):
-        self.body.append('\n\\end{centering}')
+        self.body.append('\n\\end{center}')
 
     def visit_hlist(self, node):
         # for now, we don't support a more compact list format