The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Merge ../birdfont-2.x

These changes was commited to the Birdfont repository Thu, 30 Jun 2016 09:39:26 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 30 Jun 2016 09:39:26 +0000 (11:39 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 30 Jun 2016 09:44:02 +0000 (11:44 +0200)
commit 3124d9c71848c473af41df2bbe70a764f614aaef
tree 4f3212e189a057a41d95c5696c86c3bb1bb9a39c
parent c509638f16ff4fdfa38f465fce7ae78e1ea6e1e4
parent 7cf7f71345e7ef292a8ebd4d916b8502e17436e4
Merge ../birdfont-2.x

README.md
birdui/Component.vala
birdui/GtkWindow.vala
libbirdfont/Font.vala
libbirdfont/KerningDisplay.vala
libbirdfont/OverViewItem.vala
libbirdfont/SvgParser.vala
libbirdfont/TableLayout.vala
libbirdfont/Task.vala
scripts/version.py
--- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ 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 @@ 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,7 +63,7 @@ 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"
--- a/birdui/Component.vala +++ b/birdui/Component.vala @@ -66,6 +66,11 @@ public string? id = null; 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;
--- a/birdui/GtkWindow.vala +++ b/birdui/GtkWindow.vala @@ -22,7 +22,7 @@ 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 ();
--- a/libbirdfont/Font.vala +++ b/libbirdfont/Font.vala @@ -589,7 +589,8 @@ 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; }
--- a/libbirdfont/KerningDisplay.vala +++ b/libbirdfont/KerningDisplay.vala @@ -492,7 +492,6 @@ public override void selected_canvas () { KeyBindings.set_require_modifier (true); - MainWindow.get_help ().set_help_text (description); } public void add_kerning_class (int index) {
--- a/libbirdfont/OverViewItem.vala +++ b/libbirdfont/OverViewItem.vala @@ -91,6 +91,15 @@ } 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 () { @@ -419,15 +428,6 @@ bool has_menu () { 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) {
--- a/libbirdfont/SvgParser.vala +++ b/libbirdfont/SvgParser.vala @@ -402,8 +402,14 @@ 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;
--- a/libbirdfont/TableLayout.vala +++ b/libbirdfont/TableLayout.vala @@ -231,6 +231,7 @@ } public override void selected_canvas () { + KeyBindings.set_require_modifier (true); update_scrollbar (); GlyphCanvas.redraw (); } @@ -245,8 +246,12 @@ double h = content_height - allocation.height; scroll = percent * h; GlyphCanvas.redraw (); + } + + public override bool needs_modifier () { + return true; } } }
--- a/libbirdfont/Task.vala +++ b/libbirdfont/Task.vala @@ -69,8 +69,6 @@ } task (); - - warning ("Task is done."); } public void* perform_task() {
--- a/scripts/version.py +++ b/scripts/version.py @@ -13,7 +13,7 @@ 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