Store transformation of embedded SVG files in BF format

Changed files (3)

• modified libbirdfont/BirdFontFile.vala
• modified libsvgbird/Object.vala
• modified libsvgbird/SvgFile.vala

Diff

diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 11d06dd..8860e8b 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -26,7 +26,7 @@ class BirdFontFile : GLib.Object { 	Font font; 	 	public static const int FORMAT_MAJOR = 2;-	public static const int FORMAT_MINOR = 2;+	public static const int FORMAT_MINOR = 3; 	 	public static const int MIN_FORMAT_MAJOR = 0; 	public static const int MIN_FORMAT_MINOR = 0;@@ -462,8 +462,9 @@ class BirdFontFile : GLib.Object { 		if (xml.validate ()) { 			os.put_string (@"<embedded "); 			os.put_string (@"type=\"svg\" ");-			os.put_string (@"x=\"$(round (svg.x))\"");-			os.put_string (@"y=\"$(round (svg.y))\"");+			os.put_string (@"x=\"$(round (svg.x))\" ");+			os.put_string (@"y=\"$(round (svg.y))\" ");+			os.put_string (@"transform=\"$(svg.transforms.get_xml ())\""); 			os.put_string (@">\n"); 			 			Tag tag = xml.get_root_tag ();@@ -982,7 +983,7 @@ class BirdFontFile : GLib.Object { 		} 		 		font.format_major = int.parse (v[0]);-		font.format_major = int.parse (v[1]);+		font.format_minor = int.parse (v[1]); 	} 	 	public void parse_images (Tag tag) {@@ -1498,6 +1499,7 @@ class BirdFontFile : GLib.Object { 		string type = ""; 		double x = 0; 		double y = 0;+		string transform = ""; 		 		foreach (Attribute attribute in tag.get_attributes ()) { 			if (attribute.get_name () == "x") {@@ -1511,10 +1513,15 @@ class BirdFontFile : GLib.Object { 			if (attribute.get_name () == "type") { 				type = attribute.get_content (); 			}+			+			if (attribute.get_name () == "transform") {+				transform = attribute.get_content ();+			} 		} 		 		if (type == "svg") { 			EmbeddedSvg svg = SvgParser.parse_embedded_svg_data (tag.get_content ());+			svg.transforms = SvgFile.parse_transform (transform); 			svg.x = x; 			svg.y = y; 			layer.add_object (svg);diff --git a/libsvgbird/Object.vala b/libsvgbird/Object.valaindex a75379e..55dc3d9 100644--- a/libsvgbird/Object.vala+++ b/libsvgbird/Object.vala@@ -86,8 +86,6 @@ public abstract class Object : GLib.Object {  	public const double CANVAS_MAX = 100000; 	public const double CANVAS_MIN = -100000;--	Matrix boundary_matrix = Matrix.identity (); 	 	public Object () {	 	}diff --git a/libsvgbird/SvgFile.vala b/libsvgbird/SvgFile.valaindex 2d0e28b..050a5b5 100644--- a/libsvgbird/SvgFile.vala+++ b/libsvgbird/SvgFile.vala@@ -490,7 +490,7 @@ public class SvgFile : GLib.Object { 	} 	 	// FIXME: reverse order?-	public SvgTransforms parse_transform (string transforms) {+	public static SvgTransforms parse_transform (string transforms) { 		string[] functions; 		string transform = transforms; 		SvgTransforms transform_functions;@@ -535,7 +535,7 @@ public class SvgFile : GLib.Object { 		return transform_functions; 	} -	private SvgTransform matrix (string function) {+	private static SvgTransform matrix (string function) { 		string parameters = get_transform_parameters (function); 		string[] p = parameters.split (" "); 		SvgTransform transform = new SvgTransform ();@@ -588,7 +588,7 @@ public class SvgFile : GLib.Object { 		return n; 	} 	-	private SvgTransform scale (string function) {+	private static SvgTransform scale (string function) { 		string parameters = get_transform_parameters (function); 		string[] p = parameters.split (" "); 		SvgTransform transform = new SvgTransform ();@@ -605,7 +605,7 @@ public class SvgFile : GLib.Object { 		return transform; 	} 	-	private SvgTransform translate (string function) {+	private static SvgTransform translate (string function) { 		string parameters = get_transform_parameters (function); 		string[] p = parameters.split (" "); 		SvgTransform transform = new SvgTransform ();@@ -622,7 +622,7 @@ public class SvgFile : GLib.Object { 		return transform; 	} -	private string get_transform_parameters (string function) {+	private static string get_transform_parameters (string function) { 		int i; 		string param = "";