X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07854e5edda33cdb2c4ff50f545f7a3eb94badc3..c2c87924e7e3906b8cf1f93ebbd362eab17f6857:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 4326e33e15..e2371f6497 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -19,6 +19,7 @@ #if wxUSE_RICHTEXT #include "wx/richtext/richtexthtml.h" +#include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP #endif @@ -27,8 +28,27 @@ #include "wx/wfstream.h" #include "wx/txtstrm.h" +#if wxUSE_FILESYSTEM +#include "wx/filesys.h" +#include "wx/fs_mem.h" +#endif + IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler) +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 { @@ -51,44 +71,29 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { - buffer->Defragment(); + m_buffer = buffer; + + ClearTemporaryImageLocations(); + buffer->Defragment(); + wxTextOutputStream str(stream); wxTextAttrEx currentParaStyle = buffer->GetAttributes(); wxTextAttrEx currentCharStyle = buffer->GetAttributes(); - str << wxT("
\n"); - - /* - wxRichText may be support paper formats like a1/a2/a3/a4 - when this widget grown enough, i should turn back and support its new features - but not yet - - str << wxT(""); - - wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent()); - wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent()); - - str << wxString::Format(wxT("%s | %s | |
");
- */
+ if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
+ str << wxT("\n");
str << wxT("
"); + + if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) + str << wxT(""); + + str << wxT("\n"); - 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 wxTextAttrEx& WXUNUSED(currentStyle), 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.HasPageBreak()) { - //yes it is - LIndent(thisStyle, str); - m_indent = thisStyle.GetLeftIndent() - 100; - m_indents.Add( m_indent ); - return; + str << wxT(""); + str << wxT("
\n"); + str << wxT("");
}
- //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);
+
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT(" "), align.c_str()); + + str << tag; + } + + str << wxT(" |
"), align.c_str()); + // Use a table + int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent(); + // TODO: convert to pixels + int indentPixels = indentTenthsMM/4; + str << wxString::Format(wxT("
"), indentPixels);
- //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
+ OutputFont(thisStyle, str);
- //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-- |
- //-------------------------------------------
+ if (thisStyle.GetLeftSubIndent() < 0)
+ {
+ str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
+ }
- str << wxT("
|