Surround fignum and caption with <span> tag

1 files changed, 8 insertions, 0 deletions

diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 17cbe5fd..cf92fc5e 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -248,9 +248,11 @@ class HTMLTranslator(BaseTranslator):
     def add_fignumber(self, node):
         def append_fignumber(figtype, figure_id):
             if figure_id in self.builder.fignumbers.get(figtype, {}):
+                self.body.append(self.starttag(node, 'span', '', CLASS='caption-number'))
                 prefix = self.builder.config.numfig_prefix.get(figtype, '')
                 numbers = self.builder.fignumbers[figtype][figure_id]
                 self.body.append(prefix + '.'.join(map(str, numbers)) + " ")
+                self.body.append('</span>')
 
         if isinstance(node.parent, nodes.figure):
             append_fignumber('figure', node.parent['ids'][0])
@@ -276,6 +278,8 @@ class HTMLTranslator(BaseTranslator):
         BaseTranslator.visit_title(self, node)
         self.add_secnumber(node)
         self.add_fignumber(node)
+        if isinstance(node.parent, nodes.table):
+            self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))
 
     # overwritten
     def visit_literal_block(self, node):
@@ -308,8 +312,11 @@ class HTMLTranslator(BaseTranslator):
         else:
             BaseTranslator.visit_caption(self, node)
         self.add_fignumber(node)
+        self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))
 
     def depart_caption(self, node):
+        self.body.append('</span>')
+
         # append permalink if available
         if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
             self.add_permalink_ref(node.parent, 'code')
@@ -593,6 +600,7 @@ class HTMLTranslator(BaseTranslator):
                                  _('Permalink to this headline'),
                                  self.permalink_text))
             elif isinstance(node.parent, nodes.table):
+                self.body.append('</span>')
                 self.add_permalink_ref(node.parent, 'table')
 
         BaseTranslator.depart_title(self, node)