X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8650108199bf799f21e29811cddaefd579c98c88..03f3617bf36573a7c368614191444364267ed718:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index e2371f6497..301065a91e 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -53,7 +53,7 @@ wxRichTextHTMLHandler::wxRichTextHTMLHandler(const wxString& name, const wxStrin 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")); } @@ -76,22 +76,20 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& ClearTemporaryImageLocations(); buffer->Defragment(); - + wxTextOutputStream str(stream); - wxTextAttrEx currentParaStyle = buffer->GetAttributes(); - wxTextAttrEx currentCharStyle = buffer->GetAttributes(); + wxTextAttr currentParaStyle = buffer->GetAttributes(); + wxTextAttr currentCharStyle = buffer->GetAttributes(); if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) str << wxT("\n"); - str << wxT("

"); - OutputFont(currentParaStyle, str); - + m_font = false; m_inTable = false; - + m_indents.Clear(); m_listTypes.Clear(); @@ -103,8 +101,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& if (para) { - wxTextAttrEx paraStyle(para->GetCombinedAttributes()); - + wxTextAttr paraStyle(para->GetCombinedAttributes()); + BeginParagraphFormatting(currentParaStyle, paraStyle, str); wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); @@ -114,9 +112,9 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); if (textObj && !textObj->IsEmpty()) { - wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes())); + wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); - + wxString text = textObj->GetText(); if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) @@ -131,7 +129,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& } wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); - if( image && !image->IsEmpty()) + if( image && (!image->IsEmpty() || image->GetImageBlock().GetData())) WriteImage( image, stream ); node2 = node2->GetNext(); @@ -143,16 +141,14 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& } node = node->GetNext(); } - + CloseLists(-1, str); str << wxT(""); - - str << wxT("

"); if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) str << wxT(""); - + str << wxT("\n"); m_buffer = NULL; @@ -160,18 +156,18 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& return true; } -void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) { wxString style; // Is there any change in the font properties of the item? - if (thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName()) + if (thisStyle.GetFontFaceName() != currentStyle.GetFontFaceName()) { - wxString faceName(thisStyle.GetFont().GetFaceName()); + wxString faceName(thisStyle.GetFontFaceName()); style += wxString::Format(wxT(" face=\"%s\""), faceName.c_str()); } - if (thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize()) - style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFont().GetPointSize())); + if (thisStyle.GetFontSize() != currentStyle.GetFontSize()) + style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize())); if (thisStyle.GetTextColour() != currentStyle.GetTextColour() ) { wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX)); @@ -184,27 +180,27 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current m_font = true; } - if (thisStyle.GetFont().GetWeight() == wxBOLD) + if (thisStyle.GetFontWeight() == wxBOLD) str << wxT(""); - if (thisStyle.GetFont().GetStyle() == wxITALIC) + if (thisStyle.GetFontStyle() == wxITALIC) str << wxT(""); - if (thisStyle.GetFont().GetUnderlined()) + if (thisStyle.GetFontUnderlined()) str << wxT(""); - + if (thisStyle.HasURL()) str << wxT(""); } -void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& stream) +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) { if (thisStyle.HasURL()) stream << wxT(""); - if (thisStyle.GetFont().GetUnderlined()) + if (thisStyle.GetFontUnderlined()) stream << wxT(""); - if (thisStyle.GetFont().GetStyle() == wxITALIC) + if (thisStyle.GetFontStyle() == wxITALIC) stream << wxT(""); - if (thisStyle.GetFont().GetWeight() == wxBOLD) + if (thisStyle.GetFontWeight() == wxBOLD) stream << wxT(""); if (m_font) @@ -215,13 +211,11 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED( } /// Begin paragraph formatting -void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str) { if (thisStyle.HasPageBreak()) { - str << wxT(""); str << wxT("

\n"); - str << wxT("

"); } if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0) @@ -232,7 +226,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE // 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 @@ -240,23 +234,24 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE 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("

"), align.c_str()); - + + // 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 { CloseLists(-1, str); - + wxString align = GetAlignment(thisStyle); str << wxString::Format(wxT("

"), align.c_str()); @@ -273,7 +268,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE str << SymbolicIndent( - thisStyle.GetLeftSubIndent()); } - m_inTable = true; + m_inTable = true; } } else @@ -282,20 +277,22 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE wxString align = GetAlignment(thisStyle); str << wxString::Format(wxT("

"), align.c_str()); - } + } } /// End paragraph formatting -void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxTextOutputStream& stream) +void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream) { if (m_inTable) { if (thisStyle.HasFont()) stream << wxT(""); - - stream << wxT("

\n"); + + stream << wxT("

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

\n"); } /// Closes lists to level (-1 means close all) @@ -322,17 +319,18 @@ void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str) } /// Output font tag -void wxRichTextHTMLHandler::OutputFont(const wxTextAttrEx& style, wxTextOutputStream& stream) +void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream) { if (style.HasFont()) { - stream << wxString::Format(wxT(""), - style.GetFont().GetFaceName().c_str(), PtToSize(style.GetFont().GetPointSize()), - style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str()); + stream << wxString::Format(wxT(""); } } -int 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. @@ -353,14 +351,14 @@ int wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& 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 wxTextAttr& thisStyle ) { switch( thisStyle.GetAlignment() ) { @@ -392,13 +390,13 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s 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 @@ -414,18 +412,18 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s 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); + + str << wxFileSystem::FileNameToURL(tempFilename); } else str << wxT("file:?"); @@ -458,7 +456,7 @@ long wxRichTextHTMLHandler::PtToSize(long size) for (i = 0; i < len; i++) if (size <= m_fontSizeMapping[i]) return i+1; - return 7; + return 7; } wxString wxRichTextHTMLHandler::SymbolicIndent(long indent) @@ -552,7 +550,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString for (i = 0; i < imageLocations.GetCount(); i++) { wxString location = imageLocations[i]; - + if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) { #if wxUSE_FILESYSTEM @@ -565,7 +563,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString wxRemoveFile(location); } } - + return true; }