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->GetPropVal(wxT("partialparagraph"), wxEmptyString);
+ wxString partial = node->GetAttribute(wxT("partialparagraph"), wxEmptyString);
if (partial == wxT("true"))
buffer->SetPartialParagraph(true);
}
}
textChild = textChild->GetNext();
}
-
+
wxString actualText;
actualText << (wxChar) wxAtoi(text);
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);
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.
bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node)
{
- wxString styleType = node->GetName();
- wxString styleName = node->GetPropVal(wxT("name"), wxEmptyString);
- wxString baseStyleName = node->GetPropVal(wxT("basestyle"), wxEmptyString);
-
+ 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);
}
child = child->GetNext();
}
-
+
sheet->AddCharacterStyle(def);
}
else if (styleType == wxT("paragraphstyle"))
{
wxRichTextParagraphStyleDefinition* def = new wxRichTextParagraphStyleDefinition(styleName);
- wxString nextStyleName = node->GetPropVal(wxT("nextstyle"), wxEmptyString);
+ wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);
def->SetNextStyle(nextStyleName);
def->SetBaseStyle(baseStyleName);
{
wxRichTextListStyleDefinition* def = new wxRichTextListStyleDefinition(styleName);
- wxString nextStyleName = node->GetPropVal(wxT("nextstyle"), wxEmptyString);
+ wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);
def->SetNextStyle(nextStyleName);
def->SetBaseStyle(baseStyleName);
wxTextAttrEx attr;
GetStyle(attr, child, false);
- wxString styleLevel = child->GetPropVal(wxT("level"), wxEmptyString);
+ wxString styleLevel = child->GetAttribute(wxT("level"), wxEmptyString);
if (styleLevel.IsEmpty())
- {
+ {
def->SetStyle(attr);
}
else
sheet->AddListStyle(def);
}
-
+
return true;
}
{
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);
if (buffer->GetStyleSheet() && (GetFlags() & wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET))
{
OutputIndentation(stream, level);
- OutputString(stream, wxT("<stylesheet>"), convMem, convFile);
+ 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;
bool success = ExportXML(stream, convMem, convFile, *buffer, level);
-
+
OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
OutputString(stream, wxT("\n"), NULL, NULL);
objectName = wxT("image");
else
objectName = wxT("object");
-
+
bool terminateTag = true;
if (obj.IsKindOf(CLASSINFO(wxRichTextPlainText)))
{
wxRichTextPlainText& textObj = (wxRichTextPlainText&) obj;
-
+
wxString style = CreateStyle(obj.GetAttributes(), false);
-
+
int i;
int last = 0;
const wxString& text = textObj.GetText();
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
+ // 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, wxString::Format(wxT("%d"), c), convMem, convFile);
OutputString(stream, wxT("</symbol>"), convMem, convFile);
}
}
-
+
wxString fragment;
if (last == 0)
fragment = text;
isPara = true;
wxString style = CreateStyle(obj.GetAttributes(), isPara);
-
+
if (objectName == wxT("paragraphlayout") && ((wxRichTextParagraphLayoutBox&) obj).GetPartialParagraph())
style << wxT(" partialparagraph=\"true\"");
bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextStyleDefinition* def, int level)
{
- wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition);
+ 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 + wxT(">"), convMem, convFile);
-
+ 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);
else if (listDef)
{
OutputIndentation(stream, level);
-
+
if (!listDef->GetNextStyle().IsEmpty())
baseStyleProp << wxT(" basestyle=\"") << listDef->GetNextStyle() << wxT("\"");
-
- OutputString(stream, wxT("<liststyle") + baseStyleProp + wxT(">"), convMem, convFile);
-
+
+ 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);
OutputIndentation(stream, level);
OutputString(stream, wxT("<style ") + levelStr + style + wxT(">"), convMem, convFile);
-
+
OutputIndentation(stream, level);
OutputString(stream, wxT("</style>"), convMem, convFile);
}
else if (paraDef)
{
OutputIndentation(stream, level);
-
- if (!listDef->GetNextStyle().IsEmpty())
- baseStyleProp << wxT(" basestyle=\"") << listDef->GetNextStyle() << wxT("\"");
-
- OutputString(stream, wxT("<paragraphstyle") + baseStyleProp + wxT(">"), convMem, convFile);
-
+
+ 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);
if (attr.GetFont().Ok())
{
- if (attr.HasSize())
+ if (attr.HasFontSize())
str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
-
- //if (attr.HasFamily())
+
+ //if (attr.HasFontFamily())
// str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
- if (attr.HasItalic())
+ if (attr.HasFontItalic())
str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
- if (attr.HasWeight())
+ if (attr.HasFontWeight())
str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
- if (attr.HasUnderlined())
+ if (attr.HasFontUnderlined())
str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
- if (attr.HasFaceName())
+ 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(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
str << wxT(" bulletsymbol=\"") << (int) (attr.GetBulletText()[0]) << wxT("\"");
else
str << wxT(" bullettext=\"") << attr.GetBulletText() << wxT("\"");
-
+
str << wxT(" bulletfont=\"") << attr.GetBulletFont() << wxT("\"");
}
if (attr.HasURL())
str << wxT(" url=\"") << attr.GetURL() << 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=\"");
str << wxT(",");
str << attr.GetTabs()[i];
}
- str << wxT("\"");
+ str << wxT("\"");
+ }
+
+ if (attr.HasPageBreak())
+ {
+ str << wxT(" pagebreak=\"1\"");
}
+
+ if (attr.HasOutlineLevel())
+ str << wxT(" outlinelevel=\"") << (int) attr.GetOutlineLevel() << wxT("\"");
+
}
return str;
int fontWeight = wxNORMAL;
int fontStyle = wxNORMAL;
bool fontUnderlined = false;
-
+
int fontFlags = 0;
- fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
+ fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
if (!fontFacename.IsEmpty())
fontFlags |= wxTEXT_ATTR_FONT_FACE;
wxString value;
- //value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);
+ //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.SetFlags(fontFlags);
-
+
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->GetPropVal(wxT("textcolor"), wxEmptyString);
+
+ 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));
+ }
+
// 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;
bool hasLeftIndent = false;
-
- value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
+
+ value = node->GetAttribute(wxT("leftindent"), wxEmptyString);
if (!value.empty())
{
leftIndent = wxAtoi(value);
hasLeftIndent = true;
}
- value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
+ value = node->GetAttribute(wxT("leftsubindent"), wxEmptyString);
if (!value.empty())
{
leftSubIndent = wxAtoi(value);
if (hasLeftIndent)
attr.SetLeftIndent(leftIndent, leftSubIndent);
- value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
+ 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);
attr.SetBulletText(s);
}
- value = node->GetPropVal(wxT("bullettext"), wxEmptyString);
+ value = node->GetAttribute(wxT("bullettext"), wxEmptyString);
if (!value.empty())
attr.SetBulletText(value);
- value = node->GetPropVal(wxT("bulletfont"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletfont"), wxEmptyString);
if (!value.empty())
attr.SetBulletFont(value);
- value = node->GetPropVal(wxT("bulletname"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletname"), wxEmptyString);
if (!value.empty())
attr.SetBulletName(value);
- value = node->GetPropVal(wxT("url"), wxEmptyString);
+ value = node->GetAttribute(wxT("url"), wxEmptyString);
if (!value.empty())
attr.SetURL(value);
- value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("parstyle"), wxEmptyString);
if (!value.empty())
attr.SetParagraphStyleName(value);
-
- value = node->GetPropVal(wxT("liststyle"), wxEmptyString);
+
+ value = node->GetAttribute(wxT("liststyle"), wxEmptyString);
if (!value.empty())
attr.SetListStyleName(value);
-
- value = node->GetPropVal(wxT("tabs"), wxEmptyString);
+
+ value = node->GetAttribute(wxT("tabs"), wxEmptyString);
if (!value.empty())
{
wxArrayInt tabs;
}
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;
projects / wxWidgets.git / blobdiff