X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/613992479a1b3d1dfc57d19c90786a114f44cf49..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/richtext/richtexthtml.cpp?ds=inline diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 6ec0aed2d1..84f33aadfc 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -19,6 +19,7 @@ #if wxUSE_RICHTEXT #include "wx/richtext/richtexthtml.h" +#include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP #endif @@ -27,13 +28,32 @@ #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) +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 { wxString path, file, ext; - wxSplitPath(filename, & path, & file, & ext); + wxFileName::SplitPath(filename, & path, & file, & ext); return (ext.Lower() == wxT("html") || ext.Lower() == wxT("htm")); } @@ -51,414 +71,418 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { - buffer->Defragment(); + m_buffer = buffer; - wxTextOutputStream str(stream); + ClearTemporaryImageLocations(); - wxTextAttrEx currentParaStyle = buffer->GetAttributes(); - wxTextAttrEx currentCharStyle = buffer->GetAttributes(); + wxRichTextDrawingContext context(buffer); + buffer->Defragment(context); + +#if wxUSE_UNICODE + wxCSConv* customEncoding = NULL; + wxMBConv* conv = NULL; + if (!GetEncoding().IsEmpty()) + { + customEncoding = new wxCSConv(GetEncoding()); + if (!customEncoding->IsOk()) + { + wxDELETE(customEncoding); + } + } + if (customEncoding) + conv = customEncoding; + else + conv = & wxConvUTF8; +#endif - str << wxT("\n"); + { +#if wxUSE_UNICODE + wxTextOutputStream str(stream, wxEOL_NATIVE, *conv); +#else + wxTextOutputStream str(stream, wxEOL_NATIVE); +#endif - /* - 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 + wxRichTextAttr currentParaStyle = buffer->GetAttributes(); + wxRichTextAttr currentCharStyle = buffer->GetAttributes(); - str << wxT(""), - left_indent.c_str(), //Document-Wide Left Indent - right_indent.c_str()); //Document-Wide Right Indent + m_font = false; + m_inTable = false; - str << wxT("
"); + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT("\n"); - wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent()); - wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent()); + OutputFont(currentParaStyle, str); - str << wxString::Format(wxT("%s%s
"); - */ + m_indents.Clear(); + m_listTypes.Clear(); - str << wxT("
"); + wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); - str << wxString::Format(wxT(""), - currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ), - currentParaStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str()); + if (para) + { + wxRichTextAttr paraStyle(para->GetCombinedAttributes()); - //wxString align = GetAlignment( currentParaStyle.GetAlignment() ); - //str << wxString::Format(wxT("

"), align ); + BeginParagraphFormatting(currentParaStyle, paraStyle, str); - m_font = false; - m_indent = 0; - m_list = false; + wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); + while (node2) + { + wxRichTextObject* obj = node2->GetData(); + wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); + if (textObj && !textObj->IsEmpty()) + { + wxRichTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); + BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); - wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst(); - while (node) - { - wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (para != NULL); + wxString text = textObj->GetText(); - if (para) - { - OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream); + if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) + text.MakeUpper(); - wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); - while (node2) - { - wxRichTextObject* obj = node2->GetData(); - wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); - if (textObj && !textObj->IsEmpty()) - { - BeginCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream); + wxString toReplace = wxRichTextLineBreakChar; + text.Replace(toReplace, wxT("
")); - str << textObj->GetText(); + str << text; - EndCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream); + EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); + } + + wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); + if( image && (!image->IsEmpty() || image->GetImageBlock().GetData())) + WriteImage( image, stream ); + + node2 = node2->GetNext(); } - wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); - if( image && !image->IsEmpty()) - Image_to_Base64( image, stream ); + EndParagraphFormatting(currentParaStyle, paraStyle, str); - node2 = node2->GetNext(); + str << wxT("\n"); } - str << wxT("\n"); - //OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false); + node = node->GetNext(); } - node = node->GetNext(); - } - str << wxT("

\n"); - - return true; -} + CloseLists(-1, str); -void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream) -{ - wxTextOutputStream str(stream); + str << wxT(""); - //Is the item bulleted one? - if( thisStyle.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE ) - { - //Is there any opened list? - if( m_list ) - { - //Yes there is + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT(""); - //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("
  • ");//Yes it is - else - { - //No it isn't - - //So we should close the list tag - str << (m_is_ul ? wxT("") : wxT("")); + str << wxT("\n"); + } - //And renavigate to new list's horizontal position - NavigateToListPosition(thisStyle, str); - //Ok it's done +#if wxUSE_UNICODE + if (customEncoding) + delete customEncoding; +#endif - //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. - wxString tag; - TypeOfList(thisStyle, tag); - str << tag << wxT("
  • "); - } - } - else - { - //No there isn't a list + m_buffer = NULL; - //navigate to new list's horizontal position(indent) - NavigateToListPosition(thisStyle, str); + return true; +} - //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. - wxString tag; - TypeOfList(thisStyle, tag); - str << tag << wxT("
  • "); +void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) +{ + wxString style; - //Now we have a list, mark it. - m_list = true; - } - } - else if( m_list ) + // Is there any change in the font properties of the item? + if (thisStyle.GetFontFaceName() != currentStyle.GetFontFaceName()) { - //The item is not bulleted and there is a list what should be closed now. - //So close the list - - str << (m_is_ul ? wxT("") : wxT("")); - //And mark as there is no an opened list - m_list = false; + wxString faceName(thisStyle.GetFontFaceName()); + style += wxString::Format(wxT(" face=\"%s\""), faceName.c_str()); } + if (thisStyle.GetFontSize() != currentStyle.GetFontSize()) + style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize())); - // does the item have an indentation ? - if( thisStyle.GetLeftIndent() ) + bool bTextColourChanged = (thisStyle.GetTextColour() != currentStyle.GetTextColour()); + bool bBackgroundColourChanged = (thisStyle.GetBackgroundColour() != currentStyle.GetBackgroundColour()); + if (bTextColourChanged || bBackgroundColourChanged) { - if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE ) + style += wxT(" style=\""); + + if (bTextColourChanged) { - if( m_indent ) - { - if( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) == m_indent ) - { - if( thisStyle.GetLeftSubIndent() < 0 ) - { - str << SymbolicIndent(~thisStyle.GetLeftSubIndent()); - } - } - 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 ) - { - str << SymbolicIndent(~thisStyle.GetLeftSubIndent()); - } - break; - } - else - { - str << wxT("
  • "); - - 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()); + } + if (bTextColourChanged && bBackgroundColourChanged) + style += wxT(";"); + if (bBackgroundColourChanged) + { + wxString color(thisStyle.GetBackgroundColour().GetAsString(wxC2S_HTML_SYNTAX)); + style += wxString::Format(wxT("background-color: %s"), color.c_str()); } - } - else if( m_indent ) - { - //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(""); - m_indent = 0; - m_indents.Clear(); + style += wxT("\""); } - - 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().c_str()); - if( thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize() ) - style += wxString::Format(wxT(" size=\"%ld\""), Pt_To_Size(thisStyle.GetFont().GetPointSize()) ); - if( thisStyle.GetTextColour() != currentStyle.GetTextColour() ) - style += wxString::Format(wxT(" color=\"%s\""), thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str()); - - if( style.size() ) + if (style.size()) { str << wxString::Format(wxT(""), style.c_str()); m_font = true; } - if( thisStyle.GetFont().GetWeight() == wxBOLD ) + if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD) str << wxT(""); - if( thisStyle.GetFont().GetStyle() == wxITALIC ) + if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC) str << wxT(""); - if( thisStyle.GetFont().GetUnderlined() ) + if (thisStyle.GetFontUnderlined()) str << wxT(""); + + if (thisStyle.HasURL()) + str << wxT(""); + + if (thisStyle.HasTextEffects()) + { + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) + str << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + str << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) + str << wxT(""); + } } -void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream) +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) { - wxTextOutputStream str(stream); + if (thisStyle.HasURL()) + stream << wxT(""); - if( thisStyle.GetFont().GetUnderlined() ) - str << wxT(""); - if( thisStyle.GetFont().GetStyle() == wxITALIC ) - str << wxT(""); - if( thisStyle.GetFont().GetWeight() == wxBOLD ) - str << wxT(""); + if (thisStyle.GetFontUnderlined()) + stream << wxT(""); + if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC) + stream << wxT(""); + if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD) + stream << wxT(""); - if( m_font ) + if (thisStyle.HasTextEffects()) { - m_font = false; - str << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) + stream << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + stream << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) + stream << wxT(""); } -} -/// Output paragraph formatting -void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream) -{ - //If there is no opened list currently, insert a

    after every paragraph - if(!m_list) + if (m_font) { - wxTextOutputStream str(stream); - wxString align = GetAlignment( thisStyle ); - str << wxString::Format(wxT("

    "), align.c_str()); + m_font = false; + stream << wxT(""); } } -void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle, wxTextOutputStream& str) +/// Begin paragraph formatting +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& str) { - //indenting an item using an ul/ol tag is equal to inserting 5 x   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.HasPageBreak()) { - //yes it is - LIndent(thisStyle, str); - m_indent = thisStyle.GetLeftIndent() - 100; - m_indents.Add( m_indent ); - return; + str << wxT("

    \n"); } - //No it isn't - int i = m_indents.size() - 1; - for(; i > -1; i--) + if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0) { - //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); + + // wxHTML needs an extra

    before a list when using

    ...

    in previous paragraphs. + // TODO: pass a flag that indicates we're using wxHTML. + str << wxT("

    \n"); + + str << tag; + } + + str << wxT("

  • "); } - else if( m_indent + 100 == thisStyle.GetLeftIndent() ) - break;//exact match 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(""); + CloseLists(-1, str); - m_indents.RemoveAt(i); + wxString align = GetAlignment(thisStyle); + str << wxString::Format(wxT("

    0.0)) + { + styleStr += wxString::Format(wxT("margin-left: %.2fmm; "), indentLeftMM); + } + float indentRightMM = thisStyle.GetRightIndent()/10.0; + if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasRightIndent() && (indentRightMM > 0.0)) + { + styleStr += wxString::Format(wxT("margin-right: %.2fmm; "), indentRightMM); + } + // First line indentation + float firstLineIndentMM = - thisStyle.GetLeftSubIndent() / 10.0; + if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && (firstLineIndentMM > 0.0)) + { + styleStr += wxString::Format(wxT("text-indent: %.2fmm; "), firstLineIndentMM); + } + + if (!styleStr.IsEmpty()) + str << wxT(" style=\"") << styleStr << wxT("\""); + + str << wxT(">"); + + // TODO: convert to pixels + int indentPixels = static_cast(indentLeftMM*10/4); + + if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) + { + // Use a table to do indenting if we don't have CSS + str << wxString::Format(wxT("
    "), indentPixels); + m_inTable = true; + } - if( i < 1 ){m_indent=0; break;} - m_indent = m_indents[i-1]; + if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0)) + { + str << SymbolicIndent( - thisStyle.GetLeftSubIndent()); + } } } -} -void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str ) -{ - //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. + else + { + CloseLists(-1, str); + wxString align = GetAlignment(thisStyle); + str << wxString::Format(wxT("

    "Hello world" - //Its Left Indentation -> 100 - //Its Left Sub-Indentation ->40 - //A typical indentation-table for the item will be construct as the following + if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingBefore()) + { + float spacingBeforeMM = thisStyle.GetParagraphSpacingBefore() / 10.0; - //3 x nbsp = 60 - //2 x nbsp = 40 - //LSI = Left Sub Indent - //LI = Left Indent - LSI - // - //------------------------------------------- - //|  nbsp;|nbsp;nbsp;Hello World | - //| | | | | - //| V | V | - //| --LI-- | --LSI-- | - //------------------------------------------- + styleStr += wxString::Format(wxT("margin-top: %.2fmm; "), spacingBeforeMM); + } + if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingAfter()) + { + float spacingAfterMM = thisStyle.GetParagraphSpacingAfter() / 10.0; + + styleStr += wxString::Format(wxT("margin-bottom: %.2fmm; "), spacingAfterMM); + } - str << wxT(""); + if (!styleStr.IsEmpty()) + str << wxT(" style=\"") << styleStr << wxT("\""); - wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent ); - str << wxString::Format( wxT(""), symbolic_indent.c_str() ); - str << wxT("
    %s"); + str << wxT(">"); + } + OutputFont(thisStyle, str); +} - if( thisStyle.GetLeftSubIndent() < 0 ) +/// End paragraph formatting +void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream) +{ + if (thisStyle.HasFont()) + stream << wxT(""); + + if (m_inTable) { - str << SymbolicIndent(~thisStyle.GetLeftSubIndent()); + stream << wxT("

    \n"); + m_inTable = false; } + else if (!thisStyle.HasBulletStyle()) + stream << wxT("

    \n"); +} + +/// 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(""); + else + str << wxT(""); + m_indents.RemoveAt(i); + m_listTypes.RemoveAt(i); + } + else + break; + i --; + } } -void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str ) +/// Output font tag +void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& 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;|
      | - //| |<-ULI->
    • first item | - //| |<-ULI->
    • second item | - //| |
    | - //------------------------------------------------------ - // |<-100->| - - - str << wxT(""); - - wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100); - str << wxString::Format( wxT(""), symbolic_indent.c_str() ); - str << wxT("
    %s"); + if (style.HasFont()) + { + stream << wxString::Format(wxT(""); + } } -void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag ) +int wxRichTextHTMLHandler::TypeOfList( const wxRichTextAttr& 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. + // 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)) + bool m_is_ul = false; + if (thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD)) tag = wxT("
      "); - else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER ) + else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER) tag = wxT("
        "); - else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER ) + else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER) tag = wxT("
          "); - else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER ) + else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER) tag = wxT("
            "); - else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER ) + else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER) tag = wxT("
              "); else { tag = wxT("
                "); m_is_ul = true; } + + if (m_is_ul) + return 1; + else + return 0; } -wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle ) +wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle ) { switch( thisStyle.GetAlignment() ) { @@ -475,36 +499,100 @@ 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); str << wxT("GetImageBlock().GetImageType()); - str << wxT(";base64,"); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) - image->MakeBlock(); +#if wxUSE_FILESYSTEM + if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) + { +#if 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) + image->LoadFromBlock(); + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) + image->MakeBlock(); +#endif + + if (image->GetImageBlock().IsOk()) + { + wxImage img; + image->GetImageBlock().Load(img); + if (img.IsOk()) + { + wxString ext(image->GetImageBlock().GetExtension()); + wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext.c_str())); + wxMemoryFSHandler::AddFile(tempFilename, img, 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 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) + image->LoadFromBlock(); + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) + image->MakeBlock(); +#endif + + if (image->GetImageBlock().IsOk()) + { + wxString tempDir(GetTempDir()); + if (tempDir.IsEmpty()) + tempDir = wxFileName::GetTempDir(); + + wxString ext(image->GetImageBlock().GetExtension()); + wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir.c_str(), sm_fileCounter, ext.c_str())); + image->GetImageBlock().Write(tempFilename); + + m_imageLocations.Add(tempFilename); + + str << wxFileSystem::FileNameToURL(tempFilename); + } + else + str << wxT("file:?"); - wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); - str << data; + 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 0 + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) + image->MakeBlock(); +#endif + if (image->GetImageBlock().IsOk()) + { + wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); + str << data; - delete[] data; + delete[] data; + } + } 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) @@ -521,7 +609,7 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType) { case wxBITMAP_TYPE_BMP: return wxT("image/bmp"); - case wxBITMAP_TYPE_TIF: + case wxBITMAP_TYPE_TIFF: return wxT("image/tiff"); case wxBITMAP_TYPE_GIF: return wxT("image/gif"); @@ -534,13 +622,13 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType) } } -//exim-style base64 encoder +// exim-style base64 encoder 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? + // 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; @@ -553,7 +641,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len ) *p++ = enc64[ (a >> 2) & 0x3f ]; - if( in_len-- <= 0 ) + if( in_len-- == 0 ) { *p++ = enc64[ (a << 4 ) & 0x30 ]; *p++ = '='; @@ -565,7 +653,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len ) *p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f]; - if( in_len-- <= 0 ) + if( in_len-- == 0 ) { *p++ = enc64[ (b << 2) & 0x3f ]; *p++ = '='; @@ -585,5 +673,37 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len ) #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 +