Commit Graph

1620 Commits

Author SHA1 Message Date
Takeshi KOMIYA
f3aa62e685 Merge pull request #3571 from tk0miya/refactor_init_builder
Refactor initialization process of builder
2017-03-22 09:50:31 +09:00
Takeshi KOMIYA
6376e6053c Merge branch 'stable' 2017-03-22 09:49:48 +09:00
David Baumgold
3317796739 Fix intersphinx debug tool
and add automated tests
2017-03-21 15:00:32 -04:00
Takeshi KOMIYA
cd3f48bb76 Create an instance of builder before initialize env 2017-03-19 23:16:37 +09:00
Takeshi KOMIYA
aa6dfb8b41 Merge branch 'stable' 2017-03-18 18:25:50 +09:00
Takeshi KOMIYA
a67c7855aa Merge pull request #3520 from agjohnson/fix-domain-py-nesting
Fix Python domain nesting
2017-03-18 17:33:56 +09:00
Takeshi KOMIYA
0df0a11cfa Add testcode for sphinx.pycode 2017-03-18 15:00:28 +09:00
Dmitry Shachnev
1d12165a12 tests: Fix invalid escape sequence
This fixes this warning:
tests/test_build_latex.py:958: DeprecationWarning: invalid escape sequence \s
2017-03-16 20:22:58 +03:00
Takeshi KOMIYA
c1a6377caa Merge pull request #3555 from mitya57/stable
test_markup: Make verify functions test both HTML and LaTeX outputs
2017-03-16 10:28:48 +09:00
Dmitry Shachnev
1717a95a77 Fix a test failure which was uncovered by the previous change
In PR #3527 the LaTeX output for quotes has changed, but the test was
not updated.
2017-03-15 11:29:50 +03:00
Rob Ruana
b7efbfe615 Fix #3174: [Napoleon] Defers autodoc-skip-member to other extensions if Napoleon doesn't care if the member is skipped 2017-03-14 18:53:27 -07:00
Dmitry Shachnev
6e0467ca77 test_markup: Make verify functions test both HTML and LaTeX outputs
Previously it would return after performing the HTML check, without
running the LaTeX one.
2017-03-14 22:34:51 +03:00
jfbu
bc0682af0e Merge branch 'stable'
Conflicts resolved:
	sphinx/domains/cpp.py
	sphinx/domains/python.py
	sphinx/texinputs/sphinx.sty
	sphinx/util/docfields.py
	sphinx/writers/latex.py
	tests/test_build_latex.py

Also updated:
    sphinx/domains/__init__.py
2017-03-12 13:01:47 +01:00
Jakob Lykke Andersen
acf5f94940 C++, fix parsing error of non-type template arg
Fixes sphinx-doc/sphinx#3542
2017-03-12 15:03:20 +09:00
Ray Lehtiniemi
560c8ab29d Add more decorator tests
Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
2017-03-11 14:16:23 -07:00
Ray Lehtiniemi
06b6e07b98 Add tests
Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
2017-03-11 13:40:47 -07:00
Jean-François B
3128a4327d More robust hyperlink macros in LaTeX output (refs #3317, #3340, #3533) (#3538)
More robust hyperlink macros in LaTeX output (refs #3317, #3340, #3533)
2017-03-11 16:53:53 +01:00
Takeshi KOMIYA
c7bec75bcd BuildEnvironment always own application object (after read phase) 2017-03-08 12:23:25 +09:00
Takeshi KOMIYA
5ee4c396bc Merge branch 'stable' 2017-03-08 00:22:39 +09:00
Anthony Johnson
b0875d63fc Fix Python domain nesting
Moved #3465 here, to address this in `stable` instead.

This fixes a problem with the Python domain object nesting. Because only one
object name was stored in `ref_context`, and reset to `None` in `after_content`,
nesting broke if you put anything after a nested class:

```rst
.. py:class:: Parent

    .. py:method:: foo()

        This wouldn't resolve: :py:meth:`bar`

    .. py:class:: Child

        In the `after_content` method, the object is reset to `None`, so
        anything after this in the same nesting is considered to be top level
        instead.

    .. py:method:: bar()

        This is top level, as the domain thinks the surrounding object is `None`
```

This depends on #3519 and can be rebased after that is merged into stable

Fixes #3065
Refs #3067
2017-03-06 19:04:19 -08:00
Anthony Johnson
3502336b13 Add tests for xrefs on Python and JavaScript domains
These are just the passing test cases for the domains currently. I am going to
patch up issues with nesting on both domains to start, so these are the test
cases I'll be testing against. I'll see about addressing the other core
domains, or at very least the cpp domain, with similar tests if this looks
okay.

So far, these tests only test against methods/functions for the basic nesting
structure. More complete tests will test additional domain roles.

Refs #662
2017-03-05 16:00:25 -08:00
Travis A. Everett
fde43061e5 clean up commented lines 2017-03-04 20:58:43 -06:00
Travis A. Everett
4c67c110f6 Also change depart_admonition calls for html5 builder 2017-03-04 20:32:46 -06:00
Travis A. Everett
1e28eeb348 swing two for oldstyle class 2017-03-04 15:56:06 -06:00
Travis A. Everett
b6694c9ca1 Make super call version-agnostic 2017-03-04 14:27:41 -06:00
Travis A. Everett
cabfcbd70d Fix #3506: consistently pass node to depart_admonition in HTML writer 2017-03-04 13:40:05 -06:00
jfbu
0882a41f24 Rename and simplify LaTeX macros
in particular:
``\sphinxbelowtablecaptionskip`` renamed to ``\sphinxbelowcaptionskip``
as it may be extended in future to usage for captions of literal blocks.
2017-03-04 16:09:49 +01:00
jfbu
5f71a2ccb3 Fix #3491 via equalizing vertical spaces for latex tables of all types
User interface via macros ``\sphinxtablepre``, ``\sphinxtablepost``
and ``\sphinxbelowtablecaptionskip``.
2017-03-04 00:08:02 +01:00
Takeshi KOMIYA
432ec25d9c Fix for py3 2017-03-04 01:03:29 +09:00
Takeshi KOMIYA
ffb627db89 Merge branch 'master' into refactor_inventory 2017-03-04 00:13:39 +09:00
Takeshi KOMIYA
7cb655d7cd Update testcase 2017-03-04 00:02:38 +09:00
Yoshiki Shibukawa
7e178785a7 fix style check warnings 2017-03-03 22:03:16 +09:00
jfbu
3743199576 Remove frame around LaTeX longtable's "Continued on next page" footer
refs: PR #3497
2017-03-03 10:08:08 +01:00
jfbu
33bf5410f6 Update tests after 'stable' merge (refs: #3497) 2017-03-03 10:00:56 +01:00
Takeshi KOMIYA
c1a70397e1 Add InventoryFile.dump() 2017-03-02 23:48:05 +09:00
Takeshi KOMIYA
29254c15f1 Move InventoryFile class to sphinx.util.inventory 2017-03-02 22:51:42 +09:00
Takeshi KOMIYA
69bb12c1e1 intersphinx: Add InventoryFile utility 2017-03-02 17:26:07 +09:00
Takeshi KOMIYA
00e32eeeff intersphinx: Add ZlibReader utility 2017-03-02 16:45:31 +09:00
Yoshiki Shibukawa
0ef9ac54f1 Add experimental HTML5 writer 2017-03-02 09:56:50 +09:00
jfbu
bc67d4298f Improve latex tables: fix #1574 and other rendering issues
- allow multi-paragraph contents in grid table merged cells
- allow code-blocks in merged cells
- allow generally speaking reST contents allowed in regular
  cells to be also allowed in merged cells, whether multirow,
  multicolumn, or both.

This is made possible by custom LaTeX macros replacing original
``\multicolumn`` and ``\multirow`` (none of the originals allows
verbatim contents as is needed for code-blocks). They are defined in
bundled LaTeX style file sphinxmulticell.sty. The multicolumn merged
cells give much better results with tabulary as it is coerced into
taking them into account in its automatic width algorithm.

This deprecates use of LaTeX packages eqparbox and multirow, which are
not needed anymore.

New config setting ``latex_use_latex_multicolumn`` (default value False,
currently) as custom Sphinx multicolumn is not fully compatible will all
types of custom table col specs which may be inserted via tabularcolumns
directive. It works best with standard ``|`` column separator.

The default tabulary column specifier has been changed from L
(flushleft) to J (justifying). Internally the column type is called T,
so ``r'\newcolumntype{T}{L}'`` in preamble key recovers the former
behaviour. A ``\Y`` column type is defined which admits one decimal
argument in place of the two integers for ``\X``.
2017-03-01 09:41:30 +01:00
Takeshi KOMIYA
a98818bf06 Merge pull request #3476 from stephenfin/feat/sphinx-setuptools-multiple-builders
setuptools: Support multiple builders
2017-03-01 15:30:33 +09:00
Takeshi KOMIYA
0b1178bff7 Merge branch 'stable' 2017-03-01 15:04:28 +09:00
Yoshiki Shibukawa
3502831214 replace internal copy of ElementTree with standard library's ElementTree 2017-03-01 12:01:40 +09:00
Stephen Finucane
2afa0b6627 setuptools: Support multiple builders
At present, the 'builder' option for the setuptools integration only
supports a single output format, typically HTML, like so:

  [build_sphinx]
  builder = man

There is value in being able to specify multiple format, like so:

  [build_sphinx]
  builder = html man

Make this possible.

Signed-off-by: Stephen Finucane <stephen@that.guru>
2017-02-28 17:30:28 +00:00
Yoshiki Shibukawa
229c5cfa3b Add warning messages for required EPUB3 metadata 2017-02-28 19:51:39 +09:00
jfbu
3e3d97ff9c fix test 2017-02-28 08:13:37 +01:00
Dmitry Shachnev
73cd4b038a Add tests for the previous two changes 2017-02-27 15:48:26 +03:00
Jean-François B
56d446cb42 Merge pull request #3466 from jfbu/lualatexsettings
same default settings for lualatex as for xelatex
2017-02-27 12:19:32 +01:00
Takeshi KOMIYA
496ff70f4a Merge branch 'stable' 2017-02-26 16:01:22 +09:00
Takeshi KOMIYA
64041636d6 Merge pull request #3455 from shibukawa/fix-again/epub-nbsp-issue
Fix &nbsp is appeared in EPUB docs #3450 again
2017-02-26 15:46:33 +09:00