{% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} — {{ docstitle }}{% endtrans %}

diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 30373f06b..e0a8ce68a 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -5,8 +5,8 @@

{%trans%}What users say:{%endtrans%}

-

{%trans%}“Cheers for a great tool that actually makes programmers want - to write documentation!”{%endtrans%}

+

{%trans%}“Cheers for a great tool that actually makes programmers want + to write documentation!“{%endtrans%}

{%trans%} diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html index bf28cd089..5a2a71bfc 100644 --- a/doc/_themes/sphinx13/layout.html +++ b/doc/_themes/sphinx13/layout.html @@ -57,8 +57,8 @@ {% endblock %} {% block rootrellink %} -

-

Documentation »

+

+

Documentation »

{% endblock %} {% block header %} diff --git a/sphinx/themes/basic/changes/frameset.html b/sphinx/themes/basic/changes/frameset.html index e14cb9e15..2331ec11c 100644 --- a/sphinx/themes/basic/changes/frameset.html +++ b/sphinx/themes/basic/changes/frameset.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/frameset.dtd"> - {% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} — {{ docstitle }}{% endtrans %} + {% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} — {{ docstitle }}{% endtrans %} diff --git a/sphinx/themes/basic/changes/rstsource.html b/sphinx/themes/basic/changes/rstsource.html index 0a27479b0..c93a28dad 100644 --- a/sphinx/themes/basic/changes/rstsource.html +++ b/sphinx/themes/basic/changes/rstsource.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - {% trans filename=filename, docstitle=docstitle|e %}{{ filename }} — {{ docstitle }}{% endtrans %} + {% trans filename=filename, docstitle=docstitle|e %}{{ filename }} — {{ docstitle }}{% endtrans %} diff --git a/sphinx/themes/basic/changes/versionchanges.html b/sphinx/themes/basic/changes/versionchanges.html index 372015a7b..c42cef42e 100644 --- a/sphinx/themes/basic/changes/versionchanges.html +++ b/sphinx/themes/basic/changes/versionchanges.html @@ -9,7 +9,7 @@ - {% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} — {{ docstitle }}{% endtrans %} + {% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} — {{ docstitle }}{% endtrans %}

diff --git a/sphinx/themes/basic/domainindex.html b/sphinx/themes/basic/domainindex.html index 33f1b8a2a..34800f7e2 100644 --- a/sphinx/themes/basic/domainindex.html +++ b/sphinx/themes/basic/domainindex.html @@ -32,7 +32,7 @@ {%- for letter, entries in content %} - + {%- for (name, grouptype, page, anchor, extra, qualifier, description) @@ -42,7 +42,7 @@ {%- endif %} -



	{{ letter }}
{% if grouptype == 2 %} {% endif %} +	{% if grouptype == 2 %} {% endif %} {% if page %}{% endif -%} `{{ name\|e }}` {%- if page %}{% endif %} diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html index 1afc4a0bf..cf41aff4b 100644 --- a/sphinx/themes/basic/layout.html +++ b/sphinx/themes/basic/layout.html @@ -11,7 +11,7 @@ {%- endblock %} -{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} +{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} {%- set reldelim2 = reldelim2 is not defined and ' \|' or reldelim2 %} {%- set render_sidebar = (not embedded) and (not theme_nosidebar\|tobool) and (sidebars != []) %} @@ -19,7 +19,7 @@ {# XXX necessary? #} {%- if url_root == '#' %}{% set url_root = '' %}{% endif %} {%- if not embedded and docstitle %} - {%- set titlesuffix = " — "\|safe + docstitle\|e %} + {%- set titlesuffix = " — "\|safe + docstitle\|e %} {%- else %} {%- set titlesuffix = "" %} {%- endif %} @@ -186,9 +186,9 @@ {%- if show_copyright %} {%- if hasdoc('copyright') %} - {% trans path=pathto('copyright'), copyright=copyright\|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans path=pathto('copyright'), copyright=copyright\|e %}© Copyright {{ copyright }}.{% endtrans %} {%- else %} - {% trans copyright=copyright\|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans copyright=copyright\|e %}© Copyright {{ copyright }}.{% endtrans %} {%- endif %} {%- endif %} {%- if last_updated %} diff --git a/sphinx/util/smartypants.py b/sphinx/util/smartypants.py index a0357e92f..2f4acbc8d 100644 --- a/sphinx/util/smartypants.py +++ b/sphinx/util/smartypants.py @@ -105,7 +105,7 @@ decade_abbr_re = re.compile(r"""\b'(?=\d{2}s)""") opening_double_quotes_regex = re.compile(r""" ( \s \| # a whitespace char, or - \| # a non-breaking space entity, or + \| # a non-breaking space entity, or -- \| # dashes, or &[mn]dash; \| # named dash entities %s \| # or decimal entities @@ -131,7 +131,7 @@ closing_double_quotes_regex_2 = re.compile(r""" opening_single_quotes_regex = re.compile(r""" ( \s \| # a whitespace char, or - \| # a non-breaking space entity, or + \| # a non-breaking space entity, or -- \| # dashes, or &[mn]dash; \| # named dash entities %s \| # or decimal entities diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 5558b7fec..5dbe56597 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -545,7 +545,7 @@ class HTMLTranslator(BaseTranslator): self.body.append(token) else: # protect runs of multiple spaces; the last one can wrap - self.body.append(' ' * (len(token)-1) + ' ') + self.body.append(' ' * (len(token)-1) + ' ') else: if self.in_mailto and self.settings.cloak_email_addresses: encoded = self.cloak_email(encoded) diff --git a/tests/test_markup.py b/tests/test_markup.py index f7f639491..2fde2306c 100644 --- a/tests/test_markup.py +++ b/tests/test_markup.py @@ -92,7 +92,7 @@ def verify(rst, html_expected, latex_expected): def test_inline(): # correct interpretation of code with whitespace _html = (' `' - 'code sample` ') + 'code sample ') yield verify_re, '``code sample``', _html, r'\\sphinxcode{code sample}' yield verify_re, ':samp:`code sample`', _html, r'\\sphinxcode{code sample}'