| "); + 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); + wxTextAttr 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()) + { + 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(" |
after every paragraph - if (!m_list) + if (thisStyle.HasPageBreak()) { - wxTextOutputStream str(stream); - wxString align = GetAlignment(thisStyle); - str << wxString::Format(wxT("
"), align.c_str()); + str << wxT("
\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()) + if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0) { - // 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--) - { - //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)) { - m_indent=0; break; + styleStr += wxString::Format(wxT("margin-right: %.2fmm; "), indentRightMM); } - m_indent = m_indents[i-1]; + // 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 = 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("
| "), 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(" "); } } -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("
|