[Docutils-checkins] r3507 - trunk/docutils/docutils/writers/html4css1.py

[<fel...@us...>]

Author: felixwiemann
Date: 2005-06-17 23:02:26 +0200 (Fri, 17 Jun 2005)
New Revision: 3507

Modified:
   trunk/docutils/docutils/writers/html4css1.py
Log:
fixed handling of scale image attribute,
so that David doesn't claim I just want to remove it because
I'm too lazy to fix it ;-)

Modified: trunk/docutils/docutils/writers/html4css1.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1.py	2005-06-17 15:20:28 UTC (rev 3506)
+++ trunk/docutils/docutils/writers/html4css1.py	2005-06-17 21:02:26 UTC (rev 3507)
@@ -880,16 +880,17 @@
                     pass
                 else:
                     if not atts.has_key('width'):
-                        atts['width'] = im.size[0]
+                        atts['width'] = str(im.size[0])
                     if not atts.has_key('height'):
-                        atts['height'] = im.size[1]
+                        atts['height'] = str(im.size[1])
                     del im
-            if atts.has_key('width'):
-                atts['width'] = int(round(node['width']
-                                          * (float(node['scale']) / 100)))
-            if atts.has_key('height'):
-                atts['height'] = int(round(node['height']
-                                           * (float(node['scale']) / 100)))
+            for att_name in 'width', 'height':
+                if atts.has_key(att_name):
+                    match = re.match(r'([0-9.]+)(.*)', atts[att_name])
+                    assert match
+                    atts[att_name] = '%s%s' % (
+                        float(match.group(1)) * (float(node['scale']) / 100),
+                        match.group(2))
         style = []
         for att_name in 'width', 'height':
             if atts.has_key(att_name):