From 517c3727cf0df84cb1a335d6465f6b9d466e514d Mon Sep 17 00:00:00 2001
From: Jonas Baumann <jone@jone.ch>
Date: Thu, 3 Jan 2013 13:57:17 +0100
Subject: [PATCH] Support image- / figure-alignment using "align" attribute.

---
 creole/rest2html/clean_writer.py | 22 ++++++++++++++++++++++
 creole/tests/test_rest2html.py   | 22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/creole/rest2html/clean_writer.py b/creole/rest2html/clean_writer.py
index c043943..82cd10c 100644
--- a/creole/rest2html/clean_writer.py
+++ b/creole/rest2html/clean_writer.py
@@ -164,6 +164,28 @@ def visit_docinfo(self, node):
     def depart_docinfo(self, node):
         self.body.append('</table>\n')
 
+    #__________________________________________________________________________
+    # Clean image:
+
+    depart_figure = _do_nothing
+
+    def visit_image(self, node):
+        super(CleanHTMLTranslator, self).visit_image(node)
+        if self.body[-1].startswith('<img'):
+            align = None
+
+            if 'align' in node:
+                # image with alignment
+                align = node['align']
+
+            elif node.parent.tagname == 'figure' and 'align' in node.parent:
+                # figure with alignment
+                align = node.parent['align']
+
+            if align:
+                self.body[-1] = self.body[-1].replace(' />', ' align="%s" />' % align)
+
+
 
 def rest2html(content, enable_exit_status=None, **kwargs):
     """
diff --git a/creole/tests/test_rest2html.py b/creole/tests/test_rest2html.py
index 252ef3a..fe34153 100644
--- a/creole/tests/test_rest2html.py
+++ b/creole/tests/test_rest2html.py
@@ -148,6 +148,28 @@ def test_raw_enabled(self):
             <hr width=50 size=10>
         """, raw_enabled=True)
 
+    def test_preserve_image_alignment(self):
+        self.assert_rest2html("""
+            Image alignment should be preserved.
+
+            .. image:: foo.png
+               :align: right
+        """, """
+            <p>Image alignment should be preserved.</p>
+            <img alt="foo.png" src="foo.png" align="right" />
+        """)
+
+    def test_preserve_figure_alignment(self):
+        self.assert_rest2html("""
+            Image alignment should be preserved.
+
+            .. figure:: bar.png
+               :align: right
+        """, """
+            <p>Image alignment should be preserved.</p>
+            <img alt="bar.png" src="bar.png" align="right" />
+        """)
+
 
 if __name__ == '__main__':
     unittest.main()