#if wxUSE_RICHTEXT
#include "wx/richtext/richtexthtml.h"
+#include "wx/richtext/richtextstyles.h"
#ifndef WX_PRECOMP
#endif
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
{
wxString path, file, ext;
- wxSplitPath(filename, & path, & file, & ext);
+ wxFileName::SplitPath(filename, & path, & file, & ext);
return (ext.Lower() == wxT("html") || ext.Lower() == wxT("htm"));
}
bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
{
+ m_buffer = buffer;
+
ClearTemporaryImageLocations();
buffer->Defragment();
- wxTextOutputStream str(stream);
+#if wxUSE_UNICODE
+ wxCSConv* customEncoding = NULL;
+ wxMBConv* conv = NULL;
+ if (!GetEncoding().IsEmpty())
+ {
+ customEncoding = new wxCSConv(GetEncoding());
+ if (!customEncoding->IsOk())
+ {
+ delete customEncoding;
+ customEncoding = NULL;
+ }
+ }
+ if (customEncoding)
+ conv = customEncoding;
+ else
+ conv = & wxConvUTF8;
+#endif
- wxTextAttrEx currentParaStyle = buffer->GetAttributes();
- wxTextAttrEx currentCharStyle = buffer->GetAttributes();
+ {
+#if wxUSE_UNICODE
+ wxTextOutputStream str(stream, wxEOL_NATIVE, *conv);
+#else
+ wxTextOutputStream str(stream, wxEOL_NATIVE);
+#endif
- str << wxT("<html><head></head><body>\n");
+ wxTextAttr currentParaStyle = buffer->GetAttributes();
+ wxTextAttr currentCharStyle = buffer->GetAttributes();
- str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
+ if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+ str << wxT("<html><head></head><body>\n");
- str << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\" color=\"%s\" >"),
- 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_font = false;
+ m_inTable = false;
- wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
- while (node)
- {
- wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ m_indents.Clear();
+ m_listTypes.Clear();
- if (para)
+ wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
+ while (node)
{
- wxTextAttrEx paraStyle(para->GetCombinedAttributes());
-
- OutputParagraphFormatting(currentParaStyle, paraStyle, stream);
+ wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+ wxASSERT (para != NULL);
- wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
- while (node2)
+ if (para)
{
- wxRichTextObject* obj = node2->GetData();
- wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
- if (textObj && !textObj->IsEmpty())
- {
- wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
- BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
-
- wxString text = textObj->GetText();
-
- if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
- text.MakeUpper();
+ wxTextAttr paraStyle(para->GetCombinedAttributes());
- str << text;
+ BeginParagraphFormatting(currentParaStyle, paraStyle, str);
- EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
- }
+ wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
+ while (node2)
+ {
+ wxRichTextObject* obj = node2->GetData();
+ wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
+ if (textObj && !textObj->IsEmpty())
+ {
+ wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
+ BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
- wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
- if( image && !image->IsEmpty())
- WriteImage( image, stream );
+ wxString text = textObj->GetText();
- node2 = node2->GetNext();
- }
- str << wxT("\n");
- }
- node = node->GetNext();
- }
+ if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ text.MakeUpper();
- str << wxT("</font></td></tr></table></body></html>\n");
+ wxString toReplace = wxRichTextLineBreakChar;
+ text.Replace(toReplace, wxT("<br>"));
- return true;
-}
+ str << text;
-void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream)
-{
- wxTextOutputStream str(stream);
+ EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
+ }
- // Is the item a bulleted one?
- if ( paraStyle.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE )
- {
- // Is there any opened list?
- if (m_list)
- {
- // Yes there is
+ wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
+ if( image && (!image->IsEmpty() || image->GetImageBlock().GetData()))
+ WriteImage( image, stream );
- // 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("<li>"); //Yes it is
- else
- {
- // No it isn't, so we should close the list tag
- str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
+ node2 = node2->GetNext();
+ }
- // And renavigate to new list's horizontal position
- NavigateToListPosition(paraStyle, str);
+ EndParagraphFormatting(currentParaStyle, paraStyle, str);
- // Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
- wxString tag;
- TypeOfList(paraStyle, tag);
- str << tag << wxT("<li>");
+ str << wxT("\n");
}
+ node = node->GetNext();
}
- else
- {
- // No there isn't a list.
- // navigate to new list's horizontal position(indent)
- NavigateToListPosition(paraStyle, str);
- // Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
- wxString tag;
- TypeOfList(paraStyle, tag);
- str << tag << wxT("<li>");
-
- // 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
+ CloseLists(-1, str);
- str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
+ str << wxT("</font>");
- // And mark as there is no an opened list
- m_list = false;
- }
+ if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+ str << wxT("</body></html>");
- // 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("</td></tr></table>");
-
- 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 );
- }
- }
+ str << wxT("\n");
}
- else if (m_indent)
- {
- // The item is not indented and there is a table(s) that should be closed now.
- for (unsigned int i = 0; i < m_indents.size(); i++)
- str << wxT("</td></tr></table>");
+#if wxUSE_UNICODE
+ if (customEncoding)
+ delete customEncoding;
+#endif
- 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));
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), 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("</a>");
+ stream << wxT("</a>");
- if (thisStyle.GetFont().GetUnderlined())
- str << wxT("</u>");
- if (thisStyle.GetFont().GetStyle() == wxITALIC)
- str << wxT("</i>");
- if (thisStyle.GetFont().GetWeight() == wxBOLD)
- str << wxT("</b>");
+ if (thisStyle.GetFontUnderlined())
+ stream << wxT("</u>");
+ if (thisStyle.GetFontStyle() == wxITALIC)
+ stream << wxT("</i>");
+ if (thisStyle.GetFontWeight() == wxBOLD)
+ stream << wxT("</b>");
if (m_font)
{
m_font = false;
- str << wxT("</font>");
+ stream << wxT("</font>");
}
}
-/// Output paragraph formatting
-void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream)
+/// Begin paragraph formatting
+void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str)
{
- // If there is no opened list currently, insert a <p> after every paragraph
- if (!m_list)
- {
- wxTextOutputStream str(stream);
- wxString align = GetAlignment(thisStyle);
- str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
- }
-
if (thisStyle.HasPageBreak())
{
- wxTextOutputStream str(stream);
str << wxT("<div style=\"page-break-after:always\"></div>\n");
}
-}
-
-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
-
- // 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())
- {
- // yes it is
- LIndent(thisStyle, str);
- m_indent = thisStyle.GetLeftIndent() - 100;
- m_indents.Add( m_indent );
- return;
- }
- // 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);
+
+ // 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 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("</td></tr></table>");
+ CloseLists(-1, str);
- m_indents.RemoveAt(i);
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
+
+ wxString styleStr;
- if (i < 1)
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasParagraphSpacingBefore())
{
- m_indent=0; break;
+ float spacingBeforeMM = thisStyle.GetParagraphSpacingBefore() / 10.0;
+
+ styleStr += wxString::Format(wxT("margin-top: %.2fmm; "), spacingBeforeMM);
}
- m_indent = m_indents[i-1];
+ 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(">");
+
+ // TODO: convert to pixels
+ int indentPixels = static_cast<int>(indentLeftMM*10/4);
+
+ 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;
+ }
+
+ OutputFont(thisStyle, str);
+
+ if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
+ {
+ str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
+ }
+ }
+ }
+ else
+ {
+ CloseLists(-1, str);
+
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
+
+ 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(">");
}
}
-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("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
- str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
- str << wxT("<td width=\"100%\">");
-
- if (thisStyle.GetLeftSubIndent() < 0)
+ if (m_inTable)
{
- str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
+ if (thisStyle.HasFont())
+ stream << wxT("</font>");
+
+ stream << wxT("</td></tr></table></p>\n");
+ m_inTable = false;
}
+ else if (!thisStyle.HasBulletStyle())
+ stream << wxT("</p>\n");
}
-void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+/// Closes lists to level (-1 means close all)
+void wxRichTextHTMLHandler::CloseLists(int level, 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;|<ul> |
- // | |<-ULI-><li>first item |
- // | |<-ULI-><li>second item |
- // | |</ul> |
- // ------------------------------------------------------
- // |<-100->|
-
-
- str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
- str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
- str << wxT("<td width=\"100%\">");
+ // Close levels high than this
+ int i = m_indents.GetCount()-1;
+ while (i >= 0)
+ {
+ int l = m_indents[i];
+ if (l > level)
+ {
+ if (m_listTypes[i] == 0)
+ str << wxT("</ol>");
+ else
+ str << wxT("</ul>");
+ m_indents.RemoveAt(i);
+ m_listTypes.RemoveAt(i);
+ }
+ else
+ break;
+ i --;
+ }
+}
+
+/// Output font tag
+void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream)
+{
+ if (style.HasFont())
+ {
+ 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(" >");
+ }
}
-void 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.
- m_is_ul = false;
+ bool m_is_ul = false;
if (thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
tag = wxT("<ol type=\"1\">");
else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
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, (const wxChar*) ext));
+ 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"), (const wxChar*) tempDir, sm_fileCounter, (const wxChar*) ext));
+ 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:?");
long wxRichTextHTMLHandler::PtToSize(long size)
{
- // return approximate size
- if (size < 9 ) return 1;
- else if( size < 11 ) return 2;
- else if( size < 14 ) return 3;
- else if( size < 18 ) return 4;
- else if( size < 23 ) return 5;
- else if( size < 30 ) return 6;
- else return 7;
+ int i;
+ int len = m_fontSizeMapping.GetCount();
+ for (i = 0; i < len; i++)
+ if (size <= m_fontSizeMapping[i])
+ return i+1;
+ 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