ClearTemporaryImageLocations();
- buffer->Defragment();
+ wxRichTextDrawingContext context(buffer);
+ buffer->Defragment(context);
#if wxUSE_UNICODE
wxCSConv* customEncoding = NULL;
customEncoding = new wxCSConv(GetEncoding());
if (!customEncoding->IsOk())
{
- delete customEncoding;
- customEncoding = NULL;
+ wxDELETE(customEncoding);
}
}
if (customEncoding)
#else
wxTextOutputStream str(stream, wxEOL_NATIVE);
#endif
-
- wxTextAttr currentParaStyle = buffer->GetAttributes();
- wxTextAttr currentCharStyle = buffer->GetAttributes();
-
+
+ wxRichTextAttr currentParaStyle = buffer->GetAttributes();
+ wxRichTextAttr currentCharStyle = buffer->GetAttributes();
+
if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
str << wxT("<html><head></head><body>\n");
-
+
OutputFont(currentParaStyle, str);
-
+
m_font = 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)
{
- wxTextAttr paraStyle(para->GetCombinedAttributes());
-
+ wxRichTextAttr paraStyle(para->GetCombinedAttributes());
+
BeginParagraphFormatting(currentParaStyle, paraStyle, str);
-
+
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
while (node2)
{
wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
if (textObj && !textObj->IsEmpty())
{
- wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+ wxRichTextAttr 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("<br>"));
-
+
str << text;
-
+
EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
}
-
+
wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
if( image && (!image->IsEmpty() || image->GetImageBlock().GetData()))
WriteImage( image, stream );
-
+
node2 = node2->GetNext();
}
-
+
EndParagraphFormatting(currentParaStyle, paraStyle, str);
-
+
str << wxT("\n");
}
node = node->GetNext();
}
-
+
CloseLists(-1, str);
-
+
str << wxT("</font>");
-
+
if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
str << wxT("</body></html>");
-
+
str << wxT("\n");
}
return true;
}
-void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str)
+void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str)
{
wxString style;
}
if (thisStyle.GetFontSize() != currentStyle.GetFontSize())
style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize()));
- if (thisStyle.GetTextColour() != currentStyle.GetTextColour() )
+
+ bool bTextColourChanged = (thisStyle.GetTextColour() != currentStyle.GetTextColour());
+ bool bBackgroundColourChanged = (thisStyle.GetBackgroundColour() != currentStyle.GetBackgroundColour());
+ if (bTextColourChanged || bBackgroundColourChanged)
{
- wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX));
- style += wxString::Format(wxT(" color=\"%s\""), color.c_str());
+ style += wxT(" style=\"");
+
+ if (bTextColourChanged)
+ {
+ wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX));
+ style += wxString::Format(wxT("color: %s"), color.c_str());
+ }
+ if (bTextColourChanged && bBackgroundColourChanged)
+ style += wxT(";");
+ if (bBackgroundColourChanged)
+ {
+ wxString color(thisStyle.GetBackgroundColour().GetAsString(wxC2S_HTML_SYNTAX));
+ style += wxString::Format(wxT("background-color: %s"), color.c_str());
+ }
+
+ style += wxT("\"");
}
if (style.size())
m_font = true;
}
- if (thisStyle.GetFontWeight() == wxBOLD)
+ if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)
str << wxT("<b>");
- if (thisStyle.GetFontStyle() == wxITALIC)
+ if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)
str << wxT("<i>");
if (thisStyle.GetFontUnderlined())
str << wxT("<u>");
if (thisStyle.HasURL())
str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");
+
+ if (thisStyle.HasTextEffects())
+ {
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+ str << wxT("<del>");
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+ str << wxT("<sup>");
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT)
+ str << wxT("<sub>");
+ }
}
-void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream)
{
if (thisStyle.HasURL())
stream << wxT("</a>");
if (thisStyle.GetFontUnderlined())
stream << wxT("</u>");
- if (thisStyle.GetFontStyle() == wxITALIC)
+ if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)
stream << wxT("</i>");
- if (thisStyle.GetFontWeight() == wxBOLD)
+ if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)
stream << wxT("</b>");
+ if (thisStyle.HasTextEffects())
+ {
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+ stream << wxT("</del>");
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+ stream << wxT("</sup>");
+ if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT)
+ stream << wxT("</sub>");
+ }
+
if (m_font)
{
m_font = false;
}
/// Begin paragraph formatting
-void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str)
+void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& str)
{
if (thisStyle.HasPageBreak())
{
wxString align = GetAlignment(thisStyle);
str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
- if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)
- str << wxT(" style=\"margin: 0px;\"");
+ wxString styleStr;
+
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingBefore())
+ {
+ float spacingBeforeMM = thisStyle.GetParagraphSpacingBefore() / 10.0;
+
+ styleStr += wxString::Format(wxT("margin-top: %.2fmm; "), spacingBeforeMM);
+ }
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingAfter())
+ {
+ float spacingAfterMM = thisStyle.GetParagraphSpacingAfter() / 10.0;
+
+ styleStr += wxString::Format(wxT("margin-bottom: %.2fmm; "), spacingAfterMM);
+ }
+
+ float indentLeftMM = (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent())/10.0;
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && (indentLeftMM > 0.0))
+ {
+ styleStr += wxString::Format(wxT("margin-left: %.2fmm; "), indentLeftMM);
+ }
+ float indentRightMM = thisStyle.GetRightIndent()/10.0;
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasRightIndent() && (indentRightMM > 0.0))
+ {
+ styleStr += wxString::Format(wxT("margin-right: %.2fmm; "), indentRightMM);
+ }
+ // First line indentation
+ float firstLineIndentMM = - thisStyle.GetLeftSubIndent() / 10.0;
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && (firstLineIndentMM > 0.0))
+ {
+ styleStr += wxString::Format(wxT("text-indent: %.2fmm; "), firstLineIndentMM);
+ }
+
+ if (!styleStr.IsEmpty())
+ str << wxT(" style=\"") << styleStr << wxT("\"");
str << wxT(">");
- // Use a table
- int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
// TODO: convert to pixels
- int indentPixels = indentTenthsMM/4;
- str << wxString::Format(wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"%d\"></td><td>"), indentPixels);
+ int indentPixels = static_cast<int>(indentLeftMM*10/4);
- OutputFont(thisStyle, str);
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0)
+ {
+ // Use a table to do indenting if we don't have CSS
+ str << wxString::Format(wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"%d\"></td><td>"), indentPixels);
+ m_inTable = true;
+ }
- if (thisStyle.GetLeftSubIndent() < 0)
+ if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
{
str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
}
-
- m_inTable = true;
}
}
else
wxString align = GetAlignment(thisStyle);
str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
- if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)
- str << wxT(" style=\"margin: 0px;\"");
+ wxString styleStr;
+
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingBefore())
+ {
+ float spacingBeforeMM = thisStyle.GetParagraphSpacingBefore() / 10.0;
+
+ styleStr += wxString::Format(wxT("margin-top: %.2fmm; "), spacingBeforeMM);
+ }
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingAfter())
+ {
+ float spacingAfterMM = thisStyle.GetParagraphSpacingAfter() / 10.0;
+
+ styleStr += wxString::Format(wxT("margin-bottom: %.2fmm; "), spacingAfterMM);
+ }
+
+ if (!styleStr.IsEmpty())
+ str << wxT(" style=\"") << styleStr << wxT("\"");
str << wxT(">");
}
+ OutputFont(thisStyle, str);
}
/// End paragraph formatting
-void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream)
{
+ if (thisStyle.HasFont())
+ stream << wxT("</font>");
+
if (m_inTable)
{
- if (thisStyle.HasFont())
- stream << wxT("</font>");
-
stream << wxT("</td></tr></table></p>\n");
m_inTable = false;
}
}
/// Output font tag
-void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream)
{
if (style.HasFont())
{
}
}
-int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& tag )
+int wxRichTextHTMLHandler::TypeOfList( const wxRichTextAttr& 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.
return 0;
}
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle )
{
switch( thisStyle.GetAlignment() )
{
#if wxUSE_FILESYSTEM
if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
- if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
image->LoadFromBlock();
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
+ if (image->GetImageBlock().IsOk())
{
- wxString ext(image->GetImageBlock().GetExtension());
- wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
- wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
+ wxImage img;
+ image->GetImageBlock().Load(img);
+ if (img.IsOk())
+ {
+ wxString ext(image->GetImageBlock().GetExtension());
+ wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext.c_str()));
+ wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
- m_imageLocations.Add(tempFilename);
+ m_imageLocations.Add(tempFilename);
- str << wxT("memory:") << tempFilename;
+ str << wxT("memory:") << tempFilename;
+ }
}
else
str << wxT("memory:?");
}
else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
{
- if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
image->LoadFromBlock();
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
+ if (image->GetImageBlock().IsOk())
{
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));
+ wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir.c_str(), sm_fileCounter, ext.c_str()));
image->GetImageBlock().Write(tempFilename);
m_imageLocations.Add(tempFilename);
str << wxT("data:");
str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,");
-
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+#if 0
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
+ if (image->GetImageBlock().IsOk())
+ {
+ wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
+ str << data;
- wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
- str << data;
-
- delete[] data;
+ delete[] data;
+ }
}
str << wxT("\" />");
{
case wxBITMAP_TYPE_BMP:
return wxT("image/bmp");
- case wxBITMAP_TYPE_TIF:
+ case wxBITMAP_TYPE_TIFF:
return wxT("image/tiff");
case wxBITMAP_TYPE_GIF:
return wxT("image/gif");
projects / wxWidgets.git / blobdiff