Streamline figure markdown

src/templates/base/2019/base.html

@@ -385,6 +385,41 @@
   {% endmacro %}
 {% endif %}
 
+{%- macro figure_markup(
+  id=0,
+  image="",
+  caption="",
+  alt=caption,
+  description="",
+  sheets_url="",
+  width=600,
+  height=371,
+  data_width=width,
+  data_height=height,
+  big_number="",
+  really_big_number=""
+  )
+%}
+<figure id="fig-{{ id }}">
+  {%- if image != "" %}
+  <a href="{{ image }}">
+    {%- if sheets_url != "" %}
+    <img src="{{ image }}" alt="{{ caption|striptags }}" aria-labelledby="fig{{ id }}-caption" aria-describedby="fig{{ id }}-description" width="{{ width }}" height="{{ height }}" data-width="{{ data_width }}" data-height="{{ data_height }}" data-seamless="" data-frameborder="0" data-scrolling="no" data-iframe="{{ sheets_url|safe }}" loading="lazy" />
+    {%- else %}
+    <img src="{{ image }}" alt="{{ caption|striptags }}" aria-labelledby="fig{{ id }}-caption" aria-describedby="fig{{ id }}-description" width="{{ width }}" height="{{ height }}" loading="lazy" />
+    {%- endif %}
+  </a>
+  <button hidden="" class="fig-description-button" aria-expanded="false" aria-controls="fig{{ id }}-description" data-show-text="{{ show_description(id) }}" data-hide-text="{{ hide_description(id) }}">{{ show_description(id) }}</button>
+  <div id="fig{{ id }}-description" class="visually-hidden">{{ description|safe }}</div>
+  {%- elif big_number != "" %}
+  <div class="big-number">{{ big_number }}</div>
+  {%- elif really_big_number != "" %}
+  <div class="really-big-number">{{ really_big_number }}</div>
+  {%- endif %}
+  <figcaption id="fig{{ id }}-caption">{{ figure_link( id, caption) }}</figcaption>
+</figure>
+{%- endmacro %}
+
 {% block index_menu_script %}
 <script nonce="{{ csp_nonce() }}">
 

src/templates/base/2019/base_chapter.html

@@ -83,7 +83,6 @@
   </a>
 {% endmacro %}
 
-
 {% macro render_byline() %}
   <div class="byline">{{ self.written_by_before() }}
   {% for author in metadata.get('authors') %}

src/templates/base/2019/base_ebook.html

@@ -502,4 +502,4 @@ <h2 class="title">{{ self.intro_title() }}</h2>
 
 </div>
 {% endif %} 
-{% endblock %} 
+{% endblock %}

src/templates/en/2019/base.html

@@ -53,8 +53,10 @@
 {% block open %}Open{% endblock %}
 {% block close %}Close{% endblock %}
 
-{% macro show_description(id) %}Show description of Figure {{ id }}{% endmacro %}
-{% macro hide_description(id) %}Hide description of Figure {{ id }}{% endmacro %}
+{% macro figure(id, caption) %}Figure {{ metadata.chapter_number }}.{{ id }}. {{ caption|safe }}{% endmacro %}
+{% macro figure_link(id, caption) %}<a href="#fig-{{ id }}" class="anchor-link">Figure {{ metadata.chapter_number }}.{{ id }}.</a> {{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}Show description of Figure {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
+{% macro hide_description(id) %}Hide description of Figure {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
 
 {% block written_by_before %}Written by{% endblock %}
 {% block reviewed_by_before %}Reviewed by{% endblock %}

src/templates/es/2019/base.html

@@ -53,8 +53,10 @@
 {% block open %}Abre{% endblock %}
 {% block close %}Cierra{% endblock %}
 
-{% macro show_description(id) %}Mostrar descripción de la Figura {{ id }}{% endmacro %}
-{% macro hide_description(id) %}Ocultar descripción de la Figura {{ id }}{% endmacro %}
+{% macro figure(id, caption) %}Figura {{ metadata.chapter_number }}.{{ id }}. {{ caption|safe }}{% endmacro %}
+{% macro figure_link(id,caption) %}<a href="#fig-{{ id }}" class="anchor-link">Figura {{ metadata.chapter_number }}.{{ id }}.</a> {{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}Mostrar descripción de la Figura {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
+{% macro hide_description(id) %}Ocultar descripción de la Figura {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
 
 {% block written_by_before %}Escrito por{% endblock %}
 {% block reviewed_by_before %}Revisado por{% endblock %}

src/templates/fr/2019/base.html

@@ -53,8 +53,10 @@
 {% block open %}Ouvrez{% endblock %}
 {% block close %}Fermez{% endblock %}
 
-{% macro show_description(id) %}Afficher la description de la figure {{ id }}{% endmacro %}
-{% macro hide_description(id) %}Masquer la description de la figure  {{ id }}{% endmacro %}
+{% macro figure(id, caption) %}Figure {{ metadata.chapter_number }}.{{ id }}.  {{ caption|safe }}{% endmacro %}
+{% macro figure_link(id,caption) %}<a href="#fig-{{ id }}" class="anchor-link">Figure {{ metadata.chapter_number }}.{{ id }}.</a> {{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}Afficher la description de la figure {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
+{% macro hide_description(id) %}Masquer la description de la figure  {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
 
 {% block written_by_before %}Écrit par{% endblock %}
 {% block reviewed_by_before %}Relu par{% endblock %}

src/templates/ja/2019/base.html

@@ -63,8 +63,10 @@
 {% block author %}著者{% endblock %}
 {% block authors %}著者{% endblock %}
 
-{% macro show_description(id) %}図{{ id }}の説明を表示{% endmacro %}
-{% macro hide_description(id) %}図{{ id }}の説明を非表示{% endmacro %}
+{% macro figure(id, caption) %}図{{ metadata.chapter_number }}.{{ id }}{{ caption|safe }}{% endmacro %}
+{% macro figure_link(id,caption) %}<a href="#fig-{{ id }}" class="anchor-link">図{{ metadata.chapter_number }}.{{ id }}.</a>{{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}図{{ metadata.chapter_number }}.{{ id }}の説明を表示{% endmacro %}
+{% macro hide_description(id) %}図{{ metadata.chapter_number }}.{{ id }}の説明を非表示{% endmacro %}
 
 {% macro onTwitter(twitterHandle) %}Twitterの@{{twitterHandle}}{% endmacro %}
 {% macro onGitHub(gitHubHandle) %}GitHubの{{gitHubHandle}}{% endmacro %}

src/templates/pt/2019/base.html

@@ -53,8 +53,10 @@
 {% block open %}Abrir{% endblock %}
 {% block close %}Fechar{% endblock %}
 
-{% macro show_description(id) %}Mostrar descrição da figura {{ id }}{% endmacro %}
-{% macro hide_description(id) %}Ocultar descrição da figura {{ id }}{% endmacro %}
+{% macro figure(id, caption) %}Figura {{ metadata.chapter_number }}.{{ id }}. {{ caption|safe }}{% endmacro %}
+{% macro figure_link(id,caption) %}<a href="#fig-{{ id }}" class="anchor-link">Figura {{ metadata.chapter_number }}.{{ id }}.</a> {{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}Mostrar descrição da figura {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
+{% macro hide_description(id) %}Ocultar descrição da figura {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
 
 {% block written_by_before %}Escrito por{% endblock %}
 {% block reviewed_by_before %}Revisado por{% endblock %}

src/templates/zh-CN/2019/base.html

@@ -53,8 +53,10 @@
 {% block open %}打开{% endblock %}
 {% block close %}关闭{% endblock %}
 
-{% macro show_description(id) %}显示图像描述 {{ id }}{% endmacro %}
-{% macro hide_description(id) %}隐藏图像描述 {{ id }}{% endmacro %}
+{% macro figure(id, caption) %}图 {{ metadata.chapter_number }}.{{ id }}. {{ caption|safe }}{% endmacro %}
+{% macro figure_link(id,caption) %}<a href="#fig-{{ id }}" class="anchor-link">图 {{ metadata.chapter_number }}.{{ id }}.</a> {{ caption|safe }}{% endmacro %}
+{% macro show_description(id) %}显示图像描述 {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
+{% macro hide_description(id) %}隐藏图像描述 {{ metadata.chapter_number }}.{{ id }}{% endmacro %}
 
 {% block written_by_before %}作者： {% endblock %}
 {% block reviewed_by_before %}审稿者： {% endblock %}

src/tools/generate/remove_unnecessary_markup.js

@@ -6,6 +6,8 @@
 const remove_unnecessary_markup = (html) => {
   // Remove pointless paragraph tags added by JSON in wrap_tables
   html = html.replace(/<p><\/p>/g, '');
+  // Remove pointless paragraph tags added around Jinja figure calls
+  html = html.replace(/\n*<p>({{ figure_markup.*?)<\/p>\n*/gis, '$1');
   return html
 }