Commit Graph

8439 Commits

Author SHA1 Message Date
Takeshi KOMIYA
142344ceed Merge pull request #3523 from anntzer/makefile-use--msphinx
Default SPHINXBUILD to 'python -msphinx' instead of 'sphinx-build'.
2017-03-08 15:56:34 +09:00
Takeshi KOMIYA
c7bec75bcd BuildEnvironment always own application object (after read phase) 2017-03-08 12:23:25 +09:00
Takeshi KOMIYA
a523f9893a Add load(), loads(), dump() and dumps() to BuildEnvironment 2017-03-08 12:23:25 +09:00
jfbu
71e1642749 Protect TeX double quotes ligatures in inline literals (refs #3507) 2017-03-07 22:20:11 +01:00
jfbu
c42db788d0 Sync with 1.0 footnotehyper
Since #3022 (Sphinx 1.5) more footnotes are hyperlinked but it became
impossible for Sphinx user to pass option ``hyperfootnotes=false`` to
package ``hyperref``. Release 1.0 of LaTeX package ``footnotehyper``,
which serves as bugfix replacement to older package ``footnote``, is
compatible with ``hyperfootnotes=false``, hence it is again possible to
Sphinx user to completely disable hyperlinking of footnotes, if ever
needed.
2017-03-07 19:06:23 +01:00
Takeshi KOMIYA
5ee4c396bc Merge branch 'stable' 2017-03-08 00:22:39 +09:00
Jakob Lykke Andersen
38b38d8aff Make flake8 stop complaining. 2017-03-07 20:47:53 +09:00
Jakob Lykke Andersen
bc527c533e C++, better error messages for 'func' and 'any' refs.
Followup to sphinx-dox/sphinx#2952.
On error try to get reparse without parens to get the correct message.
2017-03-07 20:28:04 +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
Takeshi KOMIYA
e060f65bc5 Merge pull request #3519 from agjohnson/add-domain-tests
Add tests for xrefs on Python and JavaScript domains
2017-03-07 11:20:32 +09:00
Antony Lee
0832aa73ab Default SPHINXBUILD to 'python -msphinx' instead of 'sphinx-build'.
Using `python -msphinx` as the default for SPHINXBUILD in the
Makefile/make.bat ensures that whatever virtual environment is currently
active (if any) gets picked up.  In the current situation, imaging that
we are working on project $foo which is also installed system-wide,
but we want to build docs for a venv-installed version; that sphinx
is installed system-wide but not in the current environment, and that
e.g. conf.py imports $foo (e.g. to retrieve a version string).  Then
sphinx-build will resolve to the globally installed version, and the
global (wrong) version of $foo will be imported as well.

With this fix, `make html` will do everything in the correct virtualenv
(if any).  This switch is similar in spirit to e.g. the deprecation of
the `pyvenv` script in Py3.6, in favor of `python -mvenv`.
2017-03-06 18:16:27 -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
Anthony Johnson
3390b7f499
Allow empty toctree in singlehtml builder
We noticed this issue with the 0.2.x release of snide/sphinx_rtd_theme. Because
we are calling toctree unconditionally, we notice a bug in the singlehtml
builder when the docs have an empty/nonexistant toctree. In this case,
`fix_refuris` as being passed `None`, which failed to traverse, throwing an
exception.

This conditionally fixes the refuris instead.
2017-03-05 13:31:43 -08:00
jfbu
6fda42f214 Reword a CHANGES entry for 1.6 (refs #3466) 2017-03-05 10:35:02 +01:00
Takeshi KOMIYA
125b224d80 Merge pull request #3509 from abathur/html_depart_admonition
Fix #3506: consistently pass node to depart_admonition in HTML writer
2017-03-05 17:38:41 +09: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
79a49805eb Add xcolor to Travis requirements for testing (refs #3070) 2017-03-04 18:56:55 +01:00
jfbu
bfaab9b45d Stop bundling LaTeX package needspace with Sphinx (refs #3070) 2017-03-04 18:55:24 +01:00
jfbu
91ec5a8012 Update CHANGES for PR#3504 2017-03-04 18:50:08 +01:00
Jean-François B
469d261abb Merge pull request #3504 from jfbu/fixtablevspaces
Fix #3491 via equalizing vertical spaces for latex tables of all types
2017-03-04 18:24:49 +01:00
jfbu
64a45053af Rename to `\shinxbelowcaptionspace` 2017-03-04 18:09:33 +01:00
jfbu
07fa4246a3 Reduce after table space 2017-03-04 16:25:21 +01: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
Jellby
5f25ade72b again 2017-03-04 13:35:03 +01:00
Jellby
b43ae69e0b again 2017-03-04 13:24:15 +01:00
Jellby
d8ff893ebd again 2017-03-04 13:06:35 +01:00
Jellby
3171a195bb again 2017-03-04 12:44:43 +01:00
Jellby
47d823ef24 Try to correct syntax for type annotation 2017-03-04 12:36:02 +01:00
Jellby
68cf06a2ce Update version (there's still hope) 2017-03-04 12:14:54 +01:00
Jellby
3ce6168958 Merge remote-tracking branch 'upstream/master'
Conflicts:
	tests/test_build_html.py
2017-03-04 12:03:15 +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
000c11ef9d Merge pull request #3493 from tk0miya/refactor_inventory
Refactor inventory
2017-03-04 01:59:35 +09:00
Takeshi KOMIYA
432ec25d9c Fix for py3 2017-03-04 01:03:29 +09:00
Takeshi KOMIYA
3ba24fb6b8 Fix mypy violation 2017-03-04 00:26:21 +09:00
Takeshi KOMIYA
e655794b8e Merge branch 'master' into refactor_inventory 2017-03-04 00:22:17 +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
Takeshi KOMIYA
f97eb91581 Merge pull request #3502 from tk0miya/3499_upgrade_mypy
Upgrade to mypy-0.5
2017-03-04 00:01:31 +09:00
Takeshi KOMIYA
45f1253e34 Fix flake8 violation 2017-03-03 23:55:53 +09:00
Takeshi KOMIYA
f32ec6533d Fix flake8 violation 2017-03-03 23:42:35 +09:00
Takeshi KOMIYA
8d35024c6c Fix mypy violation 2017-03-03 23:34:52 +09:00
Takeshi KOMIYA
554199d30e Upgrade to mypy-0.5 2017-03-03 23:17:34 +09:00
Takeshi KOMIYA
28b1aceefe Merge pull request #3495 from shibukawa/fix/html5_validation_error
fix HTML5 validation check (role attribute of body tag is unnecessary)
2017-03-03 23:04:47 +09:00
Takeshi KOMIYA
2a37b0e340 Allow to replace table templates for LaTeX by user's 2017-03-03 22:48:44 +09:00
Takeshi KOMIYA
8aa2588275 Merge pull request #3501 from shibukawa/fix/type_style_check
fix style check warnings
2017-03-03 22:46:34 +09:00
Yoshiki Shibukawa
7e178785a7 fix style check warnings 2017-03-03 22:03:16 +09:00