Merge ../birdfont-2.x

Changed files (10)

• modified README.md
• modified birdui/Component.vala
• modified birdui/GtkWindow.vala
• modified libbirdfont/Font.vala
• modified libbirdfont/KerningDisplay.vala
• modified libbirdfont/OverViewItem.vala
• modified libbirdfont/SvgParser.vala
• modified libbirdfont/TableLayout.vala
• modified libbirdfont/Task.vala
• modified scripts/version.py

Diff

diff --git a/README.md b/README.mdindex e1ff528..580a12e 100644--- a/README.md+++ b/README.md@@ -7,8 +7,8 @@ export SVG, EOT and TTF fonts.      Author: Johan Mattsson and others see AUTHORS for full attribution.     License: GNU GPL v3-    Webpage: http://birdfont.org-    Bugtracker: http://birdfont.org/bugtracker/my_view_page.php+    Webpage: https://birdfont.org+    Bugtracker: https://birdfont.org/bugtracker/my_view_page.php  [![Build Status](https://travis-ci.org/johanmattssonm/birdfont.svg)] (https://travis-ci.org/johanmattssonm/birdfont)@@ -29,7 +29,7 @@ packages with a -dev or -devel affix:     libsqlite3-dev     libxmlbird-dev -XML Bird is available from [birdfont.org][xmlbird].+XML Bird is available from [https://birdfont.org][xmlbird].  BirdFont have two build systems, one python script that builds all binaries at once and one dependency based build system that uses@@ -63,6 +63,6 @@ Windows and Mac binaries can be downloaded from http://birdfont.org Many Linux distributions have packages of Birdfont in their repositories. There is a BSD package in OpenBSD. -[birdfont]: http://birdfont.org/images/birdfont_logo2.png "Birdfont logo"-[xmlbird]: http://birdfont.org/xmlbird.php "XML Bird – XML Parser for programs written in VALA"+[birdfont]: https://birdfont.org/images/birdfont_logo2.png "Birdfont logo"+[xmlbird]: https://birdfont.org/xmlbird.php "XML Bird – XML Parser for programs written in VALA" diff --git a/birdui/Component.vala b/birdui/Component.valaindex 76bffef..99bb7c2 100644--- a/birdui/Component.vala+++ b/birdui/Component.vala@@ -67,6 +67,11 @@ public abstract class Component : GLib.Object {  	Overflow overflow = Overflow.VISIBLE; +	public Component.empty (double width, double height) {+		this.width = width;+		this.height = height;+	}+ 	public Component.load (string file_name, double width, double height) { 		this.width = width; 		this.height = height;diff --git a/birdui/GtkWindow.vala b/birdui/GtkWindow.valaindex b27b127..1b04baa 100644--- a/birdui/GtkWindow.vala+++ b/birdui/GtkWindow.vala@@ -22,7 +22,7 @@ int main (string[] args) { 	window.set_title ("UI Bird"); 	window.destroy.connect (Gtk.main_quit); 	-	UI layout = new UI ("test.ui", 700, 200);+	UI layout = new UI.for_file ("test.ui", 700, 200); 	 	layout.print_tree (); 	diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex 78e7526..b0b5e85 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -589,7 +589,8 @@ public class Font : GLib.Object { 		 		gc = glyph_name.get (glyph_collection.get_name ()); 		if (unlikely (gc != null)) {-			warning ("glyph has already been added");+			GlyphCollection added_glyph = (!) gc;+			warning (@"glyph has already been added $(added_glyph.get_name ())"); 			return; 		} 	diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex 0f39a7a..b7c39a2 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -492,7 +492,6 @@ public class KerningDisplay : FontDisplay { 	 	public override void selected_canvas () { 		KeyBindings.set_require_modifier (true);-		MainWindow.get_help ().set_help_text (description); 	} 	 	public void add_kerning_class (int index) {diff --git a/libbirdfont/OverViewItem.vala b/libbirdfont/OverViewItem.valaindex c056375..a09c7a1 100644--- a/libbirdfont/OverViewItem.vala+++ b/libbirdfont/OverViewItem.vala@@ -93,6 +93,15 @@ public class OverViewItem : GLib.Object { 		draw_background ();	 	} +	public void clear_cache () {+		cache = null;+		+		if (glyphs != null) {+			Glyph g = ((!) glyphs).get_current ();+			g.overview_thumbnail = null;+		}+	}+ 	public void draw_glyph_from_font () { 		if (glyphs == null) { 			return;@@ -421,15 +430,6 @@ public class OverViewItem : GLib.Object { 		return glyphs != null; 	} 	-	public void clear_cache () {-		cache = null;-		-		if (glyphs != null) {-			GlyphCollection gc = (!) glyphs;-			gc.get_current ().overview_thumbnail = null;-		}-	}-	 	public void draw_label_background (Context cr) { 		Surface cache; 		bool icon;diff --git a/libbirdfont/SvgParser.vala b/libbirdfont/SvgParser.valaindex bfe70e8..e2ace23 100644--- a/libbirdfont/SvgParser.vala+++ b/libbirdfont/SvgParser.vala@@ -402,8 +402,14 @@ public class SvgParser { 		 		foreach (EditPoint ep in path.points) { 			apply_matrix_on_handle (ep.get_right_handle (), a, b, c, d, e, f);-			apply_matrix_on_handle (ep.get_left_handle (), a, b, c, d, e, f);-+			+			EditPointHandle left = ep.get_left_handle ();+			if (left.type == PointType.QUADRATIC || left.type == PointType.LINE_QUADRATIC) {+				ep.get_right_handle ().process_connected_handle ();+			} else {				+				apply_matrix_on_handle (left, a, b, c, d, e, f);+			}+			 			ep.independent_y = font.top_position - ep.independent_y; 			ep.independent_x -= glyph.left_limit; 			diff --git a/libbirdfont/TableLayout.vala b/libbirdfont/TableLayout.valaindex aa95cd8..7699725 100644--- a/libbirdfont/TableLayout.vala+++ b/libbirdfont/TableLayout.vala@@ -231,6 +231,7 @@ public class TableLayout : FontDisplay { 	} 	 	public override void selected_canvas () {+		KeyBindings.set_require_modifier (true); 		update_scrollbar (); 		GlyphCanvas.redraw (); 	}@@ -246,6 +247,10 @@ public class TableLayout : FontDisplay { 		scroll = percent * h; 		GlyphCanvas.redraw (); 	}++	public override bool needs_modifier () {+		return true;+	} }  }diff --git a/libbirdfont/Task.vala b/libbirdfont/Task.valaindex 6f63810..eaf83e4 100644--- a/libbirdfont/Task.vala+++ b/libbirdfont/Task.vala@@ -69,8 +69,6 @@ public class Task : GLib.Object { 		} 		 		task ();-		-		warning ("Task is done."); 	}  	public void* perform_task() {diff --git a/scripts/version.py b/scripts/version.pyindex db33ad9..c7d8e91 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. """ -VERSION = '2.16.4'+VERSION = '2.16.5' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR