| "); + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT("\n"); - str << wxString::Format(wxT(""), - 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); + wxRichTextAttr paraStyle(para->GetCombinedAttributes()); - str << textObj->GetText(); + 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()) + { + wxRichTextAttr 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(" |
after every paragraph - if (!m_list) - { - wxTextOutputStream str(stream); - wxString align = GetAlignment(thisStyle); - str << wxString::Format(wxT("
"), align.c_str()); + stream << wxT(""); } } -void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle, wxTextOutputStream& str) +/// Begin paragraph formatting +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& 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()) + if (thisStyle.HasPageBreak()) { - // yes it is - LIndent(thisStyle, str); - m_indent = thisStyle.GetLeftIndent() - 100; - m_indents.Add( m_indent ); - return; + str << wxT("
\n"); } - // 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 extrabefore a list when using
...
in previous paragraphs. + // TODO: pass a flag that indicates we're using wxHTML. + str << wxT("\n"); + + str << tag; + } + + str << wxT("
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 ");
+ }
+ OutputFont(thisStyle, str);
}
-void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+
+/// End paragraph formatting
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& 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(""), indentPixels);
+ m_inTable = true;
+ }
+
+ if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
+ {
+ str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
}
- m_indent = m_indents[i-1];
}
}
+ else
+ {
+ CloseLists(-1, str);
+
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT("
\n");
+ m_inTable = false;
}
+ else if (!thisStyle.HasBulletStyle())
+ stream << wxT("\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;|");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
- str << wxString::Format( wxT(" %s "), symbolic_indent.c_str() );
- str << wxT("");
-
- if (thisStyle.GetLeftSubIndent() < 0)
+ if (thisStyle.HasFont())
+ stream << wxT("");
+
+ if (m_inTable)
{
- str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
+ stream << wxT(" |
- // | |<-ULI->
|
- // ------------------------------------------------------
- // |<-100->|
-
-
- str << wxT("");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
- str << wxString::Format( wxT(" %s "), symbolic_indent.c_str() );
- str << wxT("");
+ // 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("");
+ else
+ str << wxT("");
+ m_indents.RemoveAt(i);
+ m_listTypes.RemoveAt(i);
+ }
+ else
+ break;
+ i --;
+ }
+}
+
+/// Output font tag
+void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream)
+{
+ if (style.HasFont())
+ {
+ stream << wxString::Format(wxT("");
+ }
}
-void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& 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.
- m_is_ul = false;
+ bool m_is_ul = false;
if (thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
tag = wxT(" ");
else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
@@ -458,9 +454,14 @@ void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString&
tag = wxT("
");
m_is_ul = true;
}
+
+ if (m_is_ul)
+ return 1;
+ else
+ return 0;
}
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle )
{
switch( thisStyle.GetAlignment() )
{
@@ -486,20 +487,27 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
#if wxUSE_FILESYSTEM
if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
+#if 0
if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
image->LoadFromBlock();
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
- {
- wxString ext(image->GetImageBlock().GetExtension());
- wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, (const wxChar*) ext));
- wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
-
- m_imageLocations.Add(tempFilename);
-
- str << wxT("memory:") << tempFilename;
+ if (image->GetImageBlock().IsOk())
+ {
+ 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));
+ wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
+
+ m_imageLocations.Add(tempFilename);
+
+ str << wxT("memory:") << tempFilename;
+ }
}
else
str << wxT("memory:?");
@@ -508,24 +516,26 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
}
else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
{
+#if 0
if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
image->LoadFromBlock();
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
- {
+ if (image->GetImageBlock().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, (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:?");
@@ -538,14 +548,17 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
str << wxT("data:");
str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,");
-
+#if 0
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
+ if (image->GetImageBlock().Ok())
+ {
+ 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("\" />");
@@ -553,14 +566,12 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
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)
@@ -654,7 +665,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString
for (i = 0; i < imageLocations.GetCount(); i++)
{
wxString location = imageLocations[i];
-
+
if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
#if wxUSE_FILESYSTEM
@@ -667,7 +678,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString
wxRemoveFile(location);
}
}
-
+
return true;
}