#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_RICHTEXT && wxUSE_XML
#include "wx/richtext/richtextxml.h"
#ifndef WX_PRECOMP
- #include "wx/wx.h"
#include "wx/intl.h"
+ #include "wx/module.h"
#endif
#include "wx/filename.h"
#include "wx/clipbrd.h"
#include "wx/wfstream.h"
#include "wx/sstream.h"
-#include "wx/module.h"
#include "wx/txtstrm.h"
+#include "wx/tokenzr.h"
#include "wx/xml/xml.h"
IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
if (!stream.IsOk())
return false;
+ buffer->ResetAndClearCommands();
buffer->Clear();
wxXmlDocument* xmlDoc = new wxXmlDocument;
if (!xmlDoc->Load(stream, encoding))
{
+ buffer->ResetAndClearCommands();
success = false;
}
else
if (name == wxT("paragraphlayout"))
{
+ wxString partial = node->GetAttribute(wxT("partialparagraph"), wxEmptyString);
+ if (partial == wxT("true"))
+ buffer->SetPartialParagraph(true);
}
else if (name == wxT("paragraph"))
{
para->AppendChild(textObject);
}
+ else if (childName == wxT("symbol"))
+ {
+ // This is a symbol that XML can't read in the normal way
+ wxString text;
+ wxXmlNode* textChild = child->GetChildren();
+ while (textChild)
+ {
+ if (textChild->GetType() == wxXML_TEXT_NODE ||
+ textChild->GetType() == wxXML_CDATA_SECTION_NODE)
+ {
+ wxString text2 = textChild->GetContent();
+ text += text2;
+ }
+ textChild = textChild->GetNext();
+ }
+
+ wxString actualText;
+ actualText << (wxChar) wxAtoi(text);
+
+ wxRichTextPlainText* textObject = new wxRichTextPlainText(actualText, para);
+ GetStyle(textObject->GetAttributes(), child, false);
+
+ para->AppendChild(textObject);
+ }
else if (childName == wxT("image"))
{
int imageType = wxBITMAP_TYPE_PNG;
- wxString value = node->GetPropVal(wxT("imagetype"), wxEmptyString);
+ wxString value = node->GetAttribute(wxT("imagetype"), wxEmptyString);
if (!value.empty())
imageType = wxAtoi(value);
doneChildren = true;
}
+ else if (name == wxT("stylesheet"))
+ {
+ if (GetFlags() & wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET)
+ {
+ wxRichTextStyleSheet* sheet = new wxRichTextStyleSheet;
+ wxString sheetName = node->GetAttribute(wxT("name"), wxEmptyString);
+ wxString sheetDescription = node->GetAttribute(wxT("description"), wxEmptyString);
+ sheet->SetName(sheetName);
+ sheet->SetDescription(sheetDescription);
+
+ wxXmlNode* child = node->GetChildren();
+ while (child)
+ {
+ ImportStyleDefinition(sheet, child);
+
+ child = child->GetNext();
+ }
+
+ // Notify that styles have changed. If this is vetoed by the app,
+ // the new sheet will be deleted. If it is not vetoed, the
+ // old sheet will be deleted and replaced with the new one.
+ buffer->SetStyleSheetAndNotify(sheet);
+ }
+ doneChildren = true;
+ }
if (!doneChildren)
{
return true;
}
+bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node)
+{
+ wxString styleType = node->GetName();
+ wxString styleName = node->GetAttribute(wxT("name"), wxEmptyString);
+ wxString baseStyleName = node->GetAttribute(wxT("basestyle"), wxEmptyString);
+
+ if (styleName.IsEmpty())
+ return false;
+
+ if (styleType == wxT("characterstyle"))
+ {
+ wxRichTextCharacterStyleDefinition* def = new wxRichTextCharacterStyleDefinition(styleName);
+ def->SetBaseStyle(baseStyleName);
+
+ wxXmlNode* child = node->GetChildren();
+ while (child)
+ {
+ if (child->GetName() == wxT("style"))
+ {
+ wxTextAttrEx attr;
+ GetStyle(attr, child, false);
+ def->SetStyle(attr);
+ }
+ child = child->GetNext();
+ }
+
+ sheet->AddCharacterStyle(def);
+ }
+ else if (styleType == wxT("paragraphstyle"))
+ {
+ wxRichTextParagraphStyleDefinition* def = new wxRichTextParagraphStyleDefinition(styleName);
+
+ wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);
+ def->SetNextStyle(nextStyleName);
+ def->SetBaseStyle(baseStyleName);
+
+ wxXmlNode* child = node->GetChildren();
+ while (child)
+ {
+ if (child->GetName() == wxT("style"))
+ {
+ wxTextAttrEx attr;
+ GetStyle(attr, child, false);
+ def->SetStyle(attr);
+ }
+ child = child->GetNext();
+ }
+
+ sheet->AddParagraphStyle(def);
+ }
+ else if (styleType == wxT("liststyle"))
+ {
+ wxRichTextListStyleDefinition* def = new wxRichTextListStyleDefinition(styleName);
+
+ wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);
+ def->SetNextStyle(nextStyleName);
+ def->SetBaseStyle(baseStyleName);
+
+ wxXmlNode* child = node->GetChildren();
+ while (child)
+ {
+ if (child->GetName() == wxT("style"))
+ {
+ wxTextAttrEx attr;
+ GetStyle(attr, child, false);
+
+ wxString styleLevel = child->GetAttribute(wxT("level"), wxEmptyString);
+ if (styleLevel.IsEmpty())
+ {
+ def->SetStyle(attr);
+ }
+ else
+ {
+ int level = wxAtoi(styleLevel);
+ if (level > 0 && level <= 10)
+ {
+ def->SetLevelAttributes(level-1, attr);
+ }
+ }
+ }
+ child = child->GetNext();
+ }
+
+ sheet->AddListStyle(def);
+ }
+
+ return true;
+}
//-----------------------------------------------------------------------------
// xml support routines
}
last = i + 1;
}
+ else if (wxUChar(c) > 127)
+ {
+ OutputString(stream, str.Mid(last, i - last), convMem, convFile);
+
+ wxString s(wxT("&#"));
+ s << (int) c;
+ s << wxT(";");
+ OutputString(stream, s, NULL, NULL);
+ last = i + 1;
+ }
}
OutputString(stream, str.Mid(last, i - last), convMem, convFile);
}
{
if (m_encoding == wxT("<System>"))
{
+#if wxUSE_INTL
fileEncoding = wxLocale::GetSystemEncodingName();
+ // if !wxUSE_INTL, we fall back to UTF-8 or ISO-8859-1 below
+#endif
}
else
{
wxString s ;
s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
- (const wxChar*) version, (const wxChar*) fileEncoding );
+ version, fileEncoding);
OutputString(stream, s, NULL, NULL);
OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
int level = 1;
+
+ if (buffer->GetStyleSheet() && (GetFlags() & wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET))
+ {
+ OutputIndentation(stream, level);
+ wxString nameAndDescr;
+ if (!buffer->GetStyleSheet()->GetName().IsEmpty())
+ nameAndDescr << wxT(" name=\"") << buffer->GetStyleSheet()->GetName() << wxT("\"");
+ if (!buffer->GetStyleSheet()->GetDescription().IsEmpty())
+ nameAndDescr << wxT(" description=\"") << buffer->GetStyleSheet()->GetDescription() << wxT("\"");
+ OutputString(stream, wxString(wxT("<stylesheet")) + nameAndDescr + wxT(">"), convMem, convFile);
+
+ int i;
+
+ for (i = 0; i < (int) buffer->GetStyleSheet()->GetCharacterStyleCount(); i++)
+ {
+ wxRichTextCharacterStyleDefinition* def = buffer->GetStyleSheet()->GetCharacterStyle(i);
+ ExportStyleDefinition(stream, convMem, convFile, def, level + 1);
+ }
+
+ for (i = 0; i < (int) buffer->GetStyleSheet()->GetParagraphStyleCount(); i++)
+ {
+ wxRichTextParagraphStyleDefinition* def = buffer->GetStyleSheet()->GetParagraphStyle(i);
+ ExportStyleDefinition(stream, convMem, convFile, def, level + 1);
+ }
+
+ for (i = 0; i < (int) buffer->GetStyleSheet()->GetListStyleCount(); i++)
+ {
+ wxRichTextListStyleDefinition* def = buffer->GetStyleSheet()->GetListStyle(i);
+ ExportStyleDefinition(stream, convMem, convFile, def, level + 1);
+ }
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</stylesheet>"), convMem, convFile);
+ }
+
+
bool success = ExportXML(stream, convMem, convFile, *buffer, level);
OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
else
objectName = wxT("object");
+ bool terminateTag = true;
+
if (obj.IsKindOf(CLASSINFO(wxRichTextPlainText)))
{
- wxRichTextPlainText& text = (wxRichTextPlainText&) obj;
-
- OutputIndentation(stream, indent);
- OutputString(stream, wxT("<") + objectName, convMem, convFile);
+ wxRichTextPlainText& textObj = (wxRichTextPlainText&) obj;
wxString style = CreateStyle(obj.GetAttributes(), false);
- OutputString(stream, style + wxT(">"), convMem, convFile);
+ int i;
+ int last = 0;
+ const wxString& text = textObj.GetText();
+ int len = (int) text.Length();
+ for (i = 0; i < len; i++)
+ {
+ int c = (int) text[i];
+ if (c < 32 && c != 9 && c != 10 && c != 13)
+ {
+ if (i > 0)
+ {
+ OutputIndentation(stream, indent);
+ OutputString(stream, wxT("<") + objectName, convMem, convFile);
+
+ OutputString(stream, style + wxT(">"), convMem, convFile);
+
+ wxString fragment(text.Mid(last, i-last));
+ if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+ {
+ OutputString(stream, wxT("\""), convMem, convFile);
+ OutputStringEnt(stream, fragment, convMem, convFile);
+ OutputString(stream, wxT("\""), convMem, convFile);
+ }
+ else
+ OutputStringEnt(stream, fragment, convMem, convFile);
+
+ OutputString(stream, wxT("</text>"), convMem, convFile);
+ }
+
+
+ // Output this character as a number in a separate tag, because XML can't cope
+ // with entities below 32 except for 9, 10 and 13
+ last = i + 1;
+ OutputIndentation(stream, indent);
+ OutputString(stream, wxT("<symbol"), convMem, convFile);
+
+ OutputString(stream, style + wxT(">"), convMem, convFile);
+ OutputString(stream, wxString::Format(wxT("%d"), c), convMem, convFile);
+
+ OutputString(stream, wxT("</symbol>"), convMem, convFile);
+ }
+ }
+
+ wxString fragment;
+ if (last == 0)
+ fragment = text;
+ else
+ fragment = text.Mid(last, i-last);
- wxString str = text.GetText();
- if (!str.empty() && (str[0] == wxT(' ') || str[str.length()-1] == wxT(' ')))
+ if (last < len)
{
- OutputString(stream, wxT("\""), convMem, convFile);
- OutputStringEnt(stream, str, convMem, convFile);
- OutputString(stream, wxT("\""), convMem, convFile);
+ OutputIndentation(stream, indent);
+ OutputString(stream, wxT("<") + objectName, convMem, convFile);
+
+ OutputString(stream, style + wxT(">"), convMem, convFile);
+
+ if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+ {
+ OutputString(stream, wxT("\""), convMem, convFile);
+ OutputStringEnt(stream, fragment, convMem, convFile);
+ OutputString(stream, wxT("\""), convMem, convFile);
+ }
+ else
+ OutputStringEnt(stream, fragment, convMem, convFile);
}
else
- OutputStringEnt(stream, str, convMem, convFile);
+ terminateTag = false;
}
else if (obj.IsKindOf(CLASSINFO(wxRichTextImage)))
{
wxString style = CreateStyle(obj.GetAttributes(), isPara);
+ if (objectName == wxT("paragraphlayout") && ((wxRichTextParagraphLayoutBox&) obj).GetPartialParagraph())
+ style << wxT(" partialparagraph=\"true\"");
+
OutputString(stream, style + wxT(">"), convMem, convFile);
wxRichTextCompositeObject& composite = (wxRichTextCompositeObject&) obj;
if (objectName != wxT("text"))
OutputIndentation(stream, indent);
- OutputString(stream, wxT("</") + objectName + wxT(">"), convMem, convFile);
+ if (terminateTag)
+ OutputString(stream, wxT("</") + objectName + wxT(">"), convMem, convFile);
+
+ return true;
+}
+
+bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextStyleDefinition* def, int level)
+{
+ wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition);
+ wxRichTextParagraphStyleDefinition* paraDef = wxDynamicCast(def, wxRichTextParagraphStyleDefinition);
+ wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition);
+
+ wxString baseStyle = def->GetBaseStyle();
+ wxString baseStyleProp;
+ if (!baseStyle.IsEmpty())
+ baseStyleProp = wxT(" basestyle=\"") + baseStyle + wxT("\"");
+
+ wxString descr = def->GetDescription();
+ wxString descrProp;
+ if (!descr.IsEmpty())
+ descrProp = wxT(" description=\"") + descr + wxT("\"");
+
+ if (charDef)
+ {
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("<characterstyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
+
+ level ++;
+
+ wxString style = CreateStyle(def->GetStyle(), false);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</style>"), convMem, convFile);
+
+ level --;
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</characterstyle>"), convMem, convFile);
+ }
+ else if (listDef)
+ {
+ OutputIndentation(stream, level);
+
+ if (!listDef->GetNextStyle().IsEmpty())
+ baseStyleProp << wxT(" basestyle=\"") << listDef->GetNextStyle() << wxT("\"");
+
+ OutputString(stream, wxT("<liststyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
+
+ level ++;
+
+ wxString style = CreateStyle(def->GetStyle(), false);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</style>"), convMem, convFile);
+
+ int i;
+ for (i = 0; i < 10; i ++)
+ {
+ wxRichTextAttr* levelAttr = listDef->GetLevelAttributes(i);
+ if (levelAttr)
+ {
+ wxString style = CreateStyle(def->GetStyle(), false);
+ wxString levelStr = wxString::Format(wxT(" level=\"%d\" "), (i+1));
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("<style ") + levelStr + style + wxT(">"), convMem, convFile);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</style>"), convMem, convFile);
+ }
+ }
+
+ level --;
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</liststyle>"), convMem, convFile);
+ }
+ else if (paraDef)
+ {
+ OutputIndentation(stream, level);
+
+ if (!paraDef->GetNextStyle().IsEmpty())
+ baseStyleProp << wxT(" basestyle=\"") << paraDef->GetNextStyle() << wxT("\"");
+
+ OutputString(stream, wxT("<paragraphstyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
+
+ level ++;
+
+ wxString style = CreateStyle(def->GetStyle(), false);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</style>"), convMem, convFile);
+
+ level --;
+
+ OutputIndentation(stream, level);
+ OutputString(stream, wxT("</paragraphstyle>"), convMem, convFile);
+ }
return true;
}
wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara)
{
wxString str;
- if (attr.GetTextColour().Ok())
+ if (attr.HasTextColour() && attr.GetTextColour().Ok())
{
str << wxT(" textcolor=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\"");
}
- if (attr.GetBackgroundColour().Ok())
+ if (attr.HasBackgroundColour() && attr.GetBackgroundColour().Ok())
{
str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
}
if (attr.GetFont().Ok())
{
- str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
- str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
- str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
- str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
- str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
- str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
+ if (attr.HasFontSize())
+ str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
+
+ //if (attr.HasFontFamily())
+ // str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
+
+ if (attr.HasFontItalic())
+ str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
+
+ if (attr.HasFontWeight())
+ str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
+
+ if (attr.HasFontUnderlined())
+ str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
+
+ if (attr.HasFontFaceName())
+ str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
+ }
+
+ if (attr.HasTextEffects())
+ {
+ str << wxT(" texteffects=\"");
+ str << attr.GetTextEffects();
+ str << wxT("\"");
+
+ str << wxT(" texteffectflags=\"");
+ str << attr.GetTextEffectFlags();
+ str << wxT("\"");
}
if (!attr.GetCharacterStyleName().empty())
- str << wxT(" charactertyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
+ str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
+
+ if (attr.HasURL())
+ str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
if (isPara)
{
- str << wxT(" alignment=\"") << (int) attr.GetAlignment() << wxT("\"");
- str << wxT(" leftindent=\"") << (int) attr.GetLeftIndent() << wxT("\"");
- str << wxT(" leftsubindent=\"") << (int) attr.GetLeftSubIndent() << wxT("\"");
- str << wxT(" rightindent=\"") << (int) attr.GetRightIndent() << wxT("\"");
- str << wxT(" parspacingafter=\"") << (int) attr.GetParagraphSpacingAfter() << wxT("\"");
- str << wxT(" parspacingbefore=\"") << (int) attr.GetParagraphSpacingBefore() << wxT("\"");
- str << wxT(" linespacing=\"") << (int) attr.GetLineSpacing() << wxT("\"");
- str << wxT(" bulletstyle=\"") << (int) attr.GetBulletStyle() << wxT("\"");
- str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
- str << wxT(" bulletsymbol=\"") << wxString(attr.GetBulletSymbol()) << wxT("\"");
+ if (attr.HasAlignment())
+ str << wxT(" alignment=\"") << (int) attr.GetAlignment() << wxT("\"");
+
+ if (attr.HasLeftIndent())
+ {
+ str << wxT(" leftindent=\"") << (int) attr.GetLeftIndent() << wxT("\"");
+ str << wxT(" leftsubindent=\"") << (int) attr.GetLeftSubIndent() << wxT("\"");
+ }
+
+ if (attr.HasRightIndent())
+ str << wxT(" rightindent=\"") << (int) attr.GetRightIndent() << wxT("\"");
+
+ if (attr.HasParagraphSpacingAfter())
+ str << wxT(" parspacingafter=\"") << (int) attr.GetParagraphSpacingAfter() << wxT("\"");
+
+ if (attr.HasParagraphSpacingBefore())
+ str << wxT(" parspacingbefore=\"") << (int) attr.GetParagraphSpacingBefore() << wxT("\"");
+
+ if (attr.HasLineSpacing())
+ str << wxT(" linespacing=\"") << (int) attr.GetLineSpacing() << wxT("\"");
+
+ if (attr.HasBulletStyle())
+ str << wxT(" bulletstyle=\"") << (int) attr.GetBulletStyle() << wxT("\"");
+
+ if (attr.HasBulletNumber())
+ str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
+
+ if (attr.HasBulletText())
+ {
+ // If using a bullet symbol, convert to integer in case it's a non-XML-friendly character.
+ // Otherwise, assume it's XML-friendly text such as outline numbering, e.g. 1.2.3.1
+ if (!attr.GetBulletText().IsEmpty() && (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL))
+ str << wxT(" bulletsymbol=\"") << (int) (attr.GetBulletText()[0]) << wxT("\"");
+ else
+ str << wxT(" bullettext=\"") << attr.GetBulletText() << wxT("\"");
+
+ str << wxT(" bulletfont=\"") << attr.GetBulletFont() << wxT("\"");
+ }
+
+ if (attr.HasBulletName())
+ str << wxT(" bulletname=\"") << attr.GetBulletName() << wxT("\"");
if (!attr.GetParagraphStyleName().empty())
str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
+
+ if (!attr.GetListStyleName().empty())
+ str << wxT(" liststyle=\"") << wxString(attr.GetListStyleName()) << wxT("\"");
+
+ if (attr.HasTabs())
+ {
+ str << wxT(" tabs=\"");
+ size_t i;
+ for (i = 0; i < attr.GetTabs().GetCount(); i++)
+ {
+ if (i > 0)
+ str << wxT(",");
+ str << attr.GetTabs()[i];
+ }
+ str << wxT("\"");
+ }
+
+ if (attr.HasPageBreak())
+ {
+ str << wxT(" pagebreak=\"1\"");
+ }
+
+ if (attr.HasOutlineLevel())
+ str << wxT(" outlinelevel=\"") << (int) attr.GetOutlineLevel() << wxT("\"");
+
}
return str;
int fontStyle = wxNORMAL;
bool fontUnderlined = false;
- fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
+ int fontFlags = 0;
- wxString value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);
- if (!value.empty())
- fontFamily = wxAtoi(value);
+ fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
+ if (!fontFacename.IsEmpty())
+ fontFlags |= wxTEXT_ATTR_FONT_FACE;
+
+ wxString value;
+ //value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
+ //if (!value.empty())
+ // fontFamily = wxAtoi(value);
- value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);
if (!value.empty())
+ {
fontStyle = wxAtoi(value);
+ fontFlags |= wxTEXT_ATTR_FONT_ITALIC;
+ }
- value = node->GetPropVal(wxT("fontsize"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontsize"), wxEmptyString);
if (!value.empty())
+ {
fontSize = wxAtoi(value);
+ fontFlags |= wxTEXT_ATTR_FONT_SIZE;
+ }
- value = node->GetPropVal(wxT("fontweight"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontweight"), wxEmptyString);
if (!value.empty())
+ {
fontWeight = wxAtoi(value);
+ fontFlags |= wxTEXT_ATTR_FONT_WEIGHT;
+ }
- value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontunderlined"), wxEmptyString);
if (!value.empty())
+ {
fontUnderlined = wxAtoi(value) != 0;
+ fontFlags |= wxTEXT_ATTR_FONT_UNDERLINE;
+ }
- attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
+ attr.SetFlags(fontFlags);
- value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
+ if (attr.HasFlag(wxTEXT_ATTR_FONT))
+ attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
+
+ // Restore correct font flags
+ attr.SetFlags(fontFlags);
+
+ value = node->GetAttribute(wxT("textcolor"), wxEmptyString);
if (!value.empty())
{
if (value[0] == wxT('#'))
attr.SetTextColour(value);
}
- value = node->GetPropVal(wxT("backgroundcolor"), wxEmptyString);
+ value = node->GetAttribute(wxT("backgroundcolor"), wxEmptyString);
if (!value.empty())
{
if (value[0] == wxT('#'))
attr.SetBackgroundColour(value);
}
- value = node->GetPropVal(wxT("characterstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("characterstyle"), wxEmptyString);
if (!value.empty())
attr.SetCharacterStyleName(value);
+ value = node->GetAttribute(wxT("texteffects"), wxEmptyString);
+ if (!value.IsEmpty())
+ {
+ attr.SetTextEffects(wxAtoi(value));
+ }
+
+ value = node->GetAttribute(wxT("texteffectflags"), wxEmptyString);
+ if (!value.IsEmpty())
+ {
+ attr.SetTextEffectFlags(wxAtoi(value));
+ }
+
+ value = node->GetAttribute(wxT("url"), wxEmptyString);
+ if (!value.empty())
+ attr.SetURL(value);
+
// Set paragraph attributes
if (isPara)
{
- value = node->GetPropVal(wxT("alignment"), wxEmptyString);
+ value = node->GetAttribute(wxT("alignment"), wxEmptyString);
if (!value.empty())
attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
int leftSubIndent = 0;
int leftIndent = 0;
- value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
+ bool hasLeftIndent = false;
+
+ value = node->GetAttribute(wxT("leftindent"), wxEmptyString);
if (!value.empty())
+ {
leftIndent = wxAtoi(value);
- value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
+ hasLeftIndent = true;
+ }
+
+ value = node->GetAttribute(wxT("leftsubindent"), wxEmptyString);
if (!value.empty())
+ {
leftSubIndent = wxAtoi(value);
- attr.SetLeftIndent(leftIndent, leftSubIndent);
+ hasLeftIndent = true;
+ }
- value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
+ if (hasLeftIndent)
+ attr.SetLeftIndent(leftIndent, leftSubIndent);
+
+ value = node->GetAttribute(wxT("rightindent"), wxEmptyString);
if (!value.empty())
attr.SetRightIndent(wxAtoi(value));
- value = node->GetPropVal(wxT("parspacingbefore"), wxEmptyString);
+ value = node->GetAttribute(wxT("parspacingbefore"), wxEmptyString);
if (!value.empty())
attr.SetParagraphSpacingBefore(wxAtoi(value));
- value = node->GetPropVal(wxT("parspacingafter"), wxEmptyString);
+ value = node->GetAttribute(wxT("parspacingafter"), wxEmptyString);
if (!value.empty())
attr.SetParagraphSpacingAfter(wxAtoi(value));
- value = node->GetPropVal(wxT("linespacing"), wxEmptyString);
+ value = node->GetAttribute(wxT("linespacing"), wxEmptyString);
if (!value.empty())
attr.SetLineSpacing(wxAtoi(value));
- value = node->GetPropVal(wxT("bulletstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletstyle"), wxEmptyString);
if (!value.empty())
attr.SetBulletStyle(wxAtoi(value));
- value = node->GetPropVal(wxT("bulletnumber"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletnumber"), wxEmptyString);
if (!value.empty())
attr.SetBulletNumber(wxAtoi(value));
- value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletsymbol"), wxEmptyString);
+ if (!value.empty())
+ {
+ wxChar ch = wxAtoi(value);
+ wxString s;
+ s << ch;
+ attr.SetBulletText(s);
+ }
+
+ value = node->GetAttribute(wxT("bullettext"), wxEmptyString);
+ if (!value.empty())
+ attr.SetBulletText(value);
+
+ value = node->GetAttribute(wxT("bulletfont"), wxEmptyString);
+ if (!value.empty())
+ attr.SetBulletFont(value);
+
+ value = node->GetAttribute(wxT("bulletname"), wxEmptyString);
if (!value.empty())
- attr.SetBulletSymbol(value[0]);
+ attr.SetBulletName(value);
- value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("parstyle"), wxEmptyString);
if (!value.empty())
attr.SetParagraphStyleName(value);
+
+ value = node->GetAttribute(wxT("liststyle"), wxEmptyString);
+ if (!value.empty())
+ attr.SetListStyleName(value);
+
+ value = node->GetAttribute(wxT("tabs"), wxEmptyString);
+ if (!value.empty())
+ {
+ wxArrayInt tabs;
+ wxStringTokenizer tkz(value, wxT(","));
+ while (tkz.HasMoreTokens())
+ {
+ wxString token = tkz.GetNextToken();
+ tabs.Add(wxAtoi(token));
+ }
+ attr.SetTabs(tabs);
+ }
+
+ value = node->GetAttribute(wxT("pagebreak"), wxEmptyString);
+ if (!value.IsEmpty())
+ {
+ attr.SetPageBreak(wxAtoi(value) != 0);
+ }
+
+ value = node->GetAttribute(wxT("outlinelevel"), wxEmptyString);
+ if (!value.IsEmpty())
+ {
+ attr.SetOutlineLevel(wxAtoi(value) != 0);
+ }
}
return true;
#endif
// wxUSE_RICHTEXT && wxUSE_XML
+
projects / wxWidgets.git / blobdiff