From 2dd02729bc675dfaa267059ee69076bc798c9034 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sat, 8 Feb 2020 22:04:14 +0900
Subject: [PATCH 1/2] Fix #7112: html: SVG image is not layouted as float even
 if aligned

---
 CHANGES                 | 1 +
 sphinx/writers/html.py  | 2 +-
 sphinx/writers/html5.py | 8 ++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index f9c881f1fd1..57564563cab 100644
--- 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
index 84cdcc15bfc..c5d3c50b5db 100644
--- 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
index 087c92842df..9f38bf4f313 100644
--- 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)
 

From 60797f82fa6b9cf3224ffdb8815ad509b8649228 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 9 Feb 2020 15:05:46 +0900
Subject: [PATCH 2/2] fix

---
 sphinx/writers/html.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index c5d3c50b5db..ab5712410e4 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -609,11 +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="img 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
 
@@ -622,7 +618,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)