don't include missing.h before windows headers

[wxWidgets.git] / src / richtext / richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index f8d267d2e4dbc2800315ab5d06dd5a7de67484d4..eed0a71f4f35fd9ad28c917ad833bc6f9e3adbab 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtext/richtextxml.cpp
+// Name:        src/richtext/richtextxml.cpp

 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:


@@ -13,27 +13,26 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
+#if wxUSE_RICHTEXT && wxUSE_XML

 
 

-#include "wx/image.h"
+#include "wx/richtext/richtextxml.h"

 
 

-#if wxUSE_RICHTEXT
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/module.h"
+#endif

 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/sstream.h"
 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/sstream.h"

-#include "wx/module.h"

 #include "wx/txtstrm.h"
 #include "wx/txtstrm.h"

+#include "wx/tokenzr.h"

 #include "wx/xml/xml.h"
 
 #include "wx/xml/xml.h"
 

-#include "wx/richtext/richtextxml.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS


@@ -47,7 +46,14 @@ bool wxRichTextXMLHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& s
     wxXmlDocument* xmlDoc = new wxXmlDocument;
     bool success = true;
 
     wxXmlDocument* xmlDoc = new wxXmlDocument;
     bool success = true;
 

-    if (!xmlDoc->Load(stream, wxT("ISO-8859-1")))
+    // This is the encoding to convert to (memory encoding rather than file encoding)
+    wxString encoding(wxT("UTF-8"));
+
+#if !wxUSE_UNICODE && wxUSE_INTL
+    encoding = wxLocale::GetSystemEncodingName();
+#endif
+
+    if (!xmlDoc->Load(stream, encoding))

     {
         success = false;
     }
     {
         success = false;
     }


@@ -93,6 +99,9 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
     if (name == wxT("paragraphlayout"))
     {
 
     if (name == wxT("paragraphlayout"))
     {

+        wxString partial = node->GetPropVal(wxT("partialparagraph"), wxEmptyString);
+        if (partial == wxT("true"))
+            buffer->SetPartialParagraph(true);

     }
     else if (name == wxT("paragraph"))
     {
     }
     else if (name == wxT("paragraph"))
     {


@@ -117,19 +126,13 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
                         wxString text2 = textChild->GetContent();
 
                         // Strip whitespace from end
                         wxString text2 = textChild->GetContent();
 
                         // Strip whitespace from end

-                        if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('\n'))
-                            text2 = text2.Mid(0, text2.Length()-1);
+                        if (!text2.empty() && text2[text2.length()-1] == wxT('\n'))
+                            text2 = text2.Mid(0, text2.length()-1);

 
 

-                        if (text2.Length() > 0 && text2[0] == wxT('"'))
+                        if (!text2.empty() && text2[0] == wxT('"'))

                             text2 = text2.Mid(1);
                             text2 = text2.Mid(1);

-                        if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('"'))
-                            text2 = text2.Mid(0, text2.Length() - 1);
-
-                        // TODO: further entity translation
-                        text2.Replace(wxT("&lt;"), wxT("<"));
-                        text2.Replace(wxT("&gt;"), wxT(">"));
-                        text2.Replace(wxT("&amp;"), wxT("&"));
-                        text2.Replace(wxT("&quot;"), wxT("\""));
+                        if (!text2.empty() && text2[text2.length()-1] == wxT('"'))
+                            text2 = text2.Mid(0, text2.length() - 1);

 
                         text += text2;
                     }
 
                         text += text2;
                     }


@@ -141,6 +144,30 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
                 para->AppendChild(textObject);
             }
 
                 para->AppendChild(textObject);
             }

+            else if (childName == wxT("symbol"))
+            {
+                // This is a symbol that XML can't read in the normal way
+                wxString text;
+                wxXmlNode* textChild = child->GetChildren();
+                while (textChild)
+                {
+                    if (textChild->GetType() == wxXML_TEXT_NODE ||
+                        textChild->GetType() == wxXML_CDATA_SECTION_NODE)
+                    {
+                        wxString text2 = textChild->GetContent();
+                        text += text2;
+                    }
+                    textChild = textChild->GetNext();
+                }
+                
+                wxString actualText;
+                actualText << (wxChar) wxAtoi(text);
+
+                wxRichTextPlainText* textObject = new wxRichTextPlainText(actualText, para);
+                GetStyle(textObject->GetAttributes(), child, false);
+
+                para->AppendChild(textObject);
+            }

             else if (childName == wxT("image"))
             {
                 int imageType = wxBITMAP_TYPE_PNG;
             else if (childName == wxT("image"))
             {
                 int imageType = wxBITMAP_TYPE_PNG;


@@ -175,7 +202,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
                     wxStringInputStream strStream(data);
 
 
                     wxStringInputStream strStream(data);
 

-                    imageObj->GetImageBlock().ReadHex(strStream, data.Length(), imageType);
+                    imageObj->GetImageBlock().ReadHex(strStream, data.length(), imageType);

                 }
             }
             child = child->GetNext();
                 }
             }
             child = child->GetNext();


@@ -272,8 +299,16 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.empty()) return;
 #if wxUSE_UNICODE
 {
     if (str.empty()) return;
 #if wxUSE_UNICODE

-    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
-    stream.Write((const char*)buf, strlen((const char*)buf));
+    if (convFile)
+    {
+        const wxWX2MBbuf buf(str.mb_str(*convFile));
+        stream.Write((const char*)buf, strlen((const char*)buf));
+    }
+    else
+    {
+        const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+        stream.Write((const char*)buf, strlen((const char*)buf));
+    }

 #else
     if ( convFile == NULL )
         stream.Write(str.mb_str(), str.Len());
 #else
     if ( convFile == NULL )
         stream.Write(str.mb_str(), str.Len());


@@ -299,8 +334,13 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);

+
+        // Original code excluded "&amp;" but we _do_ want to convert
+        // the ampersand beginning &amp; because otherwise when read in,
+        // the original "&amp;" becomes "&".
+

         if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||
         if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||

-            (c == wxT('&') && (str.Mid(i+1, 4) != wxT("amp;"))))
+            (c == wxT('&') /* && (str.Mid(i+1, 4) != wxT("amp;")) */ ))

         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)
         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)


@@ -321,6 +361,16 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
             }
             last = i + 1;
         }
             }
             last = i + 1;
         }

+        else if (wxUChar(c) > 127)
+        {
+            OutputString(stream, str.Mid(last, i - last), convMem, convFile);
+
+            wxString s(wxT("&#"));
+            s << (int) c;
+            s << wxT(";");
+            OutputString(stream, s, NULL, NULL);
+            last = i + 1;
+        }

     }
     OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 }
     }
     OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 }


@@ -333,26 +383,6 @@ inline static void OutputIndentation(wxOutputStream& stream, int indent)
     OutputString(stream, str, NULL, NULL);
 }
 
     OutputString(stream, str, NULL, NULL);
 }
 

-static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
-{
-    stream.Write(s, s.Length());
-    return stream;
-}
-
-static wxOutputStream& operator <<(wxOutputStream& stream, long l)
-{
-    wxString str;
-    str.Printf(wxT("%ld"), l);
-    return stream << str;
-}
-
-static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
-{
-    wxString str;
-    str.Printf(wxT("%c"), c);
-    return stream << str;
-}
-

 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 {
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 {


@@ -366,7 +396,7 @@ static wxString ColourToHexString(const wxColour& col)
 }
 
 // Convert 6-digit hex string to a colour
 }
 
 // Convert 6-digit hex string to a colour

-wxColour HexStringToColour(const wxString& hex)
+static wxColour HexStringToColour(const wxString& hex)

 {
     unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
     unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
 {
     unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
     unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));


@@ -381,41 +411,64 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
         return false;
 
     wxString version(wxT("1.0") ) ;
         return false;
 
     wxString version(wxT("1.0") ) ;

+
+    bool deleteConvFile = false;
+    wxString fileEncoding;
+    wxMBConv* convFile = NULL;
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxString fileencoding(wxT("UTF-8")) ;
-    wxString memencoding(wxT("UTF-8")) ;
+    fileEncoding = wxT("UTF-8");
+    convFile = & wxConvUTF8;

 #else
 #else

-    wxString fileencoding(wxT("ISO-8859-1")) ;
-    wxString memencoding(wxT("ISO-8859-1")) ;
+    fileEncoding = wxT("ISO-8859-1");
+    convFile = & wxConvISO8859_1;

 #endif
 #endif

-    wxString s ;

 
 

-    wxMBConv *convMem = NULL, *convFile = NULL;
+    // If SetEncoding has been called, change the output encoding.
+    if (!m_encoding.empty() && m_encoding.Lower() != fileEncoding.Lower())
+    {
+        if (m_encoding == wxT("<System>"))
+        {
+            fileEncoding = wxLocale::GetSystemEncodingName();
+        }
+        else
+        {
+            fileEncoding = m_encoding;
+        }
+
+        // GetSystemEncodingName may not have returned a name
+        if (fileEncoding.empty())

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    convFile = new wxCSConv(fileencoding);
+            fileEncoding = wxT("UTF-8");

 #else
 #else

-    if ( fileencoding != memencoding )
-    {
-        convFile = new wxCSConv(fileencoding);
-        convMem = new wxCSConv(memencoding);
+            fileEncoding = wxT("ISO-8859-1");
+#endif
+        convFile = new wxCSConv(fileEncoding);
+        deleteConvFile = true;

     }
     }

+
+#if !wxUSE_UNICODE
+    wxMBConv* convMem = wxConvCurrent;
+#else
+    wxMBConv* convMem = NULL;

 #endif
 
 #endif
 

+    wxString s ;

     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),

-        (const wxChar*) version, (const wxChar*) fileencoding );
+        (const wxChar*) version, (const wxChar*) fileEncoding );

     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 
     int level = 1;
     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 
     int level = 1;

-    ExportXML(stream, convMem, convFile, *buffer, level);
+    bool success = ExportXML(stream, convMem, convFile, *buffer, level);

 
     OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
     OutputString(stream, wxT("\n"), NULL, NULL);
 
 
     OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
     OutputString(stream, wxT("\n"), NULL, NULL);
 

-    delete convFile;
-    delete convMem;
+    if (deleteConvFile)
+        delete convFile;

 
 

-    return true;
+    return success;

 }
 
 /// Recursively export an object
 }
 
 /// Recursively export an object


@@ -432,27 +485,82 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         objectName = wxT("image");
     else
         objectName = wxT("object");
         objectName = wxT("image");
     else
         objectName = wxT("object");

+    
+    bool terminateTag = true;

 
     if (obj.IsKindOf(CLASSINFO(wxRichTextPlainText)))
     {
 
     if (obj.IsKindOf(CLASSINFO(wxRichTextPlainText)))
     {

-        wxRichTextPlainText& text = (wxRichTextPlainText&) obj;
+        wxRichTextPlainText& textObj = (wxRichTextPlainText&) obj;
+        
+        wxString style = CreateStyle(obj.GetAttributes(), false);
+                
+        int i;
+        int last = 0;
+        const wxString& text = textObj.GetText();
+        int len = (int) text.Length();
+        for (i = 0; i < len; i++)
+        {
+            int c = (int) text[i];
+            if (c < 32 && c != 9 && c != 10 && c != 13)
+            {
+                if (i > 0)
+                {
+                    OutputIndentation(stream, indent);
+                    OutputString(stream, wxT("<") + objectName, convMem, convFile);

 
 

-        OutputIndentation(stream, indent);
-        stream << wxT("<") << objectName;
+                    OutputString(stream, style + wxT(">"), convMem, convFile);

 
 

-        wxString style = CreateStyle(obj.GetAttributes(), false);
+                    wxString fragment(text.Mid(last, i-last));
+                    if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+                    {
+                        OutputString(stream, wxT("\""), convMem, convFile);
+                        OutputStringEnt(stream, fragment, convMem, convFile);
+                        OutputString(stream, wxT("\""), convMem, convFile);
+                    }
+                    else
+                        OutputStringEnt(stream, fragment, convMem, convFile);

 
 

-        stream << style << wxT(">");
+                    OutputString(stream, wxT("</text>"), convMem, convFile);
+                }                
+                
+
+                // Output this character as a number in a separate tag, because XML can't cope
+                // with entities below 32 except for 9, 10 and 13                
+                last = i + 1;
+                OutputIndentation(stream, indent);
+                OutputString(stream, wxT("<symbol"), convMem, convFile);
+
+                OutputString(stream, style + wxT(">"), convMem, convFile);
+                OutputString(stream, wxString::Format(wxT("%d"), c), convMem, convFile);                
+
+                OutputString(stream, wxT("</symbol>"), convMem, convFile);
+            }
+        }
+        
+        wxString fragment;
+        if (last == 0)
+            fragment = text;
+        else
+            fragment = text.Mid(last, i-last);

 
 

-        wxString str = text.GetText();
-        if (str.Length() > 0 && (str[0] == wxT(' ') || str[str.Length()-1] == wxT(' ')))
+        if (last < len)

         {
         {

-            stream << wxT("\"");
-            OutputStringEnt(stream, str, convMem, convFile);
-            stream << wxT("\"");
+            OutputIndentation(stream, indent);
+            OutputString(stream, wxT("<") + objectName, convMem, convFile);
+
+            OutputString(stream, style + wxT(">"), convMem, convFile);
+
+            if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+            {
+                OutputString(stream, wxT("\""), convMem, convFile);
+                OutputStringEnt(stream, fragment, convMem, convFile);
+                OutputString(stream, wxT("\""), convMem, convFile);
+            }
+            else
+                OutputStringEnt(stream, fragment, convMem, convFile);

         }
         else
         }
         else

-            OutputStringEnt(stream, str, convMem, convFile);
+            terminateTag = false;

     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextImage)))
     {
     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextImage)))
     {


@@ -462,36 +570,39 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
             imageObj.MakeBlock();
 
         OutputIndentation(stream, indent);
             imageObj.MakeBlock();
 
         OutputIndentation(stream, indent);

-        stream << wxT("<") << objectName;
+        OutputString(stream, wxT("<") + objectName, convMem, convFile);

         if (!imageObj.GetImageBlock().Ok())
         {
             // No data
         if (!imageObj.GetImageBlock().Ok())
         {
             // No data

-            stream << wxT(">");
+            OutputString(stream, wxT(">"), convMem, convFile);

         }
         else
         {
         }
         else
         {

-            stream << wxString::Format(wxT(" imagetype=\"%d\""), (int) imageObj.GetImageBlock().GetImageType()) << wxT(">");
+            OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\">"), (int) imageObj.GetImageBlock().GetImageType()));

         }
 
         OutputIndentation(stream, indent+1);
         }
 
         OutputIndentation(stream, indent+1);

-        stream << wxT("<data>");
+        OutputString(stream, wxT("<data>"), convMem, convFile);

 
         imageObj.GetImageBlock().WriteHex(stream);
 
 
         imageObj.GetImageBlock().WriteHex(stream);
 

-        stream << wxT("</data>");
+        OutputString(stream, wxT("</data>"), convMem, convFile);

     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextCompositeObject)))
     {
         OutputIndentation(stream, indent);
     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextCompositeObject)))
     {
         OutputIndentation(stream, indent);

-        stream << wxT("<") << objectName;
+        OutputString(stream, wxT("<") + objectName, convMem, convFile);

 
         bool isPara = false;
         if (objectName == wxT("paragraph") || objectName == wxT("paragraphlayout"))
             isPara = true;
 
         wxString style = CreateStyle(obj.GetAttributes(), isPara);
 
         bool isPara = false;
         if (objectName == wxT("paragraph") || objectName == wxT("paragraphlayout"))
             isPara = true;
 
         wxString style = CreateStyle(obj.GetAttributes(), isPara);

+        
+        if (objectName == wxT("paragraphlayout") && ((wxRichTextParagraphLayoutBox&) obj).GetPartialParagraph())
+            style << wxT(" partialparagraph=\"true\"");

 
 

-        stream << style << wxT(">");
+        OutputString(stream, style + wxT(">"), convMem, convFile);

 
         wxRichTextCompositeObject& composite = (wxRichTextCompositeObject&) obj;
         size_t i;
 
         wxRichTextCompositeObject& composite = (wxRichTextCompositeObject&) obj;
         size_t i;


@@ -505,7 +616,8 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
     if (objectName != wxT("text"))
         OutputIndentation(stream, indent);
 
     if (objectName != wxT("text"))
         OutputIndentation(stream, indent);
 

-    stream << wxT("</") << objectName << wxT(">");
+    if (terminateTag)
+        OutputString(stream, wxT("</") + objectName + wxT(">"), convMem, convFile);

 
     return true;
 }
 
     return true;
 }


@@ -514,23 +626,34 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
 wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara)
 {
     wxString str;
 wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara)
 {
     wxString str;

-    if (attr.GetTextColour().Ok())
+    if (attr.HasTextColour() && attr.GetTextColour().Ok())

     {
         str << wxT(" textcolor=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\"");
     }
     {
         str << wxT(" textcolor=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\"");
     }

-    if (attr.GetBackgroundColour().Ok())
+    if (attr.HasBackgroundColour() && attr.GetBackgroundColour().Ok())

     {
         str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
     }
 
     if (attr.GetFont().Ok())
     {
     {
         str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
     }
 
     if (attr.GetFont().Ok())
     {

-        str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
-        str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
-        str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
-        str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
-        str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
-        str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
+        if (attr.HasSize())
+            str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
+        
+        //if (attr.HasFamily())
+        //    str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
+
+        if (attr.HasItalic())
+            str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
+
+        if (attr.HasWeight())
+            str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
+
+        if (attr.HasUnderlined())
+            str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
+
+        if (attr.HasFaceName())
+            str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");

     }
 
     if (!attr.GetCharacterStyleName().empty())
     }
 
     if (!attr.GetCharacterStyleName().empty())


@@ -538,19 +661,54 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
 
     if (isPara)
     {
 
     if (isPara)
     {

-        str << wxT(" alignment=\"") << (int) attr.GetAlignment() << wxT("\"");
-        str << wxT(" leftindent=\"") << (int) attr.GetLeftIndent() << wxT("\"");
-        str << wxT(" leftsubindent=\"") << (int) attr.GetLeftSubIndent() << wxT("\"");
-        str << wxT(" rightindent=\"") << (int) attr.GetRightIndent() << wxT("\"");
-        str << wxT(" parspacingafter=\"") << (int) attr.GetParagraphSpacingAfter() << wxT("\"");
-        str << wxT(" parspacingbefore=\"") << (int) attr.GetParagraphSpacingBefore() << wxT("\"");
-        str << wxT(" linespacing=\"") << (int) attr.GetLineSpacing() << wxT("\"");
-        str << wxT(" bulletstyle=\"") << (int) attr.GetBulletStyle() << wxT("\"");
-        str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
-        str << wxT(" bulletsymbol=\"") << wxString(attr.GetBulletSymbol()) << wxT("\"");
+        if (attr.HasAlignment())
+            str << wxT(" alignment=\"") << (int) attr.GetAlignment() << wxT("\"");
+
+        if (attr.HasLeftIndent())
+        {
+            str << wxT(" leftindent=\"") << (int) attr.GetLeftIndent() << wxT("\"");
+            str << wxT(" leftsubindent=\"") << (int) attr.GetLeftSubIndent() << wxT("\"");
+        }
+
+        if (attr.HasRightIndent())
+            str << wxT(" rightindent=\"") << (int) attr.GetRightIndent() << wxT("\"");
+
+        if (attr.HasParagraphSpacingAfter())
+            str << wxT(" parspacingafter=\"") << (int) attr.GetParagraphSpacingAfter() << wxT("\"");
+
+        if (attr.HasParagraphSpacingBefore())
+            str << wxT(" parspacingbefore=\"") << (int) attr.GetParagraphSpacingBefore() << wxT("\"");
+
+        if (attr.HasLineSpacing())
+            str << wxT(" linespacing=\"") << (int) attr.GetLineSpacing() << wxT("\"");
+
+        if (attr.HasBulletStyle())
+            str << wxT(" bulletstyle=\"") << (int) attr.GetBulletStyle() << wxT("\"");
+
+        if (attr.HasBulletNumber())
+            str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
+
+        if (attr.HasBulletSymbol())
+        {
+            str << wxT(" bulletsymbol=\"") << (int) (attr.GetBulletSymbol()) << wxT("\"");
+            str << wxT(" bulletfont=\"") << attr.GetBulletFont() << wxT("\"");
+        }

 
         if (!attr.GetParagraphStyleName().empty())
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
 
         if (!attr.GetParagraphStyleName().empty())
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");

+        
+        if (attr.HasTabs())
+        {
+            str << wxT(" tabs=\"");
+            size_t i;
+            for (i = 0; i < attr.GetTabs().GetCount(); i++)
+            {
+                if (i > 0)
+                    str << wxT(",");
+                str << attr.GetTabs()[i];
+            }
+            str << wxT("\"");            
+        }

     }
 
     return str;
     }
 
     return str;


@@ -565,31 +723,54 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
     int fontWeight = wxNORMAL;
     int fontStyle = wxNORMAL;
     bool fontUnderlined = false;
     int fontWeight = wxNORMAL;
     int fontStyle = wxNORMAL;
     bool fontUnderlined = false;

+    
+    int fontFlags = 0;

 
     fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
 
     fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);

+    if (!fontFacename.IsEmpty())
+        fontFlags |= wxTEXT_ATTR_FONT_FACE;

 
 

-    wxString value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);
-    if (!value.empty())
-        fontFamily = wxAtoi(value);
+    wxString value;
+    //value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);
+    //if (!value.empty())
+    //    fontFamily = wxAtoi(value);

 
     value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);
     if (!value.empty())
 
     value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);
     if (!value.empty())

+    {

         fontStyle = wxAtoi(value);
         fontStyle = wxAtoi(value);

+        fontFlags |= wxTEXT_ATTR_FONT_ITALIC;
+    }

 
     value = node->GetPropVal(wxT("fontsize"), wxEmptyString);
     if (!value.empty())
 
     value = node->GetPropVal(wxT("fontsize"), wxEmptyString);
     if (!value.empty())

+    {

         fontSize = wxAtoi(value);
         fontSize = wxAtoi(value);

+        fontFlags |= wxTEXT_ATTR_FONT_SIZE;
+    }

 
     value = node->GetPropVal(wxT("fontweight"), wxEmptyString);
     if (!value.empty())
 
     value = node->GetPropVal(wxT("fontweight"), wxEmptyString);
     if (!value.empty())

+    {

         fontWeight = wxAtoi(value);
         fontWeight = wxAtoi(value);

+        fontFlags |= wxTEXT_ATTR_FONT_WEIGHT;
+    }

 
     value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);
     if (!value.empty())
 
     value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);
     if (!value.empty())

+    {

         fontUnderlined = wxAtoi(value) != 0;
         fontUnderlined = wxAtoi(value) != 0;

-
-    attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
-
+        fontFlags |= wxTEXT_ATTR_FONT_UNDERLINE;
+    }
+    
+    attr.SetFlags(fontFlags);
+    
+    if (attr.HasFlag(wxTEXT_ATTR_FONT))
+        attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
+
+    // Restore correct font flags
+    attr.SetFlags(fontFlags);
+    

     value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
     if (!value.empty())
     {
     value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
     if (!value.empty())
     {


@@ -621,13 +802,24 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
 
         int leftSubIndent = 0;
         int leftIndent = 0;
 
         int leftSubIndent = 0;
         int leftIndent = 0;

+        bool hasLeftIndent = false;
+        

         value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
         if (!value.empty())
         value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
         if (!value.empty())

+        {

             leftIndent = wxAtoi(value);
             leftIndent = wxAtoi(value);

+            hasLeftIndent = true;
+        }
+

         value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
         if (!value.empty())
         value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
         if (!value.empty())

+        {

             leftSubIndent = wxAtoi(value);
             leftSubIndent = wxAtoi(value);

-        attr.SetLeftIndent(leftIndent, leftSubIndent);
+            hasLeftIndent = true;
+        }
+
+        if (hasLeftIndent)
+            attr.SetLeftIndent(leftIndent, leftSubIndent);

 
         value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
         if (!value.empty())
 
         value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
         if (!value.empty())


@@ -655,159 +847,36 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
 
         value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);
         if (!value.empty())
 
         value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);
         if (!value.empty())

-            attr.SetBulletSymbol(value[0]);
+            attr.SetBulletSymbol(wxAtoi(value));
+
+        value = node->GetPropVal(wxT("bulletfont"), wxEmptyString);
+        if (!value.empty())
+            attr.SetBulletFont(value);

 
         value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
         if (!value.empty())
             attr.SetParagraphStyleName(value);
 
         value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
         if (!value.empty())
             attr.SetParagraphStyleName(value);

-    }
-
-    return true;
-}
-
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler)
-
-/// Can we handle this filename (if using files)? By default, checks the extension.
-bool wxRichTextHTMLHandler::CanHandle(const wxString& filename) const
-{
-    wxString path, file, ext;
-    wxSplitPath(filename, & path, & file, & ext);
-
-    return (ext.Lower() == wxT("html") || ext.Lower() == wxT("htm"));
-}
-
-
-#if wxUSE_STREAMS
-bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInputStream& WXUNUSED(stream))
-{
-    return false;
-}
-
-/*
- * We need to output only _changes_ in character formatting.
- */
-
-bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
-{
-    buffer->Defragment();
-
-    wxTextOutputStream str(stream);
-
-    wxTextAttrEx currentParaStyle = buffer->GetAttributes();
-    wxTextAttrEx currentCharStyle = buffer->GetAttributes();
-
-    str << wxT("<html><head></head><body>\n");
-
-    wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
-
-        if (para)
+        
+        value = node->GetPropVal(wxT("tabs"), wxEmptyString);
+        if (!value.empty())

         {
         {

-            OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, true);
-
-            wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
-            while (node2)
+            wxArrayInt tabs;
+            wxStringTokenizer tkz(value, wxT(","));
+            while (tkz.HasMoreTokens())

             {
             {

-                wxRichTextObject* obj = node2->GetData();
-                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-                if (textObj && !textObj->IsEmpty())
-                {
-                    OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, true);
-
-                    str << textObj->GetText();
-
-                    OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, false);
-                }
-
-                node2 = node2->GetNext();
+                wxString token = tkz.GetNextToken();
+                tabs.Add(wxAtoi(token));

             }
             }

-
-            OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false);
-
-            str << wxT("<P>\n");
+            attr.SetTabs(tabs);

         }
         }

-
-        node = node->GetNext();

     }
 
     }
 

-    str << wxT("</body></html>\n");
-

     return true;
 }
 
     return true;
 }
 

-/// Output character formatting
-void wxRichTextHTMLHandler::OutputCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start)
-{
-    wxTextOutputStream str(stream);
-
-    bool isBold = false;
-    bool isItalic = false;
-    bool isUnderline = false;
-    wxString faceName;
-
-    if (thisStyle.GetFont().Ok())
-    {
-        if (thisStyle.GetFont().GetWeight() == wxBOLD)
-            isBold = true;
-        if (thisStyle.GetFont().GetStyle() == wxITALIC)
-            isItalic = true;
-        if (thisStyle.GetFont().GetUnderlined())
-            isUnderline = true;
-
-        faceName = thisStyle.GetFont().GetFaceName();
-    }
-
-    if (start)
-    {
-        if (isBold)
-            str << wxT("<b>");
-        if (isItalic)
-            str << wxT("<i>");
-        if (isUnderline)
-            str << wxT("<u>");
-    }
-    else
-    {
-        if (isUnderline)
-            str << wxT("</u>");
-        if (isItalic)
-            str << wxT("</i>");
-        if (isBold)
-            str << wxT("</b>");
-    }
-}
-
-/// Output paragraph formatting
-void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start)
-{
-    // TODO: lists, indentation (using tables), fonts, right-align, ...
-
-    wxTextOutputStream str(stream);
-    bool isCentered = false;
-
-    if (thisStyle.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
-    {
-        isCentered = true;
-    }
-
-    if (start)
-    {
-        if (isCentered)
-            str << wxT("<center>");
-    }
-    else
-    {
-        if (isCentered)
-            str << wxT("</center>");
-    }
-}
-

 #endif
 #endif

+    // wxUSE_STREAMS

 
 #endif
 
 #endif

-    // wxUSE_RICHTEXT
+    // wxUSE_RICHTEXT && wxUSE_XML
+