diff -r 0bab4ef95bfe -r bfaab8740995 src/cm/views/export.py
--- a/src/cm/views/export.py	Thu Jun 16 09:27:56 2011 +0200
+++ b/src/cm/views/export.py	Thu Jul 21 09:42:33 2011 +0200
@@ -8,6 +8,7 @@
 from cm.models import Text, TextVersion, Attachment, Comment
 import mimetypes
 import simplejson
+from cm.cm_settings import USE_ABI
 EXPORT2_INFOS = {
 # key -> { mimetype, extension}
 's5' :   {},
@@ -34,10 +35,20 @@
         else :
             fix_content = content
             if content_format == 'html':
-                from cm.converters.oo_converters import combine_css_body                
-                fix_content = combine_css_body(content, '')
-            from cm.converters.oo_converters import convert_html as oo_convert                
-            export_content = oo_convert(fix_content, format)
+                if USE_ABI:
+                  from cm.converters.abi_converters import AbiFileConverter
+                  converter = AbiFileConverter()
+                  fix_content = converter.add_html_header(content)
+                else:
+                  from cm.converters.oo_converters import combine_css_body                
+                  fix_content = combine_css_body(content, '')
+            if USE_ABI:
+              from cm.converters.abi_converters import AbiFileConverter
+              converter = AbiFileConverter()
+              export_content = converter.convert_from_html(fix_content, format)
+            else:
+              from cm.converters.oo_converters import convert_html as oo_convert                
+              export_content = oo_convert(fix_content, format)
     
     export_infos = EXPORT2_INFOS[format]
      
@@ -189,4 +200,4 @@
     return content_export(request, text_version.content, text_version.title, text_version.format, format)
 
 def text_feed(request, key):
-    return ""
\ No newline at end of file
+    return ""