]> git.saurik.com Git - wxWidgets.git/blobdiff - src/richtext/richtexthtml.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build fix for -D__WXUNIVERSAL__
[wxWidgets.git] / src / richtext / richtexthtml.cpp
diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 49552e64d3fa7ce518b289154dc64c285620a12f..2ec15138eb717d7daa0dbd5966b017e1db4b559a 100644 (file)
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        richtext/richtexthtml.cpp
+// Name:        src/richtext/richtexthtml.cpp
 // Purpose:     HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Modified by:
@@ -13,23 +13,42 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtexthtml.h"
 #endif
 
 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtexthtml.h"
+#include "wx/richtext/richtextstyles.h"
 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
 #endif
 
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/txtstrm.h"
 
 #endif
 
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/txtstrm.h"
 
+#if wxUSE_FILESYSTEM
+#include "wx/filesys.h"
+#include "wx/fs_mem.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler)
 
+int wxRichTextHTMLHandler::sm_fileCounter = 1;
+
+wxRichTextHTMLHandler::wxRichTextHTMLHandler(const wxString& name, const wxString& ext, int type)
+    : wxRichTextFileHandler(name, ext, type), m_buffer(NULL), m_font(false), m_inTable(false)
+{
+    m_fontSizeMapping.Add(8);
+    m_fontSizeMapping.Add(10);
+    m_fontSizeMapping.Add(13);
+    m_fontSizeMapping.Add(17);
+    m_fontSizeMapping.Add(22);
+    m_fontSizeMapping.Add(30);
+    m_fontSizeMapping.Add(100);
+}
+
 /// Can we handle this filename (if using files)? By default, checks the extension.
 bool wxRichTextHTMLHandler::CanHandle(const wxString& filename) const
 {
 /// Can we handle this filename (if using files)? By default, checks the extension.
 bool wxRichTextHTMLHandler::CanHandle(const wxString& filename) const
 {
@@ -52,56 +71,42 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp
 
 bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
 {
 
 bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
 {
+    m_buffer = buffer;
+
+    ClearTemporaryImageLocations();
+
     buffer->Defragment();
     buffer->Defragment();
-    
+
     wxTextOutputStream str(stream);
     wxTextOutputStream str(stream);
-    
-    wxTextAttrEx currentParaStyle = buffer->GetAttributes();
-    wxTextAttrEx currentCharStyle = buffer->GetAttributes();
-    
-    str << wxT("<html><head></head><body>\n");
-    
-    /*
-    wxRichText may be support paper formats like a1/a2/a3/a4
-    when this widget grown enough, i should turn back and support its new features
-    but not yet
-    
-      str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td>");
-      
-        wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent());
-        wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent());
-        
-          str << wxString::Format(wxT("%s</td><td></td><td>%s</td></tr><tr>"),
-          left_indent.c_str(), //Document-Wide Left Indent
-          right_indent.c_str()); //Document-Wide Right Indent
-          
-            str << wxT("<td></td><td width=\"100%\">");
-    */
-    
+
+    wxTextAttr currentParaStyle = buffer->GetAttributes();
+    wxTextAttr currentCharStyle = buffer->GetAttributes();
+
+    if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+        str << wxT("<html><head></head><body>\n");
+
     str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
     str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
-    
-    str << wxString::Format(wxT("<font face=\"%s\" size=\"%i\" color=\"#%02X%02X%02X\" >"),
-        currentParaStyle.GetFont().GetFaceName(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ), 
-        currentParaStyle.GetTextColour().Red(), currentParaStyle.GetTextColour().Green(),
-        currentParaStyle.GetTextColour().Blue());
-    
-    //wxString align = GetAlignment( currentParaStyle.GetAlignment() );
-    //str << wxString::Format(wxT("<p align=\"%s\">"), align );
-    
+
+    OutputFont(currentParaStyle, str);
+
     m_font = false;
     m_font = false;
-    m_indent = 0;
-    m_list = false;
-    
+    m_inTable = false;
+
+    m_indents.Clear();
+    m_listTypes.Clear();
+
     wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
     while (node)
     {
         wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (para != NULL);
     wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
     while (node)
     {
         wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (para != NULL);
-        
+
         if (para)
         {
         if (para)
         {
-            OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream);
-            
+            wxTextAttr paraStyle(para->GetCombinedAttributes());
+
+            BeginParagraphFormatting(currentParaStyle, paraStyle, str);
+
             wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
             while (node2)
             {
             wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
             while (node2)
             {
@@ -109,357 +114,254 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
                 wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
                 if (textObj && !textObj->IsEmpty())
                 {
                 wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
                 if (textObj && !textObj->IsEmpty())
                 {
-                    BeginCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
-                    
-                    str << textObj->GetText();
-                    
-                    EndCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
+                    wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+                    BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
+
+                    wxString text = textObj->GetText();
+
+                    if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+                        text.MakeUpper();
+
+                    wxString toReplace = wxRichTextLineBreakChar;
+                    text.Replace(toReplace, wxT("<br>"));
+
+                    str << text;
+
+                    EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
                 }
                 }
-                
+
                 wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
                 if( image && !image->IsEmpty())
                 wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
                 if( image && !image->IsEmpty())
-                    Image_to_Base64( image, stream );
-                
+                    WriteImage( image, stream );
+
                 node2 = node2->GetNext();
             }
                 node2 = node2->GetNext();
             }
-            //OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false);
+
+            EndParagraphFormatting(currentParaStyle, paraStyle, str);
+
+            str << wxT("\n");
         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }
-    
-    str << wxT("</font></td></tr></table></body></html>\n");
-    
+
+    CloseLists(-1, str);
+
+    str << wxT("</font>");
+
+    str << wxT("</td></tr></table><p>");
+
+    if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+        str << wxT("</body></html>");
+
+    str << wxT("\n");
+
+    m_buffer = NULL;
+
     return true;
 }
 
     return true;
 }
 
-void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream)
+void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str)
 {
 {
-    wxTextOutputStream str(stream);
-    
-    //Is the item bulleted one?
-    if( thisStyle.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE )
-    {
-        //Is there any opened list?
-        if( m_list )
-        {
-            //Yes there is
-            
-            //Is the item among the previous ones
-            //Is the item one of the previous list tag's child items
-            if( (thisStyle.GetLeftIndent() == (m_indent + 100)) || (thisStyle.GetLeftIndent() < 100) )
-                str << wxT("<li>");//Yes it is
-            else
-            {
-                //No it isn't
-                
-                //So we should close the list tag
-                str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
-                
-                //And renavigate to new list's horizontal position
-                NavigateToListPosition(thisStyle, str);
-                //Ok it's done
-                
-                //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
-                wxString tag;
-                TypeOfList(thisStyle, tag);
-                str << wxString::Format(wxT("%s<li>"), tag);
-            }
-        }
-        else
-        {
-            //No there isn't a list
-            
-            //navigate to new list's horizontal position(indent)
-            NavigateToListPosition(thisStyle, str);                            
-            
-            //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
-            wxString tag;
-            TypeOfList(thisStyle, tag);
-            str << wxString::Format(wxT("%s<li>"), tag);
-            
-            //Now we have a list, mark it.
-            m_list = true;
-        }                      
-    }
-    else if( m_list )
-    {
-        //The item is not bulleted and there is a list what should be closed now.        
-        //So close the list
+    wxString style;
 
 
-        str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
-        //And mark as there is no an opened list
-        m_list = false;
+    // Is there any change in the font properties of the item?
+    if (thisStyle.GetFontFaceName() != currentStyle.GetFontFaceName())
+    {
+        wxString faceName(thisStyle.GetFontFaceName());
+        style += wxString::Format(wxT(" face=\"%s\""), faceName.c_str());
     }
     }
-    
-    // does the item have an indentation ?
-    if( thisStyle.GetLeftIndent() )
+    if (thisStyle.GetFontSize() != currentStyle.GetFontSize())
+        style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize()));
+    if (thisStyle.GetTextColour() != currentStyle.GetTextColour() )
     {
     {
-        if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE )
-        {
-            if( m_indent )
-            {
-                if( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) == m_indent )
-                {
-                    if( thisStyle.GetLeftSubIndent() < 0 )
-                    {
-                        wxString symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent());
-                        str << wxString::Format(wxT("%s"), symbolic_indent);
-                    }
-                }
-                else
-                {
-                    if( thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent() > m_indent )
-                    {
-                        Indent(thisStyle, str);
-                        m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
-                        m_indents.Add( m_indent );
-                    }
-                    else
-                    {
-                        int i = m_indents.size() - 1;
-                        for(; i > -1; i--)
-                        {
-                            if( m_indent < (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) )
-                            {
-                                Indent(thisStyle, str);
-                                m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
-                                m_indents.Add( m_indent );
-                                
-                                break;
-                            }
-                            else if( m_indent == (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) )
-                            {
-                                if( thisStyle.GetLeftSubIndent() < 0 )
-                                {
-                                    wxString symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent());
-                                    str << wxString::Format(wxT("%s"), symbolic_indent);
-                                }
-                                break;
-                            }
-                            else
-                            {
-                                str << wxT("</td></tr></table>");
-                                
-                                m_indents.RemoveAt(i);
-                                
-                                if( i < 1 ){m_indent=0; break;}
-                                m_indent = m_indents[i-1];
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                Indent(thisStyle, str);
-                m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
-                m_indents.Add( m_indent );
-            }
-        }
+        wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX));
+        style += wxString::Format(wxT(" color=\"%s\""), color.c_str());
     }
     }
-    else if( m_indent )
+
+    if (style.size())
     {
     {
-        //The item is not indented and there is a table(s) what should be closed now.
-        
-        //So close them
-        for(unsigned int i = 0; i < m_indents.size(); i++ )
-            str << wxT("</td></tr></table>");
-        
-        m_indent = 0;
-        m_indents.Clear();
+        str << wxString::Format(wxT("<font %s >"), style.c_str());
+        m_font = true;
     }
     }
-    
-    
-    wxString style;
-    
-    //Is there any change on the font properties of the item
-    if( thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName() )
-        style += wxString::Format(wxT(" face=\"%s\""), thisStyle.GetFont().GetFaceName());
-    if( thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize() )
-        style += wxString::Format(wxT(" size=\"%i\""), Pt_To_Size(thisStyle.GetFont().GetPointSize()) );
-    if( thisStyle.GetTextColour() != currentStyle.GetTextColour() )
-        style += wxString::Format(wxT(" color=\"#%02X%02X%02X\""), thisStyle.GetTextColour().Red(), 
-        thisStyle.GetTextColour().Green(), thisStyle.GetTextColour().Blue());
-    
-    if( style.size() ){str << wxString::Format(wxT("<font %s >"), style); m_font = true;}
-    
-    if( thisStyle.GetFont().GetWeight() == wxBOLD )
+
+    if (thisStyle.GetFontWeight() == wxBOLD)
         str << wxT("<b>");
         str << wxT("<b>");
-    if( thisStyle.GetFont().GetStyle() == wxITALIC )
+    if (thisStyle.GetFontStyle() == wxITALIC)
         str << wxT("<i>");
         str << wxT("<i>");
-    if( thisStyle.GetFont().GetUnderlined() )
+    if (thisStyle.GetFontUnderlined())
         str << wxT("<u>");
         str << wxT("<u>");
+
+    if (thisStyle.HasURL())
+        str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");
 }
 
 }
 
-void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream)
+void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream)
 {
 {
-    wxTextOutputStream str(stream);
-    
-    if( thisStyle.GetFont().GetUnderlined() )
-        str << wxT("</u>");
-    if( thisStyle.GetFont().GetStyle() == wxITALIC )
-        str << wxT("</i>");
-    if( thisStyle.GetFont().GetWeight() == wxBOLD )
-        str << wxT("</b>");
-    
-    if( m_font )
+    if (thisStyle.HasURL())
+        stream << wxT("</a>");
+
+    if (thisStyle.GetFontUnderlined())
+        stream << wxT("</u>");
+    if (thisStyle.GetFontStyle() == wxITALIC)
+        stream << wxT("</i>");
+    if (thisStyle.GetFontWeight() == wxBOLD)
+        stream << wxT("</b>");
+
+    if (m_font)
     {
         m_font = false;
     {
         m_font = false;
-        str << wxT("</font>");
+        stream << wxT("</font>");
     }
 }
 
     }
 }
 
-/// Output paragraph formatting
-void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream)
+/// Begin paragraph formatting
+void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str)
 {
 {
-    //If there is no opened list currently, insert a <p> after every paragraph
-    if(!m_list)
+    if (thisStyle.HasPageBreak())
     {
     {
-        wxTextOutputStream str(stream);
-        wxString align = GetAlignment( thisStyle );
-        str << wxString::Format(wxT("<p align=\"%s\">"), align);
+        str << wxT("</tr></td></table>");
+        str << wxT("<div style=\"page-break-after:always\"></div>\n");
+        str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
     }
     }
-}
 
 
-void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle, wxTextOutputStream& str)
-{
-    //indenting an item using an ul/ol tag is equal to inserting 5 x &nbsp; on its left side.
-    //so we should start from 100 point left
-    
-    //Is the second td's left wall of the current indentaion table at the 100+ point-left-side 
-    //of the item, horizontally?
-    if( m_indent + 100 < thisStyle.GetLeftIndent() )
+    if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0)
     {
     {
-        //yes it is
-        LIndent(thisStyle, str);
-        m_indent = thisStyle.GetLeftIndent() - 100;
-        m_indents.Add( m_indent );
-        return;
-    }
-    //No it isn't
-    
-    int i = m_indents.size() - 1;
-    for(; i > -1; i--)
-    {
-        //Is the second td's left wall of the current indentaion table at the 100+ point-left-side 
-        //of the item ?
-        if( m_indent + 100 < thisStyle.GetLeftIndent() )
+        if (thisStyle.HasBulletStyle())
         {
         {
-            //Yes it is
-            LIndent(thisStyle, str);
-            m_indent = thisStyle.GetLeftIndent() - 100;
-            m_indents.Add( m_indent );
-            break;
+            int indent = thisStyle.GetLeftIndent();
+
+            // Close levels high than this
+            CloseLists(indent, str);
+
+            if (m_indents.GetCount() > 0 && indent == m_indents.Last())
+            {
+                // Same level, no need to start a new list
+            }
+            else if (m_indents.GetCount() == 0 || indent > m_indents.Last())
+            {
+                m_indents.Add(indent);
+
+                wxString tag;
+                int listType = TypeOfList(thisStyle, tag);
+                m_listTypes.Add(listType);
+
+                wxString align = GetAlignment(thisStyle);
+                str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
+
+                str << tag;
+            }
+
+            str << wxT("<li> ");
         }
         }
-        else if( m_indent + 100 == thisStyle.GetLeftIndent() )
-            break;//exact match
         else
         {
         else
         {
-            //No it is not, the second td's left wall of the current indentaion table is at the
-            //right side of the current item horizontally, so close it.
-            str << wxT("</td></tr></table>");
-            
-            m_indents.RemoveAt(i);
-            
-            if( i < 1 ){m_indent=0; break;}
-            m_indent = m_indents[i-1];
+            CloseLists(-1, str);
+
+            wxString align = GetAlignment(thisStyle);
+            str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
+
+            // Use a table
+            int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
+            // TODO: convert to pixels
+            int indentPixels = indentTenthsMM/4;
+            str << wxString::Format(wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"%d\"></td><td>"), indentPixels);
+
+            OutputFont(thisStyle, str);
+
+            if (thisStyle.GetLeftSubIndent() < 0)
+            {
+                str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
+            }
+
+            m_inTable = true;
         }
     }
         }
     }
+    else
+    {
+        CloseLists(-1, str);
+
+        wxString align = GetAlignment(thisStyle);
+        str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
+    }
 }
 }
-void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+
+/// End paragraph formatting
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream)
 {
 {
-    //As a five year experienced web developer i assure you there is no way to indent an item
-    //in html way, but we can use tables.
-    
-    
-    
-    //Item -> "Hello world"
-    //Its Left Indentation -> 100
-    //Its Left Sub-Indentation ->40
-    //A typical indentation-table for the item will be construct as the following
-    
-    //3 x nbsp = 60
-    //2 x nbsp = 40
-    //LSI = Left Sub Indent
-    //LI = Left Indent - LSI
-    //
-    //-------------------------------------------
-    //|&nbsp;&nbsp;nbsp;|nbsp;nbsp;Hello World  |
-    //|                   |        |    |                  | 
-    //|        V        |    V                  |
-    //|      --LI--     | --LSI--               |
-    //-------------------------------------------
-    
-    str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
-    
-    wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
-    str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent );
-    str << wxT("<td width=\"100%\">");
-    
-    if( thisStyle.GetLeftSubIndent() < 0 )
+    if (m_inTable)
     {
     {
-        symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent());
-        str << wxString::Format(wxT("%s"), symbolic_indent);
+        if (thisStyle.HasFont())
+            stream << wxT("</font>");
+
+        stream << wxT("</td></tr></table>\n");
+        m_inTable = false;
     }
 }
 
     }
 }
 
-void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+/// Closes lists to level (-1 means close all)
+void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str)
+{
+    // Close levels high than this
+    int i = m_indents.GetCount()-1;
+    while (i >= 0)
+    {
+        int l = m_indents[i];
+        if (l > level)
+        {
+            if (m_listTypes[i] == 0)
+                str << wxT("</ol>");
+            else
+                str << wxT("</ul>");
+            m_indents.RemoveAt(i);
+            m_listTypes.RemoveAt(i);
+        }
+        else
+            break;
+        i --;
+     }
+}
+
+/// Output font tag
+void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream)
 {
 {
-    //Code:
-    //r.BeginNumberedBullet(1, 200, 60);
-    //r.Newline();
-    //r.WriteText(wxT("first item"));
-    //r.EndNumberedBullet();
-    //r.BeginNumberedBullet(2, 200, 60);
-    //r.Newline();
-    //r.WriteText(wxT("second item."));
-    //r.EndNumberedBullet();
-    //
-    //A typical indentation-table for the item will be construct as the following
-    
-    //1 x nbsp = 20 point
-    //ULI -> 100pt (UL/OL tag indents its sub element by 100 point)
-    //<--------- 100 pt ---------->|
-    //------------------------------------------------------
-    //|&nbsp;&nbsp;nbsp;&nbsp;nbsp;|<ul>                   |
-    //|                                       |<-ULI-><li>first item  | 
-    //|                            |<-ULI-><li>second item |
-    //|                            |</ul>                  |
-    //------------------------------------------------------
-    //                             |<-100->|   
-    
-    
-    str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
-    
-    wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
-    str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent );
-    str << wxT("<td width=\"100%\">");
+    if (style.HasFont())
+    {
+        stream << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\""), style.GetFontFaceName().c_str(), PtToSize(style.GetFontSize()));
+        if (style.HasTextColour())
+            stream << wxString::Format(wxT(" color=\"%s\""), style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
+        stream << wxT(" >");
+    }
 }
 
 }
 
-void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag )
+int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& tag )
 {
 {
-    //We can use number attribute of li tag but not all the browsers support it. 
-    //also wxHtmlWindow doesn't support type attribute.
-    
-    m_is_ul = false;
-    if( thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
+    // We can use number attribute of li tag but not all the browsers support it.
+    // also wxHtmlWindow doesn't support type attribute.
+
+    bool m_is_ul = false;
+    if (thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
         tag = wxT("<ol type=\"1\">");
         tag = wxT("<ol type=\"1\">");
-    else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER )
+    else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
         tag = wxT("<ol type=\"A\">");
         tag = wxT("<ol type=\"A\">");
-    else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER )
+    else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER)
         tag = wxT("<ol type=\"a\">");
         tag = wxT("<ol type=\"a\">");
-    else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER )
+    else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
         tag = wxT("<ol type=\"I\">");
         tag = wxT("<ol type=\"I\">");
-    else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER )
+    else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
         tag = wxT("<ol type=\"i\">");
     else
     {
         tag = wxT("<ul>");
         m_is_ul = true;
     }
         tag = wxT("<ol type=\"i\">");
     else
     {
         tag = wxT("<ul>");
         m_is_ul = true;
     }
+
+    if (m_is_ul)
+        return 1;
+    else
+        return 0;
 }
 
 }
 
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle )
 {
     switch( thisStyle.GetAlignment() )
     {
 {
     switch( thisStyle.GetAlignment() )
     {
@@ -476,33 +378,88 @@ wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
     }
 }
 
     }
 }
 
-void wxRichTextHTMLHandler::Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream)
+void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& stream)
 {
     wxTextOutputStream str(stream);
 {
     wxTextOutputStream str(stream);
-    
+
     str << wxT("<img src=\"");
     str << wxT("<img src=\"");
-    str << wxT("data:");
-    str << GetMimeType(image->GetImageBlock().GetImageType());
-    str << wxT(";base64,");
-    
-    wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
-    str << data;
-    
-    delete[] data;
-    
+
+#if wxUSE_FILESYSTEM
+    if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
+    {
+        if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+            image->LoadFromBlock();
+        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+            image->MakeBlock();
+
+        if (image->GetImage().Ok())
+        {
+            wxString ext(image->GetImageBlock().GetExtension());
+            wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
+            wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
+
+            m_imageLocations.Add(tempFilename);
+
+            str << wxT("memory:") << tempFilename;
+        }
+        else
+            str << wxT("memory:?");
+
+        sm_fileCounter ++;
+    }
+    else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
+    {
+        if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+            image->LoadFromBlock();
+        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+            image->MakeBlock();
+
+        if (image->GetImage().Ok())
+        {
+            wxString tempDir(GetTempDir());
+            if (tempDir.IsEmpty())
+                tempDir = wxFileName::GetTempDir();
+
+            wxString ext(image->GetImageBlock().GetExtension());
+            wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext));
+            image->GetImageBlock().Write(tempFilename);
+
+            m_imageLocations.Add(tempFilename);
+
+            str << wxFileSystem::FileNameToURL(tempFilename);
+        }
+        else
+            str << wxT("file:?");
+
+        sm_fileCounter ++;
+    }
+    else // if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_BASE64) // this is implied
+#endif
+    {
+        str << wxT("data:");
+        str << GetMimeType(image->GetImageBlock().GetImageType());
+        str << wxT(";base64,");
+
+        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+            image->MakeBlock();
+
+        wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
+        str << data;
+
+        delete[] data;
+    }
+
     str << wxT("\" />");
 }
 
     str << wxT("\" />");
 }
 
-long wxRichTextHTMLHandler::Pt_To_Size(long size)
+long wxRichTextHTMLHandler::PtToSize(long size)
 {
 {
-    //return most approximate size
-    if(size < 9 ) return 1;
-    else if( size < 11 ) return 2;
-    else if( size < 14 ) return 3;
-    else if( size < 18 ) return 4;
-    else if( size < 23 ) return 5;
-    else if( size < 30 ) return 6;
-    else return 7;
+    int i;
+    int len = m_fontSizeMapping.GetCount();
+    for (i = 0; i < len; i++)
+        if (size <= m_fontSizeMapping[i])
+            return i+1;
+    return 7;
 }
 
 wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
 }
 
 wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
@@ -513,7 +470,7 @@ wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
     return in;
 }
 
     return in;
 }
 
-wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
+const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
 {
     switch(imageType)
     {
 {
     switch(imageType)
     {
@@ -532,57 +489,88 @@ wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
     }
 }
 
     }
 }
 
-//exim-style base64 encoder
+// exim-style base64 encoder
 wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
 {
 wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
 {
-    //elements of enc64 array must be 8 bit values
-    //otherwise encoder will fail
-    //hmmm.. Does wxT macro define a char as 16 bit value
-    //when compiling with UNICODE option? 
-    const static wxChar* enc64 = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
+    // elements of enc64 array must be 8 bit values
+    // otherwise encoder will fail
+    // hmmm.. Does wxT macro define a char as 16 bit value
+    // when compiling with UNICODE option?
+    static const wxChar enc64[] = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
     wxChar* output = new wxChar[4*((in_len+2)/3)+1];
     wxChar* p = output;
     wxChar* output = new wxChar[4*((in_len+2)/3)+1];
     wxChar* p = output;
-    
+
     while( in_len-- > 0 )
     {
         register wxChar a, b;
     while( in_len-- > 0 )
     {
         register wxChar a, b;
-        
+
         a = *input++;
         a = *input++;
-        
+
         *p++ = enc64[ (a >> 2) & 0x3f ];
         *p++ = enc64[ (a >> 2) & 0x3f ];
-        
-        if( in_len-- <= 0 )
+
+        if( in_len-- == 0 )
         {
             *p++ = enc64[ (a << 4 ) & 0x30 ];
             *p++ = '=';
             *p++ = '=';
             break;
         }
         {
             *p++ = enc64[ (a << 4 ) & 0x30 ];
             *p++ = '=';
             *p++ = '=';
             break;
         }
-        
+
         b = *input++;
         b = *input++;
-        
+
         *p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
         *p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
-        
-        if( in_len-- <= 0 )
+
+        if( in_len-- == 0 )
         {
             *p++ = enc64[ (b << 2) & 0x3f ];
             *p++ = '=';
             break;
         }
         {
             *p++ = enc64[ (b << 2) & 0x3f ];
             *p++ = '=';
             break;
         }
-        
+
         a = *input++;
         a = *input++;
-        
+
         *p++ = enc64[ ((( b << 2 ) & 0x3f ) | ((a >> 6)& 0x3)) & 0x3f ];
         *p++ = enc64[ ((( b << 2 ) & 0x3f ) | ((a >> 6)& 0x3)) & 0x3f ];
-        
+
         *p++ = enc64[ a & 0x3f ];
     }
     *p = 0;
         *p++ = enc64[ a & 0x3f ];
     }
     *p = 0;
-    
+
     return output;
 }
 #endif
 // wxUSE_STREAMS
 
     return output;
 }
 #endif
 // wxUSE_STREAMS
 
+/// Delete the in-memory or temporary files generated by the last operation
+bool wxRichTextHTMLHandler::DeleteTemporaryImages()
+{
+    return DeleteTemporaryImages(GetFlags(), m_imageLocations);
+}
+
+/// Delete the in-memory or temporary files generated by the last operation
+bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString& imageLocations)
+{
+    size_t i;
+    for (i = 0; i < imageLocations.GetCount(); i++)
+    {
+        wxString location = imageLocations[i];
+
+        if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
+        {
+#if wxUSE_FILESYSTEM
+            wxMemoryFSHandler::RemoveFile(location);
+#endif
+        }
+        else if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
+        {
+            if (wxFileExists(location))
+                wxRemoveFile(location);
+        }
+    }
+
+    return true;
+}
+
+
 #endif
 // wxUSE_RICHTEXT
 
 #endif
 // wxUSE_RICHTEXT
 
wxWidgets (Impactor)