refactored headers

theme/templates/index.html

@@ -6,10 +6,8 @@
 {% endblock breadcrumb %}
 
 {% block page_header %}
-<header class="visuallyhidden">
-	<h1>{{ common.softbreak_span(page.title) }}</h1>
-</header>
-<hr>
+	{{ common.render_header(page.title, 1, {"classes": ["visuallyhidden"]}, lang) }}
+	<hr>
 {% endblock %}
 
 {% block page_footer %}

theme/templates/macros/common.html

@@ -63,8 +63,15 @@
 {#- ############################# HEADER ################################## -#}
 
 {%- macro render_header(content, level, attr, lang) -%}
+	{%- call render_header_raw(content, level, attr, lang) -%}
+		{{ softbreak_span(content) }}
+	{%- endcall -%}
+{%- endmacro -%}
+
+
+{%- macro render_header_raw(content, level, attr, lang) -%}
 	<header {{ render_attr(attr, lang) }}>
-		<h{{ level }}>{{ render_inlines(content, lang) }}</h{{ level }}>
+		<h{{ level }}>{{ caller() }}</h{{ level }}>
 	</header>
 {%- endmacro -%}
 

theme/templates/macros/content_renderer.html

@@ -20,11 +20,12 @@
 {%- endmacro -%}
 
 {%- macro render_header(content, level, attr, lang) -%}
-	<header {{ common.render_attr(attr, lang) }}>
-		<h{{ level }}>{{ render_inlines(content, lang) }}</h{{ level }}>
-	</header>
+	{%- call common.render_header_raw(content, level, attr, lang) -%}
+		{{ render_inlines(content, lang) }}
+	{%- endcall -%}
 {%- endmacro -%}
 
+
 {%- macro render_orderedlist_type(style, delim) -%}
 	{#- TODO also use delim: default | period | one_parenthesis | two_parentheses -#}
 	{%-   if style == "default" -%}1
@@ -115,9 +116,8 @@
 	{%- set level = block['level'] -%}
 	{%- set attr = block['attr'] -%}
 	{%- set content = block['content'] -%}
-	<header {{ common.render_attr(attr, lang) }}>
-		<h{{ level }}>{{ render_inlines(content, lang) }}</h{{ level }}>
-	</header>
+
+	{{ render_header(content, level, attr, lang) }}
 {%- endmacro -%}
 
 {%- macro render_block_paragraph(block, lang) -%}

theme/templates/page.html

@@ -12,9 +12,7 @@
 {% block main %}
 	<article>
 		{% block page_header %}
-		<header>
-			<h1>{{ common.softbreak_span(page.title) }}</h1>
-		</header>
+			{{ common.render_header(page.title, 1, None, lang) }}
 		{% endblock %}
 		{% block page_content %}
 			{%- if 'before' in page.metadata -%}