Added support for character styles.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/xmlfixups.cpp b/src/xmlfixups.cpp
index eb6fcb7..458798a 100644
--- a/src/xmlfixups.cpp
+++ b/src/xmlfixups.cpp
@@ -42,10 +42,10 @@
 #include "tags.h"
 
 static const char* kNoDuplicates[] =
-    { kElB, kElU, kElI, kElFont, kElHide, kElSuper, kElSub, NULL };
+    { kElB, kElU, kElI, kElFont, kElHide, kElSuper, kElSub, kElSpan, NULL };
 
 static const char* kRequireAttrs[] =
-    { kElFont, NULL };
+    { kElFont, kElSpan, NULL };
 
 static const char* kRemoveTags[] =
     { kElDest, kElListdef, kElListtable, kElFontTable, kElFontDef, NULL };
@@ -503,6 +503,17 @@ void XmlFixups::runPassTwo(const DOM::Document& doc)
             continue;   // Current element no longer valid
         }
 
+		else if(name == kElSpan)
+		{
+            // Change style attribute on spans to name
+            if(haveStyles && el.hasAttribute(kElStyle))
+            {
+                DOM::Element style = styles.get(el.getAttribute(kElStyle));
+                if(style != NULL)
+                    el.setAttribute(kElStyle, style.getAttribute(kAtName));
+            }
+		}
+
         // Change id attribute on fonts to name
         if(haveFonts && name == kElFont)
         {