ClearTemporaryImageLocations();
buffer->Defragment();
-
+
wxTextOutputStream str(stream);
- wxTextAttrEx currentParaStyle = buffer->GetAttributes();
- wxTextAttrEx currentCharStyle = buffer->GetAttributes();
+ wxTextAttr currentParaStyle = buffer->GetAttributes();
+ wxTextAttr currentCharStyle = buffer->GetAttributes();
if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
str << wxT("<html><head></head><body>\n");
- str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
-
OutputFont(currentParaStyle, str);
-
+
m_font = false;
m_inTable = false;
-
+
m_indents.Clear();
m_listTypes.Clear();
if (para)
{
- wxTextAttrEx paraStyle(para->GetCombinedAttributes());
-
+ wxTextAttr paraStyle(para->GetCombinedAttributes());
+
BeginParagraphFormatting(currentParaStyle, paraStyle, str);
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
if (textObj && !textObj->IsEmpty())
{
- wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+ wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
-
+
wxString text = textObj->GetText();
if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
}
wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
- if( image && !image->IsEmpty())
+ if( image && (!image->IsEmpty() || image->GetImageBlock().GetData()))
WriteImage( image, stream );
node2 = node2->GetNext();
}
node = node->GetNext();
}
-
+
CloseLists(-1, str);
str << wxT("</font>");
-
- str << wxT("</td></tr></table><p>");
if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
str << wxT("</body></html>");
-
+
str << wxT("\n");
m_buffer = NULL;
return true;
}
-void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& str)
+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));
m_font = true;
}
- if (thisStyle.GetFont().GetWeight() == wxBOLD)
+ if (thisStyle.GetFontWeight() == wxBOLD)
str << wxT("<b>");
- if (thisStyle.GetFont().GetStyle() == wxITALIC)
+ if (thisStyle.GetFontStyle() == wxITALIC)
str << wxT("<i>");
- if (thisStyle.GetFont().GetUnderlined())
+ if (thisStyle.GetFontUnderlined())
str << wxT("<u>");
-
+
if (thisStyle.HasURL())
str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");
}
-void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& WXUNUSED(paraStyle), wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream)
{
if (thisStyle.HasURL())
stream << wxT("</a>");
- if (thisStyle.GetFont().GetUnderlined())
+ if (thisStyle.GetFontUnderlined())
stream << wxT("</u>");
- if (thisStyle.GetFont().GetStyle() == wxITALIC)
+ if (thisStyle.GetFontStyle() == wxITALIC)
stream << wxT("</i>");
- if (thisStyle.GetFont().GetWeight() == wxBOLD)
+ if (thisStyle.GetFontWeight() == wxBOLD)
stream << wxT("</b>");
if (m_font)
}
/// Begin paragraph formatting
-void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxTextOutputStream& str)
+void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str)
{
if (thisStyle.HasPageBreak())
{
- str << wxT("</tr></td></table>");
str << wxT("<div style=\"page-break-after:always\"></div>\n");
- str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
}
if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0)
// 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("<p align=\"%s\">"), align.c_str());
-
+
+ // wxHTML needs an extra <p> before a list when using <p> ... </p> in previous paragraphs.
+ // TODO: pass a flag that indicates we're using wxHTML.
+ str << wxT("<p>\n");
+
str << tag;
}
-
+
str << wxT("<li> ");
}
else
{
CloseLists(-1, str);
-
+
wxString align = GetAlignment(thisStyle);
str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
}
- m_inTable = true;
+ m_inTable = true;
}
}
else
wxString align = GetAlignment(thisStyle);
str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
- }
+ }
}
/// End paragraph formatting
-void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream)
{
if (m_inTable)
{
if (thisStyle.HasFont())
stream << wxT("</font>");
-
- stream << wxT("</td></tr></table>\n");
+
+ stream << wxT("</td></tr></table></p>\n");
m_inTable = false;
}
+ else if (!thisStyle.HasBulletStyle())
+ stream << wxT("</p>\n");
}
/// Closes lists to level (-1 means close all)
}
/// Output font tag
-void wxRichTextHTMLHandler::OutputFont(const wxTextAttrEx& style, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream)
{
if (style.HasFont())
{
- stream << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\" color=\"%s\" >"),
- style.GetFont().GetFaceName().c_str(), PtToSize(style.GetFont().GetPointSize()),
- style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
+ stream << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\""), style.GetFontFaceName().c_str(), PtToSize(style.GetFontSize()));
+ if (style.HasTextColour())
+ stream << wxString::Format(wxT(" color=\"%s\""), style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
+ stream << wxT(" >");
}
}
-int wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag )
+int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& 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.
tag = wxT("<ul>");
m_is_ul = true;
}
-
+
if (m_is_ul)
return 1;
else
return 0;
}
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle )
{
switch( thisStyle.GetAlignment() )
{
image->MakeBlock();
if (image->GetImage().Ok())
- {
+ {
wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
-
+
m_imageLocations.Add(tempFilename);
-
+
str << wxT("memory:") << tempFilename;
}
else
image->MakeBlock();
if (image->GetImage().Ok())
- {
+ {
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));
image->GetImageBlock().Write(tempFilename);
-
+
m_imageLocations.Add(tempFilename);
-
- str << wxFileSystem::FileNameToURL(tempFilename);
+
+ str << wxFileSystem::FileNameToURL(tempFilename);
}
else
str << wxT("file:?");
for (i = 0; i < len; i++)
if (size <= m_fontSizeMapping[i])
return i+1;
- return 7;
+ return 7;
}
wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
for (i = 0; i < imageLocations.GetCount(); i++)
{
wxString location = imageLocations[i];
-
+
if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
#if wxUSE_FILESYSTEM
wxRemoveFile(location);
}
}
-
+
return true;
}
projects / wxWidgets.git / blobdiff