X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b71e9aa4e2187a7f6469f68812467f2ecb6a3836..4e1fd51de7349097a30b3b994e5c6e9b074de77c:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index c1e9c9c584..76ea00e815 100644 --- 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: @@ -13,23 +13,42 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RICHTEXT #include "wx/richtext/richtexthtml.h" +#include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP - #include "wx/wx.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) +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 { @@ -52,14 +71,29 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { - buffer->Defragment(); + m_buffer = buffer; + ClearTemporaryImageLocations(); + + buffer->Defragment(); + wxTextOutputStream str(stream); wxTextAttrEx currentParaStyle = buffer->GetAttributes(); wxTextAttrEx currentCharStyle = buffer->GetAttributes(); - str << wxT("
\n"); + 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();
wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
while (node)
@@ -69,7 +103,9 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
if (para)
{
- OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, true);
+ wxTextAttrEx paraStyle(para->GetCombinedAttributes());
+
+ BeginParagraphFormatting(currentParaStyle, paraStyle, str);
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
while (node2)
@@ -78,99 +114,462 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
if (textObj && !textObj->IsEmpty())
{
- OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, true);
+ wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+ BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
+
+ wxString text = textObj->GetText();
- str << textObj->GetText();
+ if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ text.MakeUpper();
- OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, false);
+ wxString toReplace = wxRichTextLineBreakChar;
+ text.Replace(toReplace, wxT(" ")); + + str << text; + + EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); } + wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); + if( image && !image->IsEmpty()) + WriteImage( image, stream ); + node2 = node2->GetNext(); } - OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false); + EndParagraphFormatting(currentParaStyle, paraStyle, str); - str << wxT(" \n"); + str << wxT("\n"); } - node = node->GetNext(); } + + CloseLists(-1, str); + + str << wxT(""); + + str << wxT(" |
"); + + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT(""); + + str << wxT("\n"); - str << wxT("\n"); + m_buffer = NULL; return true; } -/// Output character formatting -void wxRichTextHTMLHandler::OutputCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start) +void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& str) { - wxTextOutputStream str(stream); + wxString style; + + // Is there any change in the font properties of the item? + if (thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName()) + { + wxString faceName(thisStyle.GetFont().GetFaceName()); + 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.GetTextColour() != currentStyle.GetTextColour() ) + { + wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX)); + style += wxString::Format(wxT(" color=\"%s\""), color.c_str()); + } + + if (style.size()) + { + str << wxString::Format(wxT(""), style.c_str()); + m_font = true; + } + + if (thisStyle.GetFont().GetWeight() == wxBOLD) + str << wxT(""); + if (thisStyle.GetFont().GetStyle() == wxITALIC) + str << wxT(""); + if (thisStyle.GetFont().GetUnderlined()) + str << wxT(""); + + if (thisStyle.HasURL()) + str << wxT(""); +} - bool isBold = false; - bool isItalic = false; - bool isUnderline = false; - wxString faceName; +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& stream) +{ + if (thisStyle.HasURL()) + stream << wxT(""); + + if (thisStyle.GetFont().GetUnderlined()) + stream << wxT(""); + if (thisStyle.GetFont().GetStyle() == wxITALIC) + stream << wxT(""); + if (thisStyle.GetFont().GetWeight() == wxBOLD) + stream << wxT(""); - if (thisStyle.GetFont().Ok()) + if (m_font) { - if (thisStyle.GetFont().GetWeight() == wxBOLD) - isBold = true; - if (thisStyle.GetFont().GetStyle() == wxITALIC) - isItalic = true; - if (thisStyle.GetFont().GetUnderlined()) - isUnderline = true; + m_font = false; + stream << wxT(""); + } +} - faceName = thisStyle.GetFont().GetFaceName(); +/// Begin paragraph formatting +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxTextOutputStream& str) +{ + if (thisStyle.HasPageBreak()) + { + str << wxT(""); + str << wxT("
\n"); + str << wxT("");
}
- if (start)
+ if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0)
{
- if (isBold)
- str << wxT("");
- if (isItalic)
- str << wxT("");
- if (isUnderline)
- str << wxT("");
+ if (thisStyle.HasBulletStyle())
+ {
+ 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(" "), align.c_str()); + + str << tag; + } + + str << wxT(" "), align.c_str()); + + // Use a table + int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent(); + // TODO: convert to pixels + int indentPixels = indentTenthsMM/4; + str << wxString::Format(wxT("
|