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

doc/type/tagged_string.txt

@@ -15,10 +15,12 @@ This is written as the character with code 1 in files.
 | @"<b>"@		The text inside the tag is bold.
 | @"<i>"@		The text inside the tag is italic.
 | @"<sym>"@		The text inside the tag is rendered as symbols, if a [[prop:style:symbol font]] is set for the text box.
+| @"<color:???>"@	The text inside the tag is rendered with the given [[type:color]].
+| @"<size:???>"@	The text inside the tag is scaled by the a factor, for example @"<size:2>text</size>"@ makes the text twice as large.
 | @"<line>"@		Line breaks inside this tag use the [[prop:style:line height line]], and they show a horizontal line.
 | @"<soft-line>"@	Line breaks inside this tag use the [[prop:style:soft line height]].
 | @"<atom>"@		An atomic piece of text. The cursor can never be inside it; it is selected as a whole.
-			The program automatically inserts <atom-soft>
+			The program automatically inserts @"<atom-soft>"@.
 | @"<code>"@		The text inside the text is rendered in a monospace font. This is used for syntax highlighting script code.
 | @"<code-kw>"@		The text inside the text is highlighted as a keyword in source code.
 | @"<code-str>"@	The text inside the text is highlighted as a string in source code.

src/data/font.cpp

@@ -48,7 +48,7 @@ void Font::initDependencies(Context& ctx, const Dependency& dep) const {
 	shadow_color.initDependencies(ctx, dep);
 }
 
-FontP Font::make(int add_flags, Color* other_color) const {
+FontP Font::make(int add_flags, Color* other_color, double* other_size) const {
 	FontP f(new Font(*this));
 	f->flags |= add_flags;
 	if (add_flags & FONT_CODE_STRING) {
@@ -68,6 +68,9 @@ FontP Font::make(int add_flags, Color* other_color) const {
 	if (other_color) {
 		f->color = *other_color;
 	}
+	if (other_size) {
+		f->size = *other_size;
+	}
 	return f;
 }
 

src/data/font.hpp

@@ -58,8 +58,8 @@ class Font : public IntrusivePtrBase<Font> {
 		return shadow_displacement.width != 0 || shadow_displacement.height != 0;
 	}
 	
-	/// Add style to a font, and optionally change the color
+	/// Add style to a font, and optionally change the color and size
-	FontP make(int add_flags, Color* other_color) const;
+	FontP make(int add_flags, Color* other_color, double* other_size) const;
 	
 	/// Convert this font to a wxFont
 	wxFont toWxFont(double scale) const;

src/render/symbol/filter.cpp

@@ -20,12 +20,16 @@ template <> void GetDefaultMember::handle(const AColor& col) {
 }
 template <> void Reader::handle(AColor& col) {
 	UInt r,g,b,a;
-	if (wxSscanf(getValue().c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
+	String v = getValue();
+	if (wxSscanf(v.c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
 		col.Set(r,g,b);
 		col.alpha = 255;
-	} else if (wxSscanf(getValue().c_str(),_("rgba(%u,%u,%u,%u)"),&r,&g,&b,&a)) {
+	} else if (wxSscanf(v.c_str(),_("rgba(%u,%u,%u,%u)"),&r,&g,&b,&a)) {
 		col.Set(r,g,b);
 		col.alpha = a;
+	} else {
+		col = Color(v);
+		if (!col.Ok()) col = *wxBLACK;
 	}
 }
 template <> void Writer::handle(const AColor& col) {

src/render/text/element.cpp

@@ -76,6 +76,8 @@ struct TextElementsFromString {
 	int soft, kwpph, param, line, soft_line;
 	int code, code_kw, code_string, param_ref, error;
 	int param_id;
+	vector<Color>  colors;
+	vector<double> sizes;
 	/// put angle brackets around the text?
 	bool bracket;
 	
@@ -121,6 +123,27 @@ struct TextElementsFromString {
 				else if (is_substr(text, tag_start, _("</code-str")))   code_string -= 1;
 				else if (is_substr(text, tag_start, _( "<code")))       code        += 1;
 				else if (is_substr(text, tag_start, _("</code")))       code        -= 1;
+				else if (is_substr(text, tag_start, _( "<color"))) {
+					size_t colon = text.find_first_of(_(">:"), tag_start);
+					if (colon < pos - 1 && text.GetChar(colon) == _(':')) {
+						Color c = parse_color(text.substr(colon+1, pos-colon-2));
+						if (!c.Ok()) c = style.font.color;
+						colors.push_back(c);
+					}
+				} else if (is_substr(text, tag_start, _("</color"))) {
+					if (!colors.empty()) colors.pop_back();
+				}
+				else if (is_substr(text, tag_start, _( "<size"))) {
+					size_t colon = text.find_first_of(_(">:"), tag_start);
+					if (colon < pos - 1 && text.GetChar(colon) == _(':')) {
+						double size = style.font.size;
+						String v = text.substr(colon+1, pos-colon-2);
+						v.ToDouble(&size);
+						sizes.push_back(size);
+					}
+				} else if (is_substr(text, tag_start, _("</size"))) {
+					if (!sizes.empty()) sizes.pop_back();
+				}
 				else if (is_substr(text, tag_start, _( "<ref-param"))) {
 					// determine the param being referenced
 					// from a tag <ref-param123>
@@ -222,7 +245,11 @@ struct TextElementsFromString {
 			(code_string > 0 ? FONT_CODE_STRING : FONT_NORMAL),
 			param > 0 || param_ref > 0
 				? &param_colors[(param_id++) % param_colors_count]
-				: nullptr);
+			: !colors.empty()
+				? &colors.back()
+				: nullptr,
+			!sizes.empty() ? &sizes.back() : nullptr
+			);
 	}
 };
 

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)) {
+	if (wxSscanf(v.c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
-		col.Set(r, g, b);
+		return Color(r, g, b);
 	} else {
-		col = Color(previous_value);
+		return Color(v);
-		if (!col.Ok()) col = *wxBLACK;
 	}
 }
 

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_) {			\