"),
- left_indent.c_str(), //Document-Wide Left Indent
- right_indent.c_str()); //Document-Wide Right Indent
-
- str << wxT(" | ");
- */
-
- str << wxT("| ");
-
- str << wxString::Format(wxT(""),
- currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ),
- currentParaStyle.GetTextColour().Red(), currentParaStyle.GetTextColour().Green(),
- currentParaStyle.GetTextColour().Blue());
-
- //wxString align = GetAlignment( currentParaStyle.GetAlignment() );
- //str << wxString::Format(wxT(" "), align );
-
+
+ wxTextAttr currentParaStyle = buffer->GetAttributes();
+ wxTextAttr currentCharStyle = buffer->GetAttributes();
+
+ if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+ str << wxT(" \n");
+
+ 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)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
wxASSERT (para != NULL);
-
+
if (para)
{
- OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream);
-
+ wxTextAttr paraStyle(para->GetCombinedAttributes());
+
+ BeginParagraphFormatting(currentParaStyle, paraStyle, str);
+
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
while (node2)
{
@@ -109,358 +112,253 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
if (textObj && !textObj->IsEmpty())
{
- BeginCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
-
- str << textObj->GetText();
-
- EndCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
+ wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+ BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
+
+ wxString text = textObj->GetText();
+
+ if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ text.MakeUpper();
+
+ wxString toReplace = wxRichTextLineBreakChar;
+ text.Replace(toReplace, wxT("
"));
+
+ str << text;
+
+ EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
}
-
+
wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
- if( image && !image->IsEmpty())
- Image_to_Base64( image, stream );
-
+ if( image && (!image->IsEmpty() || image->GetImageBlock().GetData()))
+ WriteImage( image, stream );
+
node2 = node2->GetNext();
}
- //OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false);
+
+ EndParagraphFormatting(currentParaStyle, paraStyle, str);
+
+ str << wxT("\n");
}
node = node->GetNext();
}
-
- str << wxT(" |
\n");
-
+
+ CloseLists(-1, str);
+
+ str << wxT("");
+
+ if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+ str << wxT("");
+
+ str << wxT("\n");
+
+ m_buffer = NULL;
+
return true;
}
-void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream)
+void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str)
{
- wxTextOutputStream str(stream);
-
- //Is the item bulleted one?
- if( thisStyle.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( (thisStyle.GetLeftIndent() == (m_indent + 100)) || (thisStyle.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(thisStyle, str);
- //Ok it's done
-
- //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
- wxString tag;
- TypeOfList(thisStyle, tag);
- str << tag << wxT("");
- }
- }
- else
- {
- //No there isn't a list
-
- //navigate to new list's horizontal position(indent)
- NavigateToListPosition(thisStyle, str);
-
- //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
- wxString tag;
- TypeOfList(thisStyle, 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
+ wxString style;
- 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( thisStyle.GetLeftIndent() )
+ // Is there any change in the font properties of the item?
+ if (thisStyle.GetFontFaceName() != currentStyle.GetFontFaceName())
{
- if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE )
- {
- if( m_indent )
- {
- if( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) == m_indent )
- {
- if( thisStyle.GetLeftSubIndent() < 0 )
- {
- str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
- }
- }
- else
- {
- if( thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent() > m_indent )
- {
- Indent(thisStyle, str);
- m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
- m_indents.Add( m_indent );
- }
- else
- {
- int i = m_indents.size() - 1;
- for(; i > -1; i--)
- {
- if( m_indent < (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) )
- {
- Indent(thisStyle, str);
- m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
- m_indents.Add( m_indent );
-
- break;
- }
- else if( m_indent == (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) )
- {
- if( thisStyle.GetLeftSubIndent() < 0 )
- {
- str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
- }
- break;
- }
- else
- {
- str << wxT(" |