IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-02-25 14:47:34 +09:00
commit 4941148c5d
6 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -122,6 +122,8 @@ Bugs fixed
* #3427: autodoc: memory addresses are not stripped on Windows
* #3428: xetex build tests fail due to fontspec v2.6 defining ``\strong``
* #3349: Result of ``IndexBuilder.load()`` is broken
* #3450: &nbsp is appeared in EPUB docs
* #3418: Search button is misaligned in nature and pyramid theme
Testing
--------

2
Makefile
View File

@ -59,7 +59,7 @@ clean-backupfiles:
clean-generated:
find . -name '.DS_Store' -exec rm -f {} +
rm -f doc/_build/
rm -rf doc/_build/
rm -f sphinx/pycode/*.pickle
rm -f utils/*3.py*
rm -f utils/regression_test.js

5
doc/markup/misc.rst
View File

@ -233,8 +233,9 @@ following directive exists:
|``J``| justified column with automatic width |
+-----+------------------------------------------+
The automatic width is determined by rendering the content in the table, and
scaling them according to their share of the total width.
The automatic widths of the ``LRCJ`` columns are attributed by ``tabulary``
in proportion to the observed shares in a first pass where the table cells
are rendered at their natural "horizontal" widths.
By default, Sphinx uses a table layout with ``L`` for every column.

4
sphinx/themes/nature/static/nature.css_t
View File

@ -128,6 +128,10 @@ div.sphinxsidebar input {
div.sphinxsidebar input[type=text]{
margin-left: 20px;
}
div.sphinxsidebar input[type=submit]{
margin-left: 20px;
}
/* -- body styles ----------------------------------------------------------- */

4
sphinx/themes/pyramid/static/pyramid.css_t
View File

@ -152,6 +152,10 @@ div.sphinxsidebar input[type=text]{
margin-left: 20px;
}
div.sphinxsidebar input[type=submit]{
margin-left: 20px;
}
/* -- sidebars -------------------------------------------------------------- */
div.sidebar {

17
sphinx/writers/html.py
View File

@ -155,7 +155,7 @@ class HTMLTranslator(BaseTranslator):
def visit_desc_returns(self, node):
# type: (nodes.Node) -> None
self.body.append(' → ')
self.body.append(' → ')
def depart_desc_returns(self, node):
# type: (nodes.Node) -> None
@ -835,6 +835,11 @@ class HTMLTranslator(BaseTranslator):
self.body.append(self.starttag(node, 'tr', ''))
node.column = 0
def visit_entry(self, node):
BaseTranslator.visit_entry(self, node)
if self.body[-1] == ' ':
self.body[-1] = ' '
def visit_field_list(self, node):
# type: (nodes.Node) -> None
self._fieldlist_row_index = 0
@ -849,6 +854,12 @@ class HTMLTranslator(BaseTranslator):
node['classes'].append('field-odd')
self.body.append(self.starttag(node, 'tr', '', CLASS='field'))
def visit_field_name(self, node):
context_count = len(self.context)
BaseTranslator.visit_field_name(self, node)
if context_count != len(self.context):
self.context[-1] = self.context[-1].replace(' ', ' ')
def visit_math(self, node, math_env=''):
# type: (nodes.Node, unicode) -> None
logger.warning('using "math" markup without a Sphinx math extension '
@ -946,6 +957,10 @@ class SmartyPantsHTMLTranslator(HTMLTranslator):
self.no_smarty -= 1
HTMLTranslator.depart_option(self, node)
def visit_option_group(self, node):
HTMLTranslator.visit_option_group(self, node)
self.context[-2] = self.context[-2].replace(' ', ' ')
def bulk_text_processor(self, text):
# type: (unicode) -> unicode
if self.no_smarty <= 0: