X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2d0adc7765dfe904f0f7e97d85a2638c934a7d6..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index eaf0343aea..2ec15138eb 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 @@ -36,6 +37,18 @@ 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 { @@ -58,26 +71,29 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { + m_buffer = buffer; + ClearTemporaryImageLocations(); buffer->Defragment(); wxTextOutputStream str(stream); - wxTextAttrEx currentParaStyle = buffer->GetAttributes(); - wxTextAttrEx currentCharStyle = buffer->GetAttributes(); + wxTextAttr currentParaStyle = buffer->GetAttributes(); + wxTextAttr currentCharStyle = buffer->GetAttributes(); - str << wxT("
\n"); + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT("\n"); str << wxT("");
- str << wxString::Format(wxT(""),
- currentParaStyle.GetFont().GetFaceName().c_str(), PtToSize(currentParaStyle.GetFont().GetPointSize()),
- currentParaStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
+ OutputFont(currentParaStyle, str);
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)
@@ -87,9 +103,9 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
if (para)
{
- wxTextAttrEx paraStyle(para->GetCombinedAttributes());
-
- OutputParagraphFormatting(currentParaStyle, paraStyle, stream);
+ wxTextAttr paraStyle(para->GetCombinedAttributes());
+
+ BeginParagraphFormatting(currentParaStyle, paraStyle, str);
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
while (node2)
@@ -98,12 +114,20 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
if (textObj && !textObj->IsEmpty())
{
- wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
- BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
+ wxTextAttr 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();
- EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
+ wxString toReplace = wxRichTextLineBreakChar;
+ text.Replace(toReplace, wxT(" ")); + + str << text; + + EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); } wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); @@ -112,161 +136,42 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& node2 = node2->GetNext(); } + + EndParagraphFormatting(currentParaStyle, paraStyle, str); + str << wxT("\n"); } node = node->GetNext(); } - str << wxT(" |
"); - // does the item have an indentation ? - if( paraStyle.GetLeftIndent() ) - { - if (paraStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) - { - if (m_indent) - { - if ((paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent()) == m_indent) - { - if (paraStyle.GetLeftSubIndent() < 0) - { - str << SymbolicIndent(~paraStyle.GetLeftSubIndent()); - } - } - else - { - if (paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent() > m_indent) - { - Indent(paraStyle, str); - m_indent = paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent(); - m_indents.Add( m_indent ); - } - else - { - int i = m_indents.size() - 1; - for (; i > -1; i--) - { - if (m_indent < (paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent())) - { - Indent(paraStyle, str); - m_indent = paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent(); - m_indents.Add( m_indent ); - - break; - } - else if (m_indent == (paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent())) - { - if (paraStyle.GetLeftSubIndent() < 0) - { - str << SymbolicIndent(~paraStyle.GetLeftSubIndent()); - } - break; - } - else - { - str << wxT(""); - - m_indents.RemoveAt(i); - - if(i < 1) - { - m_indent=0; break; - } - m_indent = m_indents[i-1]; - } - } - } - } - } - else - { - Indent(paraStyle, str); - m_indent = paraStyle.GetLeftIndent() + paraStyle.GetLeftSubIndent(); - m_indents.Add( m_indent ); - } - } - } - else if (m_indent) - { - // The item is not indented and there is a table(s) that should be closed now. + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT(""); - for (unsigned int i = 0; i < m_indents.size(); i++) - str << wxT(""); + str << wxT("\n"); - m_indent = 0; - m_indents.Clear(); - } + m_buffer = NULL; + return true; +} +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)); @@ -279,170 +184,161 @@ 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), wxOutputStream& stream) +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) { - wxTextOutputStream str(stream); - if (thisStyle.HasURL()) - str << wxT(""); + 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() == wxITALIC) + stream << wxT(""); + if (thisStyle.GetFontWeight() == wxBOLD) + stream << wxT(""); if (m_font) { m_font = false; - str << 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) - { - wxTextOutputStream str(stream); - wxString align = GetAlignment(thisStyle); - str << wxString::Format(wxT("
"), align.c_str()); + stream << wxT(""); } } -void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle, wxTextOutputStream& str) +/// Begin paragraph formatting +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& 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(""); + str << wxT("
\n"); + str << wxT("");
}
- // 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);
+
+ 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("
"), indentPixels);
- if (i < 1)
+ OutputFont(thisStyle, str);
+
+ if (thisStyle.GetLeftSubIndent() < 0)
{
- m_indent=0; break;
+ str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
}
- m_indent = m_indents[i-1];
+
+ m_inTable = true;
}
}
+ else
+ {
+ CloseLists(-1, str);
+
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT(" "), 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) { - //There is no way to indent an item in HTML, 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;Hello World | - // | | | | | - // | V | V | - // | --LI-- | --LSI-- | - // ------------------------------------------- - - str << wxT("
|