Merge pull request #769 from wouterj/figures

Two minor figure bugs

Author: jaapio

packages/guides-restructured-text/src/RestructuredText/Directives/FigureDirective.php

@@ -60,6 +60,7 @@ protected function processSub(
             'target' => $scalarOptions['target'] ?? null,
             'class' => $scalarOptions['class'] ?? null,
             'name' => $scalarOptions['name'] ?? null,
+            'align' => $scalarOptions['align'] ?? null,
         ]);
 
         return new FigureNode($image, new CollectionNode($collectionNode->getChildren()));

packages/guides/resources/template/html/body/figure.html.twig

@@ -7,7 +7,7 @@
     {% if node.document %}
         {% set caption = renderNode(node.document) %}
 
-        {% if caption %}
+        {% if caption|trim %}
             <figcaption>{{ caption|raw }}</figcaption>
         {% endif %}
     {% endif %}

tests/Functional/tests/figure/figure.html

@@ -4,3 +4,6 @@
         <p>This is a foo!</p>
     </figcaption>
 </figure>
+<figure>
+    <img src="img/test-image.jpg" />
+</figure>

tests/Functional/tests/figure/figure.rst

@@ -2,3 +2,5 @@
     :width: 100
 
     This is a foo!
+
+.. figure:: img/test-image.jpg