Merge branch '1.7'

CHANGES

@@ -89,6 +89,10 @@ Features added
 Bugs fixed
 ----------
 
+* #4769: autodoc loses the first staticmethod parameter
+* #4790: autosummary: too wide two column tables in PDF builds
+* #4795: Latex customization via ``_templates/longtable.tex_t`` is broken
+
 Testing
 --------
 

doc/conf.py

@@ -56,9 +56,14 @@ latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',
                     'Georg Brandl', 'manual', 1)]
 latex_logo = '_static/sphinx.png'
 latex_elements = {
-    'fontpkg': '\\usepackage{palatino}',
+    'fontpkg': r'''
+\usepackage[sc]{mathpazo}
+\usepackage[scaled]{helvet}
+\usepackage{courier}
+''',
     'passoptionstopackages': '\\PassOptionsToPackage{svgnames}{xcolor}',
     'preamble': '\\DeclareUnicodeCharacter{229E}{\\ensuremath{\\boxplus}}',
+    'fvset': '\\fvset{fontsize=auto}',
     # fix missing index entry due to RTD doing only once pdflatex after makeindex
     'printindex': r'''
 \IfFileExists{\jobname.ind}

doc/config.rst

@@ -1837,8 +1837,17 @@ These options influence LaTeX output. See further :doc:`latex`.
            ``'lualatex'`` uses same default setting as ``'xelatex'``
      ``'fontpkg'``
         Font package inclusion, default ``'\\usepackage{times}'`` (which uses
-        Times and Helvetica).  You can set this to ``''`` to use the Computer
-        Modern fonts.
+        Times for text, Helvetica for sans serif and Courier for code-blocks).
+
+        .. hint::
+
+           Courier is much wider than Times, and Sphinx emits LaTeX command
+           ``\small`` in code-blocks to compensate. Since ``1.5`` this is not
+           hard-coded anymore, and can be modified via inclusion in
+           ``'preamble'`` key of ``\\fvset{fontsize=auto}``. This is
+           recommended if the fonts match better than Times and Courier. At
+           ``1.8`` a separate ``'fvset'`` key will permit such customization
+           without usage of ``'preamble'`` key.
 
         .. versionchanged:: 1.2
            Defaults to ``''`` when the :confval:`language` uses the Cyrillic

sphinx/ext/autodoc/__init__.py

@@ -1301,7 +1301,10 @@ class MethodDocumenter(DocstringSignatureMixin, ClassLevelDocumenter):  # type:
                 inspect.ismethoddescriptor(self.object):
             # can never get arguments of a C function or method
             return None
-        args = Signature(self.object, bound_method=True).format_args()
+        if isstaticmethod(self.object, cls=self.parent, name=self.object_name):
+            args = Signature(self.object, bound_method=False).format_args()
+        else:
+            args = Signature(self.object, bound_method=True).format_args()
         # escape backslashes for reST
         args = args.replace('\\', '\\\\')
         return args

sphinx/ext/autosummary/__init__.py

@@ -361,7 +361,7 @@ class Autosummary(Directive):
         *items* is a list produced by :meth:`get_items`.
         """
         table_spec = addnodes.tabular_col_spec()
-        table_spec['spec'] = r'p{0.5\linewidth}p{0.5\linewidth}'
+        table_spec['spec'] = r'\X{1}{2}\X{1}{2}'
 
         table = autosummary_table('')
         real_table = nodes.table('', classes=['longtable'])

sphinx/writers/latex.py

@@ -930,8 +930,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
 
     def render(self, template_name, variables):
         # type: (unicode, Dict) -> unicode
-        for template_path in self.builder.config.templates_path:
-            template = path.join(template_path, template_name)
+        for template_dir in self.builder.config.templates_path:
+            template = path.join(self.builder.confdir, template_dir,
+                                 template_name)
             if path.exists(template):
                 return LaTeXRenderer().render(template, variables)
 

tests/roots/test-latex-table/_mytemplates/latex/longtable.tex_t

@@ -0,0 +1 @@
+SALUT LES COPAINS

tests/test_autodoc.py

@@ -804,7 +804,7 @@ def test_generate():
                   '   .. py:attribute:: Class._private_inst_attr',
                   '   .. py:classmethod:: Class.inheritedclassmeth()',
                   '   .. py:method:: Class.inheritedmeth()',
-                  '   .. py:staticmethod:: Class.inheritedstaticmeth()',
+                  '   .. py:staticmethod:: Class.inheritedstaticmeth(cls)',
                   ],
                  'class', 'Class', member_order='bysource', all_members=True)
     del directive.env.ref_context['py:module']

tests/test_build_latex.py

@@ -1098,6 +1098,30 @@ def test_latex_table_complex_tables(app, status, warning):
     assert actual == expected
 
 
+@pytest.mark.sphinx('latex', testroot='latex-table',
+                    confoverrides={'templates_path': ['_mytemplates/latex']})
+def test_latex_table_custom_template_caseA(app, status, warning):
+    app.builder.build_all()
+    result = (app.outdir / 'test.tex').text(encoding='utf8')
+    assert 'SALUT LES COPAINS' in result
+
+
+@pytest.mark.sphinx('latex', testroot='latex-table',
+                    confoverrides={'templates_path': ['_mytemplates']})
+def test_latex_table_custom_template_caseB(app, status, warning):
+    app.builder.build_all()
+    result = (app.outdir / 'test.tex').text(encoding='utf8')
+    assert 'SALUT LES COPAINS' not in result
+
+
+@pytest.mark.sphinx('latex', testroot='latex-table')
+@pytest.mark.test_params(shared_result='latex-table')
+def test_latex_table_custom_template_caseC(app, status, warning):
+    app.builder.build_all()
+    result = (app.outdir / 'test.tex').text(encoding='utf8')
+    assert 'SALUT LES COPAINS' not in result
+
+
 @pytest.mark.sphinx('latex', testroot='directives-raw')
 def test_latex_raw_directive(app, status, warning):
     app.builder.build_all()

tests/test_ext_autosummary.py

@@ -188,6 +188,16 @@ def test_autosummary_generate(app, status, warning):
             '   \n' in Foo)
 
 
+@pytest.mark.sphinx('latex', **default_kw)
+def test_autosummary_latex_table_colspec(app, status, warning):
+    app.builder.build_all()
+    result = (app.outdir / 'Python.tex').text(encoding='utf8')
+    print(status.getvalue())
+    print(warning.getvalue())
+    assert r'\begin{longtable}{\X{1}{2}\X{1}{2}}' in result
+    assert r'p{0.5\linewidth}' not in result
+
+
 def test_import_by_name():
     import sphinx
     import sphinx.ext.autosummary