The Birdfont Source Code

--- a/libbirdfont/Path.vala +++ b/libbirdfont/Path.vala @@ -1,5 +1,5 @@ /* - Copyright (C) 2012, 2013, 2014 Johan Mattsson + Copyright (C) 2012, 2013, 2014, 2015 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 @@ -433,11 +433,9 @@ draw_edit_point_center (e, cr); } - public void draw_edit_point_handles (EditPoint e, Context cr) - requires (active_edit_point_handle_image != null && edit_point_handle_image != null) - { - ImageSurface img_right, img_left; - + public void draw_edit_point_handles (EditPoint e, Context cr) { + string color_left = "Control Point Handle"; + string color_right = "Control Point Handle"; EditPoint handle_right = e.get_right_handle ().get_point (); EditPoint handle_left = e.get_left_handle ().get_point (); @@ -445,54 +443,87 @@ if (e.type != PointType.HIDDEN) { if (e.get_right_handle ().selected) { - img_right = (!) selected_edit_point_handle_image; + color_right = "Selected Control Point Handle"; } else if (e.get_right_handle ().active) { - img_right = (!) active_edit_point_handle_image; + color_right = "Active Control Point Handle"; } else { - img_right = (!) edit_point_handle_image; + color_right = "Control Point Handle"; } if (e.get_left_handle ().selected) { - img_left = (!) selected_edit_point_handle_image; + color_left = "Selected Control Point Handle"; } else if (e.get_left_handle ().active) { - img_left = (!) active_edit_point_handle_image; + color_left = "Active Control Point Handle"; } else { - img_left = (!) edit_point_handle_image; + color_left = "Control Point Handle"; } if (!hide_end_handle || !(is_open () && e == points.get (points.size - 1))) { draw_line (handle_right, e, cr, 0.15); - draw_image (cr, img_right, e.get_right_handle ().x, e.get_right_handle ().y); + draw_control_point (cr, e.get_right_handle ().x, e.get_right_handle ().y, color_right); } if (!(is_open () && e == points.get (0))) { draw_line (handle_left, e, cr, 0.15); - draw_image (cr, img_left, e.get_left_handle ().x, e.get_left_handle ().y); + draw_control_point (cr, e.get_left_handle ().x, e.get_left_handle ().y, color_left); } } } - public static void draw_edit_point_center (EditPoint e, Context cr) - requires (active_edit_point_image != null && edit_point_image != null) - { - ImageSurface img; - + public static void draw_edit_point_center (EditPoint e, Context cr) { if (e.type != PointType.HIDDEN) { if (e.type == PointType.CUBIC || e.type == PointType.LINE_CUBIC) { if (e.is_selected ()) { - img = (e.active_point) ? (!) cubic_active_selected_edit_point_image : (!) cubic_selected_edit_point_image; + if (e.active_point) { + draw_control_point (cr, e.x, e.y, "Selected Active Cubic Control Point"); + } else { + draw_control_point (cr, e.x, e.y, "Selected Cubic Control Point"); + } } else { - img = (e.active_point) ? (!) cubic_active_edit_point_image : (!) cubic_edit_point_image; + if (e.active_point) { + draw_control_point (cr, e.x, e.y, "Active Cubic Control Point"); + } else { + draw_control_point (cr, e.x, e.y, "Cubic Control Point"); + } } } else { if (e.is_selected ()) { - img = (e.active_point) ? (!) active_selected_edit_point_image : (!) selected_edit_point_image; + if (e.active_point) { + draw_control_point (cr, e.x, e.y, "Selected Active Quadratic Control Point"); + } else { + draw_control_point (cr, e.x, e.y, "Selected Quadratic Control Point"); + } } else { - img = (e.active_point) ? (!) active_edit_point_image : (!) edit_point_image; + if (e.active_point) { + draw_control_point (cr, e.x, e.y, "Active Quadratic Control Point"); + } else { + draw_control_point (cr, e.x, e.y, "Quadratic Control Point"); + } } } - draw_image (cr, img, e.x, e.y); } + } + + static void draw_control_point (Context cr, double x, double y, string color) { + Glyph g = MainWindow.get_current_glyph (); + double ivz = 1 / g.view_zoom; + double width = size * Math.sqrt (stroke_width) * ivz; + double xc = g.allocation.width / 2.0; + double yc = g.allocation.height / 2.0; + + cr.save (); + + x = xc + x - (width / 2.0) * ivz; + y = yc - y - (width / 2.0) * ivz; + + Theme.color (cr, color); + + cr.move_to (x, y); + cr.arc (x, y, width, 0, 2 * Math.PI); + cr.close_path (); + cr.fill (); + + cr.restore (); } public static void draw_image (Context cr, ImageSurface img, double x, double y) {

--- a/libbirdfont/Theme.vala +++ b/libbirdfont/Theme.vala @@ -171,7 +171,20 @@ Theme.set_default_color ("Dialog Shadow", 0, 0, 0, 0.3); - + Theme.set_default_color ("Selected Active Cubic Control Point", 0, 0, 0, 1); + Theme.set_default_color ("Selected Cubic Control Point", 0, 0, 0, 1); + Theme.set_default_color ("Active Cubic Control Point", 160 / 255.0, 160 / 255.0, 160 / 255.0, 1); + Theme.set_default_color ("Cubic Control Point", 116 / 255.0, 116 / 255.0, 116 / 255.0, 1); + + Theme.set_default_color ("Selected Active Quadratic Control Point", 0, 0, 0, 1); + Theme.set_default_color ("Selected Quadratic Control Point", 0, 0, 0, 1); + Theme.set_default_color ("Active Quadratic Control Point", 131 / 255.0, 182 / 255.0, 255 / 255.0, 1); + Theme.set_default_color ("Quadratic Control Point", 123 / 255.0, 151 / 255.0, 184 / 255.0, 1); + + Theme.set_default_color ("Selected Control Point Handle", 0, 0, 0, 1); + Theme.set_default_color ("Active Control Point Handle", 80 / 255.0, 118 / 255.0, 64 / 255.0, 1); + Theme.set_default_color ("Control Point Handle", 56 / 255.0, 62 / 255.0, 45 / 255.0, 1); + if (BirdFont.has_argument ("--test")) { current_theme = "generated_theme.theme"; write_theme (); @@ -238,6 +251,21 @@ t_("Glyph Count Background"); t_("Dialog Shadow"); + + t_("Selected Active Cubic Control Point"); + t_("Selected Cubic Control Point"); + t_("Active Cubic Control Point"); + t_("Cubic Control Point"); + + t_("Selected Active Quadratic Control Point"); + t_("Selected Quadratic Control Point"); + t_("Active Quadratic Control Point"); + t_("Cubic Quadratic Point"); + + t_("Selected Control Point Handle"); + t_("Active Control Point Handle"); + t_("Control Point Handle"); + } }

--- a/resources/default.theme +++ b/resources/default.theme @@ -3,6 +3,7 @@ <color name="Highlighted 1" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/> <color name="Guide 1" red="0.69999999999999996" green="0.69999999999999996" blue="0.80000000000000004" alpha="1"/> <color name="Foreground 6" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/> + <color name="Active Quadratic Control Point" red="0.51372549019607838" green="0.71372549019607845" blue="1" alpha="1"/> <color name="Background 1" red="1" green="1" blue="1" alpha="1"/> <color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/> <color name="Foreground 7" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/> @@ -16,12 +17,16 @@ <color name="Background 5" red="0.29999999999999999" green="0.29999999999999999" blue="0.29999999999999999" alpha="1"/> <color name="Glyph Count Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> <color name="Background 6" red="0.8784313725490196" green="0.8784313725490196" blue="0.8784313725490196" alpha="1"/> + <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> + <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Background 7" red="0.2196078431372549" green="0.23137254901960785" blue="0.25490196078431371" alpha="1"/> + <color name="Control Point Handle" red="0.2196078431372549" green="0.24313725490196078" blue="0.17647058823529413" alpha="1"/> <color name="Background 8" red="0.21568627450980393" green="0.21568627450980393" blue="0.21568627450980393" alpha="1"/> <color name="Fill Color" red="0.5" green="0.5" blue="0.5" alpha="1"/> <color name="Background 9" red="0.28235294117647058" green="0.28235294117647058" blue="0.28235294117647058" alpha="1"/> <color name="Stroke Color" red="0" green="0" blue="0" alpha="1"/> <color name="Selected Tool Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> + <color name="Selected Control Point Handle" red="0" green="0" blue="0" alpha="1"/> <color name="Button Foreground" red="1" green="1" blue="1" alpha="1"/> <color name="Grid" red="0.20000000000000001" green="0.59999999999999998" blue="0.20000000000000001" alpha="0.20000000000000001"/> <color name="Text Area Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> @@ -38,17 +43,23 @@ <color name="Button Border 4" red="0.14901960784313725" green="0.15294117647058825" blue="0.16862745098039217" alpha="1"/> <color name="Highlighted Guide" red="0" green="0" blue="0.29999999999999999" alpha="1"/> <color name="Overview Item 1" red="0.92549019607843142" green="0.92549019607843142" blue="0.92549019607843142" alpha="1"/> + <color name="Cubic Control Point" red="0.45490196078431372" green="0.45490196078431372" blue="0.45490196078431372" alpha="1"/> + <color name="Selected Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Overview Item 2" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/> <color name="Selected Button Foreground" red="1" green="1" blue="1" alpha="1"/> <color name="Menu Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> <color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/> <color name="Tool Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> + <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> + <color name="Active Cubic Control Point" red="0.62745098039215685" green="0.62745098039215685" blue="0.62745098039215685" alpha="1"/> <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/> + <color name="Active Control Point Handle" red="0.31372549019607843" green="0.46274509803921571" blue="0.25098039215686274" alpha="1"/> <color name="Foreground 2" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> <color name="Foreground 3" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/> <color name="Overview Selected Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/> <color name="Foreground 4" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/> <color name="Foreground Inverted" red="1" green="1" blue="1" alpha="1"/> <color name="Foreground 5" red="0.27450980392156865" green="0.30196078431372547" blue="0.32549019607843138" alpha="1"/> + <color name="Quadratic Control Point" red="0.4823529411764706" green="0.59215686274509804" blue="0.72156862745098038" alpha="1"/> </theme>

--- a/resources/high_contrast.theme +++ b/resources/high_contrast.theme @@ -3,6 +3,7 @@ <color name="Highlighted 1" red="0" green="0" blue="0" alpha="1"/> <color name="Guide 1" red="0" green="0" blue="0" alpha="1"/> <color name="Foreground 6" red="0" green="0" blue="0" alpha="1"/> + <color name="Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Background 1" red="1" green="1" blue="1" alpha="1"/> <color name="Guide 2" red="0" green="0" blue="0" alpha="1"/> <color name="Foreground 7" red="1" green="1" blue="1" alpha="1"/> @@ -16,12 +17,16 @@ <color name="Background 5" red="1" green="1" blue="1" alpha="1"/> <color name="Glyph Count Background" red="1" green="1" blue="1" alpha="1"/> <color name="Background 6" red="1" green="1" blue="1" alpha="1"/> + <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> + <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Background 7" red="1" green="1" blue="1" alpha="1"/> + <color name="Control Point Handle" red="0" green="0" blue="0" alpha="1"/> <color name="Background 8" red="1" green="1" blue="1" alpha="1"/> <color name="Fill Color" red="0" green="0" blue="0" alpha="1"/> <color name="Background 9" red="1" green="1" blue="1" alpha="1"/> <color name="Stroke Color" red="0" green="0" blue="0" alpha="1"/> <color name="Selected Tool Foreground" red="1" green="1" blue="1" alpha="1"/> + <color name="Selected Control Point Handle" red="0" green="0" blue="0" alpha="1"/> <color name="Button Foreground" red="0" green="0" blue="0" alpha="1"/> <color name="Grid" red="0" green="0" blue="0" alpha="1"/> <color name="Text Area Background" red="1" green="1" blue="1" alpha="1"/> @@ -38,17 +43,23 @@ <color name="Button Border 4" red="0" green="0" blue="0" alpha="1"/> <color name="Highlighted Guide" red="0" green="0" blue="0" alpha="1"/> <color name="Overview Item 1" red="1" green="1" blue="1" alpha="1"/> + <color name="Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> + <color name="Selected Active Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Overview Item 2" red="1" green="1" blue="1" alpha="1"/> <color name="Selected Button Foreground" red="1" green="1" blue="1" alpha="1"/> <color name="Menu Foreground" red="1" green="1" blue="1" alpha="1"/> <color name="Overview Foreground" red="0" green="0" blue="0" alpha="1"/> <color name="Tool Foreground" red="0" green="0" blue="0" alpha="1"/> + <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> + <color name="Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/> + <color name="Active Control Point Handle" red="0" green="0" blue="0" alpha="1"/> <color name="Foreground 2" red="0" green="0" blue="0" alpha="1"/> <color name="Foreground 3" red="0" green="0" blue="0" alpha="1"/> <color name="Overview Selected Foreground" red="1" green="1" blue="1" alpha="1"/> <color name="Foreground 4" red="1" green="1" blue="1" alpha="1"/> <color name="Foreground Inverted" red="1" green="1" blue="1" alpha="1"/> <color name="Foreground 5" red="0" green="0" blue="0" alpha="1"/> + <color name="Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> </theme>

--- a/resources/icons.bf +++ b/resources/icons.bf @@ -734,7 +734,7 @@ </collection> <collection name="show_grid"> <selected id="1"/> - <glyph id="1" left="-28" right="28"> + <glyph id="1" left="-36" right="48"> <path stroke="0" skew="0" data="B -26.1680498357,0.4146469648 M -19.4855779357,-7.1340650352 M -32.9742664357,-7.1340650352 M -26.1680498357,0.4146469648" /> <path stroke="0" skew="0" data="B -24.5528161357,-1.1741540352 M -28.1707578357,-1.1741540352 M -28.1707578357,57.8435199648 M -24.5528161357,57.8435199648 M -24.5528161357,-1.1741540352" /> <path stroke="0" skew="0" data="B 4.3528000643,1.0928469648 M 11.0352720643,-6.4558650352 M -2.4534169357,-6.4558650352 M 4.3528000643,1.0928469648" /> @@ -944,79 +944,79 @@ <ligature sequence="i n s e r t _ g l y p h _ f r o m _ o v e r v i e w" replacement="insert_glyph_from_overview"/> <ligature sequence="h i g h _ c o n t r a s t _ b a c k g r o u n d" replacement="high_contrast_background"/> + <ligature sequence="g e n e r a t e _ h t m l _ d o c u m e n t" replacement="generate_html_document"/> <ligature sequence="s h o w _ x h e i g h t _ h e l p l i n e s" replacement="show_xheight_helplines"/> - <ligature sequence="g e n e r a t e _ h t m l _ d o c u m e n t" replacement="generate_html_document"/> - <ligature sequence="s h o w _ a l l _ l i n e _ h a n d l e s" replacement="show_all_line_handles"/> - <ligature sequence="b a c k g r o u n d _ h e l p _ l i n e s" replacement="background_help_lines"/> + <ligature sequence="z o o m _ b a c k g r o u n d _ i m a g e" replacement="zoom_background_image"/> <ligature sequence="a u t o _ t r a c e _ r e s o l u t i o n" replacement="auto_trace_resolution"/> - <ligature sequence="z o o m _ b a c k g r o u n d _ i m a g e" replacement="zoom_background_image"/> + <ligature sequence="b a c k g r o u n d _ h e l p _ l i n e s" replacement="background_help_lines"/> + <ligature sequence="s h o w _ a l l _ l i n e _ h a n d l e s" replacement="show_all_line_handles"/> <ligature sequence="a u t o _ t r a c e _ s i m p l i f y" replacement="auto_trace_simplify"/> - <ligature sequence="k e r n i n g _ t e x t _ i n p u t" replacement="kerning_text_input"/> <ligature sequence="c o n t r a s t _ t h r e s h o l d" replacement="contrast_threshold"/> - <ligature sequence="d e l e t e _ b a c k g r o u n d" replacement="delete_background"/> - <ligature sequence="n e w _ p o i n t _ o n _ p a t h" replacement="new_point_on_path"/> - <ligature sequence="i n s e r t _ b a c k g r o u n d" replacement="insert_background"/> + <ligature sequence="k e r n i n g _ t e x t _ i n p u t" replacement="kerning_text_input"/> <ligature sequence="s e l e c t _ b a c k g r o u n d" replacement="select_background"/> - <ligature sequence="s c a l e _ b a c k g r o u n d" replacement="scale_background"/> + <ligature sequence="i n s e r t _ b a c k g r o u n d" replacement="insert_background"/> + <ligature sequence="n e w _ p o i n t _ o n _ p a t h" replacement="new_point_on_path"/> + <ligature sequence="d e l e t e _ b a c k g r o u n d" replacement="delete_background"/> <ligature sequence="q u a d r a t i c _ p o i n t s" replacement="quadratic_points"/> - <ligature sequence="m o v e _ b a c k g r o u n d" replacement="move_background"/> - <ligature sequence="f l i p _ h o r i z o n t a l" replacement="flip_horizontal"/> - <ligature sequence="s h o w _ b a c k g r o u n d" replacement="show_background"/> + <ligature sequence="s c a l e _ b a c k g r o u n d" replacement="scale_background"/> <ligature sequence="z o o m _ b o u n d a r i e s" replacement="zoom_boundaries"/> - <ligature sequence="i n s e r t _ u n i c h a r" replacement="insert_unichar"/> - <ligature sequence="c u t _ b a c k g r o u n d" replacement="cut_background"/> - <ligature sequence="u p d a t e _ w e b v i e w" replacement="update_webview"/> + <ligature sequence="s h o w _ b a c k g r o u n d" replacement="show_background"/> + <ligature sequence="f l i p _ h o r i z o n t a l" replacement="flip_horizontal"/> + <ligature sequence="m o v e _ b a c k g r o u n d" replacement="move_background"/> <ligature sequence="f i l l _ o p e n _ p a t h" replacement="fill_open_path"/> - <ligature sequence="d r o p d o w n _ m e n u" replacement="dropdown_menu"/> - <ligature sequence="f l i p _ v e r t i c a l" replacement="flip_vertical"/> - <ligature sequence="d e l e t e _ b u t t o n" replacement="delete_button"/> - <ligature sequence="c o n v e r t _ p o i n t" replacement="convert_point"/> - <ligature sequence="d o u b l e _ p o i n t s" replacement="double_points"/> - <ligature sequence="k e r n i n g _ c l a s s" replacement="kerning_class"/> + <ligature sequence="u p d a t e _ w e b v i e w" replacement="update_webview"/> + <ligature sequence="c u t _ b a c k g r o u n d" replacement="cut_background"/> + <ligature sequence="i n s e r t _ u n i c h a r" replacement="insert_unichar"/> <ligature sequence="a d d _ n e w _ t h e m e" replacement="add_new_theme"/> + <ligature sequence="k e r n i n g _ c l a s s" replacement="kerning_class"/> + <ligature sequence="d o u b l e _ p o i n t s" replacement="double_points"/> + <ligature sequence="c o n v e r t _ p o i n t" replacement="convert_point"/> + <ligature sequence="d e l e t e _ b u t t o n" replacement="delete_button"/> + <ligature sequence="f l i p _ v e r t i c a l" replacement="flip_vertical"/> + <ligature sequence="d r o p d o w n _ m e n u" replacement="dropdown_menu"/> + <ligature sequence="e x p o r t _ f o n t s" replacement="export_fonts"/> + <ligature sequence="r e v e r s e _ p a t h" replacement="reverse_path"/> + <ligature sequence="c u b i c _ p o i n t s" replacement="cubic_points"/> + <ligature sequence="x _ c o o r d i n a t e" replacement="x_coordinate"/> <ligature sequence="y _ c o o r d i n a t e" replacement="y_coordinate"/> - <ligature sequence="x _ c o o r d i n a t e" replacement="x_coordinate"/> - <ligature sequence="c u b i c _ p o i n t s" replacement="cubic_points"/> - <ligature sequence="r e v e r s e _ p a t h" replacement="reverse_path"/> - <ligature sequence="e x p o r t _ f o n t s" replacement="export_fonts"/> + <ligature sequence="m o v e _ c a n v a s" replacement="move_canvas"/> + <ligature sequence="s p i n _ b u t t o n" replacement="spin_button"/> + <ligature sequence="c r e a t e _ l i n e" replacement="create_line"/> + <ligature sequence="b e z i e r _ l i n e" replacement="bezier_line"/> <ligature sequence="r i g h t _ a r r o w" replacement="right_arrow"/> - <ligature sequence="b e z i e r _ l i n e" replacement="bezier_line"/> - <ligature sequence="c r e a t e _ l i n e" replacement="create_line"/> - <ligature sequence="s p i n _ b u t t o n" replacement="spin_button"/> - <ligature sequence="m o v e _ c a n v a s" replacement="move_canvas"/> + <ligature sequence="f u l l _ g l y p h" replacement="full_glyph"/> + <ligature sequence="p o i n t _ t o o l" replacement="point_tool"/> + <ligature sequence="s e l e c t _ a l l" replacement="select_all"/> + <ligature sequence="m o v e _ l a y e r" replacement="move_layer"/> + <ligature sequence="h e l p _ l i n e s" replacement="help_lines"/> <ligature sequence="l e f t _ a r r o w" replacement="left_arrow"/> - <ligature sequence="h e l p _ l i n e s" replacement="help_lines"/> - <ligature sequence="m o v e _ l a y e r" replacement="move_layer"/> - <ligature sequence="s e l e c t _ a l l" replacement="select_all"/> - <ligature sequence="p o i n t _ t o o l" replacement="point_tool"/> - <ligature sequence="f u l l _ g l y p h" replacement="full_glyph"/> + <ligature sequence="m e n u _ i c o n" replacement="menu_icon"/> + <ligature sequence="t t f _ u n i t s" replacement="ttf_units"/> + <ligature sequence="r e c t a n g l e" replacement="rectangle"/> + <ligature sequence="z o o m _ t o o l" replacement="zoom_tool"/> + <ligature sequence="f o r e s i g h t" replacement="foresight"/> + <ligature sequence="s y m m e t r i c" replacement="symmetric"/> + <ligature sequence="t i e _ p o i n t" replacement="tie_point"/> + <ligature sequence="u n d o _ t o o l" replacement="undo_tool"/> + <ligature sequence="a u t o t r a c e" replacement="autotrace"/> + <ligature sequence="s h o w _ g r i d" replacement="show_grid"/> <ligature sequence="i n f o _ i c o n" replacement="info_icon"/> - <ligature sequence="s h o w _ g r i d" replacement="show_grid"/> - <ligature sequence="a u t o t r a c e" replacement="autotrace"/> - <ligature sequence="u n d o _ t o o l" replacement="undo_tool"/> - <ligature sequence="t i e _ p o i n t" replacement="tie_point"/> - <ligature sequence="s y m m e t r i c" replacement="symmetric"/> - <ligature sequence="f o r e s i g h t" replacement="foresight"/> - <ligature sequence="z o o m _ t o o l" replacement="zoom_tool"/> - <ligature sequence="r e c t a n g l e" replacement="rectangle"/> - <ligature sequence="t t f _ u n i t s" replacement="ttf_units"/> - <ligature sequence="m e n u _ i c o n" replacement="menu_icon"/> + <ligature sequence="p r o g r e s s" replacement="progress"/> + <ligature sequence="z o o m _ 1 _ 1" replacement="zoom_1_1"/> + <ligature sequence="p e n _ t o o l" replacement="pen_tool"/> + <ligature sequence="r o t a t i o n" replacement="rotation"/> <ligature sequence="z o o m _ o u t" replacement="zoom_out"/> - <ligature sequence="r o t a t i o n" replacement="rotation"/> - <ligature sequence="p e n _ t o o l" replacement="pen_tool"/> - <ligature sequence="z o o m _ 1 _ 1" replacement="zoom_1_1"/> - <ligature sequence="p r o g r e s s" replacement="progress"/> <ligature sequence="z o o m _ i n" replacement="zoom_in"/> + <ligature sequence="c i r c l e" replacement="circle"/> + <ligature sequence="r e s i z e" replacement="resize"/> <ligature sequence="h e i g h t" replacement="height"/> - <ligature sequence="r e s i z e" replacement="resize"/> - <ligature sequence="c i r c l e" replacement="circle"/> + <ligature sequence="t r a c k" replacement="track"/> + <ligature sequence="w i d t h" replacement="width"/> <ligature sequence="t h e m e" replacement="theme"/> - <ligature sequence="w i d t h" replacement="width"/> - <ligature sequence="t r a c k" replacement="track"/> + <ligature sequence="n e x t" replacement="next"/> + <ligature sequence="p r e v" replacement="prev"/> + <ligature sequence="m o v e" replacement="move"/> <ligature sequence="s k e w" replacement="skew"/> - <ligature sequence="m o v e" replacement="move"/> - <ligature sequence="p r e v" replacement="prev"/> - <ligature sequence="n e x t" replacement="next"/> </font>