Fix sphinx-doc#7112: html: SVG image is not layouted as float even if…

… aligned
tk0miya · Feb 9, 2020 · 2dd0272 · 2dd0272
1 parent ebb9a9a
commit 2dd0272
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -71,6 +71,7 @@ Bugs fixed
 ----------
 
 * #6925: html: Remove redundant type="text/javascript" from <script> elements
+* #7112: html: SVG image is not layouted as float even if aligned
 * #6906, #6907: autodoc: failed to read the source codes encoeded in cp1251
 * #6961: latex: warning for babel shown twice
 * #7059: latex: LaTeX compilation falls into infinite loop (wrapfig issue)

diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
@@ -609,7 +609,7 @@ def visit_image(self, node: Element) -> None:
                     atts['height'] = int(atts['height']) * scale
             atts['alt'] = node.get('alt', uri)
             if 'align' in node:
-                self.body.append('<div align="%s" class="align-%s">' %
+                self.body.append('<div align="%s" class="img align-%s">' %
                                  (node['align'], node['align']))
                 self.context.append('</div>\n')
             else:

diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py
@@ -550,11 +550,7 @@ def visit_image(self, node: Element) -> None:
                     atts['height'] = int(atts['height']) * scale
             atts['alt'] = node.get('alt', uri)
             if 'align' in node:
-                self.body.append('<div align="%s" class="align-%s">' %
-                                 (node['align'], node['align']))
-                self.context.append('</div>\n')
-            else:
-                self.context.append('')
+                atts['class'] = 'align-%s' % node['align']
             self.body.append(self.emptytag(node, 'img', '', **atts))
             return
 
@@ -563,7 +559,7 @@ def visit_image(self, node: Element) -> None:
     # overwritten
     def depart_image(self, node: Element) -> None:
         if node['uri'].lower().endswith(('svg', 'svgz')):
-            self.body.append(self.context.pop())
+            pass
         else:
             super().depart_image(node)