Add gsk_path_get_previous/next_point

These functions let you iterate over the 'significant'
points of a path.

.gitlab-ci/test-msvc.bat

@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 
 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson~=0.64 || goto :error
-meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
+meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

LOG

@@ -0,0 +1,150 @@
+TAP version 13
+# random seed: R02S22611f6aefc1121b0ab2dc5286960449
+# GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dconf (DConfSettingsBackend) for ‘gsettings-backend’
+# GLib-GIO-DEBUG: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
+# GLib-GIO-DEBUG: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
+1..1
+# Start of ops tests
+# testcase 0 op 0
+collecting# 
+    Cubic 0: # M 100.000000 100.000000 C 150.000000 100.000000 200.000000 100.000000 250.000000 100.000000 
+    Cubic 1: # M 250.000000 100.000000 C 300.000000 100.000000 350.000000 100.000000 400.000000 100.000000 
+    Line 2: # M 400 100 L 200 300 
+    Line 3: # M 200 300 L 100 100 
+    Cubic 4: # M 200.000000 100.000000 C 250.000000 100.000000 300.000000 100.000000 350.000000 100.000000 
+    Cubic 5: # M 350.000000 100.000000 C 400.000000 100.000000 450.000000 100.000000 500.000000 100.000000 
+    Line 6: # M 500 100 L 300 300 
+    Line 7: # M 300 300 L 200 100 
+splitting# 
+1 intersections between Cubic 0 and Cubic 1# 
+1 intersections between Cubic 0 and Line 3# 
+9 intersections between Cubic 0 and Cubic 4# 
+# split Cubic 0.0 from Cubic 0 at 0.666666: M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000
+split Cubic 0.1 from Cubic 0 at 0.666666: M 199.999893 100.000000 C 216.666595 100.000000 233.333298 100.000000 250.000000 100.000000split Cubic 0.4 from Cubic 0 at 0.00600814: M 200.300323 100.000000 C 216.866882 100.000000 233.433441 100.000000 250.000000 100.000000split Cubic 0.7 from Cubic 0 at 0.00604445: M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000# split Cubic 4.9 from Cubic 4 at 0.00533867: M 200.800812 100.000000 C 250.533875 100.000000 300.266937 100.000000 350.000000 100.000000
+1 intersections between Cubic 0.1 and Line 7# 
+1 intersections between Cubic 1 and Line 2# 
+9 intersections between Cubic 1 and Cubic 4.9# 
+split Cubic 1.9 from Cubic 1 at 0.00534248: M 250.801361 100.000000 C 300.534241 100.000000 350.267120 100.000000 400.000000 100.000000# split Cubic 4.9.0 from Cubic 4.9 at 0.329756: M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000
+# split Cubic 4.9.1 from Cubic 4.9 at 0.329756: M 250.000122 100.000000 C 283.333435 100.000000 316.666718 100.000000 350.000000 100.000000
+# split Cubic 4.9.6 from Cubic 4.9 at 0.00500283: M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000
+9 intersections between Cubic 1.9 and Cubic 5# 
+# split Cubic 1.9.0 from Cubic 1.9 at 0.664877: M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000
+split Cubic 1.9.1 from Cubic 1.9 at 0.664877: M 350.000122 100.000000 C 366.666748 100.000000 383.333374 100.000000 400.000000 100.000000split Cubic 1.9.4 from Cubic 1.9 at 0.00601021: M 350.300598 100.000000 C 366.867065 100.000000 383.433533 100.000000 400.000000 100.000000split Cubic 1.9.7 from Cubic 1.9 at 0.00604655: M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000# split Cubic 5.9 from Cubic 5 at 0.00534248: M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000
+1 intersections between Line 2 and Line 3# 
+1 intersections between Line 2 and Line 7# 
+# split Line 2.0 from Line 2 at 0.666667: M 400 100 L 266.667 233.333
+split Line 2.1 from Line 2 at 0.666667: M 266.667 233.333 L 200 300# split Line 7.0 from Line 7 at 0.333333: M 300 300 L 266.667 233.333
+# split Line 7.1 from Line 7 at 0.333333: M 266.667 233.333 L 200 100
+1 intersections between Cubic 4 and Cubic 4.9.0# 
+1 intersections between Cubic 4 and Line 7.1# 
+1 intersections between Cubic 4.9.0 and Cubic 4.9.1# 
+1 intersections between Cubic 4.9.1 and Cubic 4.9.6# 
+1 intersections between Cubic 4.9.6 and Cubic 5# 
+1 intersections between Cubic 5 and Cubic 5.9# 
+1 intersections between Cubic 5.9 and Line 6# 
+1 intersections between Line 6 and Line 7.0# 
+    Cubic 0.0: # M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000 
+    Cubic 0.1: # M 199.999893 100.000000 C 200.100037 100.000000 200.200180 100.000000 200.300323 100.000000 
+    Cubic 0.4: # M 200.300323 100.000000 C 200.400452 100.000000 200.500580 100.000000 200.600708 100.000000 
+    Cubic 0.7: # M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000 
+    Cubic 1: # M 250.000000 100.000000 C 250.267120 100.000000 250.534241 100.000000 250.801361 100.000000 
+    Cubic 1.9.0: # M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000 
+    Cubic 1.9.1: # M 350.000122 100.000000 C 350.100281 100.000000 350.200439 100.000000 350.300598 100.000000 
+    Cubic 1.9.4: # M 350.300598 100.000000 C 350.400757 100.000000 350.500916 100.000000 350.601074 100.000000 
+    Cubic 1.9.7: # M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000 
+    Line 2.0: # M 400 100 L 266.667 233.333 
+    Line 2.1: # M 266.667 233.333 L 200 300 
+    Line 3: # M 200 300 L 100 100 
+    Cubic 4: # M 200.000000 100.000000 C 200.266937 100.000000 200.533875 100.000000 200.800812 100.000000 
+    Cubic 4.9.0: # M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000 
+    Cubic 4.9.1: # M 250.000122 100.000000 C 250.166885 100.000000 250.333649 100.000000 250.500412 100.000000 
+    Cubic 4.9.6: # M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000 
+    Cubic 5: # M 350.000000 100.000000 C 350.267120 100.000000 350.534241 100.000000 350.801361 100.000000 
+    Cubic 5.9: # M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000 
+    Line 6: # M 500 100 L 300 300 
+    Line 7.0: # M 300 300 L 266.667 233.333 
+    Line 7.1: # M 266.667 233.333 L 200 100 
+classifying# 
+ 01 Cubic 0.0: # M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000 
+[11 Cubic 0.7: # M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000 ]
+[11 Cubic 1.9.0: # M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000 ]
+[11 Cubic 1.9.7: # M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000 ]
+[11 Line 2.0: # M 400 100 L 266.667 233.333 ]
+ 01 Line 2.1: # M 266.667 233.333 L 200 300 
+ 01 Line 3: # M 200 300 L 100 100 
+[11 Cubic 4: # M 200.000000 100.000000 C 200.266937 100.000000 200.533875 100.000000 200.800812 100.000000 ]
+[11 Cubic 4.9.0: # M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000 ]
+[11 Cubic 4.9.6: # M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000 ]
+[11 Cubic 5: # M 350.000000 100.000000 C 350.267120 100.000000 350.534241 100.000000 350.801361 100.000000 ]
+ 01 Cubic 5.9: # M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000 
+ 01 Line 6: # M 500 100 L 300 300 
+ 01 Line 7.0: # M 300 300 L 266.667 233.333 
+[11 Line 7.1: # M 266.667 233.333 L 200 100 ]
+fixups# 
+# found 3 bad nodes
+# split Cubic 0/Cubic 4 BAD 200.600723 100.000000
+# 	[11 Line 7.1 ] 116.565
+# 	[11 Cubic 0.7 ] 180
+# 	[11 Cubic 4 ] 180
+# 	[11 Cubic 4 ] 180
+# 	[11 Cubic 4.9.0 ] 180
+# 	>01 Cubic 0.0  360
+# split Cubic 1/Cubic 4.9 BAD 250.801376 100.000000
+# 	[11 Cubic 1.9.0 ] 180
+# 	[11 Cubic 4.9.6 ] 180
+# 	[11 Cubic 0.7 ] 360
+# 	[11 Cubic 4.9.0 ] 360
+# split Cubic 1.9/Cubic 5 BAD 350.601105 100.000000
+# 	[11 Cubic 1.9.7 ] 180
+# 	[11 Cubic 5 ] 180
+# 	[11 Cubic 5 ] 180
+# 	<01 Cubic 5.9  180
+# 	[11 Cubic 1.9.0 ] 360
+# 	[11 Cubic 4.9.6 ] 360
+reassembling# 
+start new contour Cubic 0.0# 
+# Cubic 0.0 ends at: 
+# start 0 100.000000 100.000000
+# 	>01 Line 3  116.565
+# 	(10 Cubic 0.0 ) 180
+picking cw# 
+append Line 3# 
+# Line 3 ends at: 
+# end 2 200.000000 300.000000
+# 	>01 Line 2.1  225
+# 	(10 Line 3 ) 296.565
+picking cw# 
+append Line 2.1# 
+# Line 2.1 ends at: 
+# split Line 2/Line 7 266.666656 233.333344
+# 	(10 Line 2.1 ) 45
+# 	>01 Line 7.0  116.565
+# 	[11 Line 2.0 ] 225
+# 	[11 Line 7.1 ] 296.565
+picking cw# 
+append Line 7.0# 
+# Line 7.0 ends at: 
+# end 6 300.000000 300.000000
+# 	>01 Line 6  225
+# 	(10 Line 7.0 ) 296.565
+picking cw# 
+append Line 6# 
+# Line 6 ends at: 
+# end 5 500.000000 100.000000
+# 	(10 Line 6 ) 45
+# 	>01 Cubic 5.9  360
+picking cw# 
+append Cubic 5.9# 
+# Cubic 5.9 ends at: 
+# split Cubic 1.9/Cubic 5 BAD 350.601105 100.000000
+# 	[11 Cubic 1.9.7 ] 180
+# 	[11 Cubic 5 ] 180
+# 	[11 Cubic 5 ] 180
+# 	(10 Cubic 5.9 ) 180
+# 	[11 Cubic 1.9.0 ] 360
+# 	[11 Cubic 4.9.6 ] 360
+picking cw# 
+**
+ERROR:../testsuite/gsk/path-ops.c:359:test_ops_simple: assertion failed (s == tests[i].out): ("M 354.60110473632812 100 A 4 4 0 0 0 346.60110473632812 100 A 4 4 0 0 0 354.60110473632812 100 z M 252.80137634277344 100 A 2 2 0 0 0 248.80137634277344 100 A 2 2 0 0 0 252.80137634277344 100 z M 204.60072326660156 100 A 4 4 0 0 0 196.60072326660156 100 A 4 4 0 0 0 204.60072326660156 100 z" == "M 100 100 z")
+not ok /ops/simple - ERROR:../testsuite/gsk/path-ops.c:359:test_ops_simple: assertion failed (s == tests[i].out): ("M 354.60110473632812 100 A 4 4 0 0 0 346.60110473632812 100 A 4 4 0 0 0 354.60110473632812 100 z M 252.80137634277344 100 A 2 2 0 0 0 248.80137634277344 100 A 2 2 0 0 0 252.80137634277344 100 z M 204.60072326660156 100 A 4 4 0 0 0 196.60072326660156 100 A 4 4 0 0 0 204.60072326660156 100 z" == "M 100 100 z")
+Bail out!

demos/gtk-demo/demo.gresource.xml

@@ -336,7 +336,7 @@
     <file>panes.c</file>
     <file>password_entry.c</file>
     <file>path_fill.c</file>
-    <file>path_walk.c</file>
+    <file>path_text.c</file>
     <file>peg_solitaire.c</file>
     <file>pickers.c</file>
     <file>printing.c</file>
@@ -422,9 +422,8 @@
   <gresource prefix="/fontrendering">
     <file>fontrendering.ui</file>
   </gresource>
-  <gresource prefix="/path_walk">
-    <file>path_walk.ui</file>
-    <file compressed="true">path_world.txt</file>
+  <gresource prefix="/path_text">
+    <file>path_text.ui</file>
   </gresource>
   <gresource prefix="/org/gtk/Demo4">
     <file>icons/16x16/actions/application-exit.png</file>

demos/gtk-demo/meson.build

@@ -73,7 +73,7 @@ demos = files([
   'panes.c',
   'password_entry.c',
   'path_fill.c',
-  'path_walk.c',
+  'path_text.c',
   'peg_solitaire.c',
   'pickers.c',
   'printing.c',

demos/gtk-demo/path_text.c

@@ -0,0 +1,604 @@
+/* Path/Text
+ *
+ * This demo shows how to use GskPath to animate a path along another path.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#define GTK_TYPE_PATH_WIDGET (gtk_path_widget_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathWidget, gtk_path_widget, GTK, PATH_WIDGET, GtkWidget)
+
+#define POINT_SIZE 8
+
+enum {
+  PROP_0,
+  PROP_TEXT,
+  PROP_EDITABLE,
+  N_PROPS
+};
+
+struct _GtkPathWidget
+{
+  GtkWidget parent_instance;
+
+  char *text;
+  gboolean editable;
+
+  graphene_point_t points[4];
+
+  guint active_point;
+  float line_closest;
+
+  GskPath *line_path;
+  GskPathMeasure *line_measure;
+  GskPath *text_path;
+
+  GdkPaintable *background;
+};
+
+struct _GtkPathWidgetClass
+{
+  GtkWidgetClass parent_class;
+};
+
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+G_DEFINE_TYPE (GtkPathWidget, gtk_path_widget, GTK_TYPE_WIDGET)
+
+static GskPath *
+create_path_from_text (GtkWidget  *widget,
+                       const char *text,
+                       graphene_point_t *out_offset)
+{
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPathBuilder *builder;
+  GskPath *result;
+
+  layout = gtk_widget_create_pango_layout (widget, text);
+  desc = pango_font_description_from_string ("sans bold 36");
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_add_layout (builder, layout);
+  result = gsk_path_builder_free_to_path (builder);
+
+  if (out_offset)
+    graphene_point_init (out_offset, 0, - pango_layout_get_baseline (layout) / (double) PANGO_SCALE);
+  g_object_unref (layout);
+
+  return result;
+}
+
+typedef struct
+{
+  GskPathMeasure *measure;
+  GskPathBuilder *builder;
+  graphene_point_t offset;
+  double scale;
+} GtkPathTransform;
+
+static void
+gtk_path_transform_point (GskPathMeasure         *measure,
+                          const graphene_point_t *pt,
+                          const graphene_point_t *offset,
+                          float                   scale,
+                          graphene_point_t       *res)
+{
+  graphene_vec2_t tangent;
+  GskPathPoint point;
+
+  if (gsk_path_measure_get_point (measure, (pt->x + offset->x) * scale, &point))
+    {
+      GskPath *path = gsk_path_measure_get_path (measure);
+
+      gsk_path_point_get_position (path, &point, res);
+      gsk_path_point_get_tangent (path, &point, GSK_PATH_END, &tangent);
+
+      res->x -= (pt->y + offset->y) * scale * graphene_vec2_get_y (&tangent);
+      res->y += (pt->y + offset->y) * scale * graphene_vec2_get_x (&tangent);
+    }
+}
+
+static gboolean
+gtk_path_transform_op (GskPathOperation        op,
+                       const graphene_point_t *pts,
+                       gsize                   n_pts,
+                       gpointer                data)
+{
+  GtkPathTransform *transform = data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      {
+        graphene_point_t res;
+        gtk_path_transform_point (transform->measure, &pts[0], &transform->offset, transform->scale, &res);
+        gsk_path_builder_move_to (transform->builder, res.x, res.y);
+      }
+      break;
+
+    case GSK_PATH_LINE:
+      {
+        graphene_point_t res;
+        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res);
+        gsk_path_builder_line_to (transform->builder, res.x, res.y);
+      }
+      break;
+
+    case GSK_PATH_QUAD:
+      {
+        graphene_point_t res[2];
+        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
+        gsk_path_builder_quad_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y);
+      }
+      break;
+
+    case GSK_PATH_CUBIC:
+      {
+        graphene_point_t res[3];
+        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
+        gtk_path_transform_point (transform->measure, &pts[3], &transform->offset, transform->scale, &res[2]);
+        gsk_path_builder_cubic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, res[2].x, res[2].y);
+      }
+      break;
+
+    case GSK_PATH_CLOSE:
+      gsk_path_builder_close (transform->builder);
+      break;
+
+    default:
+      g_assert_not_reached();
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GskPath *
+gtk_path_transform (GskPathMeasure         *measure,
+                    GskPath                *path,
+                    const graphene_point_t *offset)
+{
+  GtkPathTransform transform = { measure, gsk_path_builder_new (), *offset };
+  graphene_rect_t bounds;
+
+  gsk_path_get_bounds (path, &bounds);
+  if (bounds.origin.x + bounds.size.width > 0)
+    transform.scale = gsk_path_measure_get_length (measure) / (bounds.origin.x + bounds.size.width);
+  else
+    transform.scale = 1.0f;
+
+  gsk_path_foreach (path, -1, gtk_path_transform_op, &transform);
+
+  return gsk_path_builder_free_to_path (transform.builder);
+}
+
+static void
+gtk_path_widget_clear_text_path (GtkPathWidget *self)
+{
+  g_clear_pointer (&self->text_path, gsk_path_unref);
+}
+
+static void
+gtk_path_widget_clear_paths (GtkPathWidget *self)
+{
+  gtk_path_widget_clear_text_path (self);
+
+  g_clear_pointer (&self->line_path, gsk_path_unref);
+  g_clear_pointer (&self->line_measure, gsk_path_measure_unref);
+}
+
+static void
+gtk_path_widget_create_text_path (GtkPathWidget *self)
+{
+  GskPath *path;
+  graphene_point_t offset;
+
+  gtk_path_widget_clear_text_path (self);
+
+  if (self->line_measure == NULL)
+    return;
+
+  path = create_path_from_text (GTK_WIDGET (self), self->text, &offset);
+  self->text_path = gtk_path_transform (self->line_measure, path, &offset);
+
+  gsk_path_unref (path);
+}
+
+static void
+gtk_path_widget_create_paths (GtkPathWidget *self)
+{
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  GskPathBuilder *builder;
+
+  gtk_path_widget_clear_paths (self);
+
+  if (width <= 0 || height <= 0)
+    return;
+
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_move_to (builder,
+                            self->points[0].x * width, self->points[0].y * height);
+  gsk_path_builder_cubic_to (builder,
+                             self->points[1].x * width, self->points[1].y * height,
+                             self->points[2].x * width, self->points[2].y * height,
+                             self->points[3].x * width, self->points[3].y * height);
+  self->line_path = gsk_path_builder_free_to_path (builder);
+
+  self->line_measure = gsk_path_measure_new (self->line_path);
+
+  gtk_path_widget_create_text_path (self);
+}
+
+static void
+gtk_path_widget_allocate (GtkWidget *widget,
+                          int        width,
+                          int        height,
+                          int        baseline)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
+
+  GTK_WIDGET_CLASS (gtk_path_widget_parent_class)->size_allocate (widget, width, height, baseline);
+
+  gtk_path_widget_create_paths (self);
+}
+
+static void
+gtk_path_widget_snapshot (GtkWidget   *widget,
+                          GtkSnapshot *snapshot)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
+  double width = gtk_widget_get_width (widget);
+  double height = gtk_widget_get_height (widget);
+  GskPath *path;
+  GskStroke *stroke;
+  gsize i;
+
+  /* frosted glass the background */
+  gtk_snapshot_push_blur (snapshot, 100);
+  gdk_paintable_snapshot (self->background, snapshot, width, height);
+  gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 1, 1, 1, 0.6 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_snapshot_pop (snapshot);
+
+  /* draw the text */
+  if (self->text_path)
+    {
+      gtk_snapshot_push_fill (snapshot, self->text_path, GSK_FILL_RULE_WINDING);
+      gdk_paintable_snapshot (self->background, snapshot, width, height);
+
+      /* ... with an emboss effect */
+      stroke = gsk_stroke_new (2.0);
+      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT(1, 1));
+      gtk_snapshot_push_stroke (snapshot, self->text_path, stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 0.2 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gsk_stroke_free (stroke);
+      gtk_snapshot_pop (snapshot);
+
+      gtk_snapshot_pop (snapshot);
+    }
+
+  if (self->editable && self->line_path)
+    {
+      GskPathBuilder *builder;
+
+      /* draw the control line */
+      stroke = gsk_stroke_new (1.0);
+      gtk_snapshot_push_stroke (snapshot, self->line_path, stroke);
+      gsk_stroke_free (stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      /* draw the points */
+      builder = gsk_path_builder_new ();
+      for (i = 0; i < 4; i++)
+        {
+          gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), POINT_SIZE);
+        }
+      path = gsk_path_builder_free_to_path (builder);
+
+      gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 1, 1, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      stroke = gsk_stroke_new (1.0);
+      gtk_snapshot_push_stroke (snapshot, path, stroke);
+      gsk_stroke_free (stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      gsk_path_unref (path);
+    }
+
+  if (self->line_closest >= 0)
+    {
+      GskPathBuilder *builder;
+      GskPathPoint point;
+      graphene_point_t closest;
+
+      builder = gsk_path_builder_new ();
+      if (gsk_path_measure_get_point (self->line_measure, self->line_closest, &point))
+        {
+          gsk_path_point_get_position (self->line_path, &point, &closest);
+          gsk_path_builder_add_circle (builder, &closest, POINT_SIZE);
+          path = gsk_path_builder_free_to_path (builder);
+
+          gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
+          gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+          gtk_snapshot_pop (snapshot);
+
+          gsk_path_unref (path);
+        }
+    }
+}
+
+static void
+gtk_path_widget_set_text (GtkPathWidget *self,
+                          const char    *text)
+{
+  if (g_strcmp0 (self->text, text) == 0)
+    return;
+
+  g_free (self->text);
+  self->text = g_strdup (text);
+
+  gtk_path_widget_create_paths (self);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TEXT]);
+}
+
+static void
+gtk_path_widget_set_editable (GtkPathWidget *self,
+                              gboolean       editable)
+{
+  if (self->editable == editable)
+    return;
+
+  self->editable = editable;
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_EDITABLE]);
+}
+
+static void
+gtk_path_widget_set_property (GObject      *object,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      gtk_path_widget_set_text (self, g_value_get_string (value));
+      break;
+
+    case PROP_EDITABLE:
+      gtk_path_widget_set_editable (self, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_path_widget_get_property (GObject    *object,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, self->text);
+      break;
+
+    case PROP_EDITABLE:
+      g_value_set_boolean (value, self->editable);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_path_widget_dispose (GObject *object)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  gtk_path_widget_clear_paths (self);
+
+  G_OBJECT_CLASS (gtk_path_widget_parent_class)->dispose (object);
+}
+
+static void
+gtk_path_widget_class_init (GtkPathWidgetClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gtk_path_widget_dispose;
+  object_class->set_property = gtk_path_widget_set_property;
+  object_class->get_property = gtk_path_widget_get_property;
+
+  widget_class->size_allocate = gtk_path_widget_allocate;
+  widget_class->snapshot = gtk_path_widget_snapshot;
+
+  properties[PROP_TEXT] =
+    g_param_spec_string ("text",
+                         "text",
+                         "Text transformed along a path",
+                         NULL,
+                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+  properties[PROP_EDITABLE] =
+    g_param_spec_boolean ("editable",
+                          "editable",
+                          "If the path can be edited by the user",
+                          FALSE,
+                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (object_class, N_PROPS, properties);
+}
+
+static void
+drag_begin (GtkGestureDrag *gesture,
+            double          x,
+            double          y,
+            GtkPathWidget  *self)
+{
+  graphene_point_t mouse = GRAPHENE_POINT_INIT (x, y);
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  gsize i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (graphene_point_distance (&GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), &mouse, NULL, NULL) <= POINT_SIZE)
+        {
+          self->active_point = i;
+          break;
+        }
+    }
+  if (i == 4)
+    {
+      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
+      return;
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+drag_update (GtkGestureDrag *drag,
+             double          offset_x,
+             double          offset_y,
+             GtkPathWidget  *self)
+{
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  double start_x, start_y;
+
+  gtk_gesture_drag_get_start_point (drag, &start_x, &start_y);
+
+  self->points[self->active_point] = GRAPHENE_POINT_INIT ((start_x + offset_x) / width,
+                                                          (start_y + offset_y) / height);
+  self->points[self->active_point].x = CLAMP (self->points[self->active_point].x, 0, 1);
+  self->points[self->active_point].y = CLAMP (self->points[self->active_point].y, 0, 1);
+
+  gtk_path_widget_create_paths (self);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+pointer_motion (GtkEventControllerMotion *controller,
+                double                    x,
+                double                    y,
+                GtkPathWidget            *self)
+{
+  GskPathPoint point;
+  graphene_point_t pos;
+
+  if (gsk_path_get_closest_point (gsk_path_measure_get_path (self->line_measure),
+                                  &GRAPHENE_POINT_INIT (x, y),
+                                  INFINITY,
+                                  &point))
+    {
+      gsk_path_point_get_position (self->line_path, &point, &pos);
+      self->line_closest = graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL);
+    
+      gtk_widget_queue_draw (GTK_WIDGET (self));
+    }
+}
+
+static void
+pointer_leave (GtkEventControllerMotion *controller,
+               GtkPathWidget            *self)
+{
+  self->line_closest = -1;
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+gtk_path_widget_init (GtkPathWidget *self)
+{
+  GtkEventController *controller;
+
+  controller = GTK_EVENT_CONTROLLER (gtk_gesture_drag_new ());
+  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
+  g_signal_connect (controller, "drag-update", G_CALLBACK (drag_update), self);
+  g_signal_connect (controller, "drag-end", G_CALLBACK (drag_update), self);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
+
+  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
+  g_signal_connect (controller, "enter", G_CALLBACK (pointer_motion), self);
+  g_signal_connect (controller, "motion", G_CALLBACK (pointer_motion), self);
+  g_signal_connect (controller, "leave", G_CALLBACK (pointer_leave), self);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
+
+  self->line_closest = -1;
+
+  self->points[0] = GRAPHENE_POINT_INIT (0.1, 0.9);
+  self->points[1] = GRAPHENE_POINT_INIT (0.3, 0.1);
+  self->points[2] = GRAPHENE_POINT_INIT (0.7, 0.1);
+  self->points[3] = GRAPHENE_POINT_INIT (0.9, 0.9);
+
+  self->background = GDK_PAINTABLE (gdk_texture_new_from_resource ("/sliding_puzzle/portland-rose.jpg"));
+
+  gtk_path_widget_set_text (self, "It's almost working");
+}
+
+GtkWidget *
+gtk_path_widget_new (void)
+{
+  GtkPathWidget *self;
+
+  self = g_object_new (GTK_TYPE_PATH_WIDGET, NULL);
+
+  return GTK_WIDGET (self);
+}
+
+GtkWidget *
+do_path_text (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+
+      g_type_ensure (GTK_TYPE_PATH_WIDGET);
+
+      builder = gtk_builder_new_from_resource ("/path_text/path_text.ui");
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
+      g_object_unref (builder);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_window_present (GTK_WINDOW (window));
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/path_text.ui

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow" id="window">
+    <property name="title" translatable="yes">Text along a Path</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <child type="end">
+          <object class="GtkToggleButton" id="edit-toggle">
+            <property name="icon-name">document-edit-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkRevealer">
+            <property name="reveal-child" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
+            <child>
+              <object class="GtkEntry" id="text">
+                <property name="text">Through the looking glass</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkPathWidget" id="view">
+            <property name="editable" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
+            <property name="text" bind-source="text" bind-property="text" bind-flags="sync-create"></property>
+            <property name="hexpand">true</property>
+            <property name="vexpand">true</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/path_walk.c

@@ -1,225 +0,0 @@
-/* Path/Map
- *
- * This demo shows how to draw a map using paths.
- *
- * The world map that is used here is a path with 211 lines and 1569 cubic
- * Bėzier segments in 121 contours.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_PATH_WALK (gtk_path_walk_get_type ())
-G_DECLARE_FINAL_TYPE (GtkPathWalk, gtk_path_walk, GTK, PATH_WALK, GtkWidget)
-
-#define POINT_SIZE 8
-
-enum {
-  PROP_0,
-  PROP_PATH,
-  N_PROPS
-};
-
-struct _GtkPathWalk
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  graphene_rect_t bounds;
-};
-
-struct _GtkPathWalkClass
-{
-  GtkWidgetClass parent_class;
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkPathWalk, gtk_path_walk, GTK_TYPE_WIDGET)
-
-static void
-gtk_path_walk_snapshot (GtkWidget   *widget,
-                        GtkSnapshot *snapshot)
-{
-  GtkPathWalk *self = GTK_PATH_WALK (widget);
-  double width = gtk_widget_get_width (widget);
-  double height = gtk_widget_get_height (widget);
-  GskStroke *stroke;
-
-  if (self->path == NULL)
-    return;
-
-  gtk_snapshot_save (snapshot);
-
-  stroke = gsk_stroke_new (2.0);
-  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
-  gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-  gtk_snapshot_pop (snapshot);
-  gsk_stroke_free (stroke);
-
-  gtk_snapshot_restore (snapshot);
-}
-
-static void
-gtk_path_walk_measure (GtkWidget      *widget,
-                       GtkOrientation  orientation,
-                       int             for_size,
-                       int            *minimum,
-                       int            *natural,
-                       int            *minimum_baseline,
-                       int            *natural_baseline)
-{
-  GtkPathWalk *self = GTK_PATH_WALK (widget);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = (int) ceilf (self->bounds.size.width);
-  else
-    *minimum = *natural = (int) ceilf (self->bounds.size.height);
-}
-
-static void
-gtk_path_walk_set_path (GtkPathWalk *self,
-                        GskPath     *path)
-{
-  if (self->path == path)
-    return;
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  graphene_rect_init (&self->bounds, 0, 0, 0, 0);
-  if (path)
-    {
-      GskStroke *stroke;
-
-      self->path = gsk_path_ref (path);
-      stroke = gsk_stroke_new (2.0);
-      gsk_path_get_stroke_bounds (path, stroke, &self->bounds);
-      gsk_stroke_free (stroke);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PATH]);
-}
-
-static void
-gtk_path_walk_set_property (GObject      *object,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-
-{
-  GtkPathWalk *self = GTK_PATH_WALK (object);
-
-  switch (prop_id)
-    {
-    case PROP_PATH:
-      gtk_path_walk_set_path (self, g_value_get_boxed (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_path_walk_get_property (GObject    *object,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
-{
-  GtkPathWalk *self = GTK_PATH_WALK (object);
-
-  switch (prop_id)
-    {
-    case PROP_PATH:
-      g_value_set_boxed (value, self->path);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_path_walk_dispose (GObject *object)
-{
-  GtkPathWalk *self = GTK_PATH_WALK (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-
-  G_OBJECT_CLASS (gtk_path_walk_parent_class)->dispose (object);
-}
-
-static void
-gtk_path_walk_class_init (GtkPathWalkClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_path_walk_dispose;
-  object_class->set_property = gtk_path_walk_set_property;
-  object_class->get_property = gtk_path_walk_get_property;
-
-  widget_class->snapshot = gtk_path_walk_snapshot;
-  widget_class->measure = gtk_path_walk_measure;
-
-  properties[PROP_PATH] =
-    g_param_spec_boxed ("path",
-                        NULL, NULL,
-                        GSK_TYPE_PATH,
-                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, properties);
-}
-
-static void
-gtk_path_walk_init (GtkPathWalk *self)
-{
-  /* Data taken from
-   * https://commons.wikimedia.org/wiki/Maps_of_the_world#/media/File:Simplified_blank_world_map_without_Antartica_(no_borders).svg
-   */
-  GBytes *data = g_resources_lookup_data ("/path_walk/path_world.txt", 0, NULL);
-  GskPath *path = gsk_path_parse (g_bytes_get_data (data, NULL));
-  g_bytes_unref (data);
-  gtk_path_walk_set_path (self, path);
-  gsk_path_unref (path);
-}
-
-GtkWidget *
-gtk_path_walk_new (void)
-{
-  GtkPathWalk *self;
-
-  self = g_object_new (GTK_TYPE_PATH_WALK, NULL);
-
-  return GTK_WIDGET (self);
-}
-
-GtkWidget *
-do_path_walk (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (GTK_TYPE_PATH_WALK);
-
-      builder = gtk_builder_new_from_resource ("/path_walk/path_walk.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/path_walk.ui

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">World Map</property>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkPathWalk" id="view">
-            <property name="hexpand">true</property>
-            <property name="vexpand">true</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gsk/gsk4.toml.in

@@ -34,19 +34,5 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 [extra]
 content_images = [
   "gtk-logo.svg",
-  "images/caps-dark.png",
-  "images/caps-light.png",
-  "images/cubic-dark.png",
-  "images/cubic-light.png",
-  "images/directions-dark.png",
-  "images/directions-light.png",
-  "images/join-dark.png",
-  "images/join-light.png",
-  "images/line-dark.png",
-  "images/line-light.png",
-  "images/quad-dark.png",
-  "images/quad-light.png",
-  "images/path-dark.png",
-  "images/path-light.png",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gsk/images/caps.svg

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="caps.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="2.1493149"
-     inkscape:cx="438.74445"
-     inkscape:cy="288.69664"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1">
-    <linearGradient
-       id="swatch1"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-    </linearGradient>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
-       d="m 73.096455,77.084329 c 0,0 6.439436,18.711677 18.172676,26.635721"
-       id="path1"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 94.214979,99.722163 c -4.705477,-3.177832 -9.013472,-9.233699 -11.888672,-14.531169 -2.8752,-5.29748 -4.353516,-9.587833 -4.353516,-9.587833 L 68.51576,78.85704 c 0,0 1.743663,5.064163 5.021484,11.103457 3.277822,6.039297 8.05428,13.302573 15.082031,18.048773"
-       id="path1-1"
-       sodipodi:nodetypes="csccsc" />
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
-       d="m 112.14213,75.736452 c 0,0 6.43944,18.711675 18.17268,26.635728"
-       id="path1-4"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
-       d="m 132.83284,98.590758 c -4.70551,-3.177807 -9.01347,-9.233742 -11.88867,-14.53125 -2.8752,-5.297508 -4.35351,-9.587891 -4.35351,-9.587891 -0.89828,-2.611719 -3.74396,-4.000453 -6.35547,-3.101562 -2.61172,0.898277 -4.00046,3.743958 -3.10157,6.355468 0,0 1.74367,5.064185 5.02149,11.103516 3.27782,6.039331 8.05428,13.302641 15.08203,18.048851"
-       id="path1-4-5"
-       sodipodi:nodetypes="cscccsc" />
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
-       d="m 154.10911,73.84561 c 0,0 6.43943,18.711677 18.17267,26.63572"
-       id="path1-0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 175.16683,96.47344 C 170.46135,93.295592 166.1514,87.239699 163.2762,81.94219 160.401,76.644682 158.92269,72.3543 158.92269,72.3543 l -1.62696,-4.728516 -9.45508,3.253906 1.62696,4.728516 c 0,0 1.74171,5.066138 5.01953,11.105469 3.27782,6.039331 8.05428,13.300675 15.08203,18.046895"
-       id="path1-4-1"
-       sodipodi:nodetypes="csccccsc" />
-  </g>
-</svg>

docs/reference/gsk/images/cubic.svg

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="cubic.svg"
-   inkscape:export-filename="path-dark.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75989759"
-     inkscape:cx="398.73794"
-     inkscape:cy="466.51023"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showgrid="false" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 65.680232,196.81045 31.85267,-27.20583 3.379138,46.6055 23.3915,-31.31401"
-       id="path6"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 52.936092,207.66575 12.60825,-10.20893"
-       id="path4"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:1, 3;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 43.279229,215.31751 8.95641,-7.26298"
-       id="path4-8"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 65.857856,197.15027 c 31.390863,-27.80022 35.053874,18.93262 59.490604,-13.30694"
-       id="path5"
-       sodipodi:nodetypes="cc" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7"
-       cx="97.246689"
-       cy="169.65689"
-       r="1.5" />
-    <circle
-       style="fill:#818181;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-61"
-       cx="65.471832"
-       cy="197.19359"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-6"
-       cx="101.05927"
-       cy="215.75879"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-6-3"
-       cx="124.97194"
-       cy="184.30319"
-       r="1.5" />
-  </g>
-</svg>

docs/reference/gsk/images/directions.svg

@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="directions.svg"
-   inkscape:export-filename="directions-light.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="1.0746575"
-     inkscape:cx="371.28108"
-     inkscape:cy="266.59657"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showgrid="false" />
-  <defs
-     id="defs1">
-    <marker
-       style="overflow:visible"
-       id="marker5"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="0.5"
-       markerHeight="0.5"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path5" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker3"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path3" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Triangle"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path135" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker3-8"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path3-5" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Triangle-0"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path135-9" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker5-9"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="0.5"
-       markerHeight="0.5"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path5-8" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="marker3-8-4"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path3-5-4" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Triangle-0-7"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Triangle arrow"
-       markerWidth="2"
-       markerHeight="2"
-       viewBox="0 0 1 1"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.5)"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
-         d="M 5.77,0 -2.88,5 V -5 Z"
-         id="path135-9-6" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;marker-end:url(#marker5)"
-       d="m 27.834229,78.180655 c 21.653076,9.584156 38.648414,3.28592 57.704513,-16.91815 26.702288,3.84691 38.178308,6.290079 51.837088,35.267113"
-       id="path1"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;marker-end:url(#marker5-9)"
-       d="m 91.839025,170.91959 c -22.098283,1.18425 -24.17615,-37.34309 2.699778,-37.47998 20.898567,-0.10644 38.726427,9.19795 51.837087,35.26711"
-       id="path1-8"
-       sodipodi:nodetypes="csc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;marker-start:url(#marker3);marker-end:url(#Triangle)"
-       d="M 52.087008,92.522138 119.92974,29.398044"
-       id="path2"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;marker-start:url(#marker3-8);marker-end:url(#Triangle-0)"
-       d="M 39.037646,53.839137 130.44855,69.048774"
-       id="path2-3"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-71.02355"
-       inkscape:transform-center-y="28.680447" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;marker-start:url(#marker3-8-4);marker-end:url(#Triangle-0-7)"
-       d="M 48.764932,133.73955 141.43055,133.1318"
-       id="path2-3-1"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-74.875204"
-       inkscape:transform-center-y="16.143612" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88055556px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="99.90786"
-       y="24.737305"
-       id="text4"><tspan
-         sodipodi:role="line"
-         id="tspan4"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88055556px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke-width:0.2"
-         x="99.90786"
-         y="24.737305">GSK_PATH_FROM_START</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="142.84389"
-       y="128.82414"
-       id="text4-5"><tspan
-         sodipodi:role="line"
-         id="tspan4-7"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke-width:0.2"
-         x="142.84389"
-         y="128.82414">GSK_PATH_FROM_START</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88055556px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="29.309605"
-       y="100.65614"
-       id="text5"><tspan
-         sodipodi:role="line"
-         id="tspan5"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88055556px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="29.309605"
-         y="100.65614">GSK_PATH_TO_START</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="14.843884"
-       y="141.82414"
-       id="text5-8"><tspan
-         sodipodi:role="line"
-         id="tspan5-8"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="14.843884"
-         y="141.82414">GSK_PATH_TO_START</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="135.70834"
-       y="70.811882"
-       id="text6"><tspan
-         sodipodi:role="line"
-         id="tspan6"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="135.70834"
-         y="70.811882">GSK_PATH_TO_END</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="142.84389"
-       y="141.82416"
-       id="text6-6"><tspan
-         sodipodi:role="line"
-         id="tspan6-2"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="142.84389"
-         y="141.82416">GSK_PATH_TO_END</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="14.843884"
-       y="48.774254"
-       id="text7"><tspan
-         sodipodi:role="line"
-         id="tspan7"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="14.843884"
-         y="48.774254">GSK_PATH_FROM_END</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       x="14.843884"
-       y="128.82414"
-       id="text7-5"><tspan
-         sodipodi:role="line"
-         id="tspan7-9"
-         style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:3.88056px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.2"
-         x="14.843884"
-         y="128.82414">GSK_PATH_FROM_END</tspan></text>
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9-7"
-       cx="85.343727"
-       cy="61.691891"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9-7-0"
-       cx="93.787331"
-       cy="133.30902"
-       r="1.5" />
-  </g>
-</svg>

docs/reference/gsk/images/join.svg

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="join.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75989759"
-     inkscape:cx="118.43701"
-     inkscape:cy="570.47161"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
-       d="m 12.748727,122.15935 c 4.449842,-15.44496 4.175632,-15.92044 16.908788,-26.568585 0,0 8.478091,16.421195 35.150804,33.660325"
-       id="path1"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 17.59375,123.72266 c 3.810222,-13.2249 3.591775,-14.13123 11.107422,-20.53516 1.289688,1.82186 2.604788,3.71164 4.800781,6.23242 5.743296,6.59272 14.891452,15.32766 28.632813,24.20899 M 67.5625,125.23047 C 54.631174,116.87268 46.204933,108.77726 41.041016,102.84961 35.877098,96.921954 34.140625,93.474609 34.140625,93.474609 l -2.861328,-5.544922 -4.789063,4.003907 C 13.673794,102.6514 12.411529,105.58692 7.984375,120.95313"
-       id="path1-3"
-       sodipodi:nodetypes="ccsccscccc" />
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
-       d="m 147.99215,122.60257 c 4.44988,-15.44499 4.17566,-15.92048 16.90889,-26.568657 0,0 8.47814,16.421267 35.15101,33.660397"
-       id="path1-5"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 152.79687,123.98633 c 3.81053,-13.22586 3.59005,-14.12993 11.10743,-20.53516 1.28968,1.82184 2.6029,3.71173 4.79882,6.23242 5.74333,6.59274 14.89333,15.32961 28.63477,24.21094 m 5.42773,-8.40039 c -12.9314,-8.35778 -21.35753,-16.45123 -26.52148,-22.37891 -5.16395,-5.927668 -6.90039,-9.374996 -6.90039,-9.374996 l -7.65039,-1.541015 C 148.87685,102.91706 147.61469,105.85252 143.1875,121.21875"
-       id="path1-5-8"
-       sodipodi:nodetypes="ccsccsccc" />
-    <path
-       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
-       d="m 79.729342,122.0734 c 4.449844,-15.44499 4.175634,-15.92048 16.908794,-26.568654 0,0 8.478114,16.421264 35.150984,33.660394"
-       id="path1-7"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 84.533203,123.19336 c 3.810222,-13.22495 3.591776,-14.1312 11.107422,-20.53516 1.289696,1.82187 2.604775,3.71164 4.800785,6.23243 5.74333,6.59275 14.89136,15.32765 28.63281,24.20898 m 5.42969,-8.39844 c -12.93141,-8.35778 -21.35949,-16.45122 -26.52344,-22.3789 -5.16395,-5.927686 -6.90039,-9.375004 -6.90039,-9.375004 -0.69636,-1.348401 -1.967393,-2.307601 -3.45508,-2.607422 -1.487509,-0.300132 -3.03083,0.09145 -4.195313,1.064453 C 80.61325,102.12215 79.350982,105.05756 74.923828,120.42383"
-       id="path1-7-4"
-       sodipodi:nodetypes="ccsccscccc" />
-  </g>
-</svg>

docs/reference/gsk/images/line.svg

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="line.svg"
-   inkscape:export-filename="line-light.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75989759"
-     inkscape:cx="398.73794"
-     inkscape:cy="466.51023"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showgrid="false" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 52.936092,207.66575 12.60825,-10.20893"
-       id="path4"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:1, 3;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 43.279229,215.31751 8.95641,-7.26298"
-       id="path4-8"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 66.150275,196.9925 40.275255,-5.24977"
-       id="path5"
-       sodipodi:nodetypes="cc" />
-    <circle
-       style="fill:#818181;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-61"
-       cx="65.471832"
-       cy="197.19359"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-6"
-       cx="106.42249"
-       cy="191.8156"
-       r="1.5" />
-  </g>
-</svg>

docs/reference/gsk/images/path.svg

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="path.svg"
-   inkscape:export-filename="path-dark.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75989759"
-     inkscape:cx="397.42198"
-     inkscape:cy="561.25984"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 128.28233,149.47912 154.23127,90.244656 86.340809,68.820468"
-       id="path3" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1"
-       d="m 33.956804,113.31099 c -9.049189,-11.90893 5.40551,-40.570358 20.351208,-39.990271 26.687501,1.035822 4.06495,71.984581 30.695656,74.009711 19.642072,1.49368 41.962402,-34.42048 30.634382,-50.536241 C 99.663884,74.068616 50.763019,135.42833 33.956804,113.31099 Z"
-       id="path1"
-       sodipodi:nodetypes="sssss" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2"
-       cx="34.517788"
-       cy="113.66589"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8"
-       cx="55.045853"
-       cy="73.566689"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-5"
-       cx="55.045834"
-       cy="73.831245"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9"
-       cx="55.045834"
-       cy="73.831245"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9-7"
-       cx="86.398613"
-       cy="68.897667"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9-7-8"
-       cx="153.87553"
-       cy="90.112595"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7"
-       cx="84.803238"
-       cy="147.51736"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-7-2"
-       cx="115.28235"
-       cy="96.705284"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path2-8-9-7-9"
-       cx="127.92362"
-       cy="150.03427"
-       r="1.5" />
-  </g>
-</svg>

docs/reference/gsk/images/quad.svg

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="path.svg"
-   inkscape:export-filename="path-dark.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75989759"
-     inkscape:cx="398.07996"
-     inkscape:cy="466.51023"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showgrid="false" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 52.936092,207.66575 12.60825,-10.20893"
-       id="path4"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#f90048;stroke:#a2a2a2;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:1, 3;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 43.279229,215.31751 8.95641,-7.26298"
-       id="path4-8"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 66.150275,196.9925 C 86.276878,182.17569 104.9512,180.54783 123.39945,192.39557"
-       id="path5"
-       sodipodi:nodetypes="cc" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7"
-       cx="95.69075"
-       cy="175.70657"
-       r="1.5" />
-    <circle
-       style="fill:#818181;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-61"
-       cx="65.471832"
-       cy="197.19359"
-       r="1.5" />
-    <circle
-       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2-8-7-6"
-       cx="123.73506"
-       cy="192.49165"
-       r="1.5" />
-    <path
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 65.439496,197.17632 30.328009,-21.33704 28.506125,16.61621"
-       id="path6" />
-  </g>
-</svg>

docs/reference/gtk/gtk4-path-tool.rst

@@ -1,181 +0,0 @@
-.. _gtk4-path-tool(1):
-
-=================
-gtk4-path-tool
-=================
-
------------------------
-GskPath Utility
------------------------
-
-SYNOPSIS
---------
-|   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
-|
-|   **gtk4-path-tool** decompose [OPTIONS...] <PATH>
-|   **gtk4-path-tool** show [OPTIONS...] <PATH>
-|   **gtk4-path-tool** render [OPTIONS...] <PATH>
-|   **gtk4-path-tool** info [OPTIONS...] <PATH>
-
-DESCRIPTION
------------
-
-``gtk4-path-tool`` can perform various tasks on paths. Paths are specified
-in SVG syntax, as strings like "M 100 100 C 100 200 200 200 200 100 Z".
-
-To read a path from a file, use a filename that starts with a '.' or a '/'.
-To read a path from stdin, use '-'.
-
-COMMANDS
---------
-
-Decomposing
-^^^^^^^^^^^
-
-The ``decompose`` command approximates the path by one with simpler elements.
-When used without options, the curves of the path are approximated by line
-segments.
-
-``--allow-quad``
-
-  Allow quadratic Bézier curves to be used in the generated path.
-
-``--allow-cubic``
-
-  Allow cubic Bézier curves to be used in the generated path.
-
-Showing
-^^^^^^^
-
-The ``show`` command displays the given path in a window. The interior
-of the path is filled.
-
-``--fill-rule=VALUE``
-
-  The fill rule that is used to determine what areas are inside the path.
-  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
-
-``--fg-color=COLOR``
-
-  The color that is used to fill the interior of the path or stroke the path.
-  If not specified, black is used.
-
-``--bg-color=COLOR``
-
-  The color that is used to render the background behind the path.
-  If not specified, white is used.
-
-``--stroke``
-
-  Stroke the path instead of filling it.
-
-``--line-width=VALUE``
-
-  The line width to use for the stroke. ``VALUE`` must be a positive number.
-  The default line width is 1.
-
-``--line-cap=VALUE``
-
-  The cap style to use at line ends. The possible values are ``butt``, ``round``
-  or ``square``. See the SVG specification for details on these styles.
-  The default cap style is ``butt``.
-
-``--line-join=VALUE``
-
-  The join style to use at line joins. The possible values are ``miter``,
-  ``miter-clip``, ``round``, ``bevel`` or ``arcs``. See the SVG specification
-  for details on these styles.
-  The default join style is ``miter``.
-
-``--miter-limit=VALUE``
-
-  The limit at which to clip miters at line joins. The default value is 4.
-
-``--dashes=VALUE``
-
-  The dash pattern to use for this stroke. A dash pattern is specified by
-  a comma-separated list of alternating non-negative numbers. Each number
-  provides the length of alternate "on" and "off" portions of the stroke.
-  If the dash pattern is empty, dashing is disabled, which is the default.
-  See the SVG specification for details on dashing.
-
-``--dash-offset=VALUE``
-
-  The offset into the dash pattern where dashing should begin.
-  The default value is 0.
-
-Rendering
-^^^^^^^^^
-
-The ``render`` command renders the given path as a PNG image.
-The interior of the path is filled.
-
-``--fill-rule=VALUE``
-
-  The fill rule that is used to determine what areas are inside the path.
-  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
-
-``--fg-color=COLOR``
-
-  The color that is used to fill the interior of the path or stroke the path.
-  If not specified, black is used.
-
-``--bg-color=COLOR``
-
-  The color that is used to render the background behind the path.
-  If not specified, white is used.
-
-``--output-file=FILE``
-
-  The file to save the PNG image to.
-  If not specified, "path.png" is used.
-
-``--stroke``
-
-  Stroke the path instead of filling it.
-
-``--line-width=VALUE``
-
-  The line width to use for the stroke. ``VALUE`` must be a positive number.
-  The default line width is 1.
-
-``--line-cap=VALUE``
-
-  The cap style to use at line ends. The possible values are ``butt``, ``round``
-  or ``square``. See the SVG specification for details on these styles.
-  The default cap style is ``butt``.
-
-``--line-join=VALUE``
-
-  The join style to use at line joins. The possible values are ``miter``,
-  ``miter-clip``, ``round``, ``bevel`` or ``arcs``. See the SVG specification
-  for details on these styles.
-  The default join style is ``miter``.
-
-``--miter-limit=VALUE``
-
-  The limit at which to clip miters at line joins. The default value is 4.
-
-``--dashes=VALUE``
-
-  The dash pattern to use for this stroke. A dash pattern is specified by
-  a comma-separated list of alternating non-negative numbers. Each number
-  provides the length of alternate "on" and "off" portions of the stroke.
-  If the dash pattern is empty, dashing is disabled, which is the default.
-  See the SVG specification for details on dashing.
-
-``--dash-offset=VALUE``
-
-  The offset into the dash pattern where dashing should begin.
-  The default value is 0.
-
-Info
-^^^^
-
-The ``info`` command shows various information about the given path,
-such as its bounding box.
-
-REFERENCES
-----------
-
-- SVG Path Specification, https://www.w3.org/TR/SVG2/paths.html

docs/reference/gtk/meson.build

@@ -77,7 +77,6 @@ if get_option('man-pages') and rst2man.found()
     [ 'gtk4-query-settings', '1', ],
     [ 'gtk4-rendernode-tool', '1' ],
     [ 'gtk4-update-icon-cache', '1', ],
-    [ 'gtk4-path-tool', '1', ],
   ]
 
   if get_option('demos')

gdk/gdkclipboard.c

@@ -297,7 +297,7 @@ gdk_clipboard_read_local_async (GdkClipboard        *clipboard,
     {
       GOutputStream *output_stream;
       GIOStream *stream;
-
+      
       stream = gdk_pipe_io_stream_new ();
       output_stream = g_io_stream_get_output_stream (stream);
       gdk_clipboard_write_async (clipboard,
@@ -767,7 +767,7 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
   GdkContentFormats *formats;
   GValue *value;
   GTask *task;
-
+ 
   task = g_task_new (clipboard, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, source_tag);
@@ -946,7 +946,7 @@ gdk_clipboard_read_texture_finish (GdkClipboard  *clipboard,
   value = g_task_propagate_pointer (G_TASK (result), error);
   if (!value)
     return NULL;
-
+  
   return g_value_dup_object (value);
 }
 
@@ -1011,7 +1011,7 @@ gdk_clipboard_read_text_finish (GdkClipboard  *clipboard,
   value = g_task_propagate_pointer (G_TASK (result), error);
   if (!value)
     return NULL;
-
+  
   return g_value_dup_string (value);
 }
 
@@ -1110,7 +1110,7 @@ gdk_clipboard_write_async (GdkClipboard        *clipboard,
       GError *error = NULL;
 
       g_assert (gtype != G_TYPE_INVALID);
-
+      
       g_value_init (&value, gtype);
       if (gdk_content_provider_get_value (priv->content, &value, &error))
         {
@@ -1126,7 +1126,7 @@ gdk_clipboard_write_async (GdkClipboard        *clipboard,
         {
           g_task_return_error (task, error);
         }
-
+      
       g_value_unset (&value);
     }
   else
@@ -1148,7 +1148,7 @@ gdk_clipboard_write_finish (GdkClipboard  *clipboard,
   g_return_val_if_fail (g_task_is_valid (result, clipboard), FALSE);
   g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gdk_clipboard_write_async, FALSE);
 
-  return g_task_propagate_boolean (G_TASK (result), error);
+  return g_task_propagate_boolean (G_TASK (result), error); 
 }
 
 static gboolean
@@ -1248,8 +1248,8 @@ gdk_clipboard_set_content (GdkClipboard       *clipboard,
  * Sets the clipboard to contain the value collected from the given varargs.
  *
  * Values should be passed the same way they are passed to other value
- * collecting APIs, such as [method@GObject.Object.set] or
- * [func@GObject.signal_emit].
+ * collecting APIs, such as [`method@GObject.Object.set`] or
+ * [`func@GObject.signal_emit`].
  *
  * ```c
  * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World");
@@ -1263,7 +1263,7 @@ gdk_clipboard_set (GdkClipboard *clipboard,
                    ...)
 {
   va_list args;
-
+                          
   g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
 
   va_start (args, type);

gdk/gdkglcontext.c

@@ -1528,8 +1528,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
 
   if (gdk_gl_context_get_use_es (context))
     {
-      priv->has_unpack_subimage = gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)) ||
-                                  epoxy_has_gl_extension ("GL_EXT_unpack_subimage");
+      priv->has_unpack_subimage = epoxy_has_gl_extension ("GL_EXT_unpack_subimage");
       priv->has_khr_debug = epoxy_has_gl_extension ("GL_KHR_debug");
     }
   else

gdk/gdkgltexture.c

@@ -153,7 +153,7 @@ gdk_gl_texture_find_format (gboolean         use_es,
       if (gdk_memory_format_alpha (format) != alpha)
         continue;
 
-      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type, q_swizzle))
+      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type, &q_swizzle))
         continue;
 
       if (q_format != gl_format || q_type != gl_type)
@@ -188,7 +188,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
                                    FALSE,
                                    major, minor,
                                    &gl_internal_format,
-                                   &gl_format, &gl_type, gl_swizzle))
+                                   &gl_format, &gl_type, &gl_swizzle))
     {
       if (download->stride == expected_stride &&
           download->format == format)

gdk/gdkmemoryformat.c

@@ -739,12 +739,12 @@ gdk_memory_format_gl_format (GdkMemoryFormat  format,
                              guint           *out_internal_format,
                              guint           *out_format,
                              guint           *out_type,
-                             GLint            out_swizzle[4])
+                             GLint          (*out_swizzle)[4])
 {
   *out_internal_format = memory_formats[format].gl.internal_format;
   *out_format = memory_formats[format].gl.format;
   *out_type = memory_formats[format].gl.type;
-  memcpy (out_swizzle, memory_formats[format].gl.swizzle, sizeof(GLint) * 4);
+  memcpy (out_swizzle, &memory_formats[format].gl.swizzle, sizeof(GLint) * 4);
 
   if (gles)
     {

gdk/gdkmemoryformatprivate.h

@@ -52,7 +52,7 @@ gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat
                                                              guint                      *out_internal_format,
                                                              guint                      *out_format,
                                                              guint                      *out_type,
-                                                             GLint                       out_gizzle[4]);
+                                                             GLint                     (*out_gizzle)[4]);
 
 void                    gdk_memory_convert                  (guchar                     *dest_data,
                                                              gsize                       dest_stride,

gdk/wayland/meson.build

@@ -127,6 +127,3 @@ libgdk_wayland = static_library('gdk-wayland',
   link_with: [ libwayland_cursor, ],
   dependencies: [ gdk_deps, gdk_wayland_deps ],
 )
-
-# Used to generate pkg-config Requires
-wayland_public_deps = [wlclientdep]

gdk/win32/gdkevents-win32.c

@@ -2857,10 +2857,7 @@ gdk_event_translate (MSG *msg,
       break;
 
     case WM_SYSCOMMAND:
-      /* From: https://learn.microsoft.com/en-us/windows/win32/menurc/wm-syscommand?redirectedfrom=MSDN
-       * To obtain the correct result when testing the value of wParam,
-       * an application must combine the value 0xFFF0 with the wParam value by using the bitwise AND operator. */
-      switch (msg->wParam & 0xFFF0)
+      switch (msg->wParam)
 	{
 	case SC_MINIMIZE:
 	case SC_RESTORE:
@@ -2967,14 +2964,6 @@ gdk_event_translate (MSG *msg,
                   windowpos = (WINDOWPOS *) msg->lParam;
                   windowpos->cx = our_mmi.ptMaxSize.x;
                   windowpos->cy = our_mmi.ptMaxSize.y;
-
-                  if (!_gdk_win32_surface_lacks_wm_decorations (window) &&
-                      !(windowpos->flags & SWP_NOCLIENTSIZE) &&
-                      window->width == impl->next_layout.configured_width &&
-                      window->height == impl->next_layout.configured_height)
-                    {
-                      impl->inhibit_configure = TRUE;
-                    }
                 }
 
               impl->maximizing = FALSE;

gdk/win32/gdksurface-win32.c

@@ -1230,11 +1230,18 @@ get_effective_window_decorations (GdkSurface       *window,
 
       *decoration |= GDK_DECOR_MINIMIZE;
 
+      return TRUE;
+    }
+  else if (impl->hint_flags & GDK_HINT_MAX_SIZE)
+    {
+      *decoration = GDK_DECOR_ALL | GDK_DECOR_MAXIMIZE;
+      *decoration |= GDK_DECOR_MINIMIZE;
+
       return TRUE;
     }
   else
     {
-      *decoration = GDK_DECOR_ALL;
+      *decoration = (GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE);
       return TRUE;
     }
 

gdk/x11/meson.build

@@ -86,5 +86,3 @@ libgdk_x11 = static_library('gdk-x11',
   ] + common_cflags,
   dependencies: [ gdk_deps, gdk_x11_deps, ],
 )
-
-x11_public_deps = [x11_dep]

gsk/gl/gskglcommandqueue.c

@@ -1456,7 +1456,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                          guint           *gl_internalformat,
                          guint           *gl_format,
                          guint           *gl_type,
-                         GLint            gl_swizzle[4])
+                         GLint          (*gl_swizzle)[4])
 {
   GdkMemoryDepth depth;
 
@@ -1577,7 +1577,7 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
                                          &gl_internalformat,
                                          &gl_format,
                                          &gl_type,
-                                         gl_swizzle);
+                                         &gl_swizzle);
 
   gdk_texture_downloader_init (&downloader, texture);
   gdk_texture_downloader_set_format (&downloader, data_format);
@@ -1595,7 +1595,8 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
     {
       glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, width, height, gl_format, gl_type, data);
     }
-  else if (stride % bpp == 0 && gdk_gl_context_has_unpack_subimage (self->context))
+  else if (stride % bpp == 0 &&
+           (gdk_gl_context_check_version (self->context, NULL, "3.0") || gdk_gl_context_has_unpack_subimage (self->context)))
     {
       glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp);
 
@@ -1683,7 +1684,7 @@ gsk_gl_command_queue_upload_texture_chunks (GskGLCommandQueue    *self,
                                          &gl_internalformat,
                                          &gl_format,
                                          &gl_type,
-                                         gl_swizzle);
+                                         &gl_swizzle);
 
   glTexImage2D (GL_TEXTURE_2D, 0, gl_internalformat, width, height, 0, gl_format, gl_type, NULL);
 

gsk/gsk.h

@@ -22,6 +22,7 @@
 #include <gsk/gskenums.h>
 #include <gsk/gskpath.h>
 #include <gsk/gskpathbuilder.h>
+#include <gsk/gskpathmeasure.h>
 #include <gsk/gskpathpoint.h>
 #include <gsk/gskrenderer.h>
 #include <gsk/gskrendernode.h>

gsk/gskcontour.c

@@ -61,12 +61,21 @@ struct _GskContourClass
   GskContour *          (* reverse)             (const GskContour       *contour);
   int                   (* get_winding)         (const GskContour       *contour,
                                                  const graphene_point_t *point);
-  gsize                 (* get_n_ops)           (const GskContour       *contour);
   gboolean              (* get_closest_point)   (const GskContour       *contour,
                                                  const graphene_point_t *point,
                                                  float                   threshold,
                                                  GskRealPathPoint       *result,
                                                  float                  *out_dist);
+  void                  (* get_start_point)     (const GskContour       *contour,
+                                                 GskRealPathPoint       *result);
+  void                  (* get_end_point)       (const GskContour       *contour,
+                                                 GskRealPathPoint       *result);
+  gboolean              (* get_previous_point)  (const GskContour       *contour,
+                                                 GskRealPathPoint       *point,
+                                                 GskRealPathPoint       *result);
+  gboolean              (* get_next_point)      (const GskContour       *contour,
+                                                 GskRealPathPoint       *point,
+                                                 GskRealPathPoint       *result);
   void                  (* get_position)        (const GskContour       *contour,
                                                  GskRealPathPoint       *point,
                                                  graphene_point_t       *position);
@@ -77,11 +86,26 @@ struct _GskContourClass
   float                 (* get_curvature)       (const GskContour       *contour,
                                                  GskRealPathPoint       *point,
                                                  graphene_point_t       *center);
+  gpointer              (* init_measure)        (const GskContour       *contour,
+                                                 float                   tolerance,
+                                                 float                  *out_length);
+  void                  (* free_measure)        (const GskContour       *contour,
+                                                 gpointer                measure_data);
+  int                   (* point_compare)       (const GskContour       *contour,
+                                                 GskRealPathPoint       *p1,
+                                                 GskRealPathPoint       *p2);
   void                  (* add_segment)         (const GskContour       *contour,
                                                  GskPathBuilder         *builder,
                                                  gboolean                emit_move_to,
                                                  GskRealPathPoint       *start,
                                                  GskRealPathPoint       *end);
+  void                  (* get_point)           (const GskContour       *contour,
+                                                 gpointer                measure_data,
+                                                 float                   offset,
+                                                 GskRealPathPoint       *result);
+  float                 (* get_distance)        (const GskContour       *contour,
+                                                 GskRealPathPoint       *point,
+                                                 gpointer                measure_data);
 };
 
 /* {{{ Utilities */
@@ -119,8 +143,6 @@ struct _GskStandardContour
 
   GskPathFlags flags;
 
-  GskBoundingBox bounds;
-
   gsize n_ops;
   gsize n_points;
   graphene_point_t *points;
@@ -131,13 +153,9 @@ static gsize
 gsk_standard_contour_compute_size (gsize n_ops,
                                    gsize n_points)
 {
-  gsize align = MAX (G_ALIGNOF (graphene_point_t),
-                     MAX (G_ALIGNOF (gpointer),
-                          G_ALIGNOF (GskStandardContour)));
-  gsize s = sizeof (GskStandardContour)
-          + sizeof (gskpathop) * n_ops
-          + sizeof (graphene_point_t) * n_points;
-  return s + (align - (s % align));
+  return sizeof (GskStandardContour)
+       + sizeof (gskpathop) * n_ops
+       + sizeof (graphene_point_t) * n_points;
 }
 
 static void
@@ -256,7 +274,7 @@ gsk_standard_contour_print (const GskContour *contour,
       const graphene_point_t *pt = gsk_pathop_points (self->ops[i]);
 
       switch (gsk_pathop_op (self->ops[i]))
-        {
+      {
         case GSK_PATH_MOVE:
           g_string_append (string, "M ");
           _g_string_append_point (string, &pt[0]);
@@ -290,7 +308,7 @@ gsk_standard_contour_print (const GskContour *contour,
         default:
           g_assert_not_reached();
           return;
-        }
+      }
     }
 }
 
@@ -299,32 +317,68 @@ gsk_standard_contour_get_bounds (const GskContour *contour,
                                  GskBoundingBox   *bounds)
 {
   const GskStandardContour *self = (const GskStandardContour *) contour;
+  gsize i;
 
   if (self->n_points == 0)
     return FALSE;
 
-  *bounds = self->bounds;
+  gsk_bounding_box_init (bounds,  &self->points[0], &self->points[0]);
+  for (i = 1; i < self->n_points; i ++)
+    gsk_bounding_box_expand (bounds, &self->points[i]);
 
   return bounds->max.x > bounds->min.x && bounds->max.y > bounds->min.y;
 }
 
+static gboolean
+add_stroke_bounds (GskPathOperation        op,
+                   const graphene_point_t *pts,
+                   gsize                   n_pts,
+                   gpointer                user_data)
+{
+  struct {
+    GskBoundingBox *bounds;
+    float lw;
+    float mw;
+  } *data = user_data;
+  GskBoundingBox bounds;
+
+  for (int i = 1; i < n_pts - 1; i++)
+    {
+      gsk_bounding_box_init (&bounds,
+                             &GRAPHENE_POINT_INIT (pts[i].x - data->lw/2, pts[i].y - data->lw/2),
+                             &GRAPHENE_POINT_INIT (pts[i].x + data->lw/2, pts[i].y + data->lw/2));
+      gsk_bounding_box_union (&bounds, data->bounds, data->bounds);
+    }
+
+  gsk_bounding_box_init (&bounds,
+                         &GRAPHENE_POINT_INIT (pts[n_pts - 1].x - data->mw/2, pts[n_pts  - 1].y - data->mw/2),
+                         &GRAPHENE_POINT_INIT (pts[n_pts - 1].x + data->mw/2, pts[n_pts  - 1].y + data->mw/2));
+  gsk_bounding_box_union (&bounds, data->bounds, data->bounds);
+
+  return TRUE;
+}
+
 static gboolean
 gsk_standard_contour_get_stroke_bounds (const GskContour *contour,
                                         const GskStroke  *stroke,
                                         GskBoundingBox   *bounds)
 {
   GskStandardContour *self = (GskStandardContour *) contour;
-  float extra;
+  struct {
+    GskBoundingBox *bounds;
+    float lw;
+    float mw;
+  } data;
 
-  if (self->n_points == 0)
-    return FALSE;
+  data.bounds = bounds;
+  data.lw = stroke->line_width;
+  data.mw = gsk_stroke_get_join_width (stroke);
 
-  extra = MAX (stroke->line_width / 2, gsk_stroke_get_join_width (stroke) / 2);
+  gsk_bounding_box_init (bounds,
+                         &GRAPHENE_POINT_INIT (self->points[0].x - data.mw/2, self->points[0].y - data.mw/2),
+                         &GRAPHENE_POINT_INIT (self->points[0].x + data.mw/2, self->points[0].y + data.mw/2));
 
-  gsk_bounding_box_init (bounds, &GRAPHENE_POINT_INIT (self->bounds.min.x - extra,
-                                                       self->bounds.min.y - extra),
-                                 &GRAPHENE_POINT_INIT (self->bounds.max.x + extra,
-                                                       self->bounds.max.y + extra));
+  gsk_standard_contour_foreach (contour, GSK_PATH_TOLERANCE_DEFAULT, add_stroke_bounds, &data);
 
   return TRUE;
 }
@@ -343,6 +397,211 @@ gsk_standard_contour_get_start_end (const GskContour *contour,
     *end = self->points[self->n_points - 1];
 }
 
+typedef struct
+{
+  float start;
+  float end;
+  float start_progress;
+  float end_progress;
+  GskCurveLineReason reason;
+  graphene_point_t start_point;
+  graphene_point_t end_point;
+  gsize op;
+} GskStandardContourMeasure;
+
+typedef struct
+{
+  GArray *array;
+  GskStandardContourMeasure measure;
+} LengthDecompose;
+
+static gboolean
+gsk_standard_contour_measure_add_point (const graphene_point_t *from,
+                                        const graphene_point_t *to,
+                                        float                   from_progress,
+                                        float                   to_progress,
+                                        GskCurveLineReason      reason,
+                                        gpointer                user_data)
+{
+  LengthDecompose *decomp = user_data;
+  float seg_length;
+
+  seg_length = graphene_point_distance (from, to, NULL, NULL);
+  decomp->measure.end += seg_length;
+
+  if (decomp->measure.start >= decomp->measure.end)
+    return TRUE;
+
+  decomp->measure.start_progress = from_progress;
+  decomp->measure.end_progress = to_progress;
+  decomp->measure.start_point = *from;
+  decomp->measure.end_point = *to;
+  decomp->measure.reason = reason;
+
+  g_array_append_val (decomp->array, decomp->measure);
+
+  decomp->measure.start += seg_length;
+
+  return TRUE;
+}
+
+static gpointer
+gsk_standard_contour_init_measure (const GskContour *contour,
+                                   float             tolerance,
+                                   float            *out_length)
+{
+  const GskStandardContour *self = (const GskStandardContour *) contour;
+  gsize i;
+  float length;
+  GArray *array;
+
+  array = g_array_new (FALSE, FALSE, sizeof (GskStandardContourMeasure));
+  length = 0;
+
+  for (i = 1; i < self->n_ops; i ++)
+    {
+      GskCurve curve;
+      LengthDecompose decomp = { array, { length, length, 0, 0, GSK_CURVE_LINE_REASON_SHORT, { 0, 0 }, { 0, 0 }, i } };
+
+      gsk_curve_init (&curve, self->ops[i]);
+      gsk_curve_decompose (&curve, tolerance, gsk_standard_contour_measure_add_point, &decomp);
+      length = decomp.measure.start;
+    }
+
+  *out_length = length;
+
+  return array;
+}
+
+static void
+gsk_standard_contour_free_measure (const GskContour *contour,
+                                   gpointer          data)
+{
+  g_array_free (data, TRUE);
+}
+
+static int
+gsk_standard_contour_find_measure (gconstpointer m,
+                                   gconstpointer l)
+{
+  const GskStandardContourMeasure *measure = m;
+  float length = *(const float *) l;
+
+  if (measure->start > length)
+    return 1;
+  else if (measure->end <= length)
+    return -1;
+  else
+    return 0;
+}
+
+static int
+gsk_standard_contour_point_compare (const GskContour *contour,
+                                    GskRealPathPoint *p1,
+                                    GskRealPathPoint *p2)
+{
+  if (p1->data.std.idx < p2->data.std.idx)
+    return -1;
+  else if (p1->data.std.idx > p2->data.std.idx)
+    return 1;
+  else if (p1->data.std.t < p2->data.std.t)
+    return -1;
+  else if (p1->data.std.t > p2->data.std.t)
+    return 1;
+  else
+    return 0;
+}
+
+static void
+add_curve (GskCurve       *curve,
+           GskPathBuilder *builder,
+           gboolean       *emit_move_to)
+{
+  if (*emit_move_to)
+    {
+      const graphene_point_t *s;
+
+      s = gsk_curve_get_start_point (curve);
+      gsk_path_builder_move_to (builder, s->x, s->y);
+      *emit_move_to = FALSE;
+    }
+  gsk_curve_builder_to (curve, builder);
+}
+
+static void
+gsk_standard_contour_add_segment (const GskContour *contour,
+                                  GskPathBuilder   *builder,
+                                  gboolean          emit_move_to,
+                                  GskRealPathPoint *start,
+                                  GskRealPathPoint *end)
+{
+  GskStandardContour *self = (GskStandardContour *) contour;
+  gsize first, last;
+  float first_t, last_t;
+  GskCurve c, c1, c2;
+
+  if (start)
+    {
+      first = start->data.std.idx;
+      first_t = start->data.std.t;
+    }
+  else
+    {
+      first = 1;
+      first_t = 0;
+    }
+
+  if (end)
+    {
+      last = end->data.std.idx;
+      last_t = end->data.std.t;
+    }
+  else
+    {
+      last = self->n_ops - 1;
+      last_t = 1;
+    }
+
+  gsk_curve_init (&c, self->ops[first]);
+
+  if (first == last)
+    {
+      gsk_curve_segment (&c, first_t, last_t, &c1);
+      add_curve (&c1, builder, &emit_move_to);
+      return;
+    }
+
+  if (first_t == 0)
+    {
+      add_curve (&c, builder, &emit_move_to);
+    }
+  else if (first_t < 1)
+    {
+      gsk_curve_split (&c, first_t, &c1, &c2);
+      add_curve (&c2, builder, &emit_move_to);
+    }
+
+  for (gsize i = first + 1; i < last; i++)
+    {
+      gsk_curve_init (&c, self->ops[i]);
+      add_curve (&c, builder, &emit_move_to);
+    }
+
+  gsk_curve_init (&c, self->ops[last]);
+  if (c.op == GSK_PATH_CLOSE)
+    c.op = GSK_PATH_LINE;
+
+  if (last_t == 1)
+    {
+      add_curve (&c, builder, &emit_move_to);
+    }
+  else if (last_t > 0)
+    {
+      gsk_curve_split (&c, last_t, &c1, &c2);
+      add_curve (&c, builder, &emit_move_to);
+    }
+}
+
 static int
 gsk_standard_contour_get_winding (const GskContour       *contour,
                                   const graphene_point_t *point)
@@ -350,9 +609,6 @@ gsk_standard_contour_get_winding (const GskContour       *contour,
   GskStandardContour *self = (GskStandardContour *) contour;
   int winding = 0;
 
-  if (!gsk_bounding_box_contains_point (&self->bounds, point))
-    return 0;
-
   for (gsize i = 0; i < self->n_ops; i ++)
     {
       GskCurve c;
@@ -378,14 +634,6 @@ gsk_standard_contour_get_winding (const GskContour       *contour,
   return winding;
 }
 
-static gsize
-gsk_standard_contour_get_n_ops (const GskContour *contour)
-{
-  GskStandardContour *self = (GskStandardContour *) contour;
-
-  return self->n_ops;
-}
-
 static gboolean
 gsk_standard_contour_get_closest_point (const GskContour       *contour,
                                         const graphene_point_t *point,
@@ -407,8 +655,8 @@ gsk_standard_contour_get_closest_point (const GskContour       *contour,
       if (dist <= threshold)
         {
           *out_dist = dist;
-          result->idx = 0;
-          result->t = 0;
+          result->data.std.idx = 0;
+          result->data.std.t = 0;
           return TRUE;
         }
 
@@ -436,14 +684,108 @@ gsk_standard_contour_get_closest_point (const GskContour       *contour,
   if (best_idx != G_MAXUINT)
     {
       *out_dist = threshold;
-      result->idx = best_idx;
-      result->t = best_t;
+      result->data.std.idx = best_idx;
+      result->data.std.t = best_t;
       return TRUE;
     }
 
   return FALSE;
 }
 
+static void
+gsk_standard_contour_get_start_point (const GskContour *contour,
+                                      GskRealPathPoint *result)
+{
+  result->data.std.idx = 1;
+  result->data.std.t = 0;
+}
+
+static void
+gsk_standard_contour_get_end_point (const GskContour *contour,
+                                    GskRealPathPoint *result)
+{
+  GskStandardContour *self = (GskStandardContour *) contour;
+
+  result->data.std.idx = self->n_ops - 1;
+  result->data.std.t = 1;
+}
+
+static gboolean
+gsk_standard_contour_get_previous_point (const GskContour *contour,
+                                         GskRealPathPoint *point,
+                                         GskRealPathPoint *result)
+{
+  if (point->data.std.t > 0)
+    {
+      result->data.std.idx = point->data.std.idx;
+      result->data.std.t = 0;
+      return TRUE;
+    }
+  else if (point->data.std.idx > 1)
+    {
+      result->data.std.idx = point->data.std.idx - 1;
+      result->data.std.t = 0;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gsk_standard_contour_get_next_point (const GskContour *contour,
+                                     GskRealPathPoint *point,
+                                     GskRealPathPoint *result)
+{
+  GskStandardContour *self = (GskStandardContour *) contour;
+
+  if (point->data.std.t < 1)
+    {
+      result->data.std.idx = point->data.std.idx;
+      result->data.std.t = 1;
+      return TRUE;
+    }
+  else if (point->data.std.idx + 1 < self->n_ops - 1)
+    {
+      result->data.std.idx = point->data.std.idx + 1;
+      result->data.std.t = 1;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gsk_standard_contour_get_point (const GskContour *contour,
+                                gpointer          measure_data,
+                                float             distance,
+                                GskRealPathPoint *result)
+{
+  GArray *array = measure_data;
+  unsigned int idx;
+  GskStandardContourMeasure *measure;
+  float fraction, t;
+
+  if (array->len == 0)
+    {
+      result->data.std.idx = 0;
+      result->data.std.t = 0;
+      return;
+    }
+
+  if (!g_array_binary_search (array, &distance, gsk_standard_contour_find_measure, &idx))
+    idx = array->len - 1;
+
+  measure = &g_array_index (array, GskStandardContourMeasure, idx);
+
+  fraction = (distance - measure->start) / (measure->end - measure->start);
+  t = measure->start_progress + fraction * (measure->end_progress - measure->start_progress);
+
+  g_assert (t >= 0 && t <= 1);
+
+  result->data.std.idx = measure->op;
+  result->data.std.t = t;
+}
+
 static void
 gsk_standard_contour_get_position (const GskContour *contour,
                                    GskRealPathPoint *point,
@@ -452,14 +794,14 @@ gsk_standard_contour_get_position (const GskContour *contour,
   GskStandardContour *self = (GskStandardContour *) contour;
   GskCurve curve;
 
-  if (G_UNLIKELY (point->idx == 0))
+  if (G_UNLIKELY (point->data.std.idx == 0))
     {
       *position = self->points[0];
       return;
     }
 
-  gsk_curve_init (&curve, self->ops[point->idx]);
-  gsk_curve_get_point (&curve, point->t, position);
+  gsk_curve_init (&curve, self->ops[point->data.std.idx]);
+  gsk_curve_get_point (&curve, point->data.std.t, position);
 }
 
 static void
@@ -473,19 +815,18 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
   gsize idx;
   float t;
 
-  if (G_UNLIKELY (point->idx == 0))
+  if (G_UNLIKELY (point->data.std.idx == 0))
     {
       graphene_vec2_init (tangent, 1, 0);
       return;
     }
 
-  idx = point->idx;
-  t = point->t;
+  idx = point->data.std.idx;
+  t = point->data.std.t;
 
-  if (t == 0 && (direction == GSK_PATH_FROM_START ||
-                 direction == GSK_PATH_TO_START))
+  if (t == 0 && direction == GSK_PATH_START)
     {
-      /* Look at the previous segment */
+      /* Look at the previous segment (0 is always a move, so skip it) */
       if (idx > 1)
         {
           idx--;
@@ -497,8 +838,7 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
           t = 1;
         }
     }
-  else if (t == 1 && (direction == GSK_PATH_TO_END ||
-                      direction == GSK_PATH_FROM_END))
+  else if (t == 1 && direction == GSK_PATH_END)
     {
       /* Look at the next segment */
       if (idx < self->n_ops - 1)
@@ -508,6 +848,7 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
         }
       else if (self->flags & GSK_PATH_CLOSED)
         {
+          /* segment 0 is always a move */
           idx = 1;
           t = 0;
         }
@@ -515,9 +856,6 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
 
   gsk_curve_init (&curve, self->ops[idx]);
   gsk_curve_get_tangent (&curve, t, tangent);
-
-  if (direction == GSK_PATH_TO_START || direction == GSK_PATH_FROM_END)
-    graphene_vec2_negate (tangent, tangent);
 }
 
 static float
@@ -528,78 +866,42 @@ gsk_standard_contour_get_curvature (const GskContour *contour,
   GskStandardContour *self = (GskStandardContour *) contour;
   GskCurve curve;
 
-  if (G_UNLIKELY (point->idx == 0))
+  if (G_UNLIKELY (point->data.std.idx == 0))
     return 0;
 
-  gsk_curve_init (&curve, self->ops[point->idx]);
-  return gsk_curve_get_curvature (&curve, point->t, center);
+  gsk_curve_init (&curve, self->ops[point->data.std.idx]);
+  return gsk_curve_get_curvature (&curve, point->data.std.t, center);
 }
 
-static void
-add_curve (GskCurve       *curve,
-           GskPathBuilder *builder,
-           gboolean       *emit_move_to)
+static float
+gsk_standard_contour_get_distance (const GskContour *contour,
+                                   GskRealPathPoint *point,
+                                   gpointer          measure_data)
 {
-  if (*emit_move_to)
+  GArray *array = measure_data;
+
+  if (G_UNLIKELY (point->data.std.idx == 0))
+    return 0;
+
+  for (unsigned int i = 0; i < array->len; i++)
     {
-      const graphene_point_t *s;
+      GskStandardContourMeasure *measure = &g_array_index (array, GskStandardContourMeasure, i);
+      float fraction;
 
-      s = gsk_curve_get_start_point (curve);
-      gsk_path_builder_move_to (builder, s->x, s->y);
-      *emit_move_to = FALSE;
-    }
-  gsk_curve_builder_to (curve, builder);
-}
+      if (measure->op != point->data.std.idx)
+        continue;
 
-static void
-gsk_standard_contour_add_segment (const GskContour *contour,
-                                  GskPathBuilder   *builder,
-                                  gboolean          emit_move_to,
-                                  GskRealPathPoint *start,
-                                  GskRealPathPoint *end)
-{
-  GskStandardContour *self = (GskStandardContour *) contour;
-  GskCurve c, c1, c2;
+      if (measure->end_progress < point->data.std.t)
+        continue;
 
-  g_assert (start->idx < self->n_ops);
+      g_assert (measure->op == point->data.std.idx);
+      g_assert (measure->start_progress <= point->data.std.t && point->data.std.t <= measure->end_progress);
 
-  gsk_curve_init (&c, self->ops[start->idx]);
-
-  if (start->idx == end->idx)
-    {
-      gsk_curve_segment (&c, start->t, end->t, &c1);
-      add_curve (&c1, builder, &emit_move_to);
-      return;
-    }
-  if (start->t == 0)
-    {
-      add_curve (&c, builder, &emit_move_to);
-    }
-  else if (start->t < 1)
-    {
-      gsk_curve_split (&c, start->t, &c1, &c2);
-      add_curve (&c2, builder, &emit_move_to);
+      fraction = (point->data.std.t - measure->start_progress) / (measure->end_progress - measure->start_progress);
+      return measure->start + fraction * (measure->end - measure->start);
     }
 
-  for (gsize i = start->idx + 1; i < end->idx; i++)
-    {
-      gsk_curve_init (&c, self->ops[i]);
-      add_curve (&c, builder, &emit_move_to);
-    }
-
-  gsk_curve_init (&c, self->ops[end->idx]);
-  if (c.op == GSK_PATH_CLOSE)
-    c.op = GSK_PATH_LINE;
-
-  if (end->t == 1)
-    {
-      add_curve (&c, builder, &emit_move_to);
-    }
-  else if (end->t > 0)
-    {
-      gsk_curve_split (&c, end->t, &c1, &c2);
-      add_curve (&c1, builder, &emit_move_to);
-    }
+  return 0;
 }
 
 static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
@@ -616,12 +918,20 @@ static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
   gsk_standard_contour_foreach,
   gsk_standard_contour_reverse,
   gsk_standard_contour_get_winding,
-  gsk_standard_contour_get_n_ops,
   gsk_standard_contour_get_closest_point,
+  gsk_standard_contour_get_start_point,
+  gsk_standard_contour_get_end_point,
+  gsk_standard_contour_get_previous_point,
+  gsk_standard_contour_get_next_point,
   gsk_standard_contour_get_position,
   gsk_standard_contour_get_tangent,
   gsk_standard_contour_get_curvature,
+  gsk_standard_contour_init_measure,
+  gsk_standard_contour_free_measure,
+  gsk_standard_contour_point_compare,
   gsk_standard_contour_add_segment,
+  gsk_standard_contour_get_point,
+  gsk_standard_contour_get_distance,
 };
 
 /* You must ensure the contour has enough size allocated,
@@ -638,6 +948,7 @@ gsk_standard_contour_init (GskContour             *contour,
 
 {
   GskStandardContour *self = (GskStandardContour *) contour;
+  gsize i;
 
   self->contour.klass = &GSK_STANDARD_CONTOUR_CLASS;
 
@@ -648,13 +959,11 @@ gsk_standard_contour_init (GskContour             *contour,
   memcpy (self->points, points, sizeof (graphene_point_t) * n_points);
 
   offset += self->points - points;
-  for (gsize i = 0; i < n_ops; i++)
-    self->ops[i] = gsk_pathop_encode (gsk_pathop_op (ops[i]),
-                                      gsk_pathop_points (ops[i]) + offset);
-
-  gsk_bounding_box_init (&self->bounds,  &self->points[0], &self->points[0]);
-  for (gsize i = 1; i < self->n_points; i ++)
-    gsk_bounding_box_expand (&self->bounds, &self->points[i]);
+  for (i = 0; i < n_ops; i++)
+    {
+      self->ops[i] = gsk_pathop_encode (gsk_pathop_op (ops[i]),
+                                        gsk_pathop_points (ops[i]) + offset);
+    }
 }
 
 GskContour *
@@ -744,6 +1053,21 @@ gsk_contour_foreach (const GskContour   *self,
   return self->klass->foreach (self, tolerance, func, user_data);
 }
 
+gpointer
+gsk_contour_init_measure (const GskContour *self,
+                          float             tolerance,
+                          float            *out_length)
+{
+  return self->klass->init_measure (self, tolerance, out_length);
+}
+
+void
+gsk_contour_free_measure (const GskContour *self,
+                          gpointer          data)
+{
+  self->klass->free_measure (self, data);
+}
+
 void
 gsk_contour_get_start_end (const GskContour *self,
                            graphene_point_t *start,
@@ -752,6 +1076,24 @@ gsk_contour_get_start_end (const GskContour *self,
   self->klass->get_start_end (self, start, end);
 }
 
+int
+gsk_contour_point_compare (const GskContour *self,
+                           GskRealPathPoint *p1,
+                           GskRealPathPoint *p2)
+{
+  return self->klass->point_compare (self, p1, p2);
+}
+
+void
+gsk_contour_add_segment (const GskContour *self,
+                         GskPathBuilder   *builder,
+                         gboolean          emit_move_to,
+                         GskRealPathPoint *start,
+                         GskRealPathPoint *end)
+{
+  self->klass->add_segment (self, builder, emit_move_to, start, end);
+}
+
 int
 gsk_contour_get_winding (const GskContour       *self,
                          const graphene_point_t *point)
@@ -769,10 +1111,43 @@ gsk_contour_get_closest_point (const GskContour       *self,
   return self->klass->get_closest_point (self, point, threshold, result, out_dist);
 }
 
-gsize
-gsk_contour_get_n_ops (const GskContour *self)
+void
+gsk_contour_get_start_point (const GskContour *self,
+                             GskRealPathPoint *result)
 {
-  return self->klass->get_n_ops (self);
+  self->klass->get_start_point (self, result);
+}
+
+void
+gsk_contour_get_end_point (const GskContour *self,
+                           GskRealPathPoint *result)
+{
+  self->klass->get_end_point (self, result);
+}
+
+gboolean
+gsk_contour_get_previous_point (const GskContour *self,
+                                GskRealPathPoint *point,
+                                GskRealPathPoint *result)
+{
+  return self->klass->get_previous_point (self, point, result);
+}
+
+gboolean
+gsk_contour_get_next_point (const GskContour *self,
+                            GskRealPathPoint *point,
+                            GskRealPathPoint *result)
+{
+  return self->klass->get_next_point (self, point, result);
+}
+
+void
+gsk_contour_get_point (const GskContour *self,
+                       gpointer          measure_data,
+                       float             offset,
+                       GskRealPathPoint *result)
+{
+  self->klass->get_point (self, measure_data, offset, result);
 }
 
 void
@@ -800,14 +1175,12 @@ gsk_contour_get_curvature (const GskContour *self,
   return self->klass->get_curvature (self, point, center);
 }
 
-void
-gsk_contour_add_segment (const GskContour *self,
-                         GskPathBuilder   *builder,
-                         gboolean          emit_move_to,
-                         GskRealPathPoint *start,
-                         GskRealPathPoint *end)
+float
+gsk_contour_get_distance (const GskContour *self,
+                          GskRealPathPoint *point,
+                          gpointer          measure_data)
 {
-  self->klass->add_segment (self, builder, emit_move_to, start, end);
+  return self->klass->get_distance (self, point, measure_data);
 }
 
 /* }}} */

gsk/gskcontourprivate.h

@@ -57,15 +57,17 @@ void                    gsk_contour_get_start_end               (const GskContou
                                                                  graphene_point_t       *end);
 int                     gsk_contour_get_winding                 (const GskContour       *self,
                                                                  const graphene_point_t *point);
-gsize                   gsk_contour_get_n_ops                   (const GskContour       *self);
+
 gboolean                gsk_contour_get_closest_point           (const GskContour       *self,
                                                                  const graphene_point_t *point,
                                                                  float                   threshold,
                                                                  GskRealPathPoint       *result,
                                                                  float                  *out_dist);
+
 void                    gsk_contour_get_position                (const GskContour       *self,
                                                                  GskRealPathPoint       *point,
                                                                  graphene_point_t       *pos);
+
 void                    gsk_contour_get_tangent                 (const GskContour       *self,
                                                                  GskRealPathPoint       *point,
                                                                  GskPathDirection        direction,
@@ -73,11 +75,37 @@ void                    gsk_contour_get_tangent                 (const GskContou
 float                   gsk_contour_get_curvature               (const GskContour       *self,
                                                                  GskRealPathPoint       *point,
                                                                  graphene_point_t       *center);
+gpointer                gsk_contour_init_measure                (const GskContour       *self,
+                                                                 float                   tolerance,
+                                                                 float                  *out_length);
+void                    gsk_contour_free_measure                (const GskContour       *self,
+                                                                 gpointer                data);
+int                     gsk_contour_point_compare               (const GskContour       *self,
+                                                                 GskRealPathPoint       *p1,
+                                                                 GskRealPathPoint       *p2);
+
 void                    gsk_contour_add_segment                 (const GskContour       *self,
                                                                  GskPathBuilder         *builder,
                                                                  gboolean                emit_move_to,
                                                                  GskRealPathPoint       *start,
                                                                  GskRealPathPoint       *end);
 
+void                    gsk_contour_get_point                   (const GskContour       *self,
+                                                                 gpointer                measure_data,
+                                                                 float                   offset,
+                                                                 GskRealPathPoint       *result);
+void                    gsk_contour_get_start_point             (const GskContour       *self,
+                                                                 GskRealPathPoint       *result);
+void                    gsk_contour_get_end_point               (const GskContour       *self,
+                                                                 GskRealPathPoint       *result);
+gboolean                gsk_contour_get_previous_point          (const GskContour       *self,
+                                                                 GskRealPathPoint       *point,
+                                                                 GskRealPathPoint       *result);
+gboolean                gsk_contour_get_next_point              (const GskContour       *self,
+                                                                 GskRealPathPoint       *point,
+                                                                 GskRealPathPoint       *result);
+float                   gsk_contour_get_distance                (const GskContour       *self,
+                                                                 GskRealPathPoint       *point,
+                                                                 gpointer                measure_data);
 
 G_END_DECLS

gsk/gskcurve.c

@@ -76,10 +76,6 @@ struct _GskCurveClass
                                                          GskBoundingBox         *bounds);
   void                          (* get_tight_bounds)    (const GskCurve         *curve,
                                                          GskBoundingBox         *bounds);
-  void                          (* get_derivative)      (const GskCurve         *curve,
-                                                         GskCurve               *derivative);
-  int                           (* get_crossing)        (const GskCurve         *curve,
-                                                         const graphene_point_t *point);
 };
 
 /* {{{ Utilities */
@@ -93,51 +89,6 @@ get_tangent (const graphene_point_t *p0,
   graphene_vec2_normalize (t, t);
 }
 
-static int
-line_get_crossing (const graphene_point_t *p,
-                   const graphene_point_t *p1,
-                   const graphene_point_t *p2)
-{
-  if (p1->y <= p->y)
-    {
-      if (p2->y > p->y)
-        {
-          if ((p2->x - p1->x) * (p->y - p1->y) - (p->x - p1->x) * (p2->y - p1->y) > 0)
-            return 1;
-        }
-    }
-  else if (p2->y <= p->y)
-    {
-      if ((p2->x - p1->x) * (p->y - p1->y) - (p->x - p1->x) * (p2->y - p1->y) < 0)
-        return -1;
-    }
-
-  return 0;
-}
-
-static int
-get_crossing_by_bisection (const GskCurve         *curve,
-                           const graphene_point_t *point)
-{
-  GskBoundingBox bounds;
-  GskCurve c1, c2;
-
-  gsk_curve_get_bounds (curve, &bounds);
-
-  if (bounds.max.y < point->y || bounds.min.y > point->y || bounds.max.x < point->x)
-    return 0;
-
-  if (bounds.min.x > point->x)
-    return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
-
-  if (graphene_point_distance (&bounds.min, &bounds.max, NULL, NULL) < 0.001)
-    return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
-
-  gsk_curve_split (curve, 0.5, &c1, &c2);
-
-  return gsk_curve_get_crossing (&c1, point) + gsk_curve_get_crossing (&c2, point);
-}
-
 /* Replace a line by an equivalent quad,
  * and a quad by an equivalent cubic.
  */
@@ -360,26 +311,6 @@ gsk_line_curve_get_bounds (const GskCurve  *curve,
   gsk_bounding_box_init (bounds, &pts[0], &pts[1]);
 }
 
-static void
-gsk_line_curve_get_derivative (const GskCurve *curve,
-                               GskCurve       *deriv)
-{
-  const GskLineCurve *self = &curve->line;
-  graphene_point_t p;
-
-  p.x = self->points[1].x - self->points[0].x;
-  p.y = self->points[1].y - self->points[0].y;
-
-  gsk_line_curve_init_from_points (&deriv->line, GSK_PATH_LINE, &p, &p);
-}
-
-static int
-gsk_line_curve_get_crossing (const GskCurve         *curve,
-                             const graphene_point_t *point)
-{
-  return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
-}
-
 static const GskCurveClass GSK_LINE_CURVE_CLASS = {
   gsk_line_curve_init,
   gsk_line_curve_init_foreach,
@@ -399,8 +330,6 @@ static const GskCurveClass GSK_LINE_CURVE_CLASS = {
   gsk_line_curve_decompose_curve,
   gsk_line_curve_get_bounds,
   gsk_line_curve_get_bounds,
-  gsk_line_curve_get_derivative,
-  gsk_line_curve_get_crossing,
 };
 
 /* }}} */
@@ -741,28 +670,6 @@ gsk_quad_curve_get_tight_bounds (const GskCurve  *curve,
     }
 }
 
-static void
-gsk_quad_curve_get_derivative (const GskCurve *curve,
-                               GskCurve       *deriv)
-{
-  const GskQuadCurve *self = &curve->quad;
-  graphene_point_t p[2];
-
-  p[0].x = 2.f * (self->points[1].x - self->points[0].x);
-  p[0].y = 2.f * (self->points[1].y - self->points[0].y);
-  p[1].x = 2.f * (self->points[2].x - self->points[1].x);
-  p[1].y = 2.f * (self->points[2].y - self->points[1].y);
-
-  gsk_line_curve_init_from_points (&deriv->line, GSK_PATH_LINE, &p[0], &p[1]);
-}
-
-static int
-gsk_quad_curve_get_crossing (const GskCurve         *curve,
-                             const graphene_point_t *point)
-{
-  return get_crossing_by_bisection (curve, point);
-}
-
 static const GskCurveClass GSK_QUAD_CURVE_CLASS = {
   gsk_quad_curve_init,
   gsk_quad_curve_init_foreach,
@@ -782,8 +689,6 @@ static const GskCurveClass GSK_QUAD_CURVE_CLASS = {
   gsk_quad_curve_decompose_curve,
   gsk_quad_curve_get_bounds,
   gsk_quad_curve_get_tight_bounds,
-  gsk_quad_curve_get_derivative,
-  gsk_quad_curve_get_crossing,
 };
 
 /* }}} */
@@ -954,6 +859,61 @@ gsk_cubic_curve_reverse (const GskCurve *curve,
   reverse->cubic.has_coefficients = FALSE;
 }
 
+static void
+gsk_curve_get_derivative (const GskCurve *curve,
+                          GskCurve       *deriv)
+{
+  switch (curve->op)
+    {
+    case GSK_PATH_LINE:
+      {
+        const GskLineCurve *self = &curve->line;
+        graphene_point_t p;
+
+        p.x = self->points[1].x - self->points[0].x;
+        p.y = self->points[1].y - self->points[0].y;
+
+        gsk_line_curve_init_from_points (&deriv->line, GSK_PATH_LINE, &p, &p);
+      }
+      break;
+
+    case GSK_PATH_QUAD:
+      {
+        const GskQuadCurve *self = &curve->quad;
+        graphene_point_t p[2];
+
+        p[0].x = 2.f * (self->points[1].x - self->points[0].x);
+        p[0].y = 2.f * (self->points[1].y - self->points[0].y);
+        p[1].x = 2.f * (self->points[2].x - self->points[1].x);
+        p[1].y = 2.f * (self->points[2].y - self->points[1].y);
+
+        gsk_line_curve_init_from_points (&deriv->line, GSK_PATH_LINE, &p[0], &p[1]);
+      }
+      break;
+
+    case GSK_PATH_CUBIC:
+      {
+        const GskCubicCurve *self = &curve->cubic;
+        graphene_point_t p[3];
+
+        p[0].x = 3.f * (self->points[1].x - self->points[0].x);
+        p[0].y = 3.f * (self->points[1].y - self->points[0].y);
+        p[1].x = 3.f * (self->points[2].x - self->points[1].x);
+        p[1].y = 3.f * (self->points[2].y - self->points[1].y);
+        p[2].x = 3.f * (self->points[3].x - self->points[2].x);
+        p[2].y = 3.f * (self->points[3].y - self->points[2].y);
+
+        gsk_quad_curve_init_from_points (&deriv->quad, p);
+      }
+      break;
+
+    case GSK_PATH_MOVE:
+    case GSK_PATH_CLOSE:
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static inline float
 cross (const graphene_vec2_t *v1,
        const graphene_vec2_t *v2)
@@ -968,9 +928,6 @@ pow3 (float w)
   return w * w * w;
 }
 
-static void gsk_cubic_curve_get_derivative (const GskCurve *curve,
-                                            GskCurve       *deriv);
-
 static float
 gsk_cubic_curve_get_curvature (const GskCurve *curve,
                                float           t)
@@ -980,8 +937,8 @@ gsk_cubic_curve_get_curvature (const GskCurve *curve,
   graphene_vec2_t d, dd;
   float num, denom;
 
-  gsk_cubic_curve_get_derivative (curve, &c1);
-  gsk_quad_curve_get_derivative (&c1, &c2);
+  gsk_curve_get_derivative (curve, &c1);
+  gsk_curve_get_derivative (&c1, &c2);
 
   gsk_curve_get_point (&c1, t, &p);
   gsk_curve_get_point (&c2, t, &pp);
@@ -1193,30 +1150,6 @@ gsk_cubic_curve_get_tight_bounds (const GskCurve  *curve,
     }
 }
 
-static void
-gsk_cubic_curve_get_derivative (const GskCurve *curve,
-                                GskCurve       *deriv)
-{
-  const GskCubicCurve *self = &curve->cubic;
-  graphene_point_t p[3];
-
-  p[0].x = 3.f * (self->points[1].x - self->points[0].x);
-  p[0].y = 3.f * (self->points[1].y - self->points[0].y);
-  p[1].x = 3.f * (self->points[2].x - self->points[1].x);
-  p[1].y = 3.f * (self->points[2].y - self->points[1].y);
-  p[2].x = 3.f * (self->points[3].x - self->points[2].x);
-  p[2].y = 3.f * (self->points[3].y - self->points[2].y);
-
-  gsk_quad_curve_init_from_points (&deriv->quad, p);
-}
-
-static int
-gsk_cubic_curve_get_crossing (const GskCurve         *curve,
-                              const graphene_point_t *point)
-{
-  return get_crossing_by_bisection (curve, point);
-}
-
 static const GskCurveClass GSK_CUBIC_CURVE_CLASS = {
   gsk_cubic_curve_init,
   gsk_cubic_curve_init_foreach,
@@ -1236,8 +1169,6 @@ static const GskCurveClass GSK_CUBIC_CURVE_CLASS = {
   gsk_cubic_curve_decompose_curve,
   gsk_cubic_curve_get_bounds,
   gsk_cubic_curve_get_tight_bounds,
-  gsk_cubic_curve_get_derivative,
-  gsk_cubic_curve_get_crossing,
 };
 
 /* }}} */
@@ -1428,18 +1359,52 @@ gsk_curve_get_tight_bounds (const GskCurve  *curve,
   get_class (curve->op)->get_tight_bounds (curve, bounds);
 }
 
-void
-gsk_curve_get_derivative (const GskCurve *curve,
-                          GskCurve       *deriv)
+static inline int
+line_get_crossing (const graphene_point_t *p,
+                   const graphene_point_t *p1,
+                   const graphene_point_t *p2)
 {
-  get_class (curve->op)->get_derivative (curve, deriv);
+  if (p1->y <= p->y)
+    {
+      if (p2->y > p->y)
+        {
+          if ((p2->x - p1->x) * (p->y - p1->y) - (p->x - p1->x) * (p2->y - p1->y) > 0)
+            return 1;
+        }
+    }
+  else if (p2->y <= p->y)
+    {
+      if ((p2->x - p1->x) * (p->y - p1->y) - (p->x - p1->x) * (p2->y - p1->y) < 0)
+        return -1;
+    }
+
+  return 0;
 }
 
 int
 gsk_curve_get_crossing (const GskCurve         *curve,
                         const graphene_point_t *point)
 {
-  return get_class (curve->op)->get_crossing (curve, point);
+  GskBoundingBox bounds;
+  GskCurve c1, c2;
+
+  if (curve->op == GSK_PATH_LINE || curve->op == GSK_PATH_CLOSE)
+    return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
+
+  gsk_curve_get_bounds (curve, &bounds);
+
+  if (bounds.max.y < point->y || bounds.min.y > point->y || bounds.max.x < point->x)
+    return 0;
+
+  if (bounds.min.x > point->x)
+    return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
+
+  if (graphene_point_distance (&bounds.min, &bounds.max, NULL, NULL) < 0.001)
+    return line_get_crossing (point, gsk_curve_get_start_point (curve), gsk_curve_get_end_point (curve));
+
+  gsk_curve_split (curve, 0.5, &c1, &c2);
+
+  return gsk_curve_get_crossing (&c1, point) + gsk_curve_get_crossing (&c2, point);
 }
 
 static gboolean

gsk/gskcurveprivate.h

@@ -145,8 +145,6 @@ void                    gsk_curve_get_bounds                    (const GskCurve
 void                    gsk_curve_get_tight_bounds              (const GskCurve         *curve,
                                                                  GskBoundingBox         *bounds);
 
-void                    gsk_curve_get_derivative                (const GskCurve         *curve,
-                                                                 GskCurve               *derivative);
 int                     gsk_curve_get_crossing                  (const GskCurve         *curve,
                                                                  const graphene_point_t *point);
 gboolean                gsk_curve_get_closest_point             (const GskCurve         *curve,

gsk/gskenums.h

@@ -1,5 +1,5 @@
 /* GSK - The GTK Scene Kit
- * Copyright 2016  Endless
+ * Copyright 2016  Endless 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -42,6 +42,8 @@
  * @GSK_REPEAT_NODE: A node that repeats the child's contents
  * @GSK_CLIP_NODE: A node that clips its child to a rectangular area
  * @GSK_ROUNDED_CLIP_NODE: A node that clips its child to a rounded rectangle
+ * @GSK_FILL_NODE: A node that fills a path
+ * @GSK_STROKE_NODE: A node that strokes a path
  * @GSK_SHADOW_NODE: A node that draws a shadow below its child
  * @GSK_BLEND_NODE: A node that blends two children together
  * @GSK_CROSS_FADE_NODE: A node that cross-fades between two children
@@ -51,9 +53,7 @@
  * @GSK_GL_SHADER_NODE: A node that uses OpenGL fragment shaders to render
  * @GSK_TEXTURE_SCALE_NODE: A node drawing a `GdkTexture` scaled and filtered (Since: 4.10)
  * @GSK_MASK_NODE: A node that masks one child with another (Since: 4.10)
- * @GSK_FILL_NODE: A node that fills a path
- * @GSK_STROKE_NODE: A node that strokes a path
-
+ 
  * The type of a node determines what the node is rendering.
  */
 typedef enum {
@@ -76,6 +76,8 @@ typedef enum {
   GSK_REPEAT_NODE,
   GSK_CLIP_NODE,
   GSK_ROUNDED_CLIP_NODE,
+  GSK_FILL_NODE,
+  GSK_STROKE_NODE,
   GSK_SHADOW_NODE,
   GSK_BLEND_NODE,
   GSK_CROSS_FADE_NODE,
@@ -84,9 +86,7 @@ typedef enum {
   GSK_DEBUG_NODE,
   GSK_GL_SHADER_NODE,
   GSK_TEXTURE_SCALE_NODE,
-  GSK_MASK_NODE,
-  GSK_FILL_NODE,
-  GSK_STROKE_NODE
+  GSK_MASK_NODE
 } GskRenderNodeType;
 
 /**
@@ -222,14 +222,6 @@ typedef enum {
  *
  * New entries may be added in future versions.
  *
- * <figure>
- *   <picture>
- *     <source srcset="caps-dark.png" media="(prefers-color-scheme: dark)">
- *     <img alt="Line Cap Styles" src="caps-light.png">
- *   </picture>
- *   <figcaption>GSK_LINE_CAP_BUTT, GSK_LINE_CAP_ROUND, GSK_LINE_CAP_SQUARE</figcaption>
- * </figure>
- *
  * Since: 4.14
  */
 typedef enum {
@@ -252,14 +244,6 @@ typedef enum {
  *
  * New entries may be added in future versions.
  *
- * <figure>
- *   <picture>
- *     <source srcset="join-dark.png" media="(prefers-color-scheme: dark)">
- *     <img alt="Line Join Styles" src="join-light.png">
- *   </picture>
- *   <figcaption>GSK_LINE_JOINT_MITER, GSK_LINE_JOINT_ROUND, GSK_LINE_JOIN_BEVEL</figcaption>
- * </figure>
- *
  * Since: 4.14
  */
 typedef enum {
@@ -298,34 +282,17 @@ typedef enum {
 
 /**
  * GskPathDirection:
- * @GSK_PATH_FROM_START: The tangent in path direction of the incoming side
- *   of the path
- * @GSK_PATH_TO_START: The tangent against path direction of the incoming side
- *   of the path
- * @GSK_PATH_TO_END: The tangent in path direction of the outgoing side
- *   of the path
- * @GSK_PATH_FROM_END: The tangent against path direction of the outgoing
- *   side of the path
+ * @GSK_PATH_START: The side that leads to the start of the path
+ * @GSK_PATH_END: The side that leads to the end of the path
  *
  * The values of the `GskPathDirection` enum are used to pick one
- * of the four tangents at a given point on the path.
- *
- * Note that the directions for @GSK_PATH_FROM_START/@GSK_PATH_TO_END and
- * @GSK_PATH_TO_START/@GSK_PATH_FROM_END will coincide for smooth points.
- * Only sharp turns will exhibit four different directions.
- *
- * <picture>
- *   <source srcset="directions-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Path Tangents" src="directions-light.png">
- * </picture>
+ * of the two sides of the path that at a given point on the path.
  *
  * Since: 4.14
  */
 typedef enum {
-  GSK_PATH_FROM_START,
-  GSK_PATH_TO_START,
-  GSK_PATH_TO_END,
-  GSK_PATH_FROM_END,
+  GSK_PATH_START,
+  GSK_PATH_END
 } GskPathDirection;
 
 /**

gsk/gskpath.c

@@ -30,26 +30,18 @@
  * GskPath:
  *
  * A `GskPath` describes lines and curves that are more complex
- * than simple rectangles.
- *
- * Paths can used for rendering (filling or stroking) and for animations
- * (e.g. as trajectories).
+ * than simple rectangles. Paths can used for rendering (filling or
+ * stroking) and for animations (e.g. as trajectories).
  *
  * `GskPath` is an immutable, opaque, reference-counted struct.
- * After creation, you cannot change the types it represents. Instead,
- * new `GskPath` objects have to be created. The [struct@Gsk.PathBuilder]
- * structure is meant to help in this endeavor.
+ * After creation, you cannot change the types it represents.
+ * Instead, new `GskPath` objects have to be created.
+ *
+ * The [struct@Gsk.PathBuilder] structure is meant to help in this endeavor.
  *
  * Conceptually, a path consists of zero or more contours (continous, connected
  * curves), each of which may or may not be closed. Contours are typically
  * constructed from Bézier segments.
- *
- * <picture>
- *   <source srcset="path-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="A Path" src="path-light.png">
- * </picture>
- *
- * Since: 4.14
  */
 
 struct _GskPath
@@ -302,7 +294,7 @@ gsk_path_to_cairo (GskPath *self,
                                    cr);
 }
 
-/**
+/*< private >
  * gsk_path_get_n_contours:
  * @path: a `GskPath`
  *
@@ -311,10 +303,8 @@ gsk_path_to_cairo (GskPath *self,
  * Returns: the number of contours in @path
  */
 gsize
-gsk_path_get_n_contours (GskPath *self)
+gsk_path_get_n_contours (const GskPath *self)
 {
-  g_return_val_if_fail (self != NULL, 0);
-
   return self->n_contours;
 }
 
@@ -430,7 +420,6 @@ gsk_path_get_bounds (GskPath         *self,
  *
  * Returns: `TRUE` if the path has bounds, `FALSE` if the path is known
  *   to be empty and have no bounds.
- * Since: 4.14
  */
 gboolean
 gsk_path_get_stroke_bounds (GskPath         *self,
@@ -501,72 +490,6 @@ gsk_path_in_fill (GskPath                *self,
     }
 }
 
-/**
- * gsk_path_get_start_point:
- * @self: a `GskPath`
- * @result: (out caller-allocates): return location for point
- *
- * Gets the start point of the path.
- *
- * An empty path has no points, so `FALSE`
- * is returned in this case.
- *
- * Returns: `TRUE` if @result was filled
- *
- * Since: 4.14
- */
-gboolean
-gsk_path_get_start_point (GskPath      *self,
-                          GskPathPoint *result)
-{
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  res->contour = 0;
-  res->idx = 1;
-  res->t = 0;
-
-  return TRUE;
-}
-
-/**
- * gsk_path_get_end_point:
- * @self: a `GskPath`
- * @result: (out caller-allocates): return location for point
- *
- * Gets the end point of the path.
- *
- * An empty path has no points, so `FALSE`
- * is returned in this case.
- *
- * Returns: `TRUE` if @result was filled
- *
- * Since: 4.14
- */
-gboolean
-gsk_path_get_end_point (GskPath      *self,
-                        GskPathPoint *result)
-{
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  res->contour = self->n_contours - 1;
-  res->idx = gsk_contour_get_n_ops (self->contours[self->n_contours - 1]) - 1;
-  res->t = 1;
-
-  return TRUE;
-}
-
 /**
  * gsk_path_get_closest_point:
  * @self: a `GskPath`
@@ -609,6 +532,7 @@ gsk_path_get_closest_point (GskPath                *self,
         {
           found = TRUE;
           res->contour = i;
+          res->path = self;
           threshold = distance;
         }
     }
@@ -616,6 +540,74 @@ gsk_path_get_closest_point (GskPath                *self,
   return found;
 }
 
+/**
+ * gsk_path_get_start_point:
+ * @self: a `GskPath`
+ * @result: (out caller-allocates): return location for point
+ *
+ * Gets the start point of the path.
+ *
+ * An empty path has no points, so `FALSE`
+ * is returned in this case.
+ *
+ * Returns: `TRUE` if @result was filled
+ *
+ * Since: 4.14
+ */
+gboolean
+gsk_path_get_start_point (GskPath      *self,
+                          GskPathPoint *result)
+{
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (result != NULL, FALSE);
+
+  if (self->n_contours == 0)
+    return FALSE;
+
+  gsk_contour_get_start_point (self->contours[0], res);
+
+  res->path = self;
+  res->contour = 0;
+
+  return TRUE;
+}
+
+/**
+ * gsk_path_get_end_point:
+ * @self: a `GskPath`
+ * @result: (out caller-allocates): return location for point
+ *
+ * Gets the end point of the path.
+ *
+ * An empty path has no points, so `FALSE`
+ * is returned in this case.
+ *
+ * Returns: `TRUE` if @result was filled
+ *
+ * Since: 4.14
+ */
+gboolean
+gsk_path_get_end_point (GskPath      *self,
+                        GskPathPoint *result)
+{
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (result!= NULL, FALSE);
+
+  if (self->n_contours == 0)
+    return FALSE;
+
+  gsk_contour_get_end_point (self->contours[self->n_contours - 1], res);
+
+  res->path = self;
+  res->contour = self->n_contours - 1;
+
+  return TRUE;
+}
+
 /**
  * gsk_path_foreach:
  * @self: a `GskPath`
@@ -916,7 +908,7 @@ parse_command (const char **p,
   if (*cmd == 'X')
     allowed = "mM";
   else
-    allowed = "mMhHvVzZlLcCsStTqQaA";
+    allowed = "mMhHvVzZlLcCsStTqQoOaA";
 
   skip_whitespace (p);
   s = _strchr (allowed, **p);
@@ -929,6 +921,81 @@ parse_command (const char **p,
   return FALSE;
 }
 
+static gboolean
+parse_string (const char **p,
+              const char  *s)
+{
+  int len = strlen (s);
+  if (strncmp (*p, s, len) != 0)
+    return FALSE;
+  (*p) += len;
+  return TRUE;
+}
+
+static gboolean
+parse_rectangle (const char **p,
+                 double      *x,
+                 double      *y,
+                 double      *w,
+                 double      *h)
+{
+  const char *o = *p;
+  double w2;
+
+  /* Check for M%g,%gh%gv%gh%gz without any intervening whitespace */
+  if (parse_coordinate_pair (p, x, y) &&
+      parse_string (p, "h") &&
+      parse_coordinate (p, w) &&
+      parse_string (p, "v") &&
+      parse_coordinate (p, h) &&
+      parse_string (p, "h") &&
+      parse_coordinate (p, &w2) &&
+      parse_string (p, "z") &&
+      w2 == - *w)
+    {
+      skip_whitespace (p);
+
+      return TRUE;
+    }
+
+  *p = o;
+  return FALSE;
+}
+
+static gboolean
+parse_circle (const char **p,
+              double      *sx,
+              double      *sy,
+              double      *r)
+{
+  const char *o = *p;
+  double r1, r2, r3, mx, my, ex, ey;
+
+  /* Check for M%g,%gA%g,%g,0,1,0,%g,%gA%g,%g,0,1,0,%g,%g
+   * without any intervening whitespace
+   */
+  if (parse_coordinate_pair (p, sx, sy) &&
+      parse_string (p, "A") &&
+      parse_coordinate_pair (p, r, &r1) &&
+      parse_string (p, "0 0 0") &&
+      parse_coordinate_pair (p, &mx, &my) &&
+      parse_string (p, "A") &&
+      parse_coordinate_pair (p, &r2, &r3) &&
+      parse_string (p, "0 0 0") &&
+      parse_coordinate_pair (p, &ex, &ey) &&
+      parse_string (p, "z") &&
+      *r == r1 && r1 == r2 && r2 == r3 &&
+      *sx == ex && *sy == ey)
+    {
+      skip_whitespace (p);
+
+      return TRUE;
+    }
+
+  *p = o;
+  return FALSE;
+}
+
 /**
  * gsk_path_parse:
  * @string: a string
@@ -940,22 +1007,6 @@ parse_command (const char **p,
  * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData),
  * as e.g. produced by [method@Gsk.Path.to_string].
  *
- * A high-level summary of the syntax:
- *
- * - `M x y` Move to `(x, y)`
- * - `L x y` Add a line from the current point to `(x, y)`
- * - `Q x1 y1 x2 y2` Add a quadratic Bézier from the current point to `(x2, y2)`, with control point `(x1, y1)`
- * - `C x1 y1 x2 y2 x3 y3` Add a cubic Bézier from the current point to `(x3, y3)`, with control points `(x1, y1)` and `(x2, y2)`
- * - `Z` Close the contour by drawing a line back to the start point
- * - `H x` Add a horizontal line from the current point to the given x value
- * - `V y` Add a vertical line from the current point to the given y value
- * - `T x2 y2` Add a quadratic Bézier, using the reflection of the previous segments' control point as control point
- * - `S x2 y2 x3 y3` Add a cubic Bézier, using the reflection of the previous segments' second control point as first control point
- * - `A rx ry r l s x y` Add an elliptical arc from the current point to `(x, y)` with radii rx and ry. See the SVG documentation for how the other parameters influence the arc.
- *
- * All the commands have lowercase variants that interpret coordinates
- * relative to the current point.
- *
  * Returns: (nullable): a new `GskPath`, or `NULL`
  *   if @string could not be parsed
  *
@@ -1011,9 +1062,31 @@ gsk_path_parse (const char *string)
         case 'M':
         case 'm':
           {
-            double x1, y1;
+            double x1, y1, w, h, r;
 
-            if (parse_coordinate_pair (&p, &x1, &y1))
+            if (parse_rectangle (&p, &x1, &y1, &w, &h))
+              {
+                gsk_path_builder_add_rect (builder, &GRAPHENE_RECT_INIT (x1, y1, w, h));
+                if (_strchr ("zZX", prev_cmd))
+                  {
+                    path_x = x1;
+                    path_y = y1;
+                  }
+                x = x1;
+                y = y1;
+              }
+            else if (parse_circle (&p, &x1, &y1, &r))
+              {
+                gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (x1 - r, y1), r);
+                if (_strchr ("zZX", prev_cmd))
+                  {
+                    path_x = x1;
+                    path_y = y1;
+                  }
+                x = x1;
+                y = y1;
+              }
+            else if (parse_coordinate_pair (&p, &x1, &y1))
               {
                 if (cmd == 'm')
                   {
@@ -1318,3 +1391,174 @@ error:
 
   return NULL;
 }
+
+/**
+ * gsk_path_builder_add_segment:
+ * @self: a `GskPathBuilder`
+ * @path: the `GskPath` to take the segment to
+ * @start: the point on @path to start at
+ * @end: the point on @path to end at
+ *
+ * Adds to @self the segment of @path from @start to @end.
+ *
+ * If @start is after @end, the path will first add the segment
+ * from @start to the end of the path, and then add the segment from
+ * the beginning to @end. If the path is closed, these segments will
+ * be connected.
+ *
+ * Since: 4.14
+ */
+void
+gsk_path_builder_add_segment (GskPathBuilder     *self,
+                              GskPath            *path,
+                              const GskPathPoint *start,
+                              const GskPathPoint *end)
+{
+  GskRealPathPoint *s = (GskRealPathPoint *) start;
+  GskRealPathPoint *e = (GskRealPathPoint *) end;
+  const GskContour *contour;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (path != NULL);
+  g_return_if_fail (path == s->path);
+  g_return_if_fail (path == e->path);
+
+  contour = gsk_path_get_contour (path, s->contour);
+
+  if (s->contour == e->contour)
+    {
+      if (gsk_contour_point_compare (contour, s, e) < 0)
+        {
+          gsk_contour_add_segment (contour, self, TRUE, s, e);
+          return;
+        }
+      else if (path->n_contours == 1)
+        {
+          gsk_contour_add_segment (contour, self, TRUE, s, NULL);
+          gsk_contour_add_segment (contour, self, FALSE, NULL, e);
+          return;
+        }
+    }
+
+  gsk_contour_add_segment (contour, self, TRUE, s, NULL);
+
+  for (gsize i = (s->contour + 1) % path->n_contours; i != e->contour; i = (i + 1) % path->n_contours)
+    gsk_path_builder_add_contour (self, gsk_contour_dup (gsk_path_get_contour (path, i)));
+
+  contour = gsk_path_get_contour (path, e->contour);
+  gsk_contour_add_segment (contour, self, FALSE, NULL, e);
+}
+
+/**
+ * gsk_path_get_previous_point:
+ * @self: a `GskPath`
+ * @point: a point on @self
+ * @result: (out caller-allocates): Return location for the result
+ *
+ * Gets the previous 'significant' point on @self before @point.
+ *
+ * The 'significant' points of a path are typically the
+ * on-curve points that have been specified when the
+ * path was created.
+ *
+ * For example, in a path with 3 Bézier segments, the
+ * significant points are the start of the first segment,
+ * the start point of the second segment (which coincides
+ * with the end point of the first segment), the start
+ * point of the third segment, and the end point of the
+ * last segment.
+ *
+ * If @point is the start point of the path, there is no
+ * prior point, and this function returns `FALSE`.
+ *
+ * Returns: `TRUE` if @result has been set to a point
+ */
+gboolean
+gsk_path_get_previous_point (GskPath            *self,
+                             const GskPathPoint *point,
+                             GskPathPoint       *result)
+{
+  GskRealPathPoint *p = (GskRealPathPoint *) point;
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
+  const GskContour *contour;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (self == p->path, FALSE);
+
+  contour = gsk_path_get_contour (self, p->contour);
+
+  if (gsk_contour_get_previous_point (contour, p, res))
+    {
+      res->path  = self;
+      res->contour = p->contour;
+      return TRUE;
+    }
+
+  if (p->contour > 0)
+    {
+      contour = gsk_path_get_contour (self, p->contour - 1);
+      gsk_contour_get_end_point (contour, res);
+      res->path = self;
+      res->contour = p->contour - 1;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gsk_path_get_next_point:
+ * @self: a `GskPath`
+ * @point: a point on @self
+ * @result: (out caller-allocates): Return location for the result
+ *
+ * Gets the next 'significant' point on @self after @point.
+ *
+ * The 'significant' points of a path are typically the
+ * on-curve points that have been specified when the
+ * path was created.
+ *
+ * For example, in a path with 3 Bézier segments, the
+ * significant points are the start of the first segment,
+ * the start point of the second segment (which coincides
+ * with the end point of the first segment), the start
+ * point of the third segment, and the end point of the
+ * last segment.
+ *
+ * If @point is the end point of the path, there is no
+ * next point, and this function returns `FALSE`.
+ *
+ * Returns: `TRUE` if @result has been set to a point
+ */
+gboolean
+gsk_path_get_next_point (GskPath            *self,
+                         const GskPathPoint *point,
+                         GskPathPoint       *result)
+{
+  GskRealPathPoint *p = (GskRealPathPoint *) point;
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
+  const GskContour *contour;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (self == p->path, FALSE);
+
+  contour = gsk_path_get_contour (self, p->contour);
+
+  if (gsk_contour_get_next_point (contour, p, res))
+    {
+      res->path  = self;
+      res->contour = p->contour;
+      return TRUE;
+    }
+
+  if (p->contour < self->n_contours - 1)
+    {
+      contour = gsk_path_get_contour (self, p->contour + 1);
+      gsk_contour_get_start_point (contour, res);
+      res->path = self;
+      res->contour = p->contour + 1;
+      return TRUE;
+    }
+
+  return FALSE;
+}

gsk/gskpath.h

@@ -41,8 +41,6 @@ G_BEGIN_DECLS
  * By default, [method@Gsk.Path.foreach] will only emit a path with all operations
  * flattened to straight lines to allow for maximum compatibility. The only
  * operations emitted will be `GSK_PATH_MOVE`, `GSK_PATH_LINE` and `GSK_PATH_CLOSE`.
- *
- * Since: 4.14
  */
 typedef enum
 {
@@ -92,9 +90,6 @@ GDK_AVAILABLE_IN_4_14
 void                    gsk_path_to_cairo                       (GskPath                *self,
                                                                  cairo_t                *cr);
 
-GDK_AVAILABLE_IN_4_14
-gsize                   gsk_path_get_n_contours                 (GskPath                *self);
-
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_is_empty                       (GskPath                *self);
 
@@ -115,6 +110,22 @@ gboolean                gsk_path_in_fill                        (GskPath
                                                                  const graphene_point_t *point,
                                                                  GskFillRule             fill_rule);
 
+GDK_AVAILABLE_IN_4_14
+gboolean                gsk_path_get_closest_point              (GskPath                *self,
+                                                                 const graphene_point_t *point,
+                                                                 float                   threshold,
+                                                                 GskPathPoint           *result);
+
+GDK_AVAILABLE_IN_4_14
+gboolean                gsk_path_get_previous_point             (GskPath                *self,
+                                                                 const GskPathPoint     *point,
+                                                                 GskPathPoint           *result);
+
+GDK_AVAILABLE_IN_4_14
+gboolean                gsk_path_get_next_point                 (GskPath                *self,
+                                                                 const GskPathPoint     *point,
+                                                                 GskPathPoint           *result);
+
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_get_start_point                (GskPath                *self,
                                                                  GskPathPoint           *result);
@@ -122,12 +133,6 @@ GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_get_end_point                  (GskPath                *self,
                                                                  GskPathPoint           *result);
 
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_closest_point              (GskPath                *self,
-                                                                 const graphene_point_t *point,
-                                                                 float                   threshold,
-                                                                 GskPathPoint           *result);
-
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_foreach                        (GskPath                *self,
                                                                  GskPathForeachFlags     flags,

gsk/gskpathbuilder.c

@@ -54,9 +54,6 @@
  * either common shapes like [method@Gsk.PathBuilder.add_circle]
  * or by adding from other paths like [method@Gsk.PathBuilder.add_path].
  *
- * The `gsk_path_builder_add_*` methods always add complete contours,
- * and do not use or modify the current point.
- *
  * The other option is to define each line and curve manually with
  * the `gsk_path_builder_*_to` group of functions. You start with
  * a call to [method@Gsk.PathBuilder.move_to] to set the starting point
@@ -66,8 +63,6 @@
  * back with a line to the starting point.
  *
  * This is similar for how paths are drawn in Cairo.
- *
- * Since: 4.14
  */
 
 struct _GskPathBuilder
@@ -180,9 +175,6 @@ gsk_path_builder_append_current (GskPathBuilder         *self,
   self->current_point = points[n_points - 1];
 }
 
-static void add_contour (GskPathBuilder *self,
-                         GskContour     *contour);
-
 static void
 gsk_path_builder_end_current (GskPathBuilder *self)
 {
@@ -202,16 +194,7 @@ gsk_path_builder_end_current (GskPathBuilder *self)
   g_array_set_size (self->points, 0);
 
   /* do this at the end to avoid inflooping when add_contour calls back here */
-  add_contour (self, contour);
-}
-
-static void
-add_contour (GskPathBuilder *self,
-             GskContour     *contour)
-{
-  gsk_path_builder_end_current (self);
-
-  self->contours = g_slist_prepend (self->contours, contour);
+  gsk_path_builder_add_contour (self, contour);
 }
 
 static void
@@ -310,6 +293,15 @@ gsk_path_builder_to_path (GskPathBuilder *self)
   return path;
 }
 
+void
+gsk_path_builder_add_contour (GskPathBuilder *self,
+                              GskContour     *contour)
+{
+  gsk_path_builder_end_current (self);
+
+  self->contours = g_slist_prepend (self->contours, contour);
+}
+
 /**
  * gsk_path_builder_get_current_point:
  * @self: a `GskPathBuilder`
@@ -353,7 +345,7 @@ gsk_path_builder_add_path (GskPathBuilder *self,
     {
       const GskContour *contour = gsk_path_get_contour (path, i);
 
-      add_contour (self, gsk_contour_dup (contour));
+      gsk_path_builder_add_contour (self, gsk_contour_dup (contour));
     }
 }
 
@@ -377,7 +369,7 @@ gsk_path_builder_add_reverse_path (GskPathBuilder *self,
     {
       const GskContour *contour = gsk_path_get_contour (path, i - 1);
 
-      add_contour (self, gsk_contour_reverse (contour));
+      gsk_path_builder_add_contour (self, gsk_contour_reverse (contour));
     }
 }
 
@@ -396,13 +388,9 @@ void
 gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
                                  const cairo_path_t *path)
 {
-  graphene_point_t current;
-
   g_return_if_fail (self != NULL);
   g_return_if_fail (path != NULL);
 
-  current = self->current_point;
-
   for (gsize i = 0; i < path->num_data; i += path->data[i].header.length)
     {
       const cairo_path_data_t *data = &path->data[i];
@@ -433,9 +421,6 @@ gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
           break;
         }
     }
-
-  gsk_path_builder_end_current (self);
-  self->current_point = current;
 }
 
 /**
@@ -445,8 +430,6 @@ gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
  *
  * Adds @rect as a new contour to the path built by the builder.
  *
- * The path is going around the rectangle in clockwise direction.
- *
  * If the width or height of the rectangle is negative, the start
  * point will be on the right or bottom, respectively.
  *
@@ -459,12 +442,8 @@ void
 gsk_path_builder_add_rect (GskPathBuilder        *self,
                            const graphene_rect_t *rect)
 {
-  graphene_point_t current;
-
   g_return_if_fail (self != NULL);
 
-  current = self->current_point;
-
   gsk_path_builder_move_to (self, rect->origin.x, rect->origin.y);
 
   gsk_path_builder_rel_line_to (self, rect->size.width, 0);
@@ -472,81 +451,6 @@ gsk_path_builder_add_rect (GskPathBuilder        *self,
   gsk_path_builder_rel_line_to (self, - rect->size.width, 0);
 
   gsk_path_builder_close (self);
-  self->current_point = current;
-}
-
-/**
- * gsk_path_builder_add_rounded_rect:
- * @self: a #GskPathBuilder
- * @rect: the rounded rect
- *
- * Adds @rect as a new contour to the path built in @self.
- *
- * The path is going around the rectangle in clockwise direction.
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_add_rounded_rect (GskPathBuilder       *self,
-                                   const GskRoundedRect *rect)
-{
-  graphene_point_t current;
-
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (rect != NULL);
-
-  current = self->current_point;
-
-  gsk_path_builder_move_to (self,
-                            rect->bounds.origin.x + rect->corner[GSK_CORNER_TOP_LEFT].width,
-                            rect->bounds.origin.y);
-  /* top */
-  gsk_path_builder_line_to (self,
-                            rect->bounds.origin.x + rect->bounds.size.width - rect->corner[GSK_CORNER_TOP_RIGHT].width,
-                            rect->bounds.origin.y);
-  /* topright corner */
-  gsk_path_builder_svg_arc_to (self,
-                               rect->corner[GSK_CORNER_TOP_RIGHT].width,
-                               rect->corner[GSK_CORNER_TOP_RIGHT].height,
-                               0, FALSE, TRUE,
-                               rect->bounds.origin.x + rect->bounds.size.width,
-                               rect->bounds.origin.y + rect->corner[GSK_CORNER_TOP_RIGHT].height);
-  /* right */
-  gsk_path_builder_line_to (self,
-                            rect->bounds.origin.x + rect->bounds.size.width,
-                            rect->bounds.origin.y + rect->bounds.size.height - rect->corner[GSK_CORNER_BOTTOM_RIGHT].height);
-  /* bottomright corner */
-  gsk_path_builder_svg_arc_to (self,
-                               rect->corner[GSK_CORNER_BOTTOM_RIGHT].width,
-                               rect->corner[GSK_CORNER_BOTTOM_RIGHT].height,
-                               0, FALSE, TRUE,
-                               rect->bounds.origin.x + rect->bounds.size.width - rect->corner[GSK_CORNER_BOTTOM_RIGHT].width,
-                               rect->bounds.origin.y + rect->bounds.size.height);
-  /* bottom */
-  gsk_path_builder_line_to (self,
-                            rect->bounds.origin.x + rect->corner[GSK_CORNER_BOTTOM_LEFT].width,
-                            rect->bounds.origin.y + rect->bounds.size.height);
-  /* bottomleft corner */
-  gsk_path_builder_svg_arc_to (self,
-                               rect->corner[GSK_CORNER_BOTTOM_LEFT].width,
-                               rect->corner[GSK_CORNER_BOTTOM_LEFT].height,
-                               0, FALSE, TRUE,
-                               rect->bounds.origin.x,
-                               rect->bounds.origin.y + rect->bounds.size.height - rect->corner[GSK_CORNER_BOTTOM_LEFT].height);
-  /* left */
-  gsk_path_builder_line_to (self,
-                            rect->bounds.origin.x,
-                            rect->bounds.origin.y + rect->corner[GSK_CORNER_TOP_LEFT].height);
-  /* topleft corner */
-  gsk_path_builder_svg_arc_to (self,
-                               rect->corner[GSK_CORNER_TOP_LEFT].width,
-                               rect->corner[GSK_CORNER_TOP_LEFT].height,
-                               0, FALSE, TRUE,
-                               rect->bounds.origin.x + rect->corner[GSK_CORNER_TOP_LEFT].width,
-                               rect->bounds.origin.y);
-  /* done */
-  gsk_path_builder_close (self);
-  self->current_point = current;
 }
 
 static gboolean
@@ -571,8 +475,6 @@ circle_contour_curve (const graphene_point_t pts[4],
  *
  * Adds a circle with the @center and @radius.
  *
- * The path is going around the circle in clockwise direction.
- *
  * Since: 4.14
  */
 void
@@ -580,22 +482,16 @@ gsk_path_builder_add_circle (GskPathBuilder         *self,
                              const graphene_point_t *center,
                              float                   radius)
 {
-  graphene_point_t current;
-
   g_return_if_fail (self != NULL);
   g_return_if_fail (center != NULL);
   g_return_if_fail (radius > 0);
 
-  current = self->current_point;
-
   gsk_path_builder_move_to (self, center->x + radius, center->y);
   gsk_spline_decompose_arc (center, radius,
                             GSK_PATH_TOLERANCE_DEFAULT,
                             0, 2 * M_PI,
                             circle_contour_curve, self);
-
   gsk_path_builder_close (self);
-  self->current_point = current;
 }
 
 /**
@@ -660,11 +556,6 @@ gsk_path_builder_rel_move_to (GskPathBuilder *self,
  * Draws a line from the current point to @x, @y and makes it
  * the new current point.
  *
- * <picture>
- *   <source srcset="line-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Line To" src="line-light.png">
- * </picture>
- *
  * Since: 4.14
  */
 void
@@ -724,11 +615,6 @@ gsk_path_builder_rel_line_to (GskPathBuilder *self,
  *
  * After this, @x2, @y2 will be the new current point.
  *
- * <picture>
- *   <source srcset="quad-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Quad To" src="quad-light.png">
- * </picture>
- *
  * Since: 4.14
  */
 void
@@ -796,11 +682,6 @@ gsk_path_builder_rel_quad_to (GskPathBuilder *self,
  * from the current point to @x3, @y3 with @x1, @y1 and @x2, @y2 as the control
  * points.
  *
- * <picture>
- *   <source srcset="cubic-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Cubic To" src="cubic-light.png">
- * </picture>
- *
  * After this, @x3, @y3 will be the new current point.
  *
  * Since: 4.14
@@ -1102,118 +983,3 @@ gsk_path_builder_add_layout (GskPathBuilder *self,
   cairo_destroy (cr);
   cairo_surface_destroy (surface);
 }
-
-/**
- * gsk_path_builder_add_segment:
- * @self: a `GskPathBuilder`
- * @path: the `GskPath` to take the segment to
- * @start: the point on @path to start at
- * @end: the point on @path to end at
- *
- * Adds to @self the segment of @path from @start to @end.
- *
- * If @start is equal to or after @end, the path will first add the
- * segment from @start to the end of the path, and then add the segment
- * from the beginning to @end. If the path is closed, these segments
- * will be connected.
- *
- * Note that this method always adds a path with the given start point
- * and end point. To add a closed path, use [method@Gsk.PathBuilder.add_path]
- * of [method@Gsk.PathBuilder.add_contour].
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_add_segment (GskPathBuilder     *self,
-                              GskPath            *path,
-                              const GskPathPoint *start,
-                              const GskPathPoint *end)
-{
-  GskRealPathPoint *s = (GskRealPathPoint *) start;
-  GskRealPathPoint *e = (GskRealPathPoint *) end;
-  const GskContour *contour;
-  gsize n_contours = gsk_path_get_n_contours (path);
-  graphene_point_t current;
-  gsize n_ops;
-
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (start != NULL);
-  g_return_if_fail (end != NULL);
-  g_return_if_fail (s->contour < n_contours);
-  g_return_if_fail (e->contour < n_contours);
-
-  current = self->current_point;
-
-  contour = gsk_path_get_contour (path, s->contour);
-  n_ops = gsk_contour_get_n_ops (contour);
-
-  if (s->contour == e->contour)
-    {
-      if (gsk_path_point_compare (start, end) < 0)
-        {
-          gsk_contour_add_segment (contour, self, TRUE, s, e);
-          goto out;
-        }
-      else if (n_contours == 1)
-        {
-          if (n_ops > 1)
-            gsk_contour_add_segment (contour, self, TRUE,
-                                     s,
-                                     &(GskRealPathPoint) { s->contour, n_ops - 1, 1 });
-          gsk_contour_add_segment (contour, self, n_ops <= 1,
-                                   &(GskRealPathPoint) { s->contour, 1, 0 },
-                                   e);
-          goto out;
-        }
-    }
-
-  if (n_ops > 1)
-    gsk_contour_add_segment (contour, self, TRUE,
-                             s,
-                             &(GskRealPathPoint) { s->contour, n_ops - 1, 1. });
-
-  for (gsize i = (s->contour + 1) % n_contours; i != e->contour; i = (i + 1) % n_contours)
-    {
-      const GskContour *contour = gsk_path_get_contour (path, i);
-
-      add_contour (self, gsk_contour_dup (contour));
-    }
-
-  contour = gsk_path_get_contour (path, e->contour);
-  n_ops = gsk_contour_get_n_ops (contour);
-
-  if (n_ops > 1)
-    gsk_contour_add_segment (contour, self, TRUE,
-                             &(GskRealPathPoint) { e->contour, 1, 0 },
-                             e);
-
-out:
-  gsk_path_builder_end_current (self);
-  self->current_point = current;
-}
-
-/**
- * gsk_path_builder_add_contour:
- * @self: a `GskPathBuilder`
- * @path: the `GskPath` to take the contour from
- * @contour: the index of the contour to take
- *
- * Adds one of the connected contours of @path to @self.
- *
- * Use [method@Gsk.Path.get_n_contours] to find out how
- * many contours a path has.
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_add_contour (GskPathBuilder *self,
-                              GskPath        *path,
-                              gsize           contour)
-{
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (contour < gsk_path_get_n_contours (path));
-
-  add_contour (self, gsk_contour_dup (gsk_path_get_contour (path, contour)));
-}

gsk/gskpathbuilder.h

@@ -65,9 +65,6 @@ GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_rect               (GskPathBuilder         *self,
                                                                  const graphene_rect_t  *rect);
 GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_add_rounded_rect       (GskPathBuilder         *self,
-                                                                 const GskRoundedRect   *rect);
-GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_circle             (GskPathBuilder         *self,
                                                                  const graphene_point_t *center,
                                                                  float                   radius);
@@ -76,12 +73,6 @@ void                    gsk_path_builder_add_segment            (GskPathBuilder
                                                                  GskPath                *path,
                                                                  const GskPathPoint     *start,
                                                                  const GskPathPoint     *end);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_add_contour            (GskPathBuilder         *self,
-                                                                 GskPath                *path,
-                                                                 gsize                   contour);
-
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_move_to                (GskPathBuilder         *self,
                                                                  float                   x,

gsk/gskpathmeasure.c

@@ -0,0 +1,328 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include "config.h"
+
+#include "gskpathmeasure.h"
+
+#include "gskpathbuilder.h"
+#include "gskpathpointprivate.h"
+#include "gskpathprivate.h"
+
+/**
+ * GskPathMeasure:
+ *
+ * `GskPathMeasure` is an object that allows measurements
+ * on `GskPath`s such as determining the length of the path.
+ *
+ * Many measuring operations require approximating the path
+ * with simpler shapes. Therefore, a `GskPathMeasure` has
+ * a tolerance that determines what precision is required
+ * for such approximations.
+ *
+ * A `GskPathMeasure` struct is a reference counted struct
+ * and should be treated as opaque.
+ */
+
+typedef struct _GskContourMeasure GskContourMeasure;
+
+struct _GskContourMeasure
+{
+  float length;
+  gpointer contour_data;
+};
+
+struct _GskPathMeasure
+{
+  /*< private >*/
+  guint ref_count;
+
+  GskPath *path;
+  float tolerance;
+
+  float length;
+  gsize n_contours;
+  GskContourMeasure measures[];
+};
+
+G_DEFINE_BOXED_TYPE (GskPathMeasure, gsk_path_measure,
+                     gsk_path_measure_ref,
+                     gsk_path_measure_unref)
+
+/**
+ * gsk_path_measure_new:
+ * @path: the path to measure
+ *
+ * Creates a measure object for the given @path.
+ *
+ * Returns: a new `GskPathMeasure` representing @path
+ *
+ * Since: 4.14
+ */
+GskPathMeasure *
+gsk_path_measure_new (GskPath *path)
+{
+  return gsk_path_measure_new_with_tolerance (path, GSK_PATH_TOLERANCE_DEFAULT);
+}
+
+/**
+ * gsk_path_measure_new_with_tolerance:
+ * @path: the path to measure
+ * @tolerance: the tolerance for measuring operations
+ *
+ * Creates a measure object for the given @path and @tolerance.
+ *
+ * Returns: a new `GskPathMeasure` representing @path
+ *
+ * Since: 4.14
+ */
+GskPathMeasure *
+gsk_path_measure_new_with_tolerance (GskPath *path,
+                                     float    tolerance)
+{
+  GskPathMeasure *self;
+  gsize i, n_contours;
+
+  g_return_val_if_fail (path != NULL, NULL);
+  g_return_val_if_fail (tolerance > 0, NULL);
+
+  n_contours = gsk_path_get_n_contours (path);
+
+  self = g_malloc0 (sizeof (GskPathMeasure) + n_contours * sizeof (GskContourMeasure));
+
+  self->ref_count = 1;
+  self->path = gsk_path_ref (path);
+  self->tolerance = tolerance;
+  self->n_contours = n_contours;
+
+  for (i = 0; i < n_contours; i++)
+    {
+      self->measures[i].contour_data = gsk_contour_init_measure (gsk_path_get_contour (path, i),
+                                                                 self->tolerance,
+                                                                 &self->measures[i].length);
+      self->length += self->measures[i].length;
+    }
+
+  return self;
+}
+
+/**
+ * gsk_path_measure_ref:
+ * @self: a `GskPathMeasure`
+ *
+ * Increases the reference count of a `GskPathMeasure` by one.
+ *
+ * Returns: the passed in `GskPathMeasure`.
+ *
+ * Since: 4.14
+ */
+GskPathMeasure *
+gsk_path_measure_ref (GskPathMeasure *self)
+{
+  g_return_val_if_fail (self != NULL, NULL);
+
+  self->ref_count++;
+
+  return self;
+}
+
+/**
+ * gsk_path_measure_unref:
+ * @self: a `GskPathMeasure`
+ *
+ * Decreases the reference count of a `GskPathMeasure` by one.
+ *
+ * If the resulting reference count is zero, frees the object.
+ *
+ * Since: 4.14
+ */
+void
+gsk_path_measure_unref (GskPathMeasure *self)
+{
+  gsize i;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (self->ref_count > 0);
+
+  self->ref_count--;
+  if (self->ref_count > 0)
+    return;
+
+  for (i = 0; i < self->n_contours; i++)
+    {
+      gsk_contour_free_measure (gsk_path_get_contour (self->path, i),
+                                self->measures[i].contour_data);
+    }
+
+  gsk_path_unref (self->path);
+  g_free (self);
+}
+
+/**
+ * gsk_path_measure_get_path:
+ * @self: a `GskPathMeasure`
+ *
+ * Returns the path that the measure was created for.
+ *
+ * Returns: (transfer none): the path of @self
+ *
+ * Since: 4.14
+ */
+GskPath *
+gsk_path_measure_get_path (GskPathMeasure *self)
+{
+  return self->path;
+}
+
+/**
+ * gsk_path_measure_get_tolerance:
+ * @self: a `GskPathMeasure`
+ *
+ * Returns the tolerance that the measure was created with.
+ *
+ * Returns: the tolerance of @self
+ *
+ * Since: 4.14
+ */
+float
+gsk_path_measure_get_tolerance (GskPathMeasure *self)
+{
+  return self->tolerance;
+}
+
+/**
+ * gsk_path_measure_get_length:
+ * @self: a `GskPathMeasure`
+ *
+ * Gets the length of the path being measured.
+ *
+ * The length is cached, so this function does not do any work.
+ *
+ * Returns: The length of the path measured by @self
+ *
+ * Since: 4.14
+ */
+float
+gsk_path_measure_get_length (GskPathMeasure *self)
+{
+  g_return_val_if_fail (self != NULL, 0);
+
+  return self->length;
+}
+
+static float
+gsk_path_measure_clamp_distance (GskPathMeasure *self,
+                                 float           distance)
+{
+  if (isnan (distance))
+    return 0;
+
+  return CLAMP (distance, 0, self->length);
+}
+
+/**
+ * gsk_path_measure_get_point:
+ * @self: a `GskPathMeasure`
+ * @distance: the distance
+ * @result: (out caller-allocates): return location for the result
+ *
+ * Sets @result to the point at the given distance into the path.
+ *
+ * An empty path has no points, so `FALSE` is returned in that case.
+ *
+ * Returns: `TRUE` if @result was set
+ *
+ * Since: 4.14
+ */
+gboolean
+gsk_path_measure_get_point (GskPathMeasure *self,
+                            float           distance,
+                            GskPathPoint   *result)
+{
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
+  gsize i;
+  float offset;
+  const GskContour *contour;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (result != NULL, FALSE);
+
+  if (self->n_contours == 0)
+    return FALSE;
+
+  offset = gsk_path_measure_clamp_distance (self, distance);
+
+  for (i = 0; i < self->n_contours - 1; i++)
+    {
+      if (offset < self->measures[i].length)
+        break;
+
+      offset -= self->measures[i].length;
+    }
+
+  g_assert (0 <= i && i < self->n_contours);
+
+  offset = CLAMP (offset, 0, self->measures[i].length);
+
+  contour = gsk_path_get_contour (self->path, i);
+
+  gsk_contour_get_point (contour, self->measures[i].contour_data, offset, res);
+
+  res->path = self->path;
+  res->contour = i;
+
+  return TRUE;
+}
+
+/**
+ * gsk_path_point_get_distance:
+ * @measure: a `GskPathMeasure`
+ * @point: a `GskPathPoint on the path of @self
+ *
+ * Returns the distance from the beginning of the path
+ * to @point.
+ *
+ * Returns: the distance of @point
+ *
+ * Since: 4.14
+ */
+float
+gsk_path_point_get_distance (GskPathMeasure     *measure,
+                             const GskPathPoint *point)
+{
+  GskRealPathPoint *p = (GskRealPathPoint *)point;
+  const GskContour *contour = gsk_path_get_contour (measure->path, p->contour);
+  float contour_offset = 0;
+
+  g_return_val_if_fail (measure != NULL, 0);
+  g_return_val_if_fail (measure->path == p->path, 0);
+  g_return_val_if_fail (contour != NULL, 0);
+
+  for (gsize i = 0; i < measure->n_contours; i++)
+    {
+      if (contour == gsk_path_get_contour (measure->path, i))
+        return contour_offset + gsk_contour_get_distance (contour,
+                                                          p,
+                                                          measure->measures[i].contour_data);
+
+      contour_offset += measure->measures[i].length;
+    }
+
+  g_return_val_if_reached (0);
+}

gsk/gskpathmeasure.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#pragma once
+
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gsk/gsk.h> can be included directly."
+#endif
+
+
+#include <gsk/gskpath.h>
+#include <gsk/gskpathpoint.h>
+
+G_BEGIN_DECLS
+
+#define GSK_TYPE_PATH_MEASURE (gsk_path_measure_get_type ())
+
+GDK_AVAILABLE_IN_4_14
+GType                   gsk_path_measure_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_4_14
+GskPathMeasure *        gsk_path_measure_new                    (GskPath                *path);
+GDK_AVAILABLE_IN_4_14
+GskPathMeasure *        gsk_path_measure_new_with_tolerance     (GskPath                *path,
+                                                                 float                   tolerance);
+
+GDK_AVAILABLE_IN_4_14
+GskPathMeasure *        gsk_path_measure_ref                    (GskPathMeasure         *self);
+GDK_AVAILABLE_IN_4_14
+void                    gsk_path_measure_unref                  (GskPathMeasure         *self);
+
+GDK_AVAILABLE_IN_4_14
+GskPath *               gsk_path_measure_get_path               (GskPathMeasure         *self) G_GNUC_PURE;
+GDK_AVAILABLE_IN_4_14
+float                   gsk_path_measure_get_tolerance          (GskPathMeasure         *self) G_GNUC_PURE;
+
+GDK_AVAILABLE_IN_4_14
+float                   gsk_path_measure_get_length             (GskPathMeasure         *self);
+
+GDK_AVAILABLE_IN_4_14
+gboolean                gsk_path_measure_get_point              (GskPathMeasure         *self,
+                                                                 float                   distance,
+                                                                 GskPathPoint           *result);
+
+GDK_AVAILABLE_IN_4_14
+float                   gsk_path_measure_get_distance           (GskPathMeasure         *self,
+                                                                 const GskPathPoint     *point);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPathMeasure, gsk_path_measure_unref)
+
+G_END_DECLS

gsk/gskpathpoint.c

@@ -19,16 +19,13 @@
 
 #include "config.h"
 
-#include <math.h>
-
 #include "gskpathpointprivate.h"
 
 #include "gskcontourprivate.h"
+#include "gskpathmeasure.h"
 
 #include "gdk/gdkprivate.h"
 
-#define RAD_TO_DEG(x)          ((x) / (G_PI / 180.f))
-
 /**
  * GskPathPoint:
  *
@@ -37,14 +34,13 @@
  * It can be queried for properties of the path at that point, such as its
  * tangent or its curvature.
  *
- * To obtain a `GskPathPoint`, use [method@Gsk.Path.get_closest_point].
+ * To obtain a `GskPathPoint`, use [method@Gsk.Path.get_closest_point]
+ * or [method@Gsk.PathMeasure.get_point].
  *
  * Note that `GskPathPoint` structs are meant to be stack-allocated, and
  * don't a reference to the path object they are obtained from. It is the
  * callers responsibility to keep a reference to the path as long as the
  * `GskPathPoint` is used.
- *
- * Since: 4.14
  */
 
 G_DEFINE_BOXED_TYPE (GskPathPoint, gsk_path_point,
@@ -70,81 +66,10 @@ gsk_path_point_free (GskPathPoint *point)
   g_free (point);
 }
 
-/**
- * gsk_path_point_equal:
- * @point1: a `GskPathPoint`
- * @point2: another `GskPathPoint`
- *
- * Returns whether the two path points refer to the same
- * location on all paths.
- *
- * Note that the start- and endpoint of a closed contour
- * will compare nonequal according to this definition.
- * Use [method@Gsk.Path.is_closed] to find out if the
- * start- and endpoint of a concrete path refer to the
- * same location.
- *
- * Return: `TRUE` if @point1 and @point2 are equal
- */
-gboolean
-gsk_path_point_equal (const GskPathPoint *point1,
-                      const GskPathPoint *point2)
-{
-  const GskRealPathPoint *p1 = (const GskRealPathPoint *) point1;
-  const GskRealPathPoint *p2 = (const GskRealPathPoint *) point2;
-
-  if (p1->contour == p2->contour)
-    {
-      if ((p1->idx     == p2->idx     && p1->t == p2->t) ||
-          (p1->idx + 1 == p2->idx     && p1->t == 1 && p2->t == 0) ||
-          (p1->idx     == p2->idx + 1 && p1->t == 0 && p2->t == 1))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-/**
- * gsk_path_point_compare:
- * @point1: a `GskPathPoint`
- * @point2: another `GskPathPoint`
- *
- * Returns whether @point1 is before or after @point2.
- *
- * Returns: -1 if @point1 is before @point2,
- *   1 if @point1 is after @point2,
- *   0 if they are equal
- */
-int
-gsk_path_point_compare (const GskPathPoint *point1,
-                        const GskPathPoint *point2)
-{
-  const GskRealPathPoint *p1 = (const GskRealPathPoint *) point1;
-  const GskRealPathPoint *p2 = (const GskRealPathPoint *) point2;
-
-  if (gsk_path_point_equal (point1, point2))
-    return 0;
-
-  if (p1->contour < p2->contour)
-    return -1;
-  else if (p1->contour > p2->contour)
-    return 1;
-  else if (p1->idx < p2->idx)
-    return -1;
-  else if (p1->idx > p2->idx)
-    return 1;
-  else if (p1->t < p2->t)
-    return -1;
-  else if (p1->t > p2->t)
-    return 1;
-
-  return 0;
-}
-
 /**
  * gsk_path_point_get_position:
- * @point: a `GskPathPoint`
- * @path: the path that @point is on
+ * @path: a `GskPath`
+ * @point: a `GskPathPoint` on @path
  * @position: (out caller-allocates): Return location for
  *   the coordinates of the point
  *
@@ -153,26 +78,23 @@ gsk_path_point_compare (const GskPathPoint *point1,
  * Since: 4.14
  */
 void
-gsk_path_point_get_position (const GskPathPoint *point,
-                             GskPath            *path,
+gsk_path_point_get_position (GskPath            *path,
+                             const GskPathPoint *point,
                              graphene_point_t   *position)
 {
   GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour;
+  const GskContour *contour = gsk_path_get_contour (path, self->contour);
 
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (position != NULL);
-  g_return_if_fail (self->contour < gsk_path_get_n_contours (path));
+  g_return_if_fail (path == self->path);
+  g_return_if_fail (contour != NULL);
 
-  contour = gsk_path_get_contour (path, self->contour),
   gsk_contour_get_position (contour, self, position);
 }
 
 /**
  * gsk_path_point_get_tangent:
- * @point: a `GskPathPoint`
- * @path: the path that @point is on
+ * @path: a `GskPath`
+ * @point: a `GskPathPoint` on @path
  * @direction: the direction for which to return the tangent
  * @tangent: (out caller-allocates): Return location for
  *   the tangent at the point
@@ -185,69 +107,28 @@ gsk_path_point_get_position (const GskPathPoint *point,
  * point, and the direction coming out of it. The @direction
  * argument lets you choose which one to get.
  *
- * If you want to orient something in the direction of the
- * path, [method@Gsk.PathPoint.get_rotation] may be more
- * convenient to use.
- *
  * Since: 4.14
  */
 void
-gsk_path_point_get_tangent (const GskPathPoint *point,
-                            GskPath            *path,
+gsk_path_point_get_tangent (GskPath            *path,
+                            const GskPathPoint *point,
                             GskPathDirection    direction,
                             graphene_vec2_t    *tangent)
 {
   GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour;
+  const GskContour *contour = gsk_path_get_contour (path, self->contour);
 
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (tangent != NULL);
-  g_return_if_fail (self->contour < gsk_path_get_n_contours (path));
+  g_return_if_fail (path == self->path);
+  g_return_if_fail (contour != NULL);
 
-  contour = gsk_path_get_contour (path, self->contour),
   gsk_contour_get_tangent (contour, self, direction, tangent);
 }
 
-/**
- * gsk_path_point_get_rotation:
- * @point: a `GskPathPoint`
- * @path: the path that @point is on
- * @direction: the direction for which to return the rotation
- *
- * Gets the direction of the tangent at a given point.
- *
- * This is a convenience variant of [method@Gsk.PathPoint.get_tangent]
- * that returns the angle between the tangent and the X axis. The angle
- * can e.g. be used in [method@Gtk.Snapshot.rotate].
- *
- * Returns: the angle between the tangent and the X axis, in degrees
- *
- * Since: 4.14
- */
-float
-gsk_path_point_get_rotation (const GskPathPoint *point,
-                             GskPath            *path,
-                             GskPathDirection    direction)
-{
-  GskRealPathPoint *self = (GskRealPathPoint *) point;
-  graphene_vec2_t tangent;
-
-  g_return_val_if_fail (self != NULL, 0);
-  g_return_val_if_fail (path != NULL, 0);
-  g_return_val_if_fail (self->contour < gsk_path_get_n_contours (path), 0);
-
-  gsk_path_point_get_tangent (point, path, direction, &tangent);
-
-  return RAD_TO_DEG (atan2f (graphene_vec2_get_y (&tangent),
-                             graphene_vec2_get_x (&tangent)));
-}
-
 /**
  * gsk_path_point_get_curvature:
- * @point: a `GskPathPoint`
- * @path: the path that @point is on
- * @center: (out caller-allocates) (nullable): Return location for
+ * @path: a `GskPath`
+ * @point: a `GskPathPoint` on @path
+ * @center: (out caller-allocates): Return location for
  *   the center of the osculating circle
  *
  * Calculates the curvature of the path at the point.
@@ -262,17 +143,15 @@ gsk_path_point_get_rotation (const GskPathPoint *point,
  * Since: 4.14
  */
 float
-gsk_path_point_get_curvature (const GskPathPoint *point,
-                              GskPath            *path,
+gsk_path_point_get_curvature (GskPath            *path,
+                              const GskPathPoint *point,
                               graphene_point_t   *center)
 {
   GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour;
+  const GskContour *contour = gsk_path_get_contour (path, self->contour);
 
-  g_return_val_if_fail (self != NULL, 0);
-  g_return_val_if_fail (path != NULL, 0);
-  g_return_val_if_fail (self->contour < gsk_path_get_n_contours (path), 0);
+  g_return_val_if_fail (path == self->path, 0);
+  g_return_val_if_fail (contour != NULL, 0);
 
-  contour = gsk_path_get_contour (path, self->contour);
   return gsk_contour_get_curvature (contour, self, center);
 }

gsk/gskpathpoint.h

@@ -49,33 +49,23 @@ GDK_AVAILABLE_IN_4_14
 void                    gsk_path_point_free            (GskPathPoint       *point);
 
 GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_point_equal           (const GskPathPoint *point1,
-                                                        const GskPathPoint *point2);
-
-GDK_AVAILABLE_IN_4_14
-int                     gsk_path_point_compare         (const GskPathPoint *point1,
-                                                        const GskPathPoint *point2);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_point_get_position    (const GskPathPoint *point,
-                                                        GskPath            *path,
+void                    gsk_path_point_get_position    (GskPath            *path,
+                                                        const GskPathPoint *point,
                                                         graphene_point_t   *position);
 
 GDK_AVAILABLE_IN_4_14
-void                    gsk_path_point_get_tangent     (const GskPathPoint *point,
-                                                        GskPath            *path,
+void                    gsk_path_point_get_tangent     (GskPath            *path,
+                                                        const GskPathPoint *point,
                                                         GskPathDirection    direction,
                                                         graphene_vec2_t    *tangent);
 
 GDK_AVAILABLE_IN_4_14
-float                   gsk_path_point_get_rotation    (const GskPathPoint *point,
-                                                        GskPath            *path,
-                                                        GskPathDirection    direction);
-
-GDK_AVAILABLE_IN_4_14
-float                   gsk_path_point_get_curvature   (const GskPathPoint *point,
-                                                        GskPath            *path,
+float                   gsk_path_point_get_curvature   (GskPath            *path,
+                                                        const GskPathPoint *point,
                                                         graphene_point_t   *center);
 
+GDK_AVAILABLE_IN_4_14
+float                   gsk_path_point_get_distance    (GskPathMeasure     *measure,
+                                                        const GskPathPoint *point);
 
 G_END_DECLS

gsk/gskpathpointprivate.h

@@ -7,9 +7,15 @@ G_BEGIN_DECLS
 
 struct _GskRealPathPoint
 {
+  GskPath *path;
   gsize contour;
-  gsize idx;
-  float t;
+
+  union {
+    struct {
+      unsigned int idx;
+      float t;
+    } std;
+  } data;
 };
 
 G_STATIC_ASSERT (sizeof (GskRealPathPoint) <= sizeof (GskPathPoint));

gsk/gskpathprivate.h

@@ -40,6 +40,7 @@ typedef struct _GskRealPathPoint GskRealPathPoint;
 
 GskPath *               gsk_path_new_from_contours              (const GSList           *contours);
 
+gsize                   gsk_path_get_n_contours                 (const GskPath          *self);
 const GskContour *      gsk_path_get_contour                    (const GskPath          *self,
                                                                  gsize                   i);
 
@@ -51,6 +52,10 @@ gboolean                gsk_path_foreach_with_tolerance         (GskPath
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
 
+
+void                    gsk_path_builder_add_contour            (GskPathBuilder         *builder,
+                                                                 GskContour             *contour);
+
 void                    gsk_path_builder_svg_arc_to             (GskPathBuilder         *builder,
                                                                  float                   rx,
                                                                  float                   ry,

gsk/gskrendernode.h

@@ -35,6 +35,7 @@ G_BEGIN_DECLS
 
 #define GSK_SERIALIZATION_ERROR       (gsk_serialization_error_quark ())
 
+typedef struct _GskRenderNode           GskRenderNode;
 typedef struct _GskColorStop            GskColorStop;
 typedef struct _GskShadow               GskShadow;
 

gsk/gskrendernodeimpl.c

@@ -3841,12 +3841,11 @@ gsk_color_matrix_node_class_init (gpointer g_class,
  * Creates a `GskRenderNode` that will drawn the @child with
  * @color_matrix.
  *
- * In particular, the node will transform colors by applying
+ * In particular, the node will transform the operation
  *
- *     pixel = transpose(color_matrix) * pixel + color_offset
+ *     pixel = color_matrix * pixel + color_offset
  *
- * for every pixel. The transformation operates on unpremultiplied
- * colors, with color components ordered R, G, B, A.
+ * for every pixel.
  *
  * Returns: (transfer full) (type GskColorMatrixNode): A new `GskRenderNode`
  */
@@ -3971,7 +3970,7 @@ gsk_repeat_node_draw (GskRenderNode *node,
   scale_x *= width / self->child_bounds.size.width;
   scale_y *= height / self->child_bounds.size.height;
   cairo_surface_set_device_scale (surface, scale_x, scale_y);
-  cairo_surface_set_device_offset (surface,
+  cairo_surface_set_device_offset (surface, 
                                    - self->child_bounds.origin.x * scale_x,
                                    - self->child_bounds.origin.y * scale_y);
 
@@ -4142,7 +4141,7 @@ gsk_clip_node_diff (GskRenderNode  *node1,
       gsk_render_node_diff_impossible (node1, node2, region);
     }
 }
-
+ 
 static void
 gsk_clip_node_class_init (gpointer g_class,
                                gpointer class_data)
@@ -4373,15 +4372,6 @@ gsk_rounded_clip_node_get_clip (const GskRenderNode *node)
 /* }}} */
 /* {{{ GSK_FILL_NODE */
 
-/**
- * GskFillNode:
- *
- * A render node filling the area given by [struct@Gsk.Path]
- * and [enum@Gsk.FillRule] with the child node.
- *
- * Since: 4.14
- */
-
 struct _GskFillNode
 {
   GskRenderNode render_node;
@@ -4582,15 +4572,6 @@ gsk_fill_node_get_fill_rule (const GskRenderNode *node)
 /* }}} */
 /* {{{ GSK_STROKE_NODE */
 
-/**
- * GskStrokeNode:
- *
- * A render node that will fill the area determined by stroking the the given
- * [struct@Gsk.Path] using the [struct@Gsk.Stroke] attributes.
- *
- * Since: 4.14
- */
-
 struct _GskStrokeNode
 {
   GskRenderNode render_node;
@@ -4689,10 +4670,8 @@ gsk_stroke_node_class_init (gpointer g_class,
  * @path: (transfer none): The path describing the area to stroke
  * @stroke: (transfer none): The stroke attributes to use
  *
- * Creates a #GskRenderNode that will fill the outline generated by stroking
- * the given @path using the attributes defined in @stroke.
- *
- * The area is filled with @child.
+ * Creates a #GskRenderNode that will stroke the @child along the given
+ * @path using the attributes defined in @stroke.
  *
  * Returns: (transfer none) (type GskStrokeNode): A new #GskRenderNode
  *

gsk/gskrendernodeprivate.h

@@ -14,7 +14,7 @@ typedef struct _GskRenderNodeClass GskRenderNodeClass;
  * We don't add an "n-types" value to avoid having to handle
  * it in every single switch.
  */
-#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_STROKE_NODE + 1)
+#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_MASK_NODE + 1)
 
 extern GType gsk_render_node_types[];
 

gsk/gskstroke.c

@@ -26,8 +26,6 @@
  *
  * A `GskStroke` struct collects the parameters that influence
  * the operation of stroking a path.
- *
- * Since: 4.14
  */
 
 G_DEFINE_BOXED_TYPE (GskStroke, gsk_stroke, gsk_stroke_copy, gsk_stroke_free)
@@ -428,7 +426,8 @@ gsk_stroke_set_dash (GskStroke   *self,
 /**
  * gsk_stroke_get_dash:
  * @self: a `GskStroke`
- * @n_dash: (out): number of elements in the array returned
+ * @n_dash: (out caller-allocates): number of elements
+ *     in the array returned
  *
  * Gets the dash array in use or `NULL` if dashing is disabled.
  *

gsk/gsktypes.h

@@ -27,9 +27,9 @@
 
 typedef struct _GskPath                 GskPath;
 typedef struct _GskPathBuilder          GskPathBuilder;
+typedef struct _GskPathMeasure          GskPathMeasure;
 typedef struct _GskPathPoint            GskPathPoint;
 typedef struct _GskRenderer             GskRenderer;
-typedef struct _GskRenderNode           GskRenderNode;
 typedef struct _GskStroke               GskStroke;
 typedef struct _GskTransform            GskTransform;
 

gsk/meson.build

@@ -28,6 +28,7 @@ gsk_public_sources = files([
   'gskglshader.c',
   'gskpath.c',
   'gskpathbuilder.c',
+  'gskpathmeasure.c',
   'gskpathpoint.c',
   'gskrenderer.c',
   'gskrendernode.c',
@@ -75,6 +76,7 @@ gsk_public_headers = files([
   'gskglshader.h',
   'gskpath.h',
   'gskpathbuilder.h',
+  'gskpathmeasure.h',
   'gskpathpoint.h',
   'gskrenderer.h',
   'gskrendernode.h',

gtk/deprecated/gtkcellarea.c

@@ -234,8 +234,8 @@
  * API as they come in. Usually `GtkCellArea` is only interested in
  * button events, however some customized derived areas can be implemented
  * who are interested in handling other events. Handling an event can
- * trigger the [signal@Gtk.CellArea::focus-changed] signal to fire; as well
- * as [signal@Gtk.CellArea::add-editable] in the case that an editable cell
+ * trigger the [`signal@Gtk.CellArea::focus-changed`] signal to fire; as well
+ * as [`signal@Gtk.CellArea::add-editable`] in the case that an editable cell
  * was clicked and needs to start editing. You can call
  * [method@Gtk.CellArea.stop_editing] at any time to cancel any cell editing
  * that is currently in progress.

gtk/deprecated/gtktreeview.c

@@ -1140,7 +1140,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
    * @column: (nullable): the `GtkTreeViewColumn` in which the activation occurred
    *
    * The "row-activated" signal is emitted when the method
-   * [method@Gtk.TreeView.row_activated] is called.
+   * [`method@Gtk.TreeView.row_activated`] is called.
    *
    * This signal is emitted when the user double-clicks a treeview row with the
    * [property@Gtk.TreeView:activate-on-single-click] property set to %FALSE,

gtk/deprecated/gtktreeviewcolumn.c

@@ -937,13 +937,13 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
       if ((!alternative && priv->sort_order == GTK_SORT_ASCENDING) ||
           (alternative && priv->sort_order == GTK_SORT_DESCENDING))
         {
-          gtk_widget_remove_css_class (arrow, "ascending");
-          gtk_widget_add_css_class (arrow, "descending");
+          gtk_widget_remove_css_class (arrow, "descending");
+          gtk_widget_add_css_class (arrow, "ascending");
         }
       else
         {
-          gtk_widget_remove_css_class (arrow, "descending");
-          gtk_widget_add_css_class (arrow, "ascending");
+          gtk_widget_remove_css_class (arrow, "ascending");
+          gtk_widget_add_css_class (arrow, "descending");
         }
     }
 

gtk/gskpango.c

@@ -459,8 +459,7 @@ gsk_pango_renderer_release (GskPangoRenderer *renderer)
  *
  * Creates render nodes for rendering @layout in the given foregound @color
  * and appends them to the current node of @snapshot without changing the
- * current node. The current theme's foreground color for a widget can be
- * obtained with [method@Gtk.Widget.get_color].
+ * current node.
  *
  * Note that if the layout does not produce any visible output, then nodes
  * may not be added to the @snapshot.

gtk/gtkaboutdialog.c

@@ -566,7 +566,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    * A logo for the about box.
    *
    * If it is `NULL`, the default window icon set with
-   * [func@Gtk.Window.set_default_icon_name] will be used.
+   * [id@gtk_window_set_default_icon_name] will be used.
    */
   props[PROP_LOGO] =
     g_param_spec_object ("logo", NULL, NULL,

gtk/gtkcolordialogbutton.c

@@ -45,7 +45,6 @@ static GdkContentProvider *
                                 double                x,
                                 double                y,
                                 GtkColorDialogButton *self);
-static void     activated      (GtkColorDialogButton *self);
 static void     button_clicked (GtkColorDialogButton *self);
 static void     update_button_sensitivity
                                (GtkColorDialogButton *self);
@@ -97,17 +96,8 @@ enum
   NUM_PROPERTIES
 };
 
-/* Signals */
-enum
-{
-  SIGNAL_ACTIVATE = 1,
-  NUM_SIGNALS
-};
-
 static GParamSpec *properties[NUM_PROPERTIES];
 
-static unsigned int color_dialog_button_signals[NUM_SIGNALS] = { 0 };
-
 G_DEFINE_TYPE (GtkColorDialogButton, gtk_color_dialog_button, GTK_TYPE_WIDGET)
 
 static void
@@ -118,8 +108,6 @@ gtk_color_dialog_button_init (GtkColorDialogButton *self)
   GtkDragSource *source;
   GtkDropTarget *dest;
 
-  g_signal_connect_swapped (self, "activate", G_CALLBACK (activated), self);
-
   self->color = GDK_RGBA ("00000000");
 
   self->button = gtk_button_new ();
@@ -290,27 +278,6 @@ gtk_color_dialog_button_class_init (GtkColorDialogButtonClass *class)
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
 
-  /**
-   * GtkColorDialogButton::activate:
-   * @widget: the object which received the signal
-   *
-   * Emitted when the color dialog button is activated.
-   *
-   * The `::activate` signal on `GtkColorDialogButton` is an action signal
-   * and emitting it causes the button to pop up its dialog.
-   *
-   * Since: 4.14
-   */
-  color_dialog_button_signals[SIGNAL_ACTIVATE] =
-    g_signal_new (I_ ("activate"),
-                  G_TYPE_FROM_CLASS (class),
-                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 0);
-
-  gtk_widget_class_set_activate_signal (widget_class, color_dialog_button_signals[SIGNAL_ACTIVATE]);
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
   gtk_widget_class_set_css_name (widget_class, "colorbutton");
   gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_GROUP);
@@ -399,12 +366,6 @@ color_chosen (GObject      *source,
   update_button_sensitivity (self);
 }
 
-static void
-activated (GtkColorDialogButton *self)
-{
-  gtk_widget_activate (self->button);
-}
-
 static void
 button_clicked (GtkColorDialogButton *self)
 {

gtk/gtkcolumnview.c

@@ -1798,8 +1798,6 @@ gtk_column_view_scroll_to_column (GtkColumnView       *self,
                                                        gtk_adjustment_get_page_size (self->hadjustment));
 
   gtk_adjustment_set_value (self->hadjustment, new_value);
-
-  g_clear_pointer (&scroll_info, gtk_scroll_info_unref);
 }
 
 void
@@ -2216,14 +2214,9 @@ gtk_column_view_scroll_to (GtkColumnView       *self,
   if (column && (flags & GTK_LIST_SCROLL_FOCUS))
     gtk_column_view_set_focus_column (self, column, FALSE);
 
-  gtk_list_view_scroll_to (self->listview,
-                           pos,
-                           flags,
-                           scroll ? gtk_scroll_info_ref (scroll) : NULL);
+  gtk_list_view_scroll_to (self->listview, pos, flags, scroll);
 
   if (column)
     gtk_column_view_scroll_to_column (self, column, scroll);
-  else
-    g_clear_pointer (&scroll, gtk_scroll_info_unref);
 }
 

gtk/gtkenums.h

@@ -1728,18 +1728,5 @@ typedef enum { /*< prefix=GTK_ACCESSIBLE_SORT >*/
   GTK_ACCESSIBLE_SORT_OTHER
 } GtkAccessibleSort;
 
-/**
- * GtkPopoverMenuFlags:
- * @GTK_POPOVER_MENU_NESTED: Create submenus as nested
- *    popovers. Without this flag, submenus are created as
- *    sliding pages that replace the main menu.
- *
- * Flags that affect how [class@Gtk.PopoverMenu] widgets built from
- * a [class@Gio.MenuModel] are created and displayed.
- */
-typedef enum { /*< prefix=GTK_POPOVER_MENU >*/
-  GTK_POPOVER_MENU_NESTED = 1 << 0
-} GtkPopoverMenuFlags;
-
 G_END_DECLS
 

gtk/gtkexpression.c

@@ -89,7 +89,7 @@
  * ## GtkExpression in GObject properties
  *
  * In order to use a `GtkExpression` as a `GObject` property, you must use the
- * [func@Gtk.param_spec_expression] when creating a `GParamSpec` to install in the
+ * [id@gtk_param_spec_expression] when creating a `GParamSpec` to install in the
  * `GObject` class being defined; for instance:
  *
  * ```c
@@ -103,8 +103,8 @@
  * ```
  *
  * When implementing the `GObjectClass.set_property` and `GObjectClass.get_property`
- * virtual functions, you must use [func@Gtk.value_get_expression], to retrieve the
- * stored `GtkExpression` from the `GValue` container, and [func@Gtk.value_set_expression],
+ * virtual functions, you must use [id@gtk_value_get_expression], to retrieve the
+ * stored `GtkExpression` from the `GValue` container, and [id@gtk_value_set_expression],
  * to store the `GtkExpression` into the `GValue`; for instance:
  *
  * ```c

gtk/gtkfilechoosernativequartz.c

@@ -43,8 +43,6 @@
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
-@class FilterComboBox;
-
 typedef struct {
   GtkFileChooserNative *self;
 
@@ -70,33 +68,31 @@ typedef struct {
 
   NSMutableArray *filters;
   NSMutableArray *filter_names;
-  FilterComboBox *filter_popup_button;
+  NSComboBox *filter_combo_box;
 
   GSList *files;
   int response;
 } FileChooserQuartzData;
 
-@interface FilterComboBox : NSPopUpButton
+@interface FilterComboBox : NSObject<NSComboBoxDelegate>
 {
   FileChooserQuartzData *data;
 }
 - (id) initWithData:(FileChooserQuartzData *) quartz_data;
-- (void) popUpButtonSelectionChanged:(id) sender;
+- (void)comboBoxSelectionDidChange:(NSNotification *)notification;
 @end
 
 @implementation FilterComboBox
 
 - (id) initWithData:(FileChooserQuartzData *) quartz_data
 {
-  [super initWithFrame:NSMakeRect(0, 0, 200, 24)];
-  [self setTarget:self];
-  [self setAction:@selector(popUpButtonSelectionChanged:)];
+  [super init];
   data = quartz_data;
   return self;
 }
-- (void)popUpButtonSelectionChanged:(id)sender
+- (void)comboBoxSelectionDidChange:(NSNotification *)notification
 {
-  NSInteger selected_index = [data->filter_popup_button indexOfSelectedItem];
+  NSInteger selected_index = [data->filter_combo_box indexOfSelectedItem];
   NSArray *filter = [data->filters objectAtIndex:selected_index];
   // check for empty strings in filter -> indicates all filetypes should be allowed!
   if ([filter containsObject:@""])
@@ -306,8 +302,10 @@ filechooser_quartz_launch (FileChooserQuartzData *data)
   if (data->filters)
     {
       // when filters have been provided, a combobox needs to be added
-      data->filter_popup_button = [[FilterComboBox alloc] initWithData:data];
-      [data->filter_popup_button addItemsWithTitles:data->filter_names];
+      data->filter_combo_box = [[NSComboBox alloc] initWithFrame:NSMakeRect(0, 0, 200, 24)];
+      [data->filter_combo_box addItemsWithObjectValues:data->filter_names];
+      [data->filter_combo_box setEditable:NO];
+      [data->filter_combo_box setDelegate:[[FilterComboBox alloc] initWithData:data]];
 
       if (data->self->current_filter)
         {
@@ -331,18 +329,16 @@ filechooser_quartz_launch (FileChooserQuartzData *data)
           g_object_unref (filters);
 
           if (current_filter_index != GTK_INVALID_LIST_POSITION)
-            [data->filter_popup_button selectItemAtIndex:current_filter_index];
+            [data->filter_combo_box selectItemAtIndex:current_filter_index];
           else
-            [data->filter_popup_button selectItemAtIndex:0];
+            [data->filter_combo_box selectItemAtIndex:0];
         }
       else
         {
-          [data->filter_popup_button selectItemAtIndex:0];
+          [data->filter_combo_box selectItemAtIndex:0];
         }
-
-      [data->filter_popup_button popUpButtonSelectionChanged:NULL];
-      [data->filter_popup_button setToolTip:[NSString stringWithUTF8String:_("Select which types of files are shown")]];
-      [data->panel setAccessoryView:data->filter_popup_button];
+      [data->filter_combo_box setToolTip:[NSString stringWithUTF8String:_("Select which types of files are shown")]];
+      [data->panel setAccessoryView:data->filter_combo_box];
       if ([data->panel isKindOfClass:[NSOpenPanel class]] && [data->panel respondsToSelector:@selector(setAccessoryViewDisclosed:)])
         {
           [(id<CanSetAccessoryViewDisclosed>) data->panel setAccessoryViewDisclosed:YES];
@@ -582,3 +578,4 @@ gtk_file_chooser_native_quartz_hide (GtkFileChooserNative *self)
     }
   data->panel = NULL;
 }
+

gtk/gtkfilefilter.c

@@ -758,6 +758,8 @@ gtk_file_filter_get_attributes (GtkFileFilter *filter)
 
 #ifdef GDK_WINDOWING_MACOS
 
+#import <Foundation/Foundation.h>
+
 NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter)
 {
   NSMutableArray *array = [[NSMutableArray alloc] init];
@@ -771,8 +773,9 @@ NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter)
         {
         case FILTER_RULE_MIME_TYPE:
           {
-            // GContentType from GIO use UTI on macOS since glib version 2.51
-            NSString *uti_nsstring = [NSString stringWithUTF8String: rule->u.content_types[0]];
+            // convert mime-types to UTI
+            NSString *mime_type_nsstring = [NSString stringWithUTF8String: rule->u.content_types[0]];
+            NSString *uti_nsstring = (NSString *) UTTypeCreatePreferredIdentifierForTag (kUTTagClassMIMEType, (CFStringRef) mime_type_nsstring, NULL);
             if (uti_nsstring == NULL)
               {
                 [array release];

gtk/gtkfontdialogbutton.c

@@ -32,7 +32,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtktypebuiltins.h"
 
-static void     activated      (GtkFontDialogButton *self);
+
 static void     button_clicked (GtkFontDialogButton *self);
 static void     update_button_sensitivity
                                (GtkFontDialogButton *self);
@@ -100,17 +100,8 @@ enum
   NUM_PROPERTIES
 };
 
-/* Signals */
-enum
-{
-  SIGNAL_ACTIVATE = 1,
-  NUM_SIGNALS
-};
-
 static GParamSpec *properties[NUM_PROPERTIES];
 
-static unsigned int font_dialog_button_signals[NUM_SIGNALS] = { 0 };
-
 G_DEFINE_TYPE (GtkFontDialogButton, gtk_font_dialog_button, GTK_TYPE_WIDGET)
 
 static void
@@ -119,8 +110,6 @@ gtk_font_dialog_button_init (GtkFontDialogButton *self)
   GtkWidget *box;
   PangoFontDescription *font_desc;
 
-  g_signal_connect_swapped (self, "activate", G_CALLBACK (activated), self);
-
   self->button = gtk_button_new ();
   g_signal_connect_swapped (self->button, "clicked", G_CALLBACK (button_clicked), self);
   self->font_label = gtk_label_new (_("Font"));
@@ -394,27 +383,6 @@ gtk_font_dialog_button_class_init (GtkFontDialogButtonClass *class)
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
 
-  /**
-   * FontDialogButton::activate:
-   * @widget: The object which received the signal
-   *
-   * Emitted when the font dialog button is activated.
-   *
-   * The `::activate` signal on `GtkFontDialogButton` is an action signal
-   * and emitting it causes the button to pop up its dialog.
-   *
-   * Since: 4.14
-   */
-  font_dialog_button_signals[SIGNAL_ACTIVATE] =
-    g_signal_new (I_ ("activate"),
-                  G_TYPE_FROM_CLASS (class),
-                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 0);
-
-  gtk_widget_class_set_activate_signal (widget_class, font_dialog_button_signals[SIGNAL_ACTIVATE]);
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
   gtk_widget_class_set_css_name (widget_class, "fontbutton");
   gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_GROUP);
@@ -531,12 +499,6 @@ font_and_features_chosen (GObject      *source,
   update_button_sensitivity (self);
 }
 
-static void
-activated (GtkFontDialogButton *self)
-{
-  gtk_widget_activate (self->button);
-}
-
 static void
 button_clicked (GtkFontDialogButton *self)
 {

gtk/gtklistbase.c

@@ -121,7 +121,7 @@ static GParamSpec *properties[N_PROPS] = { NULL, };
  * @self: a `GtkListBase`
  * @across: position in pixels in the direction cross to the list
  * @along:  position in pixels in the direction of the list
- * @pos: (out): set to the looked up position
+ * @pos: (out caller-allocates): set to the looked up position
  * @area: (out caller-allocates) (optional): set to the area occupied
  *   by the returned position
  *
@@ -1519,7 +1519,7 @@ gtk_list_base_allocate_children (GtkListBase *self,
   GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self);
   GtkListTile *tile;
   int dx, dy;
-
+  
   gtk_list_base_get_adjustment_values (self, OPPOSITE_ORIENTATION (priv->orientation), &dx, NULL, NULL);
   gtk_list_base_get_adjustment_values (self, priv->orientation, &dy, NULL, NULL);
 

gtk/gtklistheader.c

@@ -27,9 +27,9 @@
  * `GtkListHeader` is used by list widgets to represent the headers they
  * display.
  *
- * `GtkListHeader` objects are managed just like [class@Gtk.ListItem]
- * objects via their factory, but provide a different set of properties suitable
- * for managing the header instead of individual items.
+ * The `GtkListHeader`s are managed just like [class@gtk.ListItem]s via
+ * their factory, but provide a different set of properties suitable for
+ * managing the header instead of individual items.
  *
  * Since: 4.12
  */

gtk/gtklistitem.c

@@ -27,14 +27,13 @@
 /**
  * GtkListItem:
  *
- * `GtkListItem` is used by list widgets to represent items in a
- * [iface@Gio.ListModel].
+ * `GtkListItem` is used by list widgets to represent items in a `GListModel`.
  *
- * `GtkListItem` objects are managed by the list widget (with its factory)
+ * The `GtkListItem`s are managed by the list widget (with its factory)
  * and cannot be created by applications, but they need to be populated
  * by application code. This is done by calling [method@Gtk.ListItem.set_child].
  *
- * `GtkListItem` objects exist in 2 stages:
+ * `GtkListItem`s exist in 2 stages:
  *
  * 1. The unbound stage where the listitem is not currently connected to
  *    an item in the list. In that case, the [property@Gtk.ListItem:item]

gtk/gtkmain.c

@@ -247,7 +247,7 @@ static gboolean do_setlocale = TRUE;
 /**
  * gtk_disable_setlocale:
  *
- * Prevents [func@Gtk.init] and [func@Gtk.init_check] from automatically calling
+ * Prevents [id@gtk_init] and [id@gtk_init_check] from automatically calling
  * `setlocale (LC_ALL, "")`.
  *
  * You would want to use this function if you wanted to set the locale for

gtk/gtkmenubutton.c

@@ -1510,8 +1510,8 @@ gtk_menu_button_set_child (GtkMenuButton *menu_button,
                                           NULL,
                                           NULL,
                                           NULL,
-                                          (GtkGizmoFocusFunc)gtk_widget_focus_child,
-                                          NULL);
+                                          (GtkGizmoFocusFunc)gtk_widget_focus_self,
+                                          (GtkGizmoGrabFocusFunc)gtk_widget_grab_focus_self);
 
   gtk_widget_set_layout_manager (inner_widget, gtk_bin_layout_new ());
   gtk_widget_set_hexpand (inner_widget, TRUE);

gtk/gtkoverlaylayout.c

@@ -33,12 +33,12 @@
 /**
  * GtkOverlayLayout:
  *
- * `GtkOverlayLayout` is the layout manager used by [class@Gtk.Overlay].
+ * `GtkOverlayLayout` is the layout manager used by `GtkOverlay`.
  *
  * It places widgets as overlays on top of the main child.
  *
  * This is not a reusable layout manager, since it expects its widget
- * to be a `GtkOverlay`. It is only listed here so that its layout
+ * to be a `GtkOverlay`. It only listed here so that its layout
  * properties get documented.
  */
 

gtk/gtkpopover.c

@@ -70,31 +70,30 @@
  * # CSS nodes
  *
  * ```
- * popover.background[.menu]
+ * popover[.menu]
  * ├── arrow
- * ╰── contents
+ * ╰── contents.background
  *     ╰── <child>
  * ```
  *
- * `GtkPopover` has a main node with name `popover`, an arrow with name `arrow`,
- * and another node for the content named `contents`. The `popover` node always
- * gets the `.background` style class. It also gets the `.menu` style class
- * if the popover is menu-like, e.g. is a [class@Gtk.PopoverMenu].
+ * The contents child node always gets the .background style class
+ * and the popover itself gets the .menu style class if the popover
+ * is menu-like (i.e. `GtkPopoverMenu`).
  *
  * Particular uses of `GtkPopover`, such as touch selection popups or
  * magnifiers in `GtkEntry` or `GtkTextView` get style classes like
- * `.touch-selection` or `.magnifier` to differentiate from plain popovers.
+ * .touch-selection or .magnifier to differentiate from plain popovers.
  *
- * When styling a popover directly, the `popover` node should usually
+ * When styling a popover directly, the popover node should usually
  * not have any background. The visible part of the popover can have
- * a shadow. To specify it in CSS, set the box-shadow of the `contents` node.
+ * a shadow. To specify it in CSS, set the box-shadow of the contents node.
  *
  * Note that, in order to accomplish appropriate arrow visuals, `GtkPopover`
- * uses custom drawing for the `arrow` node. This makes it possible for the
+ * uses custom drawing for the arrow node. This makes it possible for the
  * arrow to change its shape dynamically, but it also limits the possibilities
- * of styling it using CSS. In particular, the `arrow` gets drawn over the
- * `content` node's border and shadow, so they look like one shape, which
- * means that the border width of the `content` node and the `arrow` node should
+ * of styling it using CSS. In particular, the arrow gets drawn over the
+ * content node's border and shadow, so they look like one shape, which
+ * means that the border width of the content node and the arrow node should
  * be the same. The arrow also does not support any border shape other than
  * solid, no border-radius, only one border width (border-bottom-width is
  * used) and no box-shadow.

gtk/gtkpopovermenu.c

@@ -38,6 +38,7 @@
 #include "gtkscrolledwindow.h"
 #include "gtkviewport.h"
 
+
 /**
  * GtkPopoverMenu:
  *
@@ -49,7 +50,6 @@
  * `GtkPopoverMenu` treats its children like menus and allows switching
  * between them. It can open submenus as traditional, nested submenus,
  * or in a more touch-friendly sliding fashion.
- * The property [property@Gtk.PopoverMenu:flags] controls this appearance.
  *
  * `GtkPopoverMenu` is meant to be used primarily with menu models,
  * using [ctor@Gtk.PopoverMenu.new_from_model]. If you need to put
@@ -128,21 +128,14 @@
  *
  * Menu items will also show accelerators, which are usually associated
  * with actions via [method@Gtk.Application.set_accels_for_action],
- * [method@WidgetClass.add_binding_action] or
+ * [id@gtk_widget_class_add_binding_action] or
  * [method@Gtk.ShortcutController.add_shortcut].
  *
  * # CSS Nodes
  *
  * `GtkPopoverMenu` is just a subclass of `GtkPopover` that adds custom content
  * to it, therefore it has the same CSS nodes. It is one of the cases that add
- * a `.menu` style class to the main `popover` node.
- *
- * Menu items have nodes with name `button` and class `.model`. If a section
- * display-hint is set, the section gets a node `box` with class `horizontal`
- * plus a class with the same text as the display hint. Note that said box may
- * not be the direct ancestor of the item `button`s. Thus, for example, to style
- * items in an `inline-buttons` section, select `.inline-buttons button.model`.
- * Other things that may be of interest to style in menus include `label` nodes.
+ * a .menu style class to the popover's main node.
  *
  * # Accessibility
  *
@@ -173,8 +166,7 @@ struct _GtkPopoverMenuClass
 
 enum {
   PROP_VISIBLE_SUBMENU = 1,
-  PROP_MENU_MODEL,
-  PROP_FLAGS
+  PROP_MENU_MODEL
 };
 
 static void gtk_popover_menu_buildable_iface_init (GtkBuildableIface *iface);
@@ -411,10 +403,6 @@ gtk_popover_menu_get_property (GObject    *object,
       g_value_set_object (value, gtk_popover_menu_get_menu_model (menu));
       break;
 
-    case PROP_FLAGS:
-      g_value_set_flags (value, gtk_popover_menu_get_flags (menu));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -439,10 +427,6 @@ gtk_popover_menu_set_property (GObject      *object,
       gtk_popover_menu_set_menu_model (menu, g_value_get_object (value));
       break;
 
-    case PROP_FLAGS:
-      gtk_popover_menu_set_flags (menu, g_value_get_flags (value));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -524,6 +508,7 @@ gtk_popover_menu_focus (GtkWidget        *widget,
   return FALSE;
 }
 
+
 static void
 add_tab_bindings (GtkWidgetClass   *widget_class,
                   GdkModifierType   modifiers,
@@ -543,7 +528,7 @@ add_arrow_bindings (GtkWidgetClass   *widget_class,
                     GtkDirectionType  direction)
 {
   guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
-
+ 
   gtk_widget_class_add_binding_signal (widget_class, keysym, 0,
                                        "move-focus",
                                        "(i)", direction);
@@ -624,23 +609,6 @@ gtk_popover_menu_class_init (GtkPopoverMenuClass *klass)
                                                         G_TYPE_MENU_MODEL,
                                                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  /**
-   * GtkPopoverMenu:flags: (attributes org.gtk.Property.get=gtk_popover_menu_get_flags org.gtk.Property.set=gtk_popover_menu_set_flags)
-   *
-   * The flags that @popover uses to create/display a menu from its model.
-   *
-   * If a model is set and the flags change, contents are rebuilt, so if setting
-   * properties individually, set flags before model to avoid a redundant rebuild.
-   *
-   * Since: 4.14
-   */
-  g_object_class_install_property (object_class,
-                                   PROP_FLAGS,
-                                   g_param_spec_flags ("flags", NULL, NULL,
-                                                       GTK_TYPE_POPOVER_MENU_FLAGS, 0,
-                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS
-                                                         | G_PARAM_EXPLICIT_NOTIFY));
-
   add_arrow_bindings (widget_class, GDK_KEY_Up, GTK_DIR_UP);
   add_arrow_bindings (widget_class, GDK_KEY_Down, GTK_DIR_DOWN);
   add_arrow_bindings (widget_class, GDK_KEY_Left, GTK_DIR_LEFT);
@@ -690,20 +658,6 @@ gtk_popover_menu_buildable_iface_init (GtkBuildableIface *iface)
   iface->add_child = gtk_popover_menu_buildable_add_child;
 }
 
-static void
-gtk_popover_menu_rebuild_contents (GtkPopoverMenu *popover)
-{
-  GtkWidget *stack;
-  GtkWidget *child;
-
-  stack = gtk_popover_menu_get_stack (popover);
-  while ((child = gtk_widget_get_first_child (stack)))
-    gtk_stack_remove (GTK_STACK (stack), child);
-
-  if (popover->model)
-    gtk_menu_section_box_new_toplevel (popover, popover->model, popover->flags);
-}
-
 /**
  * gtk_popover_menu_new:
  *
@@ -814,7 +768,7 @@ gtk_popover_menu_new_from_model_full (GMenuModel          *model,
   g_return_val_if_fail (model == NULL || G_IS_MENU_MODEL (model), NULL);
 
   popover = gtk_popover_menu_new ();
-  gtk_popover_menu_set_flags (GTK_POPOVER_MENU (popover), flags);
+  GTK_POPOVER_MENU (popover)->flags = flags;
   gtk_popover_menu_set_menu_model (GTK_POPOVER_MENU (popover), model);
 
   return popover;
@@ -840,41 +794,20 @@ gtk_popover_menu_set_menu_model (GtkPopoverMenu *popover,
 
   if (g_set_object (&popover->model, model))
     {
-      gtk_popover_menu_rebuild_contents (popover);
+      GtkWidget *stack;
+      GtkWidget *child;
+
+      stack = gtk_popover_menu_get_stack (popover);
+      while ((child = gtk_widget_get_first_child (stack)))
+        gtk_stack_remove (GTK_STACK (stack), child);
+
+      if (model)
+        gtk_menu_section_box_new_toplevel (popover, model, popover->flags);
+
       g_object_notify (G_OBJECT (popover), "menu-model");
     }
 }
 
-/**
- * gtk_popover_menu_set_flags: (attributes org.gtk.Method.set_property=flags)
- * @popover: a `GtkPopoverMenu`
- * @flags: a set of `GtkPopoverMenuFlags`
- *
- * Sets the flags that @popover uses to create/display a menu from its model.
- *
- * If a model is set and the flags change, contents are rebuilt, so if setting
- * properties individually, set flags before model to avoid a redundant rebuild.
- *
- * Since: 4.14
- */
-void
-gtk_popover_menu_set_flags (GtkPopoverMenu      *popover,
-                            GtkPopoverMenuFlags  flags)
-{
-  g_return_if_fail (GTK_IS_POPOVER_MENU (popover));
-
-  if (popover->flags == flags)
-    return;
-
-  popover->flags = flags;
-
-  /* This shouldn’t happen IRL, but notify test unsets :child, so dodge error */
-  if (gtk_popover_get_child (GTK_POPOVER (popover)) != NULL)
-    gtk_popover_menu_rebuild_contents (popover);
-
-  g_object_notify (G_OBJECT (popover), "flags");
-}
-
 /**
  * gtk_popover_menu_get_menu_model: (attributes org.gtk.Method.get_property=menu-model)
  * @popover: a `GtkPopoverMenu`
@@ -891,24 +824,6 @@ gtk_popover_menu_get_menu_model (GtkPopoverMenu *popover)
   return popover->model;
 }
 
-/**
- * gtk_popover_menu_get_flags: (attributes org.gtk.Method.get_property=flags)
- * @popover: a `GtkPopoverMenu`
- *
- * Returns the flags that @popover uses to create/display a menu from its model.
- *
- * Returns: the `GtkPopoverMenuFlags`
- *
- * Since: 4.14
- */
-GtkPopoverMenuFlags
-gtk_popover_menu_get_flags (GtkPopoverMenu *popover)
-{
-  g_return_val_if_fail (GTK_IS_POPOVER_MENU (popover), 0);
-
-  return popover->flags;
-}
-
 /**
  * gtk_popover_menu_add_child:
  * @popover: a `GtkPopoverMenu`

gtk/gtkpopovermenu.h

@@ -37,6 +37,19 @@ GType       gtk_popover_menu_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_popover_menu_new_from_model (GMenuModel *model);
 
+/**
+ * GtkPopoverMenuFlags:
+ * @GTK_POPOVER_MENU_NESTED: Create submenus as nested
+ *    popovers. Without this flag, submenus are created as
+ *    sliding pages that replace the main menu.
+ *
+ * Flags that affect how popover menus are created from
+ * a menu model.
+ */
+typedef enum {
+  GTK_POPOVER_MENU_NESTED = 1 << 0
+} GtkPopoverMenuFlags;
+
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_popover_menu_new_from_model_full (GMenuModel          *model,
                                                   GtkPopoverMenuFlags  flags);
@@ -47,12 +60,6 @@ void        gtk_popover_menu_set_menu_model (GtkPopoverMenu *popover,
 GDK_AVAILABLE_IN_ALL
 GMenuModel *gtk_popover_menu_get_menu_model (GtkPopoverMenu *popover);
 
-GDK_AVAILABLE_IN_4_14
-void                gtk_popover_menu_set_flags (GtkPopoverMenu      *popover,
-                                                GtkPopoverMenuFlags  flags);
-GDK_AVAILABLE_IN_4_14
-GtkPopoverMenuFlags gtk_popover_menu_get_flags (GtkPopoverMenu *popover);
-
 GDK_AVAILABLE_IN_ALL
 gboolean    gtk_popover_menu_add_child (GtkPopoverMenu *popover,
                                         GtkWidget      *child,

gtk/gtksectionmodel.c

@@ -113,9 +113,10 @@ gtk_section_model_default_init (GtkSectionModelInterface *iface)
  * gtk_section_model_get_section:
  * @self: a `GtkSectionModel`
  * @position: the position of the item to query
- * @out_start: (out): the position of the first item in the section
- * @out_end: (out): the position of the first item not part of the section
- *   anymore.
+ * @out_start: (out caller-allocates): the position of the first
+ *   item in the section
+ * @out_end: (out caller-allocates): the position of the first
+ *   item not part of the section anymore.
  *
  * Query the section that covers the given position. The number of
  * items in the section can be computed by `out_end - out_start`.

gtk/gtksignallistitemfactory.c

@@ -29,7 +29,7 @@
  * GtkSignalListItemFactory:
  *
  * `GtkSignalListItemFactory` is a `GtkListItemFactory` that emits signals
- * to manage listitems.
+ * to to manage listitems.
  *
  * Signals are emitted for every listitem in the same order:
  *
@@ -216,9 +216,9 @@ gtk_signal_list_item_factory_class_init (GtkSignalListItemFactoryClass *klass)
    * @self: The `GtkSignalListItemFactory`
    * @object: The `GObject` to unbind
    *
-   * Emitted when an object has been unbound from its item, for example when
+   * Emitted when a object has been unbound from its item, for example when
    * a listitem was removed from use in a list widget
-   * and its [property@Gtk.ListItem:item] is about to be unset.
+   * and its new [property@Gtk.ListItem:item] is about to be unset.
    *
    * This signal is the opposite of the [signal@Gtk.SignalListItemFactory::bind]
    * signal and should be used to undo everything done in that signal.

gtk/gtksizerequest.c

@@ -608,7 +608,7 @@ gtk_widget_get_request_mode (GtkWidget *widget)
  * the required height for the natural width is generally smaller than the
  * required height for the minimum width.
  *
- * Use [method@Gtk.Widget.measure] if you want to support baseline alignment.
+ * Use [id@gtk_widget_measure] if you want to support baseline alignment.
  */
 void
 gtk_widget_get_preferred_size (GtkWidget      *widget,

gtk/gtksnapshot.c

@@ -567,29 +567,29 @@ merge_color_matrix_nodes (const graphene_matrix_t *matrix2,
                           const graphene_vec4_t   *offset2,
                           GskRenderNode           *child)
 {
-  const graphene_matrix_t *matrix1 = gsk_color_matrix_node_get_color_matrix (child);
+  const graphene_matrix_t *mat1 = gsk_color_matrix_node_get_color_matrix (child);
   const graphene_vec4_t *offset1 = gsk_color_matrix_node_get_color_offset (child);
-  graphene_matrix_t matrix;
-  graphene_vec4_t offset;
+  graphene_matrix_t mat2 = *matrix2;
+  graphene_vec4_t off2 = *offset2;
   GskRenderNode *result;
 
   g_assert (gsk_render_node_get_node_type (child) == GSK_COLOR_MATRIX_NODE);
 
-  /* color matrix node: color = trans(mat) * p + offset; for a pixel p.
-   * color =  trans(mat2) * (trans(mat1) * p + offset1) + offset2
-   *       =  trans(mat2) * trans(mat1) * p + trans(mat2) * offset1 + offset2
-   *       = trans(mat1 * mat2) * p + (trans(mat2) * offset1 + offset2)
+  /* color matrix node: color = mat * p + offset; for a pixel p.
+   * color =  mat1 * (mat2 * p + offset2) + offset1;
+   *       =  mat1 * mat2  * p + offset2 * mat1 + offset1
+   *       = (mat1 * mat2) * p + (offset2 * mat1 + offset1)
    * Which this code does.
    * mat1 and offset1 come from @child.
    */
 
-  graphene_matrix_transform_vec4 (matrix2, offset1, &offset);
-  graphene_vec4_add (&offset, offset2, &offset);
+  graphene_matrix_transform_vec4 (mat1, offset2, &off2);
+  graphene_vec4_add (&off2, offset1, &off2);
 
-  graphene_matrix_multiply (matrix1, matrix2, &matrix);
+  graphene_matrix_multiply (mat1, &mat2, &mat2);
 
   result = gsk_color_matrix_node_new (gsk_color_matrix_node_get_child (child),
-                                      &matrix, &offset);
+                                      &mat2, &off2);
 
   return result;
 }
@@ -656,13 +656,6 @@ gtk_snapshot_collect_color_matrix (GtkSnapshot      *snapshot,
  * Modifies the colors of an image by applying an affine transformation
  * in RGB space.
  *
- * In particular, the colors will be transformed by applying
- *
- *     pixel = transpose(color_matrix) * pixel + color_offset
- *
- * for every pixel. The transformation operates on unpremultiplied
- * colors, with color components ordered R, G, B, A.
- *
  * The image is recorded until the next call to [method@Gtk.Snapshot.pop].
  */
 void
@@ -1158,9 +1151,6 @@ gtk_snapshot_clear_fill (GtkSnapshotState *state)
  *
  * The image is recorded until the next call to [method@Gtk.Snapshot.pop].
  *
- * If you want to fill the path with a color, [method@Gtk.Snapshot.append_fill]
- * may be more convenient.
- *
  * Since: 4.14
  */
 void
@@ -1181,35 +1171,6 @@ gtk_snapshot_push_fill (GtkSnapshot *snapshot,
   state->data.fill.fill_rule = fill_rule;
 }
 
-/**
- * gtk_snapshot_append_fill:
- * @snapshot: a `GtkSnapshot`
- * @path: The path describing the area to fill
- * @fill_rule: The fill rule to use
- * @color: the color to fill the path with
- *
- * A convenience method to fill a path with a color.
- *
- * See [method@Gtk.Snapshot.push_fill] if you need
- * to fill a path with more complex content than
- * a color.
- *
- * Since: 4.14
- */
-void
-gtk_snapshot_append_fill (GtkSnapshot   *snapshot,
-                          GskPath       *path,
-                          GskFillRule    fill_rule,
-                          const GdkRGBA *color)
-{
-  graphene_rect_t bounds;
-
-  gsk_path_get_bounds (path, &bounds);
-  gtk_snapshot_push_fill (snapshot, path, fill_rule);
-  gtk_snapshot_append_color (snapshot, color, &bounds);
-  gtk_snapshot_pop (snapshot);
-}
-
 static GskRenderNode *
 gtk_snapshot_collect_stroke (GtkSnapshot      *snapshot,
                              GtkSnapshotState *state,
@@ -1261,9 +1222,6 @@ gtk_snapshot_clear_stroke (GtkSnapshotState *state)
  * everything else, so uneven scaling will cause horizontal and vertical
  * strokes to have different widths.
  *
- * If you want to stroke the path with a color, [method@Gtk.Snapshot.append_stroke]
- * may be more convenient.
- *
  * Since: 4.14
  */
 void
@@ -1307,35 +1265,6 @@ gtk_snapshot_collect_shadow (GtkSnapshot      *snapshot,
   return shadow_node;
 }
 
-/**
- * gtk_snapshot_append_stroke:
- * @snapshot: a `GtkSnapshot`
- * @path: The path describing the area to fill
- * @stroke: The stroke attributes
- * @color: the color to fill the path with
- *
- * A convenience method to stroke a path with a color.
- *
- * See [method@Gtk.Snapshot.push_stroke] if you need
- * to stroke a path with more complex content than
- * a color.
- *
- * Since: 4.14
- */
-void
-gtk_snapshot_append_stroke (GtkSnapshot     *snapshot,
-                            GskPath         *path,
-                            const GskStroke *stroke,
-                            const GdkRGBA   *color)
-{
-  graphene_rect_t bounds;
-
-  gsk_path_get_stroke_bounds (path, stroke, &bounds);
-  gtk_snapshot_push_stroke (snapshot, path, stroke);
-  gtk_snapshot_append_color (snapshot, color, &bounds);
-  gtk_snapshot_pop (snapshot);
-}
-
 static void
 gtk_snapshot_clear_shadow (GtkSnapshotState *state)
 {

gtk/gtksnapshot.h

@@ -240,16 +240,6 @@ void            gtk_snapshot_append_layout              (GtkSnapshot
                                                          PangoLayout            *layout,
                                                          const GdkRGBA          *color);
 
-GDK_AVAILABLE_IN_4_14
-void            gtk_snapshot_append_fill                (GtkSnapshot            *snapshot,
-                                                         GskPath                *path,
-                                                         GskFillRule             fill_rule,
-                                                         const GdkRGBA          *color);
-GDK_AVAILABLE_IN_4_14
-void            gtk_snapshot_append_stroke              (GtkSnapshot            *snapshot,
-                                                         GskPath                *path,
-                                                         const GskStroke        *stroke,
-                                                         const GdkRGBA          *color);
 
 G_END_DECLS
 

gtk/gtktext.c

@@ -3977,11 +3977,9 @@ gtk_text_insert_at_cursor (GtkText    *self,
 
   if (priv->editable)
     {
-      begin_change (self);
       gtk_text_reset_im_context (self);
       gtk_editable_insert_text (GTK_EDITABLE (self), str, -1, &pos);
       gtk_text_set_selection_bounds (self, pos, pos);
-      end_change (self);
     }
 }
 
@@ -4001,14 +3999,12 @@ gtk_text_delete_from_cursor (GtkText       *self,
       return;
     }
 
-  begin_change (self);
-
   if (priv->selection_bound != priv->current_pos)
     {
       gtk_text_delete_selection (self);
       gtk_text_schedule_im_reset (self);
       gtk_text_reset_im_context (self);
-      goto done;
+      return;
     }
 
   switch (type)
@@ -4078,8 +4074,6 @@ gtk_text_delete_from_cursor (GtkText       *self,
       gtk_text_reset_im_context (self);
     }
 
-done:
-  end_change (self);
   gtk_text_pend_cursor_blink (self);
 }
 
@@ -4095,14 +4089,12 @@ gtk_text_backspace (GtkText *self)
       return;
     }
 
-  begin_change (self);
-
   if (priv->selection_bound != priv->current_pos)
     {
       gtk_text_delete_selection (self);
       gtk_text_schedule_im_reset (self);
       gtk_text_reset_im_context (self);
-      goto done;
+      return;
     }
 
   prev_pos = gtk_text_move_logically (self, priv->current_pos, -1);
@@ -4155,8 +4147,6 @@ gtk_text_backspace (GtkText *self)
       gtk_widget_error_bell (GTK_WIDGET (self));
     }
 
-done:
-  end_change (self);
   gtk_text_pend_cursor_blink (self);
 }
 
@@ -4201,11 +4191,7 @@ gtk_text_cut_clipboard (GtkText *self)
   if (priv->editable)
     {
       if (priv->selection_bound != priv->current_pos)
-        {
-          begin_change (self);
-          gtk_text_delete_selection (self);
-          end_change (self);
-        }
+        gtk_text_delete_selection (self);
     }
   else
     {
@@ -4223,15 +4209,9 @@ gtk_text_paste_clipboard (GtkText *self)
   GtkTextPrivate *priv = gtk_text_get_instance_private (self);
 
   if (priv->editable)
-    {
-      begin_change (self);
-      gtk_text_paste (self, gtk_widget_get_clipboard (GTK_WIDGET (self)));
-      end_change (self);
-    }
+    gtk_text_paste (self, gtk_widget_get_clipboard (GTK_WIDGET (self)));
   else
-    {
-      gtk_widget_error_bell (GTK_WIDGET (self));
-    }
+    gtk_widget_error_bell (GTK_WIDGET (self));
 
   gtk_text_update_handles (self);
 }

gtk/gtktexthistory.c

@@ -1100,18 +1100,6 @@ gtk_text_history_modified_changed (GtkTextHistory *self,
       peek->is_modified_set = TRUE;
     }
 
-  if ((peek = g_queue_peek_head (&self->redo_queue)))
-    {
-      if (peek->kind == ACTION_KIND_BARRIER)
-        {
-          if (!(peek = peek->link.next->data))
-            return;
-        }
-
-      peek->is_modified = TRUE;
-      peek->is_modified_set = TRUE;
-    }
-
   self->is_modified = !!modified;
   self->is_modified_set = TRUE;
 

gtk/gtkviewport.c

@@ -744,7 +744,5 @@ gtk_viewport_scroll_to (GtkViewport   *viewport,
 
   gtk_adjustment_animate_to_value (viewport->adjustment[GTK_ORIENTATION_HORIZONTAL], x);
   gtk_adjustment_animate_to_value (viewport->adjustment[GTK_ORIENTATION_VERTICAL], y);
-
-  g_clear_pointer (&scroll, gtk_scroll_info_unref);
 }
 

gtk/gtkwidget.c

@@ -126,13 +126,13 @@
  * For example, when queried in the normal %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH mode:
  *
  * First, the default minimum and natural width for each widget
- * in the interface will be computed using [method@Gtk.Widget.measure] with an
+ * in the interface will be computed using [id@gtk_widget_measure] with an
  * orientation of %GTK_ORIENTATION_HORIZONTAL and a for_size of -1.
  * Because the preferred widths for each widget depend on the preferred
  * widths of their children, this information propagates up the hierarchy,
  * and finally a minimum and natural width is determined for the entire
  * toplevel. Next, the toplevel will use the minimum width to query for the
- * minimum height contextual to that width using [method@Gtk.Widget.measure] with an
+ * minimum height contextual to that width using [id@gtk_widget_measure] with an
  * orientation of %GTK_ORIENTATION_VERTICAL and a for_size of the just computed
  * width. This will also be a highly recursive operation. The minimum height
  * for the minimum width is normally used to set the minimum size constraint
@@ -223,7 +223,7 @@
  * to do it.
  *
  * Of course if you are getting the size request for another widget, such
- * as a child widget, you must use [method@Gtk.Widget.measure]; otherwise, you
+ * as a child widget, you must use [id@gtk_widget_measure]; otherwise, you
  * would not properly consider widget margins, [class@Gtk.SizeGroup], and
  * so forth.
  *
@@ -240,7 +240,7 @@
  *
  * If a widget ends up baseline aligned it will be allocated all the space in
  * the parent as if it was %GTK_ALIGN_FILL, but the selected baseline can be
- * found via [method@Gtk.Widget.get_baseline]. If the baseline has a
+ * found via [id@gtk_widget_get_baseline]. If the baseline has a
  * value other than -1 you need to align the widget such that the baseline
  * appears at the position.
  *
@@ -405,7 +405,7 @@
  * ```
  *
  * You can access widgets defined in the template using the
- * [method@Gtk.Widget.get_template_child] function, but you will typically declare
+ * [id@gtk_widget_get_template_child] function, but you will typically declare
  * a pointer in the instance private data structure of your type using the same
  * name as the widget in the template definition, and call
  * [method@Gtk.WidgetClass.bind_template_child_full] (or one of its wrapper macros

gtk/inspector/object-tree.c

@@ -1312,22 +1312,10 @@ gtk_inspector_object_tree_select_object (GtkInspectorObjectTree *wt,
                              GTK_LIST_SCROLL_SELECT | GTK_LIST_SCROLL_FOCUS,
                              NULL);
 
-  g_signal_emit (wt, signals[OBJECT_SELECTED], 0, object);
+  g_signal_emit (wt, signals[OBJECT_SELECTED], 0, object); // FIXME
   g_object_unref (row_item);
 }
 
-static void
-on_selected_item (GtkSingleSelection     *selection,
-                  GParamSpec             *pspec,
-                  GtkInspectorObjectTree *wt)
-{
-  GObject *selected = gtk_single_selection_get_selected_item (selection);
-  GtkTreeListRow *row = GTK_TREE_LIST_ROW (selected);
-  GObject *object = gtk_tree_list_row_get_item (row);
-  g_signal_emit (wt, signals[OBJECT_SELECTED], 0, object);
-  g_object_unref (object);
-}
-
 void
 gtk_inspector_object_tree_set_display (GtkInspectorObjectTree *wt,
                                        GdkDisplay *display)
@@ -1341,5 +1329,4 @@ gtk_inspector_object_tree_set_display (GtkInspectorObjectTree *wt,
   wt->priv->selection = gtk_single_selection_new (g_object_ref (G_LIST_MODEL (wt->priv->tree_model)));
   gtk_column_view_set_model (GTK_COLUMN_VIEW (wt->priv->list),
                              GTK_SELECTION_MODEL (wt->priv->selection));
-  g_signal_connect (wt->priv->selection, "notify::selected-item", G_CALLBACK (on_selected_item), wt);
 }

gtk/meson.build

@@ -1075,6 +1075,7 @@ endif
 if macos_enabled
   gtk_macos_frameworks = [
     'AppKit',
+    'Foundation',
   ]
   gtk_deps += [dependency('appleframeworks', modules: gtk_macos_frameworks)]
 endif

meson.build

@@ -817,15 +817,28 @@ endif
 gsk_packages = [ 'graphene-gobject-1.0 @0@'.format(graphene_req) ]
 gtk_packages = [ 'gio-2.0 @0@'.format(glib_req) ]
 
-enabled_backends = []
+gio_pkgname = os_unix ? 'gio-unix-2.0' : 'gio-2.0'
+gdk_private_packages = [
+  '@0@ @1@'.format(gio_pkgname, glib_req),
+  'epoxy @0@'.format(epoxy_req),
+] + x11_pkgs + wayland_pkgs + cairo_backends
+gsk_private_packages = [] # all already in gdk_private_packages
+pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
+gtk_private_packages = pangoft2_pkgs
+
+pkgs = []
+pkg_targets = []
+display_backends = []
 foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ]
   if get_variable('@0@_enabled'.format(backend))
-    enabled_backends += backend
+    pkgs += ['gtk4-@0@'.format(backend)]
+    pkg_targets += backend
+    display_backends += [ backend ]
   endif
 endforeach
 
 common_pc_variables = [
-  'targets=@0@'.format(' '.join(enabled_backends)),
+  'targets=@0@'.format(' '.join(pkg_targets)),
   'gtk_binary_version=@0@'.format(gtk_binary_version),
   'gtk_host=@0@-@1@'.format(host_machine.cpu_family(), host_machine.system()), # FIXME
 ]
@@ -840,14 +853,13 @@ pkg_config.generate(libgtk,
 )
 meson.override_dependency('gtk4', libgtk_dep)
 
-foreach backend: enabled_backends
-  pkg = 'gtk4-@0@'.format(backend)
+foreach pkg: pkgs
   pkg_config.generate(
     filebase: pkg,
     unescaped_variables: common_pc_variables,
     name: 'GTK',
     description: 'GTK Graphical UI Library',
-    requires: ['gtk4', get_variable('@0@_public_deps'.format(backend), [])],
+    requires: 'gtk4',
   )
   meson.override_dependency(pkg, libgtk_dep)
 endforeach
@@ -892,7 +904,7 @@ endif
 
 #### Summary ####
 
-summary('Display backends', enabled_backends, section: 'Components')
+summary('Display backends', display_backends, section: 'Components')
 summary('Print backends', print_backends, section: 'Components')
 summary('Media backends', media_backends, section: 'Components')
 

modules/printbackends/gtkprintbackendcpdb.h

@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include "gtk/print/gtkprintbackendprivate.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 

modules/printbackends/gtkprintercpdb.h

@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 #include <cpdb/cpdb-frontend.h>
-#include <gtk/print/gtkprinterprivate.h>
+#include <gtk/gtkprinterprivate.h>
 
 G_BEGIN_DECLS
 
@@ -43,4 +43,4 @@ void                  gtk_printer_cpdb_set_printer_obj        (GtkPrinterCpdb
 
 G_END_DECLS
 
-#endif /* __GTK_PRINTER_CPDB_H__ */
+#endif /* __GTK_PRINTER_CPDB_H__ */