Xml encoding

Changed files (3)

• modified libbirdfont/ExportTool.vala
• modified libbirdfont/FontSettings.vala
• modified libbirdfont/SvgFontFormatWriter.vala

Diff

diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex 01975a2..c473d52 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -61,7 +61,7 @@ public class ExportTool : GLib.Object { 		string name; 		StringBuilder s; -		name = XmlParser.encode (glyph.get_name ());+		name = BirdFontFile.encode (glyph.get_name ()); 		s = new StringBuilder (); 		 		s.append ("""<?xml version="1.0" encoding="utf-8"?>diff --git a/libbirdfont/FontSettings.vala b/libbirdfont/FontSettings.valaindex b220d0e..238dcfb 100644--- a/libbirdfont/FontSettings.vala+++ b/libbirdfont/FontSettings.vala@@ -65,10 +65,10 @@ public class FontSettings : GLib.Object { 			 			foreach (var k in settings.keys) { 				sb.append ("\t<setting key=\"");-				sb.append (XmlParser.encode (k));+				sb.append (BirdFontFile.encode (k)); 				sb.append ("\" "); 				sb.append ("value=\"");-				sb.append (XmlParser.encode (settings.get (k)));+				sb.append (BirdFontFile.encode (settings.get (k))); 				sb.append ("\" />\n"); 			} 			@@ -114,11 +114,11 @@ public class FontSettings : GLib.Object { 		string v = ""; 		foreach (Attribute a in tag.get_attributes ()) { 			if (a.get_name () == "key") {-				key = XmlParser.decode (a.get_content ());+				key = BirdFontFile.decode (a.get_content ()); 			}  			if (a.get_name () == "value") {-				v = XmlParser.decode (a.get_content ());+				v = BirdFontFile.decode (a.get_content ()); 			} 		} 		diff --git a/libbirdfont/SvgFontFormatWriter.vala b/libbirdfont/SvgFontFormatWriter.valaindex 4ade2ae..58e1b98 100644--- a/libbirdfont/SvgFontFormatWriter.vala+++ b/libbirdfont/SvgFontFormatWriter.vala@@ -58,7 +58,7 @@ class SvgFontFormatWriter : Object  { 		// (metadata goes here) 		 		string font_id = font_name.replace (" ", "-");-		font_id = B.XmlParser.encode (font_id); +		font_id = BirdFontFile.encode (font_id);  		 		Glyph space = font.get_space ().get_current (); 		double space_width = space.get_width ();