X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b71e9aa4e2187a7f6469f68812467f2ecb6a3836..ba53bf083e768a770a7011d0ba0143484a8d3a33:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index c1e9c9c584..4326e33e15 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,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RICHTEXT @@ -21,7 +21,6 @@ #include "wx/richtext/richtexthtml.h" #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wx/filename.h" @@ -61,6 +60,36 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& str << wxT("\n"); + /* + 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 + + str << wxT(""), + left_indent.c_str(), //Document-Wide Left Indent + right_indent.c_str()); //Document-Wide Right Indent + + str << wxT("

"); + + wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent()); + wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent()); + + str << wxString::Format(wxT("%s

"); + */ + + str << wxT("

"); + + str << wxString::Format(wxT(""), + currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ), + currentParaStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str()); + + //wxString align = GetAlignment( currentParaStyle.GetAlignment() ); + //str << wxString::Format(wxT("

"), align ); + + m_font = false; + m_indent = 0; + m_list = false; + wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst(); while (node) { @@ -69,7 +98,9 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& if (para) { - OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, true); + wxTextAttrEx paraStyle(para->GetCombinedAttributes()); + + OutputParagraphFormatting(currentParaStyle, paraStyle, stream); wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); while (node2) @@ -78,99 +109,484 @@ 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, stream); str << textObj->GetText(); - OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, false); + EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream); } + wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage); + if( image && !image->IsEmpty()) + Image_to_Base64( image, stream ); + node2 = node2->GetNext(); } - - OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false); - - str << wxT("

\n"); + str << wxT("\n"); + //OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false); } - node = node->GetNext(); } - str << wxT("\n"); + str << wxT("

\n"); 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& paraStyle, wxOutputStream& stream) { wxTextOutputStream str(stream); - bool isBold = false; - bool isItalic = false; - bool isUnderline = false; - wxString faceName; + //Is the item bulleted one? + if( paraStyle.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE ) + { + //Is there any opened list? + if( m_list ) + { + //Yes there is + + //Is the item among the previous ones + //Is the item one of the previous list tag's child items + if( (paraStyle.GetLeftIndent() == (m_indent + 100)) || (paraStyle.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("")); + + //And renavigate to new list's horizontal position + NavigateToListPosition(paraStyle, str); + //Ok it's done + + //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. + wxString tag; + TypeOfList(paraStyle, tag); + str << tag << wxT("

"); + } + } + else + { + //No there isn't a list + + //navigate to new list's horizontal position(indent) + NavigateToListPosition(paraStyle, str); - if (thisStyle.GetFont().Ok()) + //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. + wxString tag; + TypeOfList(paraStyle, tag); + str << tag << wxT("

"); + + //Now we have a list, mark it. + m_list = true; + } + } + else if( m_list ) + { + //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; + } + + // 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 ) { - if (thisStyle.GetFont().GetWeight() == wxBOLD) - isBold = true; - if (thisStyle.GetFont().GetStyle() == wxITALIC) - isItalic = true; - if (thisStyle.GetFont().GetUnderlined()) - isUnderline = true; - - faceName = thisStyle.GetFont().GetFaceName(); + //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(); } - if (start) + + 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 (isBold) - str << wxT(""); - if (isItalic) - str << wxT(""); - if (isUnderline) - str << wxT(""); + str << wxString::Format(wxT(""), style.c_str()); + m_font = true; } - else + + if( thisStyle.GetFont().GetWeight() == wxBOLD ) + str << wxT(""); + if( thisStyle.GetFont().GetStyle() == wxITALIC ) + str << wxT(""); + if( thisStyle.GetFont().GetUnderlined() ) + str << wxT(""); +} + +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxOutputStream& stream) +{ + wxTextOutputStream str(stream); + + if( thisStyle.GetFont().GetUnderlined() ) + str << wxT(""); + if( thisStyle.GetFont().GetStyle() == wxITALIC ) + str << wxT(""); + if( thisStyle.GetFont().GetWeight() == wxBOLD ) + str << wxT(""); + + if( m_font ) { - if (isUnderline) - str << wxT(""); - if (isItalic) - str << wxT(""); - if (isBold) - str << wxT(""); + m_font = false; + str << wxT(""); } } /// Output paragraph formatting -void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start) +void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream) { - // TODO: lists, indentation (using tables), fonts, right-align, ... + //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()); + } +} - wxTextOutputStream str(stream); - bool isCentered = false; +void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& 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 - if (thisStyle.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) + //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() ) { - isCentered = true; + //yes it is + LIndent(thisStyle, str); + m_indent = thisStyle.GetLeftIndent() - 100; + m_indents.Add( m_indent ); + return; } + //No it isn't - if (start) + int i = m_indents.size() - 1; + for(; i > -1; i--) { - if (isCentered) - str << wxT("

"); + //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() ) + { + //Yes it is + LIndent(thisStyle, str); + m_indent = thisStyle.GetLeftIndent() - 100; + m_indents.Add( m_indent ); + break; + } + 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(""); + + m_indents.RemoveAt(i); + + if( i < 1 ){m_indent=0; break;} + m_indent = m_indents[i-1]; + } + } +} +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. + + + + //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(""); + + wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent ); + str << wxString::Format( wxT(""), symbolic_indent.c_str() ); + str << wxT("

"); + + if( thisStyle.GetLeftSubIndent() < 0 ) + { + str << SymbolicIndent(~thisStyle.GetLeftSubIndent()); } +} + +void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str ) +{ + //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;|

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("

"); +} + +void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& 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. + + m_is_ul = false; + if( thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD)) + tag = wxT("