Added <color:???> and <size:???> tags for changing text color/size

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@831 0fc631ac-6414-0410-93d0-97cfa31319b6

src/util/io/reader.cpp

@@ -368,12 +368,15 @@ template <> void Reader::handle(Vector2D& vec) {
 }
 
 template <> void Reader::handle(Color& col) {
+	col = parse_color(getValue());
+	if (!col.Ok()) col = *wxBLACK;
+}
+Color parse_color(const String& v) {
 	UInt r,g,b;
-	if (wxSscanf(getValue().c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
-		col.Set(r, g, b);
+	if (wxSscanf(v.c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
+		return Color(r, g, b);
 	} else {
-		col = Color(previous_value);
-		if (!col.Ok()) col = *wxBLACK;
+		return Color(v);
 	}
 }
 

src/util/io/reader.hpp

@@ -251,6 +251,9 @@ void Reader::handle(IndexMap<K,V>& m) {
 
 // ----------------------------------------------------------------------------- : Reflection for enumerations
 
+/// Parse a color
+Color parse_color(const String& value);
+
 /// Implement enum reflection as used by Reader
 #define REFLECT_ENUM_READER(Enum)								\
 	template<> void Reader::handle<Enum>(Enum& enum_) {			\