diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/markup/misc.rst | 5 | ||||
| -rw-r--r-- | sphinx/themes/nature/static/nature.css_t | 4 | ||||
| -rw-r--r-- | sphinx/themes/pyramid/static/pyramid.css_t | 4 | ||||
| -rw-r--r-- | sphinx/writers/html.py | 17 |
6 files changed, 30 insertions, 4 deletions
@@ -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:   is appeared in EPUB docs +* #3418: Search button is misaligned in nature and pyramid theme Testing -------- @@ -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 diff --git a/doc/markup/misc.rst b/doc/markup/misc.rst index bdfc3346c..0e1d104d6 100644 --- a/doc/markup/misc.rst +++ b/doc/markup/misc.rst @@ -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. diff --git a/sphinx/themes/nature/static/nature.css_t b/sphinx/themes/nature/static/nature.css_t index 4406956b4..511fd1418 100644 --- a/sphinx/themes/nature/static/nature.css_t +++ b/sphinx/themes/nature/static/nature.css_t @@ -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 ----------------------------------------------------------- */ diff --git a/sphinx/themes/pyramid/static/pyramid.css_t b/sphinx/themes/pyramid/static/pyramid.css_t index d40da6661..194a4c4bb 100644 --- a/sphinx/themes/pyramid/static/pyramid.css_t +++ b/sphinx/themes/pyramid/static/pyramid.css_t @@ -152,6 +152,10 @@ div.sphinxsidebar input[type=text]{ margin-left: 20px; } +div.sphinxsidebar input[type=submit]{ + margin-left: 20px; +} + /* -- sidebars -------------------------------------------------------------- */ div.sidebar { diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 03d7c86df..7e924fce9 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -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: |