X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e7ced16e4c2ef7c88bdea84d78bb3c169a7bce3..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 3244486e09..84f33aadfc 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -75,7 +75,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& ClearTemporaryImageLocations(); - buffer->Defragment(); + wxRichTextDrawingContext context(buffer); + buffer->Defragment(context); #if wxUSE_UNICODE wxCSConv* customEncoding = NULL; @@ -85,8 +86,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& customEncoding = new wxCSConv(GetEncoding()); if (!customEncoding->IsOk()) { - delete customEncoding; - customEncoding = NULL; + wxDELETE(customEncoding); } } if (customEncoding) @@ -102,8 +102,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& wxTextOutputStream str(stream, wxEOL_NATIVE); #endif - wxTextAttr currentParaStyle = buffer->GetAttributes(); - wxTextAttr currentCharStyle = buffer->GetAttributes(); + wxRichTextAttr currentParaStyle = buffer->GetAttributes(); + wxRichTextAttr currentCharStyle = buffer->GetAttributes(); if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) str << wxT("\n"); @@ -124,7 +124,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& if (para) { - wxTextAttr paraStyle(para->GetCombinedAttributes()); + wxRichTextAttr paraStyle(para->GetCombinedAttributes()); BeginParagraphFormatting(currentParaStyle, paraStyle, str); @@ -135,7 +135,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); if (textObj && !textObj->IsEmpty()) { - wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); + wxRichTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); wxString text = textObj->GetText(); @@ -185,7 +185,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& return true; } -void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) { wxString style; @@ -197,10 +197,27 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentSt } if (thisStyle.GetFontSize() != currentStyle.GetFontSize()) style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize())); - if (thisStyle.GetTextColour() != currentStyle.GetTextColour() ) + + bool bTextColourChanged = (thisStyle.GetTextColour() != currentStyle.GetTextColour()); + bool bBackgroundColourChanged = (thisStyle.GetBackgroundColour() != currentStyle.GetBackgroundColour()); + if (bTextColourChanged || bBackgroundColourChanged) { - wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX)); - style += wxString::Format(wxT(" color=\"%s\""), color.c_str()); + style += wxT(" style=\""); + + if (bTextColourChanged) + { + 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()); + } + + style += wxT("\""); } if (style.size()) @@ -209,29 +226,49 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentSt m_font = true; } - if (thisStyle.GetFontWeight() == wxBOLD) + if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD) str << wxT(""); - if (thisStyle.GetFontStyle() == wxITALIC) + if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC) str << wxT(""); 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 wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) { if (thisStyle.HasURL()) stream << wxT(""); if (thisStyle.GetFontUnderlined()) stream << wxT(""); - if (thisStyle.GetFontStyle() == wxITALIC) + if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC) stream << wxT(""); - if (thisStyle.GetFontWeight() == wxBOLD) + if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD) stream << wxT(""); + if (thisStyle.HasTextEffects()) + { + 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(""); + } + if (m_font) { m_font = false; @@ -240,7 +277,7 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(cu } /// Begin paragraph formatting -void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& str) { if (thisStyle.HasPageBreak()) { @@ -368,7 +405,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED( } /// End paragraph formatting -void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream) +void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream) { if (thisStyle.HasFont()) stream << wxT(""); @@ -406,7 +443,7 @@ void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str) } /// Output font tag -void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream) +void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream) { if (style.HasFont()) { @@ -417,7 +454,7 @@ void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStre } } -int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& 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. @@ -445,7 +482,7 @@ int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& ta return 0; } -wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle ) +wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle ) { switch( thisStyle.GetAlignment() ) { @@ -471,20 +508,27 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s #if wxUSE_FILESYSTEM if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) { - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) +#if 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); +#endif - if (image->GetImage().Ok()) + if (image->GetImageBlock().IsOk()) { - wxString ext(image->GetImageBlock().GetExtension()); - wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext)); - wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType()); + 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); + m_imageLocations.Add(tempFilename); - str << wxT("memory:") << tempFilename; + str << wxT("memory:") << tempFilename; + } } else str << wxT("memory:?"); @@ -493,19 +537,21 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s } else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES) { - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) +#if 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); +#endif - if (image->GetImage().Ok()) + 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, sm_fileCounter, ext)); + 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); @@ -523,14 +569,17 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s str << wxT("data:"); str << GetMimeType(image->GetImageBlock().GetImageType()); str << wxT(";base64,"); - - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) +#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; - wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); - str << data; - - delete[] data; + delete[] data; + } } str << wxT("\" />"); @@ -560,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");