From 637d3122914e3c38f51266a01d89943f7ae920d2 Mon Sep 17 00:00:00 2001
From: luk156 <matteo@luccalug.it>
Date: Fri, 26 Jul 2013 16:00:23 +0200
Subject: [PATCH 1/2] fix <span style... .odt file

---
 webodt/preprocessors.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webodt/preprocessors.py b/webodt/preprocessors.py
index 3a57678..dce59c0 100644
--- a/webodt/preprocessors.py
+++ b/webodt/preprocessors.py
@@ -37,6 +37,11 @@ def unescape_templatetags_preprocessor(template_content):
             template_content = template_content.replace(
                 '{{%s}}' % include_text, '{{%s}}' % new_include_text
             )
+        for include_text in re.findall(r'{{(.+?)}}', template_content):
+            new_include_text = re.sub(r'<.*?>', '', include_text)
+            template_content = template_content.replace(
+                '{{%s}}' % include_text, '{{%s}}' % new_include_text
+            )
     return template_content
 
 def xmlfor_preprocessor(template_content):

From 24f6d8275ca55c22f89ec01640dbed18c56d8155 Mon Sep 17 00:00:00 2001
From: Matteo Lucchesi <matteo156@gmail.com>
Date: Fri, 2 Aug 2013 11:44:12 +0200
Subject: [PATCH 2/2] Update preprocessors.py

---
 webodt/preprocessors.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/webodt/preprocessors.py b/webodt/preprocessors.py
index dce59c0..ad86d67 100644
--- a/webodt/preprocessors.py
+++ b/webodt/preprocessors.py
@@ -45,6 +45,13 @@ def unescape_templatetags_preprocessor(template_content):
     return template_content
 
 def xmlfor_preprocessor(template_content):
+    for include_text in re.findall(r'{%(.+?)%}', template_content):
+        new_include_text = re.sub(r'<.*?>', '', include_text)
+        template_content = template_content.replace(
+            '{%%%s%%}' % include_text, '{%%%s%%}' % new_include_text
+        )
+        print include_text
+        print template_content
     tree = etree.parse(StringIO(template_content))
 
     # 1. search for xmlfor pairs