From b13735f75e5a360038acf29c1bed419eab8227c8 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 16 Nov 2008 10:31:31 +0100 Subject: [PATCH] #39: spurious was emitted in HTML output. This is due to a Jinja bug; the workaround is to just not use empty {% block %} tags. --- CHANGES | 3 +++ sphinx/templates/layout.html | 8 ++++---- sphinx/templates/opensearch.xml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 19b6343db..b2afba121 100644 --- a/CHANGES +++ b/CHANGES @@ -156,6 +156,9 @@ New features added Bugs fixed ---------- +* Work around a bug in Jinja that caused "" to be + emitted in HTML output. + * Fix a problem with module links not being generated in LaTeX output. * Fix the handling of images in different directories. diff --git a/sphinx/templates/layout.html b/sphinx/templates/layout.html index 45826f803..5ad4f8dd1 100644 --- a/sphinx/templates/layout.html +++ b/sphinx/templates/layout.html @@ -20,7 +20,7 @@ {%- for parent in parents %}
  • {{ parent.title }}{{ reldelim1 }}
    • {%- endfor %} - {%- block relbaritems %}{% endblock %} + {%- block relbaritems %} {% endblock %} {%- endmacro %} @@ -143,13 +143,13 @@ {%- endif %} {%- endblock %} -{%- block extrahead %}{% endblock %} +{%- block extrahead %} {% endblock %} {%- block relbar1 %}{{ relbar() }}{% endblock %} -{%- block sidebar1 %}{# possible location for sidebar #}{% endblock %} +{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %} {%- block document %}
    @@ -158,7 +158,7 @@
    {%- endif %}
    - {% block body %}{% endblock %} + {% block body %} {% endblock %}
    {%- if builder != 'htmlhelp' %}
    diff --git a/sphinx/templates/opensearch.xml b/sphinx/templates/opensearch.xml index 5b6ab7bf6..fb7fd31f5 100644 --- a/sphinx/templates/opensearch.xml +++ b/sphinx/templates/opensearch.xml @@ -6,5 +6,5 @@ {{ docstitle }} -{% block extra %}{# Put e.g. an element here. #}{% endblock %} +{% block extra %} {# Put e.g. an element here. #} {% endblock %}