#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/module.h"
+ #include "wx/log.h"
#endif
#include "wx/filename.h"
}
else if (childName == wxT("image"))
{
- int imageType = wxBITMAP_TYPE_PNG;
- wxString value = node->GetAttribute(wxT("imagetype"), wxEmptyString);
+ wxBitmapType imageType = wxBITMAP_TYPE_PNG;
+ wxString value = child->GetAttribute(wxT("imagetype"), wxEmptyString);
if (!value.empty())
- imageType = wxAtoi(value);
+ {
+ int type = wxAtoi(value);
+
+ // note: 0 == wxBITMAP_TYPE_INVALID
+ if (type <= 0 || type >= wxBITMAP_TYPE_MAX)
+ {
+ wxLogWarning("Invalid bitmap type specified for <image> tag: %d", type);
+ }
+ else
+ {
+ imageType = (wxBitmapType)type;
+ }
+ }
wxString data;
OutputString(stream, str.Mid(last, i - last), convMem, convFile);
wxString s(wxT("&#"));
+#if wxUSE_UNICODE
s << (int) c;
+#else
+ s << (int) wxUChar(c);
+#endif
s << wxT(";");
OutputString(stream, s, NULL, NULL);
last = i + 1;
str1 += str.Mid(last, i - last);
wxString s(wxT("&#"));
+#if wxUSE_UNICODE
s << (int) c;
+#else
+ s << (int) wxUChar(c);
+#endif
s << wxT(";");
str1 += s;
last = i + 1;
}
else for (i = 0; i < len; i++)
{
+#if wxUSE_UNICODE
int c = (int) text[i];
- if ((c < 32 || c == 34) && c != 9 && c != 10 && c != 13)
+#else
+ int c = (int) wxUChar(text[i]);
+#endif
+ if ((c < 32 || c == 34) && /* 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(' ')))
+ if (!fragment.IsEmpty())
{
- OutputString(stream, wxT("\""), convMem, convFile);
- OutputStringEnt(stream, fragment, 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);
+
+ OutputString(stream, wxT("</text>"), 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
+ // with entities below 32 except for 10 and 13
last = i + 1;
OutputIndentation(stream, indent);
OutputString(stream, wxT("<symbol"), convMem, convFile);
if (attr.HasFontSize())
str << wxT(" fontsize=\"") << attr.GetFontSize() << wxT("\"");
- //if (attr.HasFontFamily())
- // str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
+ if (attr.HasFontFamily())
+ str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
if (attr.HasFontItalic())
str << wxT(" fontstyle=\"") << attr.GetFontStyle() << wxT("\"");
return str;
}
+/// Replace face name with current name for platform.
+/// TODO: introduce a virtual function or settable table to
+/// do this comprehensively.
+bool wxRichTextFixFaceName(wxString& facename)
+{
+ if (facename.IsEmpty())
+ return false;
+
+#ifdef __WXMSW__
+ if (facename == wxT("Times"))
+ {
+ facename = wxT("Times New Roman");
+ return true;
+ }
+ else if (facename == wxT("Helvetica"))
+ {
+ facename = wxT("Arial");
+ return true;
+ }
+ else if (facename == wxT("Courier"))
+ {
+ facename = wxT("Courier New");
+ return true;
+ }
+ else
+ return false;
+#else
+ if (facename == wxT("Times New Roman"))
+ {
+ facename = wxT("Times");
+ return true;
+ }
+ else if (facename == wxT("Arial"))
+ {
+ facename = wxT("Helvetica");
+ return true;
+ }
+ else if (facename == wxT("Courier New"))
+ {
+ facename = wxT("Courier");
+ return true;
+ }
+ else
+ return false;
+#endif
+}
+
/// Get style parameters
bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)
{
wxString fontFacename;
int fontSize = 12;
- // int fontFamily = wxDEFAULT;
- int fontWeight = wxNORMAL;
- int fontStyle = wxNORMAL;
+ wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT;
+ wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
+ wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
bool fontUnderlined = false;
+ const wxString emptyString; // save a temporary string construction in GetPropVal
// int fontFlags = 0;
- fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
+ fontFacename = node->GetAttribute(wxT("fontface"), emptyString);
if (!fontFacename.IsEmpty())
+ {
attr.SetFontFaceName(fontFacename);
+ if (GetFlags() & wxRICHTEXT_HANDLER_CONVERT_FACENAMES)
+ wxRichTextFixFaceName(fontFacename);
+ }
wxString value;
- //value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
- //if (!value.empty())
- // fontFamily = wxAtoi(value);
+ value = node->GetAttribute(wxT("fontfamily"), emptyString);
+ if (!value.empty())
+ {
+ fontFamily = (wxFontFamily)wxAtoi(value);
+ attr.SetFontFamily(fontFamily);
+ }
- value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontstyle"), emptyString);
if (!value.empty())
{
- fontStyle = wxAtoi(value);
+ fontStyle = (wxFontStyle)wxAtoi(value);
attr.SetFontStyle(fontStyle);
}
- value = node->GetAttribute(wxT("fontsize"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontsize"), emptyString);
if (!value.empty())
{
fontSize = wxAtoi(value);
attr.SetFontSize(fontSize);
}
- value = node->GetAttribute(wxT("fontweight"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontweight"), emptyString);
if (!value.empty())
{
- fontWeight = wxAtoi(value);
+ fontWeight = (wxFontWeight)wxAtoi(value);
attr.SetFontWeight(fontWeight);
}
- value = node->GetAttribute(wxT("fontunderlined"), wxEmptyString);
+ value = node->GetAttribute(wxT("fontunderlined"), emptyString);
if (!value.empty())
{
fontUnderlined = wxAtoi(value) != 0;
attr.SetFontUnderlined(fontUnderlined);
}
- value = node->GetAttribute(wxT("textcolor"), wxEmptyString);
+ value = node->GetAttribute(wxT("textcolor"), emptyString);
if (!value.empty())
{
if (value[0] == wxT('#'))
attr.SetTextColour(value);
}
- value = node->GetAttribute(wxT("bgcolor"), wxEmptyString);
+ value = node->GetAttribute(wxT("bgcolor"), emptyString);
if (!value.empty())
{
if (value[0] == wxT('#'))
attr.SetBackgroundColour(value);
}
- value = node->GetAttribute(wxT("characterstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("characterstyle"), emptyString);
if (!value.empty())
attr.SetCharacterStyleName(value);
- value = node->GetAttribute(wxT("texteffects"), wxEmptyString);
+ value = node->GetAttribute(wxT("texteffects"), emptyString);
if (!value.IsEmpty())
{
attr.SetTextEffects(wxAtoi(value));
}
- value = node->GetAttribute(wxT("texteffectflags"), wxEmptyString);
+ value = node->GetAttribute(wxT("texteffectflags"), emptyString);
if (!value.IsEmpty())
{
attr.SetTextEffectFlags(wxAtoi(value));
}
- value = node->GetAttribute(wxT("url"), wxEmptyString);
+ value = node->GetAttribute(wxT("url"), emptyString);
if (!value.empty())
attr.SetURL(value);
// Set paragraph attributes
if (isPara)
{
- value = node->GetAttribute(wxT("alignment"), wxEmptyString);
+ value = node->GetAttribute(wxT("alignment"), emptyString);
if (!value.empty())
attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
int leftIndent = 0;
bool hasLeftIndent = false;
- value = node->GetAttribute(wxT("leftindent"), wxEmptyString);
+ value = node->GetAttribute(wxT("leftindent"), emptyString);
if (!value.empty())
{
leftIndent = wxAtoi(value);
hasLeftIndent = true;
}
- value = node->GetAttribute(wxT("leftsubindent"), wxEmptyString);
+ value = node->GetAttribute(wxT("leftsubindent"), emptyString);
if (!value.empty())
{
leftSubIndent = wxAtoi(value);
if (hasLeftIndent)
attr.SetLeftIndent(leftIndent, leftSubIndent);
- value = node->GetAttribute(wxT("rightindent"), wxEmptyString);
+ value = node->GetAttribute(wxT("rightindent"), emptyString);
if (!value.empty())
attr.SetRightIndent(wxAtoi(value));
- value = node->GetAttribute(wxT("parspacingbefore"), wxEmptyString);
+ value = node->GetAttribute(wxT("parspacingbefore"), emptyString);
if (!value.empty())
attr.SetParagraphSpacingBefore(wxAtoi(value));
- value = node->GetAttribute(wxT("parspacingafter"), wxEmptyString);
+ value = node->GetAttribute(wxT("parspacingafter"), emptyString);
if (!value.empty())
attr.SetParagraphSpacingAfter(wxAtoi(value));
- value = node->GetAttribute(wxT("linespacing"), wxEmptyString);
+ value = node->GetAttribute(wxT("linespacing"), emptyString);
if (!value.empty())
attr.SetLineSpacing(wxAtoi(value));
- value = node->GetAttribute(wxT("bulletstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletstyle"), emptyString);
if (!value.empty())
attr.SetBulletStyle(wxAtoi(value));
- value = node->GetAttribute(wxT("bulletnumber"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletnumber"), emptyString);
if (!value.empty())
attr.SetBulletNumber(wxAtoi(value));
- value = node->GetAttribute(wxT("bulletsymbol"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletsymbol"), emptyString);
if (!value.empty())
{
wxChar ch = wxAtoi(value);
attr.SetBulletText(s);
}
- value = node->GetAttribute(wxT("bullettext"), wxEmptyString);
+ value = node->GetAttribute(wxT("bullettext"), emptyString);
if (!value.empty())
attr.SetBulletText(value);
- value = node->GetAttribute(wxT("bulletfont"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletfont"), emptyString);
if (!value.empty())
attr.SetBulletFont(value);
- value = node->GetAttribute(wxT("bulletname"), wxEmptyString);
+ value = node->GetAttribute(wxT("bulletname"), emptyString);
if (!value.empty())
attr.SetBulletName(value);
- value = node->GetAttribute(wxT("parstyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("parstyle"), emptyString);
if (!value.empty())
attr.SetParagraphStyleName(value);
- value = node->GetAttribute(wxT("liststyle"), wxEmptyString);
+ value = node->GetAttribute(wxT("liststyle"), emptyString);
if (!value.empty())
attr.SetListStyleName(value);
- value = node->GetAttribute(wxT("tabs"), wxEmptyString);
+ value = node->GetAttribute(wxT("tabs"), emptyString);
if (!value.empty())
{
wxArrayInt tabs;
attr.SetTabs(tabs);
}
- value = node->GetAttribute(wxT("pagebreak"), wxEmptyString);
+ value = node->GetAttribute(wxT("pagebreak"), emptyString);
if (!value.IsEmpty())
{
attr.SetPageBreak(wxAtoi(value) != 0);
}
- value = node->GetAttribute(wxT("outlinelevel"), wxEmptyString);
+ value = node->GetAttribute(wxT("outlinelevel"), emptyString);
if (!value.IsEmpty())
{
attr.SetOutlineLevel(wxAtoi(value));
projects / wxWidgets.git / blobdiff