Fix copy and paste etc.

Changed files (4)

• modified libbirdfont/ClipTool.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/SpacingTab.vala
• modified libbirdfont/SvgFontFormatWriter.vala

Diff

diff --git a/libbirdfont/ClipTool.vala b/libbirdfont/ClipTool.valaindex e89912a..3a559de 100644--- a/libbirdfont/ClipTool.vala+++ b/libbirdfont/ClipTool.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2014 2016 Johan Mattsson+	Copyright (C) 2012 2014 2016 2017 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -201,19 +201,13 @@ public class ClipTool : Tool { 				s.append (@"$(gc.get_current ().right_limit)"); 				s.append ("\n"); -				foreach (Path path in gc.get_current ().get_visible_paths ()) {-					s.append ("BF path: ");-					s.append (BirdFontFile.get_point_data (path));-					s.append ("\n");--					s.append ("BF stroke: ");-					s.append (@"$(path.stroke)");-					s.append ("\n");-					-					if (path.line_cap == LineCap.ROUND) {-						s.append ("BF cap: round\n");-					} else if (path.line_cap == LineCap.SQUARE) {-						s.append ("BF cap: square\n");+				foreach (SvgBird.Object obejct in gc.get_current ().get_visible_objects ()) {+					if (obejct is Path) {+						Path path = (Path) object;+						add_birdfont_path (s, path);+					} else if (object is EmbeddedSvg) {+						EmbeddedSvg svg = (EmbeddedSvg) object:+						add_birdfont_svg (s, svg); 					} 				} 				@@ -335,6 +329,30 @@ public class ClipTool : Tool { 		 		return s.str; 	}++	public void add_birdfont_svg (StringBuilder s, EmbeddedSvg svg) {+		s.append ("BF svg: ");+		string svg_data = svg.svg_data.replace ("\n", " ");+		svg_data = svg_data.replace ("\r", "");+		s.append (XmlParser.encode (svg_data));+		s.append ("\n");	+	}++	public void add_birdfont_path (StringBuilder s, Path path) {+		s.append ("BF path: ");+		s.append (BirdFontFile.get_point_data (path));+		s.append ("\n");++		s.append ("BF stroke: ");+		s.append (@"$(path.stroke)");+		s.append ("\n");+		+		if (path.line_cap == LineCap.ROUND) {+			s.append ("BF cap: round\n");+		} else if (path.line_cap == LineCap.SQUARE) {+			s.append ("BF cap: square\n");+		}+	} 	 	static bool all_points_selected (Path p) { 		foreach (EditPoint ep in p.points) {diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 75008ad..1f8f6b1 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -2208,7 +2208,7 @@ public class Glyph : FontDisplay {  		sd = font.get_spacing (); 		s = sd.get_all_connections (get_name ());-+		 		foreach (string l in s) { 			if (l != (!) unichar_code.to_string ()) { 				g = font.get_glyph_collection (l);diff --git a/libbirdfont/SpacingTab.vala b/libbirdfont/SpacingTab.valaindex 949d017..2613d5d 100644--- a/libbirdfont/SpacingTab.vala+++ b/libbirdfont/SpacingTab.vala@@ -250,6 +250,7 @@ public class SpacingTab : KerningDisplay { 			 			v = double.parse (submitted_value); 			text_input_glyph.left_limit -= v - text_input_glyph.get_left_side_bearing ();+			text_input_glyph.update_other_spacing_classes (); 		}); 		 		suppress_input = true;@@ -294,6 +295,7 @@ public class SpacingTab : KerningDisplay { 			 			v = double.parse (submitted_value); 			text_input_glyph.right_limit += v - text_input_glyph.get_right_side_bearing ();+			text_input_glyph.update_other_spacing_classes (); 		}); 		 		suppress_input = true;diff --git a/libbirdfont/SvgFontFormatWriter.vala b/libbirdfont/SvgFontFormatWriter.valaindex db6d6b1..e97ffac 100644--- a/libbirdfont/SvgFontFormatWriter.vala+++ b/libbirdfont/SvgFontFormatWriter.vala@@ -69,7 +69,7 @@ class SvgFontFormatWriter : GLib.Object  { 		put (@"<font-face units-per-em=\"$(to_float (units_per_em))\" ascent=\"$(to_float (ascent))\" descent=\"$(to_float (descent))\" />");  		put (@"<font-src>");-		put (@"\t<font-face-name=\"XmlParser.encode ($font_name)\">");+		put (@"\t<font-face-name=\"XmlParser.encode ($font_name)\" />"); 		put (@"</font-src>");  		// (missing-glyph goes here)