IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7114 from tk0miya/7112_svg_not_floated

Browse Source 
Fix #7112: html: SVG image is not layouted as float even if aligned
This commit is contained in:
Takeshi KOMIYA 2020-02-09 15:26:49 +09:00 committed by GitHub
commit d07985ed85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -73,6 +73,7 @@ Bugs fixed
---------- ----------
* #6925: html: Remove redundant type="text/javascript" from <script> elements * #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 * #6906, #6907: autodoc: failed to read the source codes encoeded in cp1251
* #6961: latex: warning for babel shown twice * #6961: latex: warning for babel shown twice
* #7059: latex: LaTeX compilation falls into infinite loop (wrapfig issue) * #7059: latex: LaTeX compilation falls into infinite loop (wrapfig issue)

8
sphinx/writers/html.py
View File

@ -609,11 +609,7 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
atts['height'] = int(atts['height']) * scale atts['height'] = int(atts['height']) * scale
atts['alt'] = node.get('alt', uri) atts['alt'] = node.get('alt', uri)
if 'align' in node: if 'align' in node:
self.body.append('<div align="%s" class="align-%s">' % atts['class'] = 'align-%s' % node['align']
(node['align'], node['align']))
self.context.append('</div>\n')
else:
self.context.append('')
self.body.append(self.emptytag(node, 'img', '', **atts)) self.body.append(self.emptytag(node, 'img', '', **atts))
return return
@ -622,7 +618,7 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
# overwritten # overwritten
def depart_image(self, node: Element) -> None: def depart_image(self, node: Element) -> None:
if node['uri'].lower().endswith(('svg', 'svgz')): if node['uri'].lower().endswith(('svg', 'svgz')):
self.body.append(self.context.pop()) pass
else: else:
super().depart_image(node) super().depart_image(node)

8
sphinx/writers/html5.py
View File

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