Merge branch '2.x' of github.com:johanmattssonm/birdfont

Changed files (4)

• modified libbirdfont/Path.vala
• modified libbirdfont/SvgParser.vala
• modified scripts/release.sh
• modified scripts/version.py

Diff

diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex 11e0f1b..5cf86a3 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -2252,10 +2252,11 @@ public class Path : GLib.Object { 		if (points.size == 0) { 			return; 		}-+		 		for (int i = 0; i < points.size + 1; i++) { 			EditPoint ep = points.get (i % points.size);-			if (ep.get_right_handle ().length < t3+			if ((ep.flags & EditPoint.STROKE_OFFSET) > 0+				&& ep.get_right_handle ().length < t3 				&& ep.get_left_handle ().length < t3 				&& !is_endpoint (ep) 				&& (ep.flags & EditPoint.CURVE_KEEP) == 0diff --git a/libbirdfont/SvgParser.vala b/libbirdfont/SvgParser.valaindex e23e299..ec07102 100644--- a/libbirdfont/SvgParser.vala+++ b/libbirdfont/SvgParser.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2014 2015 Johan Mattsson+	Copyright (C) 2012 - 2016 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 @@ -1357,7 +1357,6 @@ public class SvgParser { 		ep = new EditPoint (); 		 		for (int i = 0; i < num_b; i++) {-			warning (@"$(b[i])\n"); 			if (b[i].type == '\0') { 				warning ("Parser error."); 				return path_list;diff --git a/scripts/release.sh b/scripts/release.shindex c807b6c..98032e2 100755--- a/scripts/release.sh+++ b/scripts/release.sh@@ -15,9 +15,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>.  rep="$(pwd)"+repname="$(basename $(pwd))"  mkdir -p build cd build+rm -rf export mkdir -p export cd export  @@ -51,7 +53,7 @@ else 	git clone --depth 1 -b $1 file://$rep fi -mv birdfont birdfont-$version+mv $repname birdfont-$version  rm -rf birdfont-$version/.git rm -rf birdfont-$version/.gitignorediff --git a/scripts/version.py b/scripts/version.pyindex 16cb94a..93e0e8d 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.15.3'+VERSION = '2.15.5' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR