#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;
if (!data.empty())
{
wxRichTextImage* imageObj = new wxRichTextImage(para);
+ GetStyle(imageObj->GetAttributes(), child, false);
para->AppendChild(imageObj);
wxStringInputStream strStream(data);
{
if (child->GetName() == wxT("style"))
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
GetStyle(attr, child, false);
def->SetStyle(attr);
}
{
if (child->GetName() == wxT("style"))
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
GetStyle(attr, child, false);
def->SetStyle(attr);
}
{
if (child->GetName() == wxT("style"))
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
GetStyle(attr, child, false);
wxString styleLevel = child->GetAttribute(wxT("level"), wxEmptyString);
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;
OutputString(stream, str.Mid(last, i - last), convMem, convFile);
}
+static wxString AttributeToXML(const wxString& str)
+{
+ wxString str1;
+ size_t i, last, len;
+ wxChar c;
+
+ len = str.Len();
+ last = 0;
+ for (i = 0; i < len; i++)
+ {
+ c = str.GetChar(i);
+
+ // Original code excluded "&" but we _do_ want to convert
+ // the ampersand beginning & because otherwise when read in,
+ // the original "&" becomes "&".
+
+ if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||
+ (c == wxT('&') /* && (str.Mid(i+1, 4) != wxT("amp;")) */ ))
+ {
+ str1 += str.Mid(last, i - last);
+ switch (c)
+ {
+ case wxT('<'):
+ str1 += wxT("<");
+ break;
+ case wxT('>'):
+ str1 += wxT(">");
+ break;
+ case wxT('&'):
+ str1 += wxT("&");
+ break;
+ case wxT('"'):
+ str1 += wxT(""");
+ break;
+ default: break;
+ }
+ last = i + 1;
+ }
+ else if (wxUChar(c) > 127)
+ {
+ 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;
+ }
+ }
+ str1 += str.Mid(last, i - last);
+ return str1;
+}
+
inline static void OutputIndentation(wxOutputStream& stream, int indent)
{
wxString str = wxT("\n");
int last = 0;
const wxString& text = textObj.GetText();
int len = (int) text.Length();
- for (i = 0; i < len; i++)
+
+ if (len == 0)
{
+ i = 0;
+ OutputIndentation(stream, indent);
+ OutputString(stream, wxT("<") + objectName, convMem, convFile);
+ OutputString(stream, style + wxT(">"), convMem, convFile);
+ OutputString(stream, wxT("</text>"), convMem, convFile);
+ }
+ else for (i = 0; i < len; i++)
+ {
+#if wxUSE_UNICODE
int c = (int) text[i];
- if (c < 32 && 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)
{
{
wxRichTextImage& imageObj = (wxRichTextImage&) obj;
+ wxString style = CreateStyle(obj.GetAttributes(), false);
+
if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
imageObj.MakeBlock();
if (!imageObj.GetImageBlock().Ok())
{
// No data
- OutputString(stream, wxT(">"), convMem, convFile);
+ OutputString(stream, style + wxT(">"), convMem, convFile);
}
else
{
- OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\">"), (int) imageObj.GetImageBlock().GetImageType()));
+ OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\"") + style + wxT(">"), (int) imageObj.GetImageBlock().GetImageType()));
}
OutputIndentation(stream, indent+1);
int i;
for (i = 0; i < 10; i ++)
{
- wxRichTextAttr* levelAttr = listDef->GetLevelAttributes(i);
+ wxTextAttr* levelAttr = listDef->GetLevelAttributes(i);
if (levelAttr)
{
wxString style = CreateStyle(def->GetStyle(), false);
}
/// Create style parameters
-wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara)
+wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttr& attr, bool isPara)
{
wxString str;
if (attr.HasTextColour() && attr.GetTextColour().Ok())
str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
}
- if (attr.GetFont().Ok())
- {
- if (attr.HasFontSize())
- str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
+ 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.GetFont().GetStyle() << wxT("\"");
+ if (attr.HasFontItalic())
+ str << wxT(" fontstyle=\"") << attr.GetFontStyle() << wxT("\"");
- if (attr.HasFontWeight())
- str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
+ if (attr.HasFontWeight())
+ str << wxT(" fontweight=\"") << attr.GetFontWeight() << wxT("\"");
- if (attr.HasFontUnderlined())
- str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
+ if (attr.HasFontUnderlined())
+ str << wxT(" fontunderlined=\"") << (int) attr.GetFontUnderlined() << wxT("\"");
- if (attr.HasFontFaceName())
- str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
- }
+ if (attr.HasFontFaceName())
+ str << wxT(" fontface=\"") << attr.GetFontFaceName() << wxT("\"");
if (attr.HasTextEffects())
{
str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
if (attr.HasURL())
- str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
+ str << wxT(" url=\"") << AttributeToXML(attr.GetURL()) << wxT("\"");
if (isPara)
{
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(wxTextAttrEx& attr, wxXmlNode* node, bool isPara)
+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;
- int fontFlags = 0;
+ // int fontFlags = 0;
fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
if (!fontFacename.IsEmpty())
- fontFlags |= wxTEXT_ATTR_FONT_FACE;
+ {
+ 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"), wxEmptyString);
+ if (!value.empty())
+ {
+ fontFamily = (wxFontFamily)wxAtoi(value);
+ attr.SetFontFamily(fontFamily);
+ }
value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);
if (!value.empty())
{
- fontStyle = wxAtoi(value);
- fontFlags |= wxTEXT_ATTR_FONT_ITALIC;
+ fontStyle = (wxFontStyle)wxAtoi(value);
+ attr.SetFontStyle(fontStyle);
}
value = node->GetAttribute(wxT("fontsize"), wxEmptyString);
if (!value.empty())
{
fontSize = wxAtoi(value);
- fontFlags |= wxTEXT_ATTR_FONT_SIZE;
+ attr.SetFontSize(fontSize);
}
value = node->GetAttribute(wxT("fontweight"), wxEmptyString);
if (!value.empty())
{
- fontWeight = wxAtoi(value);
- fontFlags |= wxTEXT_ATTR_FONT_WEIGHT;
+ fontWeight = (wxFontWeight)wxAtoi(value);
+ attr.SetFontWeight(fontWeight);
}
value = node->GetAttribute(wxT("fontunderlined"), wxEmptyString);
if (!value.empty())
{
fontUnderlined = wxAtoi(value) != 0;
- fontFlags |= wxTEXT_ATTR_FONT_UNDERLINE;
+ attr.SetFontUnderlined(fontUnderlined);
}
- 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->GetAttribute(wxT("textcolor"), wxEmptyString);
if (!value.empty())
{
attr.SetTextColour(value);
}
- value = node->GetAttribute(wxT("backgroundcolor"), wxEmptyString);
+ value = node->GetAttribute(wxT("bgcolor"), wxEmptyString);
if (!value.empty())
{
if (value[0] == wxT('#'))
projects / wxWidgets.git / blobdiff