[MERGE] Forward port of 12.0 to 13.0

2019-12-13 15:16:43 +01:00
parent ac88abfa4b 299d2f544d
commit 8d3616fd3a
11 changed files with 165 additions and 140 deletions
@@ -377,7 +377,11 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
                    "Unsupported alignment value \"%s\"" % node['align'],
                    location=doc
                )
-        # todo: explicit width/height/scale?
+        attrs['style'] = '; '.join(
+            '%s:%s' % (name, node[name] + ('px' if re.match(r'^[0-9]+$', node[name]) else ''))
+            for name in ['width', 'height']
+            if name in node
+        )
        self.body.append(self.starttag(node, 'img', **attrs))
    def depart_image(self, node): pass
    def visit_figure(self, node):