The ReStructuredText directive "figure" now is translated into the HT…

…ML5 tag "figure"
regebro · Aug 21, 2018 · c18e27c · c18e27c
1 parent b511250
commit c18e27c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,7 +4,8 @@ Changes
 3.0 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- The ReStructuredText directive "figure" now is translated into the HTML5
+  tag "figure", with the caption becoming a figcaption tag.
 
 
 2.5 (2017-12-10)

diff --git a/docs/examples/hovercraft.rst b/docs/examples/hovercraft.rst
@@ -278,9 +278,9 @@ Presenter console!
 **Hovercraft!**
 ===============
 
-.. image:: images/hovercraft_logo.png
+.. figure:: images/hovercraft_logo.png
 
-The merge of convenience and cool!
+    The merge of convenience and cool!
 
 .. note::
 

diff --git a/hovercraft/position.py b/hovercraft/position.py
@@ -228,10 +228,8 @@ def update_positions(tree, positions):
                     els = tree.findall(".//*[@id='" + value + "']")
                     for el in els :
                         pos[abs_key] = num(el.get(abs_key)) + pos.get(abs_key)
-                        print(num(el.get(abs_key)))
-                        print(pos.get(abs_key))
                         step.attrib[abs_key] = str(pos.get(abs_key))
-            else: 
+            else:
                 step.attrib[key] = str(pos[key])
 
         if 'hovercraft-path' in step.attrib:
@@ -240,7 +238,7 @@ def update_positions(tree, positions):
 
 def position_slides(tree):
     """Position the slides in the tree"""
-    
+
     positions = gather_positions(tree)
     positions = calculate_positions(positions)
     update_positions(tree, positions)
diff --git a/hovercraft/templates/reST.xsl b/hovercraft/templates/reST.xsl
@@ -32,7 +32,12 @@
 	 SUCH DAMAGE.
 -->
 
-<!-- Modifications by Lennart Regebro, 2013:
+<!--
+Modifications by Lennart Regebro, 2018:
+
+* Added support for the HTML5 <figure> and <figcaption> tags.
+
+Modifications by Lennart Regebro, 2013:
 
 * Added support for the <notes>-tag.
 
@@ -482,6 +487,19 @@ Modification by Carl Mayer, 2013:
 	</span>
 </xsl:template>
 
+<xsl:template match="figure">
+	<figure>
+		<xsl:apply-templates />
+	</figure>
+</xsl:template>
+
+<xsl:template match="figure/caption">
+	<figcaption>
+		<xsl:apply-templates />
+	</figcaption>
+</xsl:template>
+
+
 <!-- Skip ReST comments -->
 <xsl:template match="comment">
 </xsl:template>