Make points stack-allocated

This does the necessary reshuffling to make GskPathPoint
a stack-allocated struct.

.gitlab-ci.yml

@@ -30,16 +30,8 @@ variables:
 
 workflow:
   rules:
-    # run merge request pipelines
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # do not run branch pipelines if corresponding merge requests exist...
-    # (this avoids duplicate pipelines)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    # ...but otherwise run branch pipelines
-    - if: $CI_COMMIT_BRANCH
-    # run tag pipelines
     - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
 
 default:
   retry:
@@ -205,30 +197,21 @@ msys2-mingw64:
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
-macos-x86_64:
+macos:
+  # Sadly, this fails regularly, and its failure is never enlightening
+  allow_failure: true
   rules:
-    # Do not run in forks as the runner is not available there.
     - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
-    - macosintel
+    - macos
   needs: []
-  variables:
-    MESON_FORCE_BACKTRACKE: 1
-    TMPDIR: /Users/Shared/work/tmp
-    SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
-    CCACHE_DIR: /Users/Shared/work/ccache
-    PIP_CACHE_DIR: /Users/Shared/build/cache
-    PIPENV_CACHE_DIR: $PIP_CACHE_DIR
-    PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - python3 -m venv .venv
-    - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
-    - ln -s /opt/ccache/ccache .venv/bin
-    - source .venv/bin/activate
-    - pip3 install meson==1.2.0
-    - pip3 install ninja==1.11.1
+    - pip3 install --user meson~=1.0
+    - pip3 install --user ninja
+    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
+    - export MESON_FORCE_BACKTRACE=1
   script:
     - meson setup ${COMMON_MESON_FLAGS}
             -Dx11-backend=false

.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

NEWS

@@ -1,81 +1,6 @@
-Overview of Changes in 4.13.1, xx-xx-xxxx
+Overview of Changes in 4.13.0, xx-xx-xxxx
 =========================================
 
-Overview of Changes in 4.13.0, 25-08-2023
-=========================================
-
-* GskPath, GskPathBuilder, GskPathMeasure:
-  Data types and APIs for path rendering. These APIs are still
-  considered experimental, and may change until 4.14. Please try
-  them out and give us feedback. Documentation can be found
-  here: https://docs.gtk.org/gsk4/paths.html
-
-* GtkGridView:
- - Fix a crash when scrolling
-
-* GtkColumnView:
- - Fix a refcounting issue in the new scroll_to api
-
-* GtkTreeView
- - Fix style classes for sort arrows
-
-* GtkEntry:
- - Improve tracking of user changes (for undo)
-
-* GtkNotebook:
- - Fix a critical when switching pages
-
-* GtkColor/FontDialogButton:
- - Make these widgets activatable
-
-* GtkMenuButton:
- - Fix problems with focus handling
- - Fix problems with DND
- - Make flags a settable property
-
-* GtkShortcutsWindow:
- - Add API to build shortcuts windows programmatically
-
-* Printing
- - Fix the cpdb backend build
-
-* MacOS:
- - Make file filters work again
-
-* GSK:
- - Fix issues with color matrix nodes
-
-* Wayland:
- - Fix a crash with compositors other than gnome-shell
-
-* Deprecations:
- - Remaining GtkTreeModel-related types
-
-* Demos:
- - Add a few path demos to gtk4-demo
-
-* Tools:
- - gtk4-path-tool provides a commandline interface for paths
-
-* Translation updates:
- Basque
- Catalan
- Finnish
- Galician
- Georgian
- German
- Greek
- Indonesian
- Kazakh
- Persian
- Polish
- Romanian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.12.0, 05-08-2023
 =========================================
 

demos/gtk-demo/demo.gresource.xml

@@ -127,7 +127,6 @@
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
-    <file>tiger.node</file>
   </gresource>
   <gresource prefix="/frames">
     <file>frames.ui</file>
@@ -338,8 +337,6 @@
     <file>password_entry.c</file>
     <file>path_fill.c</file>
     <file>path_maze.c</file>
-    <file>path_spinner.c</file>
-    <file>path_walk.c</file>
     <file>path_text.c</file>
     <file>peg_solitaire.c</file>
     <file>pickers.c</file>
@@ -426,10 +423,6 @@
   <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>
   <gresource prefix="/path_text">
     <file>path_text.ui</file>
   </gresource>

demos/gtk-demo/fishbowl.c

@@ -11,9 +11,6 @@
 #include "gtkgears.h"
 #include "gskshaderpaintable.h"
 
-#include "nodewidget.h"
-#include "graphwidget.h"
-
 const char *const css =
 ".blurred-button {"
 "  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
@@ -211,18 +208,6 @@ create_menu_button (void)
   return w;
 }
 
-static GtkWidget *
-create_tiger (void)
-{
-  return node_widget_new ("/fishbowl/tiger.node");
-}
-
-static GtkWidget *
-create_graph (void)
-{
-  return graph_widget_new ();
-}
-
 static const struct {
   const char *name;
   GtkWidget * (*create_func) (void);
@@ -240,8 +225,6 @@ static const struct {
   { "Switch",     create_switch         },
   { "Menubutton", create_menu_button    },
   { "Shader",     create_cogs           },
-  { "Tiger",      create_tiger          },
-  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;

demos/gtk-demo/graphwidget.c

@@ -1,153 +0,0 @@
-#include "graphwidget.h"
-
-struct _GraphWidget
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  GskStroke *stroke;
-  GdkRGBA color;
-
-  guint tick_cb;
-  guint64 start_time;
-
-  double period;
-  double amplitude;
-};
-
-struct _GraphWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GraphWidget, graph_widget, GTK_TYPE_WIDGET)
-
-static void
-update_path (GraphWidget *self,
-             float        amplitude)
-{
-  graphene_point_t p[20];
-  GskPathBuilder *builder;
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-
-  for (int i = 0; i < 20; i++)
-    {
-      p[i].x = 10 * i;
-      p[i].y = 50;
-
-      if (i % 4 == 1 || i % 4 == 2)
-        {
-          if (i % 8 < 4)
-            p[i].y += amplitude;
-          else
-            p[i].y -= amplitude;
-        }
-    }
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_move_to (builder, p[0].x, p[0].y);
-
-  for (int i = 0; i < 20; i += 4)
-    gsk_path_builder_cubic_to (builder,
-                               p[i+1].x, p[i+1].y,
-                               p[i+2].x, p[i+2].y,
-                               p[i+3].x, p[i+3].y);
-
-  self->path = gsk_path_builder_free_to_path (builder);
-}
-
-static gboolean
-tick_cb (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       user_data)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-  guint64 now;
-  double angle;
-
-  now = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (self->start_time == 0)
-    self->start_time = now;
-
-  angle = 360 * (now - self->start_time) / (double)(self->period * G_TIME_SPAN_MINUTE);
-  update_path (self, sin (angle) * self->amplitude);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-graph_widget_init (GraphWidget *self)
-{
-  self->color.red = g_random_double_range (0, 1);
-  self->color.green = g_random_double_range (0, 1);
-  self->color.blue = g_random_double_range (0, 1);
-  self->color.alpha = 1;
-
-  self->period = g_random_double_range (0.5, 1);
-  self->amplitude = g_random_double_range (10, 25);
-
-  self->stroke = gsk_stroke_new (2);
-
-  update_path (self, 0);
-
-  self->start_time = 0;
-  self->tick_cb = gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_cb, NULL, NULL);
-}
-
-static void
-graph_widget_dispose (GObject *object)
-{
-  GraphWidget *self = GRAPH_WIDGET (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  gsk_stroke_free (self->stroke);
-
-  G_OBJECT_CLASS (graph_widget_parent_class)->dispose (object);
-}
-
-static void
-graph_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-
-  gtk_snapshot_append_stroke (snapshot, self->path, self->stroke, &self->color);
-}
-
-static void
-graph_widget_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = 200;
-  else
-    *minimum = *natural = 100;
-}
-
-
-static void
-graph_widget_class_init (GraphWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = graph_widget_dispose;
-
-  widget_class->snapshot = graph_widget_snapshot;
-  widget_class->measure = graph_widget_measure;
-}
-
-GtkWidget *
-graph_widget_new (void)
-{
-  return g_object_new (GRAPH_TYPE_WIDGET, NULL);
-}

demos/gtk-demo/graphwidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define GRAPH_TYPE_WIDGET (graph_widget_get_type ())
-G_DECLARE_FINAL_TYPE (GraphWidget, graph_widget, GRAPH, WIDGET, GtkWidget)
-
-GtkWidget * graph_widget_new       (void);

demos/gtk-demo/gtkgears.c

@@ -840,24 +840,24 @@ gtk_gears_unrealize (GtkWidget *widget)
   GtkGearsPrivate *priv = gtk_gears_get_instance_private ((GtkGears *) widget);
 
   gtk_gl_area_make_current (glarea);
-  if (gtk_gl_area_get_error (glarea) == NULL)
-    {
-      /* Release the resources associated with OpenGL */
-      if (priv->gear_vbo[0] != 0)
-        glDeleteBuffers (1, &(priv->gear_vbo[0]));
+  if (gtk_gl_area_get_error (glarea) != NULL)
+    return;
 
-      if (priv->gear_vbo[1] != 0)
-        glDeleteBuffers (1, &(priv->gear_vbo[1]));
+  /* Release the resources associated with OpenGL */
+  if (priv->gear_vbo[0] != 0)
+    glDeleteBuffers (1, &(priv->gear_vbo[0]));
 
-      if (priv->gear_vbo[2] != 0)
-        glDeleteBuffers (1, &(priv->gear_vbo[2]));
+  if (priv->gear_vbo[1] != 0)
+    glDeleteBuffers (1, &(priv->gear_vbo[1]));
 
-      if (priv->vao != 0)
-        glDeleteVertexArrays (1, &priv->vao);
+  if (priv->gear_vbo[2] != 0)
+    glDeleteBuffers (1, &(priv->gear_vbo[2]));
 
-      if (priv->program != 0)
-        glDeleteProgram (priv->program);
-    }
+  if (priv->vao != 0)
+    glDeleteVertexArrays (1, &priv->vao);
+
+  if (priv->program != 0)
+    glDeleteProgram (priv->program);
 
   priv->ModelViewProjectionMatrix_location = 0;
   priv->NormalMatrix_location = 0;

demos/gtk-demo/meson.build

@@ -74,8 +74,6 @@ demos = files([
   'password_entry.c',
   'path_fill.c',
   'path_maze.c',
-  'path_spinner.c',
-  'path_walk.c',
   'path_text.c',
   'peg_solitaire.c',
   'pickers.c',
@@ -141,8 +139,6 @@ extra_demo_sources = files([
   'unicode-names.c',
   'suggestionentry.c',
   'language-names.c',
-  'nodewidget.c',
-  'graphwidget.c',
 ])
 
 if os_unix

demos/gtk-demo/nodewidget.c

@@ -1,76 +0,0 @@
-#include "nodewidget.h"
-
-struct _NodeWidget
-{
-  GtkWidget parent_instance;
-
-  GskRenderNode *node;
-};
-
-struct _NodeWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (NodeWidget, node_widget, GTK_TYPE_WIDGET)
-
-static void
-node_widget_init (NodeWidget *self)
-{
-}
-
-static void
-node_widget_dispose (GObject *object)
-{
-  NodeWidget *self = NODE_WIDGET (object);
-
-  gsk_render_node_unref (self->node);
-
-  G_OBJECT_CLASS (node_widget_parent_class)->dispose (object);
-}
-
-static void
-node_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  NodeWidget *self = NODE_WIDGET (widget);
-
-  gtk_snapshot_append_node (snapshot, self->node);
-}
-
-static void
-node_widget_class_init (NodeWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = node_widget_dispose;
-
-  widget_class->snapshot = node_widget_snapshot;
-}
-
-GtkWidget *
-node_widget_new (const char *resource)
-{
-  NodeWidget *self;
-  GBytes *bytes;
-  GskRenderNode *node;
-  graphene_rect_t bounds;
-  float scale;
-  GskTransform *transform;
-
-  self = g_object_new (NODE_TYPE_WIDGET, NULL);
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  node = gsk_render_node_deserialize (bytes, NULL, NULL);
-  g_bytes_unref (bytes);
-
-  gsk_render_node_get_bounds (node, &bounds);
-  scale = MIN (100.0/bounds.size.width, 100.0/bounds.size.height);
-  transform = gsk_transform_scale (NULL, scale, scale);
-  self->node = gsk_transform_node_new (node, transform);
-  gsk_transform_unref (transform);
-  gsk_render_node_unref (node);
-
-  return GTK_WIDGET (self);
-}

demos/gtk-demo/nodewidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define NODE_TYPE_WIDGET (node_widget_get_type ())
-G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)
-
-GtkWidget * node_widget_new       (const char *file);

demos/gtk-demo/path_fill.c

@@ -1,7 +1,7 @@
-/* Path/Fill and Stroke
+/* Path/Fill
  *
- * This demo shows how to use GskPath to draw shapes that are (a bit)
- * more complex than a rounded rectangle.
+ * This demo shows how to use PangoCairo to draw text with more than
+ * just a single color.
  */
 
 #include <glib/gi18n.h>
@@ -9,162 +9,305 @@
 
 #include "paintable.h"
 
-#define GTK_TYPE_LOGO_PAINTABLE (gtk_logo_paintable_get_type ())
-G_DECLARE_FINAL_TYPE (GtkLogoPaintable, gtk_logo_paintable, GTK, LOGO_PAINTABLE, GObject)
+#define GTK_TYPE_PATH_PAINTABLE (gtk_path_paintable_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathPaintable, gtk_path_paintable, GTK, PATH_PAINTABLE, GObject)
 
-struct _GtkLogoPaintable
+struct _GtkPathPaintable
 {
   GObject parent_instance;
 
   int width;
   int height;
-  GskPath *path[3];
-  GdkRGBA color[3];
-
-  GskPath *stroke_path;
-  GskStroke *stroke1;
-  GskStroke *stroke2;
-  GdkRGBA stroke_color;
+  GskPath *path;
+  GdkPaintable *background;
 };
 
-struct _GtkLogoPaintableClass
+struct _GtkPathPaintableClass
 {
   GObjectClass parent_class;
 };
 
 static int
-gtk_logo_paintable_get_intrinsic_width (GdkPaintable *paintable)
+gtk_path_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
 
-  return self->width;
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_width (self->background), self->width);
+  else
+    return self->width;
 }
 
 static int
-gtk_logo_paintable_get_intrinsic_height (GdkPaintable *paintable)
+gtk_path_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
 
-  return self->height;
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_height (self->background), self->height);
+  else
+    return self->height;
 }
 
 static void
-gtk_logo_paintable_snapshot (GdkPaintable *paintable,
+gtk_path_paintable_snapshot (GdkPaintable *paintable,
                              GdkSnapshot  *snapshot,
                              double        width,
                              double        height)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
 
-  for (unsigned int i = 0; i < 3; i++)
+#if 0
+  gtk_snapshot_push_fill (snapshot, self->path, GSK_FILL_RULE_WINDING);
+#else
+  GskStroke *stroke = gsk_stroke_new (2.0);
+  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
+  gsk_stroke_free (stroke);
+#endif
+
+  if (self->background)
     {
-      gtk_snapshot_push_fill (snapshot, self->path[i], GSK_FILL_RULE_WINDING);
-      gtk_snapshot_append_color (snapshot,
-                                 &self->color[i],
-                                 &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
+      gdk_paintable_snapshot (self->background, snapshot, width, height);
     }
-  for (unsigned int i = 0; i < 3; i++)
+  else
     {
-      gtk_snapshot_push_stroke (snapshot, self->stroke_path, self->stroke1);
-      gtk_snapshot_append_color (snapshot,
-                                 &self->stroke_color,
-                                 &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
+      gtk_snapshot_append_linear_gradient (snapshot,
+                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
+                                           &GRAPHENE_POINT_INIT (0, 0),
+                                           &GRAPHENE_POINT_INIT (width, height),
+                                           (GskColorStop[8]) {
+                                             { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
+                                             { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
+                                             { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
+                                             { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
+                                             { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
+                                             { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
+                                             { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
+                                             { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
+                                           },
+                                           8);
     }
 
-  gtk_snapshot_push_stroke (snapshot, self->stroke_path, self->stroke2);
-  gtk_snapshot_append_color (snapshot,
-                             &self->stroke_color,
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
   gtk_snapshot_pop (snapshot);
+
 }
 
 static GdkPaintableFlags
-gtk_logo_paintable_get_flags (GdkPaintable *paintable)
+gtk_path_paintable_get_flags (GdkPaintable *paintable)
 {
-  return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+  if (self->background)
+    return gdk_paintable_get_flags (self->background);
+  else
+    return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
 }
 
 static void
-gtk_logo_paintable_paintable_init (GdkPaintableInterface *iface)
+gtk_path_paintable_paintable_init (GdkPaintableInterface *iface)
 {
-  iface->get_intrinsic_width = gtk_logo_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_logo_paintable_get_intrinsic_height;
-  iface->snapshot = gtk_logo_paintable_snapshot;
-  iface->get_flags = gtk_logo_paintable_get_flags;
+  iface->get_intrinsic_width = gtk_path_paintable_get_intrinsic_width;
+  iface->get_intrinsic_height = gtk_path_paintable_get_intrinsic_height;
+  iface->snapshot = gtk_path_paintable_snapshot;
+  iface->get_flags = gtk_path_paintable_get_flags;
 }
 
 /* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkLogoPaintable, gtk_logo_paintable, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (GtkPathPaintable, gtk_path_paintable, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_logo_paintable_paintable_init))
+                                                gtk_path_paintable_paintable_init))
 
-static void
-gtk_logo_paintable_dispose (GObject *object)
+/* Here's the boilerplate for the GObject declaration.
+ * We need to disconnect the signals here that we set up elsewhere
+ */
+static void 
+gtk_path_paintable_dispose (GObject *object)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (object);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (object);
 
-  for (unsigned int i = 0; i < 3; i++)
-    gsk_path_unref (self->path[i]);
+  if (self->background)
+    {
+      g_signal_handlers_disconnect_by_func (self->background, gdk_paintable_invalidate_contents, self);
+      g_signal_handlers_disconnect_by_func (self->background, gdk_paintable_invalidate_size, self);
+      g_clear_object (&self->background);
+    }
 
-  gsk_path_unref (self->stroke_path);
-
-  gsk_stroke_free (self->stroke1);
-  gsk_stroke_free (self->stroke2);
-
-  G_OBJECT_CLASS (gtk_logo_paintable_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gtk_path_paintable_parent_class)->dispose (object);
 }
 
 static void
-gtk_logo_paintable_class_init (GtkLogoPaintableClass *klass)
+gtk_path_paintable_class_init (GtkPathPaintableClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->dispose = gtk_logo_paintable_dispose;
+  object_class->dispose = gtk_path_paintable_dispose;
 }
 
 static void
-gtk_logo_paintable_init (GtkLogoPaintable *self)
+gtk_path_paintable_init (GtkPathPaintable *self)
 {
 }
 
-static GdkPaintable *
-gtk_logo_paintable_new (void)
+/* And finally, we add a simple constructor.
+ * It is declared in the header so that the other examples
+ * can use it.
+ */
+GdkPaintable *
+gtk_path_paintable_new (GskPath      *path,
+                        GdkPaintable *background,
+                        int           width,
+                        int           height)
 {
-  GtkLogoPaintable *self;
-  graphene_rect_t bounds, bounds2;
+  GtkPathPaintable *self;
 
-  self = g_object_new (GTK_TYPE_LOGO_PAINTABLE, NULL);
-
-  /* Paths and colors extracted from gtk-logo.svg */
-  self->path[0] = gsk_path_parse ("m3.12,66.17 -2.06,-51.46 32.93,24.7 v55.58 l-30.87,-28.82 z");
-  self->path[1] = gsk_path_parse ("m34,95 49.4,-20.58 4.12,-51.46 -53.52,16.47 v55.58 z");
-  self->path[2] = gsk_path_parse ("m1.06,14.71 32.93,24.7 53.52,-16.47 -36.75,-21.88 -49.7,13.65 z");
-
-  gdk_rgba_parse (&self->color[0], "#e40000");
-  gdk_rgba_parse (&self->color[1], "#7fe719");
-  gdk_rgba_parse (&self->color[2], "#729fcf");
-
-  self->stroke_path = gsk_path_parse ("m50.6,51.3 -47.3,14 z l33,23 z v-50");
-  self->stroke1 = gsk_stroke_new (2.12);
-  self->stroke2 = gsk_stroke_new (1.25);
-  gdk_rgba_parse (&self->stroke_color, "#ffffff");
-
-  gsk_path_get_stroke_bounds (self->path[0], self->stroke1, &bounds);
-  gsk_path_get_stroke_bounds (self->path[1], self->stroke1, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-  gsk_path_get_stroke_bounds (self->path[2], self->stroke1, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-  gsk_path_get_stroke_bounds (self->stroke_path, self->stroke2, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-
-  self->width = bounds.origin.x + bounds.size.width;
-  self->height = bounds.origin.y + bounds.size.height;
+  self = g_object_new (GTK_TYPE_PATH_PAINTABLE, NULL);
+  self->path = path;
+  self->background = background;
+  if (self->background)
+    {
+      g_object_ref (self->background);
+      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
+      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
+    }
+  self->width = width;
+  self->height = height;
 
   return GDK_PAINTABLE (self);
 }
 
+void
+gtk_path_paintable_set_path (GtkPathPaintable *self,
+                             GskPath          *path)
+{
+  g_clear_pointer (&self->path, gsk_path_unref);
+  self->path = gsk_path_ref (path);
+
+  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
+}
+
+static GskPath *
+create_hexagon (GtkWidget *widget)
+{
+  GskPathBuilder *builder;
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_move_to (builder, 120, 0);
+  gsk_path_builder_line_to (builder, 360, 0);
+  gsk_path_builder_line_to (builder, 480, 208);
+  gsk_path_builder_line_to (builder, 360, 416);
+  gsk_path_builder_line_to (builder, 120, 416);
+  gsk_path_builder_line_to (builder, 0, 208);
+  gsk_path_builder_close (builder);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static GskPath *
+create_path_from_text (GtkWidget *widget)
+{
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPathBuilder *builder;
+
+  layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
+  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);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static gboolean
+build_path (GskPathOperation        op,
+            const graphene_point_t *pts,
+            gsize                   n_pts,
+            float                   weight,
+            gpointer                user_data)
+{
+  GskPathBuilder *builder = user_data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
+      break;
+
+    case GSK_PATH_CLOSE:
+      gsk_path_builder_close (builder);
+      break;
+
+    case GSK_PATH_LINE:
+      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
+      break;
+
+    case GSK_PATH_QUAD:
+      gsk_path_builder_quad_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y);
+      break;
+
+    case GSK_PATH_CUBIC:
+      gsk_path_builder_cubic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
+      break;
+
+    case GSK_PATH_CONIC:
+      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
+      break;
+
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return TRUE;
+}
+
+
+static gboolean
+update_path (GtkWidget     *widget,
+             GdkFrameClock *frame_clock,
+             gpointer       measure)
+{
+  float progress = gdk_frame_clock_get_frame_time (frame_clock) % (60 * G_USEC_PER_SEC) / (float) (30 * G_USEC_PER_SEC);
+  GskPathBuilder *builder;
+  GskPath *path;
+  GskPathPoint point;
+  graphene_point_t pos;
+  graphene_vec2_t tangent;
+  GskStroke *stroke;
+
+  path = gsk_path_measure_get_path (measure);
+
+  stroke = gsk_stroke_new (1);
+  gsk_stroke_set_dash (stroke, (float[2]) { 10, 5 }, 2);
+  gsk_stroke_set_dash_offset (stroke, - (gdk_frame_clock_get_frame_time (frame_clock) % G_USEC_PER_SEC) * 15. / G_USEC_PER_SEC);
+  builder = gsk_path_builder_new ();
+  gsk_path_dash (path, stroke, 0.2, build_path, builder);
+
+  if (gsk_path_measure_get_point (measure,
+                                   (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure), &point))
+    {
+      gsk_path_point_get_position (&point, &pos);
+      gsk_path_point_get_tangent (&point, GSK_PATH_END, &tangent);
+
+      gsk_path_builder_move_to (builder, pos.x + 5 * graphene_vec2_get_x (&tangent), pos.y + 5 * graphene_vec2_get_y (&tangent));
+      gsk_path_builder_line_to (builder, pos.x + 3 * graphene_vec2_get_y (&tangent), pos.y + 3 * graphene_vec2_get_x (&tangent));
+      gsk_path_builder_line_to (builder, pos.x - 3 * graphene_vec2_get_y (&tangent), pos.y - 3 * graphene_vec2_get_x (&tangent));
+      gsk_path_builder_close (builder);
+
+      path = gsk_path_builder_free_to_path (builder);
+
+      gtk_path_paintable_set_path (GTK_PATH_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget))),
+                                   path);
+      gsk_path_unref (path);
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
 GtkWidget *
 do_path_fill (GtkWidget *do_widget)
 {
@@ -174,14 +317,35 @@ do_path_fill (GtkWidget *do_widget)
     {
       GtkWidget *picture;
       GdkPaintable *paintable;
+      GtkMediaStream *stream;
+      GskPath *path;
+      graphene_rect_t bounds;
+      GskPathMeasure *measure;
 
       window = gtk_window_new ();
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Fill and Stroke");
+      gtk_window_set_title (GTK_WINDOW (window), "Path Fill");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      paintable = gtk_logo_paintable_new ();
+#if 0
+      stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+#else
+      stream = gtk_nuclear_media_stream_new ();
+#endif
+      gtk_media_stream_play (stream);
+      gtk_media_stream_set_loop (stream, TRUE);
+
+      path = create_hexagon (window);
+      path = create_path_from_text (window);
+      gsk_path_get_bounds (path, &bounds);
+
+      paintable = gtk_path_paintable_new (path,
+                                          GDK_PAINTABLE (stream),
+                                          bounds.origin.x + bounds.size.width,
+                                          bounds.origin.y + bounds.size.height);
       picture = gtk_picture_new_for_paintable (paintable);
+      measure = gsk_path_measure_new (path);
+      gtk_widget_add_tick_callback (picture, update_path, measure, (GDestroyNotify) gsk_path_measure_unref);
       gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_CONTAIN);
       gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
       g_object_unref (paintable);

demos/gtk-demo/path_maze.c

@@ -1,7 +1,7 @@
 /* Path/Maze
  *
  * This demo shows how to use a GskPath to create a maze and use
- * gsk_path_get_closest_point() to check the mouse stays
+ * gsk_path_measure_get_closest_point() to check the mouse stays
  * on the path.
  *
  * It also shows off the performance of GskPath (or not) as this
@@ -138,23 +138,21 @@ pointer_motion (GtkEventControllerMotion *controller,
                 GtkMaze                  *self)
 {
   GskPathPoint point;
-  float distance;
+  graphene_point_t pos;
 
   if (!self->active)
     return;
 
-  if (gsk_path_get_closest_point (self->path,
-                                  &GRAPHENE_POINT_INIT (x, y),
-                                  INFINITY,
-                                  &point,
-                                  &distance))
+  if (gsk_path_get_closest_point (self->path, &GRAPHENE_POINT_INIT (x, y), INFINITY, &point))
     {
-      if (distance < MAZE_STROKE_SIZE_ACTIVE / 2.f)
-        return;
-    }
+      gsk_path_point_get_position (&point, &pos);
 
-  self->active = FALSE;
-  gtk_widget_queue_draw (GTK_WIDGET (self));
+      if (graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL) <= MAZE_STROKE_SIZE_ACTIVE / 2.0f)
+        return;
+
+      self->active = FALSE;
+      gtk_widget_queue_draw (GTK_WIDGET (self));
+    }
 }
 
 static void

demos/gtk-demo/path_spinner.c

@@ -1,320 +0,0 @@
-/* Path/Spinner
- *
- * This demo shows how to use GskPath to draw a simple animation
- * that could be used as a spinner.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-#define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
-G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
-
-struct _GtkSpinnerPaintable
-{
-  GObject parent_instance;
-
-  gint64 start_time;
-
-  int width;
-  double angle;
-  double completion;
-
-  GskPath *circle;
-  GskPath *path;
-  GskStroke *stroke;
-  GdkRGBA color;
-  GdkRGBA circle_color;
-#ifdef SHOW_CONTROLS
-  GskPath *controls;
-  GdkRGBA control_color;
-#endif
-};
-
-struct _GtkSpinnerPaintableClass
-{
-  GObjectClass parent_class;
-};
-
-static int
-gtk_spinner_paintable_get_intrinsic_width (GdkPaintable *paintable)
-{
-  GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (paintable);
-
-  return self->width;
-}
-
-static int
-gtk_spinner_paintable_get_intrinsic_height (GdkPaintable *paintable)
-{
-  GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (paintable);
-
-  return self->width;
-}
-
-static void
-gtk_spinner_paintable_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
-                                double        width,
-                                double        height)
-{
-  GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (paintable);
-
-  gtk_snapshot_append_stroke (snapshot, self->circle, self->stroke, &self->circle_color);
-  gtk_snapshot_append_stroke (snapshot, self->path, self->stroke, &self->color);
-#ifdef SHOW_CONTROLS
-  GskStroke *stroke = gsk_stroke_new (1);
-  gtk_snapshot_append_stroke (snapshot, self->controls, stroke, &self->control_color);
-  gsk_stroke_free (stroke);
-#endif
-}
-
-static GdkPaintableFlags
-gtk_spinner_paintable_get_flags (GdkPaintable *paintable)
-{
-  return GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_spinner_paintable_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->get_intrinsic_width = gtk_spinner_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_spinner_paintable_get_intrinsic_height;
-  iface->snapshot = gtk_spinner_paintable_snapshot;
-  iface->get_flags = gtk_spinner_paintable_get_flags;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkSpinnerPaintable, gtk_spinner_paintable, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_spinner_paintable_paintable_init))
-
-static void
-gtk_spinner_paintable_dispose (GObject *object)
-{
-  GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (object);
-
-  gsk_path_unref (self->circle);
-  gsk_path_unref (self->path);
-#ifdef SHOW_CONTROLS
-  gsk_path_unref (self->controls);
-#endif
-
-  gsk_stroke_free (self->stroke);
-
-  G_OBJECT_CLASS (gtk_spinner_paintable_parent_class)->dispose (object);
-}
-
-static void
-gtk_spinner_paintable_class_init (GtkSpinnerPaintableClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_spinner_paintable_dispose;
-}
-
-static void
-gtk_spinner_paintable_init (GtkSpinnerPaintable *self)
-{
-}
-
-static GdkPaintable *
-gtk_spinner_paintable_new (void)
-{
-  GtkSpinnerPaintable *self;
-  GskPathBuilder *builder;
-
-  self = g_object_new (GTK_TYPE_SPINNER_PAINTABLE, NULL);
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (50, 50), 40);
-  self->circle = gsk_path_builder_free_to_path (builder);
-
-  self->width = 100;
-  self->angle = 0;
-  self->completion = 1;
-  gdk_rgba_parse (&self->color, "green");
-  gdk_rgba_parse (&self->circle_color, "lightgray");
-#ifdef SHOW_CONTROLS
-  gdk_rgba_parse (&self->control_color, "black");
-#endif
-  self->stroke = gsk_stroke_new (5);
-
-  return GDK_PAINTABLE (self);
-}
-
-#ifdef SHOW_CONTROLS
-static gboolean
-add_controls (GskPathOperation        op,
-              const graphene_point_t *pts,
-              gsize                   n_pts,
-              gpointer                data)
-{
-  GskPathBuilder *builder = data;
-
-  switch (op)
-    {
-    case GSK_PATH_MOVE:
-      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
-      break;
-
-    case GSK_PATH_CLOSE:
-    case GSK_PATH_LINE:
-      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
-      break;
-
-    case GSK_PATH_QUAD:
-    case GSK_PATH_ARC:
-      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
-      gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
-      break;
-
-    case GSK_PATH_CUBIC:
-      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
-      gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
-      gsk_path_builder_line_to (builder, pts[3].x, pts[3].y);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  return TRUE;
-}
-#endif
-
-static void
-update_path (GtkSpinnerPaintable *self)
-{
-  GskPathBuilder *builder;
-  GskPathPoint start, end;
-  graphene_point_t p0, p1;
-  float start_angle, end_angle;
-
-  start_angle = self->angle;
-  end_angle = fmod (self->angle + 360 * self->completion / 100, 360);
-
-  p0 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * start_angle / 180),
-                            50 + 40 * sin (M_PI * start_angle / 180));
-  p1 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * end_angle / 180),
-                            50 + 40 * sin (M_PI * end_angle / 180));
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-
-  gsk_path_get_closest_point (self->circle, &p0, INFINITY, &start, NULL);
-  gsk_path_get_closest_point (self->circle, &p1, INFINITY, &end, NULL);
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_segment (builder, self->circle, &start, &end);
-  self->path = gsk_path_builder_free_to_path (builder);
-
-#ifdef SHOW_CONTROLS
-  g_clear_pointer (&self->controls, gsk_path_unref);
-  builder = gsk_path_builder_new ();
-  gsk_path_foreach (self->path, -1, add_controls, builder);
-  self->controls = gsk_path_builder_free_to_path (builder);
-#endif
-
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-}
-
-static void
-gtk_spinner_paintable_set_completion (GtkSpinnerPaintable *self,
-                                   float             completion)
-{
-  self->completion = CLAMP (completion, 0, 100);
-  update_path (self);
-}
-
-static float
-gtk_spinner_paintable_get_completion (GtkSpinnerPaintable *self)
-{
-  return self->completion;
-}
-
-static void
-gtk_spinner_paintable_set_frame_time (GtkSpinnerPaintable *self,
-                                      gint64            time)
-{
-  double delta;
-
-  if (self->start_time == 0)
-    self->start_time = time;
-
-  delta = (time - self->start_time) / (double) G_TIME_SPAN_SECOND;
-  self->angle = fmod (60 * delta, 360);
-  update_path (self);
-}
-
-static gboolean
-tick_cb (GtkWidget *widget,
-         GdkFrameClock *clock,
-         gpointer data)
-{
-  GtkSpinnerPaintable *self = data;
-
-  gtk_spinner_paintable_set_frame_time (self, gdk_frame_clock_get_frame_time (clock));
-  return G_SOURCE_CONTINUE;
-}
-
-static gboolean
-progress_timeout (gpointer data)
-{
-  GtkSpinnerPaintable *self = data;
-  static float progress_delta = 0.5;
-  float progress;
-
-  progress = gtk_spinner_paintable_get_completion (self);
-  if (progress >= 100 || progress <= 0)
-    progress_delta = -progress_delta;
-
-  gtk_spinner_paintable_set_completion (self, progress + progress_delta);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-unset_timeout (gpointer data)
-{
-  g_source_remove (GPOINTER_TO_UINT (data));
-}
-
-GtkWidget *
-do_path_spinner (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *picture;
-      GdkPaintable *paintable;
-      guint timeout_id;
-
-      window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Spinner");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      paintable = gtk_spinner_paintable_new ();
-      picture = gtk_picture_new_for_paintable (paintable);
-      gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_CONTAIN);
-      gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
-      g_object_unref (paintable);
-
-      gtk_widget_add_tick_callback (picture, tick_cb, paintable, NULL);
-      timeout_id = g_timeout_add (100, progress_timeout, paintable);
-
-      g_object_set_data_full (G_OBJECT (picture), "timeout", GUINT_TO_POINTER (timeout_id), unset_timeout);
-
-      gtk_window_set_child (GTK_WINDOW (window), picture);
-    }
-
-  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.c

@@ -1,9 +1,6 @@
 /* Path/Text
  *
- * This demo shows how to use GskPath to transform a path along another path.
- *
- * It also demonstrates that paths can be filled with more interesting
- * content than just plain colors.
+ * This demo shows how to use GskPath to animate a path along another path.
  */
 
 #include <glib/gi18n.h>
@@ -31,8 +28,10 @@ struct _GtkPathWidget
   graphene_point_t points[4];
 
   guint active_point;
+  float line_closest;
 
   GskPath *line_path;
+  GskPathMeasure *line_measure;
   GskPath *text_path;
 
   GdkPaintable *background;
@@ -93,10 +92,8 @@ gtk_path_transform_point (GskPathMeasure         *measure,
 
   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 (&point, path, res);
-      gsk_path_point_get_tangent (&point, path, GSK_PATH_TO_END, &tangent);
+      gsk_path_point_get_position (&point, res);
+      gsk_path_point_get_tangent (&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);
@@ -153,7 +150,7 @@ gtk_path_transform_op (GskPathOperation        op,
       {
         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[3], &transform->offset, transform->scale, &res[1]);
+        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
         gsk_path_builder_conic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, weight);
       }
       break;
@@ -171,11 +168,10 @@ gtk_path_transform_op (GskPathOperation        op,
 }
 
 static GskPath *
-gtk_path_transform (GskPath                *line_path,
+gtk_path_transform (GskPathMeasure         *measure,
                     GskPath                *path,
                     const graphene_point_t *offset)
 {
-  GskPathMeasure *measure = gsk_path_measure_new (line_path);
   GtkPathTransform transform = { measure, gsk_path_builder_new (), *offset };
   graphene_rect_t bounds;
 
@@ -187,8 +183,6 @@ gtk_path_transform (GskPath                *line_path,
 
   gsk_path_foreach (path, -1, gtk_path_transform_op, &transform);
 
-  gsk_path_measure_unref (measure);
-
   return gsk_path_builder_free_to_path (transform.builder);
 }
 
@@ -204,6 +198,7 @@ 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
@@ -214,8 +209,11 @@ gtk_path_widget_create_text_path (GtkPathWidget *self)
 
   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_path, path, &offset);
+  self->text_path = gtk_path_transform (self->line_measure, path, &offset);
 
   gsk_path_unref (path);
 }
@@ -241,6 +239,8 @@ gtk_path_widget_create_paths (GtkPathWidget *self)
                              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);
 }
 
@@ -322,6 +322,27 @@ gtk_path_widget_snapshot (GtkWidget   *widget,
 
       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 (&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
@@ -501,13 +522,16 @@ pointer_motion (GtkEventControllerMotion *controller,
                 GtkPathWidget            *self)
 {
   GskPathPoint point;
+  graphene_point_t pos;
 
-  if (gsk_path_get_closest_point (self->line_path,
+  if (gsk_path_get_closest_point (gsk_path_measure_get_path (self->line_measure),
                                   &GRAPHENE_POINT_INIT (x, y),
                                   INFINITY,
-                                  &point,
-                                  NULL))
+                                  &point))
     {
+      gsk_path_point_get_position (&point, &pos);
+      self->line_closest = graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL);
+    
       gtk_widget_queue_draw (GTK_WIDGET (self));
     }
 }
@@ -516,6 +540,8 @@ static void
 pointer_leave (GtkEventControllerMotion *controller,
                GtkPathWidget            *self)
 {
+  self->line_closest = -1;
+
   gtk_widget_queue_draw (GTK_WIDGET (self));
 }
 
@@ -536,6 +562,8 @@ gtk_path_widget_init (GtkPathWidget *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);

demos/gtk-demo/path_walk.c

@@ -1,373 +0,0 @@
-/* Path/Walk
- *
- * This demo draws a world map and shows how to animate objects along a GskPath.
- *
- * 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_N_POINTS,
-  PROP_PATH,
-  N_PROPS
-};
-
-struct _GtkPathWalk
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  GskPathMeasure *measure;
-  graphene_rect_t bounds;
-  GskPath *arrow_path;
-  guint n_points;
-};
-
-struct _GtkPathWalkClass
-{
-  GtkWidgetClass parent_class;
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkPathWalk, gtk_path_walk, GTK_TYPE_WIDGET)
-
-static void
-rgba_init_from_hsla (GdkRGBA *rgba,
-                     float    hue,
-                     float    saturation,
-                     float    lightness,
-                     float    alpha)
-{
-  float m1, m2;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue -= 120;
-      if (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue -= 120;
-      if (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}
-
-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);
-  float length, progress;
-  GskStroke *stroke;
-  guint i;
-
-  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);
-
-  length = gsk_path_measure_get_length (self->measure);
-  progress = 25.f * gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget)) / G_USEC_PER_SEC;
-
-  stroke = gsk_stroke_new (1.0);
-  for (i = 0; i < self->n_points; i++)
-    {
-      GskPathPoint point;
-      graphene_point_t position;
-      float angle;
-      GdkRGBA color;
-      float distance;
-
-      distance = i * length / self->n_points;
-      distance = fmod (distance + progress, length);
-
-      gsk_path_measure_get_point (self->measure, distance, &point);
-      gsk_path_point_get_position (&point, self->path, &position);
-      angle = gsk_path_point_get_rotation (&point, self->path, GSK_PATH_FROM_START);
-      rgba_init_from_hsla (&color, 360.f * i / self->n_points, 1, 0.5, 1);
-
-      gtk_snapshot_save (snapshot);
-      gtk_snapshot_translate (snapshot, &position);
-      gtk_snapshot_rotate (snapshot, angle);
-      gtk_snapshot_append_fill (snapshot, self->arrow_path, GSK_FILL_RULE_EVEN_ODD, &color);
-      gtk_snapshot_append_stroke (snapshot, self->arrow_path, stroke, &(GdkRGBA) { 0, 0, 0, 1 });
-      gtk_snapshot_restore (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_n_points (GtkPathWalk *self,
-                            gsize        n_points)
-{
-  if (self->n_points == n_points)
-    return;
-
-  self->n_points = n_points;
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_POINTS]);
-}
-
-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);
-      self->measure = gsk_path_measure_new (self->path);
-    }
-
-  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_N_POINTS:
-      gtk_path_walk_set_n_points (self, g_value_get_uint (value));
-      break;
-
-    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_N_POINTS:
-      g_value_set_uint (value, self->n_points);
-      break;
-
-    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_clear_pointer (&self->measure, gsk_path_measure_unref);
-  g_clear_pointer (&self->arrow_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_N_POINTS] =
-    g_param_spec_uint ("n-points",
-                       NULL, NULL,
-                       1, G_MAXUINT,
-                       500,
-                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  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 gboolean
-tick_tick_tick (GtkWidget     *self,
-                GdkFrameClock *frame_clock,
-                gpointer       unused)
-{
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-  return G_SOURCE_CONTINUE;
-}
-
-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);
-  self->arrow_path = gsk_path_parse ("M 5 0 L 0 -5. 0 -2, -5 -2, -5 2, 0 2, 0 5 Z");
-  self->n_points = 500;
-  gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_tick_tick, NULL, NULL);
-}
-
-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,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">World Map</property>
-    <property name="titlebar">
-      <object class="GtkHeaderBar">
-        <child type="end">
-          <object class="GtkSpinButton">
-            <property name="adjustment">
-              <object class="GtkAdjustment" id="adjustment">
-                <property name="lower">0</property>
-                <property name="upper">5000</property>
-                <property name="value">500</property>
-              </object>
-            </property>
-          </object>
-        </child>
-      </object>
-    </property>
-    <property name="child">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkPathWalk" id="view">
-            <property name="n-points" bind-source="adjustment" bind-property="value"/>
-            <property name="hexpand">true</property>
-            <property name="vexpand">true</property>
-          </object>
-        </child>
-      </object>
-    </property>
-  </object>
-</interface>

demos/node-editor/node-format.md

@@ -147,19 +147,6 @@ Creates a node like `gsk_cross_fade_node_new()` with the given properties.
 
 Creates a node like `gsk_debug_node_new()` with the given properties.
 
-### fill
-
-| property  | syntax          | default                | printed     |
-| --------- | --------------- | ---------------------- | ----------- |
-| child     | `<node>`        | *see below*            | always      |
-| path      | `<string>`      | ""                     | always      |
-| fill-rule | `<fill-rule>`   | winding                | always      |
-
-Creates a node like `gsk_fill_node_new()` with the given properties.
-
-The default child node is the default color node, but created with the
-bounds of the path.
-
 ### glshader
 
 | property   | syntax             | default                | printed     |
@@ -302,24 +289,6 @@ Creates a node like `gsk_rounded_clip_node_new()` with the given properties.
 
 Creates a node like `gsk_shadow_node_new()` with the given properties.
 
-### stroke
-
-| property    | syntax             | default           | printed     |
-| ----------- | ------------------ | ----------------- | ----------- |
-| child       | `<node>`           | *see below*       | always      |
-| path        | `<string>`         | ""                | always      |
-| line-width  | `<number>`         | 0                 | non-default |
-| line-cap    | `<line-cap>`       | butt              | always      |
-| line-join   | `<line-join>`      | miter             | always      |
-| miter-limit | `<number>`         | 4                 | non-default |
-| dash        | `<number>{+}|none` | none              | non-default |
-| dash-offset | `<number>`         | 0                 | non-default |
-
-Creates a node like `gsk_stroke_node_new()` with the given properties.
-
-The default child node is the default color node, but created with the
-stroke bounds of the path.
-
 ### text
 
 | property | syntax           | default                | printed     |

docs/reference/gsk/gsk4.toml.in

@@ -32,34 +32,7 @@ show_class_hierarchy = true
 base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 
 [extra]
-content_files = [
-  "paths.md",
-]
 content_images = [
   "gtk-logo.svg",
-  "images/arc-dark.png",
-  "images/arc-light.png",
-  "images/caps-dark.png",
-  "images/caps-light.png",
-  "images/conic-light.png",
-  "images/conic-dark.png",
-  "images/cubic-dark.png",
-  "images/cubic-light.png",
-  "images/curvature-dark.png",
-  "images/curvature-light.png",
-  "images/directions-dark.png",
-  "images/directions-light.png",
-  "images/fill-even-odd.png",
-  "images/fill-winding.png",
-  "images/join-dark.png",
-  "images/join-light.png",
-  "images/line-dark.png",
-  "images/line-light.png",
-  "images/path-dark.png",
-  "images/path-light.png",
-  "images/quad-dark.png",
-  "images/quad-light.png",
-  "images/stroke-miter.png",
-  "images/stroke-round.png",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gsk/images/arc.svg

@@ -1,92 +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="arcto.svg"
-   inkscape:export-filename="cubic-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="399.39592"
-     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;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       d="M 58.033485,123.96862 C 75.231194,113.95411 92.489919,103.26728 107.81401,113.89786"
-       id="path3"
-       sodipodi:nodetypes="cc" />
-    <ellipse
-       style="fill:none;stroke:#000000;stroke-width:0.20061772;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2"
-       cx="-16.837238"
-       cy="154.55043"
-       rx="35.832706"
-       ry="17.920988"
-       transform="matrix(0.86643544,-0.49928912,0.59215321,0.8058254,0,0)" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       d="M 57.432798,124.38759 86.59638,102.1496 107.25717,113.71009"
-       id="path1"
-       sodipodi:nodetypes="ccc" />
-    <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-9"
-       cx="86.580566"
-       cy="102.81618"
-       r="1.5" />
-    <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 45.061871,134.70541 12.60825,-10.20893"
-       id="path4-4"
-       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 35.405008,142.35717 8.95641,-7.26298"
-       id="path4-8-8"
-       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-1"
-       cx="57.597607"
-       cy="124.23325"
-       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-5"
-       cx="108.01463"
-       cy="114.17829"
-       r="1.5" />
-  </g>
-</svg>

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/conic.svg

@@ -1,93 +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="conic.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="1.5197952"
-     inkscape:cx="397.75096"
-     inkscape:cy="525.39974"
-     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;stroke:#8b8b8b;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="m 66.52304,196.79607 c 27.88945,-10.42358 28.400227,-11.25919 57.24918,-4.59693"
-       id="path5-7-6"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#848484;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 28.059619,-18.89157 28.355331,-21.42218 57.249175,-4.59693"
-       id="path5"
-       sodipodi:nodetypes="cc" />
-    <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" />
-    <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.25585,197.17683 c 29.459015,-15.97487 29.941733,-16.52508 57.24918,-4.59693"
-       id="path5-7"
-       sodipodi:nodetypes="cc" />
-    <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" />
-    <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" />
-  </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/curvature.svg

@@ -1,65 +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="curvature.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="1.0746575"
-     inkscape:cx="396.87064"
-     inkscape:cy="561.57428"
-     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:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       d="m 61.499887,117.85302 0.05055,-14.89554"
-       id="path3"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       d="m 47.704374,176.11887 c 0,0 -17.048386,-67.06278 9.674156,-72.76426 29.478854,-6.289566 30.433539,55.72526 58.46942,50.81836"
-       id="path1"
-       sodipodi:nodetypes="csc" />
-    <ellipse
-       style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
-       id="path2"
-       cy="117.87344"
-       cx="61.445835"
-       rx="14.692688"
-       ry="14.525347" />
-    <circle
-       style="fill:#818181;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="61.42588"
-       cy="117.79034"
-       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/gsk/meson.build

@@ -1,7 +1,3 @@
-gsk_expand_content_md_files = [
-  'paths.md',
-]
-
 if get_option('documentation')
   gsk4_toml = configure_file(
     input: 'gsk4.toml.in',
@@ -25,7 +21,7 @@ if get_option('documentation')
       '@INPUT1@',
     ],
     depends: [ gdk_gir[0] ],
-    depend_files: [ gsk_expand_content_md_files ],
+    depend_files: [ expand_content_md_files ],
     build_by_default: true,
     install: true,
     install_dir: docs_dir,

docs/reference/gsk/paths.md

@@ -1,174 +0,0 @@
-Title: Paths
-Slug: paths
-
-GSK provides a path API that can be used to render more complex
-shapes than lines or rounded rectangles. It is comparable to cairos
-[path API](https://www.cairographics.org/manual/cairo-Paths.html),
-with some notable differences.
-
-In general, a path consists of one or more connected **_contours_**,
-each of which may have multiple **_operations_**, and may or may not be closed.
-Operations can be straight lines or curves of various kinds. At the points
-where the operations connect, the path can have sharp turns.
-
-<figure>
-  <picture>
-    <source srcset="path-dark.png" media="(prefers-color-scheme: dark)">
-    <img alt="A path with multiple contours" src="path-light.png">
-  </picture>
-  <figcaption>A path with one closed, and one open contour</figcaption>
-</figure>
-
-The central object of the GSK path API is the immutable [struct@Gsk.Path]
-struct, which contains path data in compact form suitable for rendering.
-
-## Creating Paths
-
-Since `GskPath` is immutable, the auxiliary [struct@Gsk.PathBuilder] struct
-can be used to construct a path piece by piece. The pieces are specified with
-points, some of which will be on the path, while others are just **_control points_**
-that are used to influence the shape of the resulting path.
-
-<figure>
-  <picture>
-    <source srcset="cubic-dark.png" media="(prefers-color-scheme: dark)">
-    <img alt="An cubic Bézier" src="cubic-light.png">
-  </picture>
-  <figcaption>A cubic Bézier operation, with 2 control points</figcaption>
-</figure>
-
-The `GskPathBuilder` API has three distinct groups of functions:
-
-- Functions for building contours from individual operations, like [method@Gsk.PathBuilder.move_to],
-  [method@Gsk.PathBuilder.line_to], [method@Gsk.PathBuilder.cubic_to], [method@Gsk.PathBuilder.close]. `GskPathBuilder` maintains a **_current point_**, so these methods all
-  take one less points than necessary for the operation (e.g. `gsk_path_builder_line_to`
-  only takes a single point and draws a line from the current point to the new point).
-
-- Functions for adding complete contours, such as [method@Gsk.PathBuilder.add_rect],
-  [method@Gsk.PathBuilder.add_rounded_rect], [method@Gsk.PathBuilder.add_circle].
-
-- Adding parts of a preexisting path. Functions in this group include
-  [method@Gsk.PathBuilder.add_path] and [method@Gsk.PathBuilder.add_segment].
-
-When you are done with building a path, you can convert the accumulated path
-data into a `GskPath` struct with [method@Gsk.PathBuilder.free_to_path].
-
-A sometimes convenient alternative is to create a path from a serialized form,
-with [func@Gsk.Path.parse]. This function interprets strings in SVG path syntax,
-such as:
-
-    M 100 100 C 100 200 200 200 200 100 Z
-
-## Rendering with Paths
-
-There are two main ways to render with paths. The first is to **_fill_** the
-interior of a path with a color or more complex content, such as a gradient.
-GSK supports different ways of determining what part of the plane are interior
-to the path, which can be selected with a [enum@Gsk.FillRule] value.
-
-<figure>
-  <picture>
-    <img alt="A filled path" src="fill-winding.png">
-  </picture>
-  <figcaption>A path filled with GSK_FILL_RULE_WINDING</figcaption>
-</figure>
-
-<figure>
-  <picture>
-    <img alt="A filled path" src="fill-even-odd.png">
-  </picture>
-  <figcaption>The same path, filled with GSK_FILL_RULE_EVEN_ODD</figcaption>
-</figure>
-
-To fill a path, use [gtk_snapshot_append_fill()](../gtk4/method.Snapshot.append_fill.html)
-or the more general [gtk_snapshot_push_fill()](../gtk4/method.Snapshot.push_fill.html).
-
-Alternatively, a path can be **_stroked_**, which means to emulate drawing
-with an idealized pen along the path. The result of stroking a path is another
-path (the **_stroke path_**), which is then filled.
-
-The stroke operation can be influenced with the [struct@Gsk.Stroke] struct
-that collects various stroke parameters, such as the line width, the style
-of line joins and line caps, and a dash pattern.
-
-<figure>
-  <picture>
-    <img alt="A stroked path" src="stroke-miter.png">
-  </picture>
-  <figcaption>The same path, stroked with GSK_LINE_JOIN_MITER</figcaption>
-</figure>
-
-<figure>
-  <picture>
-    <img alt="A stroked path" src="stroke-round.png">
-  </picture>
-  <figcaption>The same path, stroked with GSK_LINE_JOIN_ROUND</figcaption>
-</figure>
-
-To stroke a path, use
-[gtk_snapshot_append_stroke()](../gtk4/method.Snapshot.append_stroke.html)
-or [gtk_snapshot_push_stroke()](../gtk4/method.Snapshot.push_stroke.html).
-
-## Hit testing
-
-When paths are rendered as part of an interactive interface, it is sometimes
-necessary to determine whether the mouse points is over the path. GSK provides
-[method@Gsk.Path.in_fill] for this purpose.
-
-## Path length
-
-An important property of paths is their **_length_**. Computing it efficiently
-requires caching, therefore GSK provides a separate [struct@Gsk.PathMeasure] object
-to deal with path lengths. After constructing a `GskPathMeasure` object for a path,
-it can be used to determine the length of the path with [method@Gsk.PathMeasure.get_length]
-and locate points at a given distance into the path with [method@Gsk.PathMeasure.get_point].
-
-## Other Path APIs
-
-Paths have uses beyond rendering, for example as trajectories in animations.
-In such uses, it is often important to access properties of paths, such as
-their tangents at certain points. GSK provides an abstract representation
-for points on a path in the form of the [struct@Gsk.PathPoint] struct.
-You can query properties of a path at certain point once you have a
-`GskPathPoint` representing that point.
-
-`GskPathPoint` structs can be compared for equality with [method@Gsk.PathPoint.equal]
-and ordered wrt. to which one comes first, using [method@Gsk.PathPoint.compare].
-
-To obtain a `GskPathPoint`, use [method@Gsk.Path.get_closest_point],
-[method@Gsk.Path.get_start_point], [method@Gsk.Path.get_end_point] or
-[method@Gsk.PathMeasure.get_point].
-
-To query properties of the path at a point, use [method@Gsk.PathPoint.get_position],
-[method@Gsk.PathPoint.get_tangent], [method@Gsk.PathPoint.get_rotation],
-[method@Gsk.PathPoint.get_curvature] and [method@Gsk.PathPoint.get_distance].
-
-Some of the properties can have different values for the path going into
-the point and the path leaving the point, typically at points where the
-path takes sharp turns. Examples for this are tangents (which can have up
-to 4 different values) and curvatures (which can have two different values).
-
-<figure>
-  <picture>
-    <source srcset="directions-dark.png" media="(prefers-color-scheme: dark)">
-    <img alt="Path Tangents" src="directions-light.png">
-  </picture>
-  <figcaption>Path Tangents</figcaption>
-</figure>
-
-## Going beyond GskPath
-
-Lots of powerful functionality can be implemented for paths:
-
-- Finding intersections
-- Offsetting curves
-- Turning stroke outlines into paths
-- Molding curves (making them pass through a given point)
-
-GSK does not provide API for all of these, but it does offer a way to get at
-the underlying Bézier curves, so you can implement such functionality yourself.
-You can use [method@Gsk.Path.foreach] to iterate over the operations of the
-path, and get the points needed to reconstruct or modify the path piece by piece.
-
-See e.g. the [Primer on Bézier curves](https://pomax.github.io/bezierinfo/)
-for inspiration of useful things to explore.

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

@@ -13,9 +13,9 @@ SYNOPSIS
 |   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
 |
 |   **gtk4-path-tool** decompose [OPTIONS...] <PATH>
+|   **gtk4-path-tool** restrict [OPTIONS...] <PATH>
 |   **gtk4-path-tool** show [OPTIONS...] <PATH>
 |   **gtk4-path-tool** render [OPTIONS...] <PATH>
-|   **gtk4-path-tool** reverse [OPTIONS...] <PATH>
 |   **gtk4-path-tool** info [OPTIONS...] <PATH>
 
 DESCRIPTION
@@ -37,17 +37,30 @@ 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-curves``
 
   Allow cubic Bézier curves to be used in the generated path.
 
-``--allow-conic``
+``--allow-conics``
 
-  Allow conic Bézier curves to be used in the generated path.
+  Allow rational quadratic Bézier curves to be used in the generated path.
+
+Restricting
+^^^^^^^^^^^
+
+The ``restrict`` command creates a path that traces a segment of the original
+path. Note that the start and the end of the segment are specified as
+path length from the beginning of the path.
+
+``--start=LENGTH``
+
+  The distance from the beginning of the path where the segment begins. The
+  default values is 0.
+
+``--end=LENGTH``
+
+  The distance from the beginning of the path where the segment ends. The
+  default value is the length of path.
 
 Showing
 ^^^^^^^
@@ -62,7 +75,7 @@ of the path is filled.
 
 ``--fg-color=COLOR``
 
-  The color that is used to fill the interior of the path or stroke the path.
+  The color that is used to fill the interior of the path.
   If not specified, black is used.
 
 ``--bg-color=COLOR``
@@ -70,49 +83,6 @@ of the path is filled.
   The color that is used to render the background behind the path.
   If not specified, white is used.
 
-``--fill``
-
-  Fill the path (this is the default).
-
-``--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
 ^^^^^^^^^
 
@@ -126,7 +96,7 @@ The interior of the path is filled.
 
 ``--fg-color=COLOR``
 
-  The color that is used to fill the interior of the path or stroke the path.
+  The color that is used to fill the interior of the path.
   If not specified, black is used.
 
 ``--bg-color=COLOR``
@@ -139,60 +109,11 @@ The interior of the path is filled.
   The file to save the PNG image to.
   If not specified, "path.png" is used.
 
-``--fill``
-
-  Fill the path (this is the default).
-
-``--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.
-
-Reversing
-^^^^^^^^^
-
-The ``reverse`` command changes the direction of the path. The resulting
-paths starts where the original path ends.
-
 Info
 ^^^^
 
 The ``info`` command shows various information about the given path,
-such as its bounding box.
+such as its bounding box and and its length.
 
 REFERENCES
 ----------

docs/reference/gtk/section-accessibility.md

@@ -222,7 +222,7 @@ It is possible to set accessible attributes in UI files as well:
   <accessibility>
     <property name="label">Download</property>
     <relation name="labelled-by">label1</relation>
-  </accessibility>
+  /accessibility>
 </object>
 ```
 

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

@@ -95,11 +95,10 @@ static gboolean
 gdk_gl_texture_invoke_callback (gpointer data)
 {
   InvokeData *invoke = data;
-  GdkGLContext *context, *previous;
+  GdkGLContext *context;
 
   context = gdk_display_get_gl_context (gdk_gl_context_get_display (invoke->self->context));
 
-  previous = gdk_gl_context_get_current ();
   gdk_gl_context_make_current (context);
 
   if (invoke->self->sync && context != invoke->self->context)
@@ -111,11 +110,6 @@ gdk_gl_texture_invoke_callback (gpointer data)
 
   g_atomic_int_set (&invoke->spinlock, 1);
 
-  if (previous)
-    gdk_gl_context_make_current (previous);
-  else
-    gdk_gl_context_clear_current ();
-
   return FALSE;
 }
 
@@ -159,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)
@@ -194,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/gdkpaintable.c

@@ -25,12 +25,10 @@
 #include "gdkprivate.h"
 
 /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */
-GdkSnapshot *   gtk_snapshot_new                        (void);
 void            gtk_snapshot_push_debug                 (GdkSnapshot            *snapshot,
                                                          const char             *message,
                                                          ...) G_GNUC_PRINTF (2, 3);
 void            gtk_snapshot_pop                        (GdkSnapshot            *snapshot);
-GdkPaintable *  gtk_snapshot_free_to_paintable          (GdkSnapshot            *snapshot);
 
 /**
  * GdkPaintable:
@@ -104,21 +102,9 @@ gdk_paintable_default_snapshot (GdkPaintable *paintable,
 static GdkPaintable *
 gdk_paintable_default_get_current_image (GdkPaintable *paintable)
 {
-  int width, height;
-  GdkSnapshot *snapshot;
+  g_warning ("FIXME: implement by snapshotting at default size and returning a GskRendererNodePaintable");
 
-  /* No need to check whether the paintable is static, as
-   * gdk_paintable_get_current_image () takes care of that already.  */
-
-  width = gdk_paintable_get_intrinsic_width (paintable);
-  height = gdk_paintable_get_intrinsic_height (paintable);
-
-  if (width <= 0 || height <= 0)
-    return gdk_paintable_new_empty (width, height);
-
-  snapshot = gtk_snapshot_new ();
-  gdk_paintable_snapshot (paintable, snapshot, width, height);
-  return gtk_snapshot_free_to_paintable (snapshot);
+  return paintable;
 }
 
 static GdkPaintableFlags

gdk/macos/gdkmacosglcontext-private.h

@@ -27,7 +27,9 @@
 #include "gdkmacosdisplay.h"
 #include "gdkmacossurface.h"
 
-#import <epoxy/gl.h>
+#import <OpenGL/OpenGL.h>
+#import <OpenGL/gl3.h>
+#import <AppKit/AppKit.h>
 
 G_BEGIN_DECLS
 

gdk/macos/gdkmacosglcontext.c

@@ -21,6 +21,7 @@
 
 #include "gdkconfig.h"
 
+#include <OpenGL/gl3.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <QuartzCore/QuartzCore.h>
 
@@ -498,7 +499,7 @@ gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
   gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
   gdk_macos_gl_context_allocate (self);
 
-  GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, depth, region);
+  GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, prefers_high_depth, region);
 
   gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
   CHECK_GL (NULL, glBindFramebuffer (GL_FRAMEBUFFER, self->fbo));

gdk/macos/gdkmacosmonitor.c

@@ -331,7 +331,7 @@ _gdk_macos_monitor_reconfigure (GdkMacosMonitor *self)
   gdk_monitor_set_physical_size (GDK_MONITOR (self), width_mm, height_mm);
   gdk_monitor_set_scale_factor (GDK_MONITOR (self), scale_factor);
   gdk_monitor_set_refresh_rate (GDK_MONITOR (self), refresh_rate);
-  gdk_monitor_set_subpixel_layout (GDK_MONITOR (self), subpixel_layout);
+  gdk_monitor_set_subpixel_layout (GDK_MONITOR (self), GDK_SUBPIXEL_LAYOUT_UNKNOWN);
 
   self->workarea = [screen visibleFrame];
 

gdk/wayland/gdkapplaunchcontext-wayland.c

@@ -93,8 +93,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
       id = app_launch_data.token;
       wl_event_queue_destroy (event_queue);
     }
-  else if (display->gtk_shell &&
-           gtk_shell1_get_version (display->gtk_shell) >= GTK_SHELL1_NOTIFY_LAUNCH_SINCE_VERSION)
+  else if (gtk_shell1_get_version (display->gtk_shell) >= GTK_SHELL1_NOTIFY_LAUNCH_SINCE_VERSION)
     {
       id = g_uuid_string_random ();
       gtk_shell1_notify_launch (display->gtk_shell, id);

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/gdkclipboard-x11.c

@@ -201,7 +201,7 @@ gdk_x11_clipboard_formats_to_targets (GdkContentFormats *formats)
             continue;
 
           if (g_str_equal (mime_types[i], special_targets[j].mime_type))
-            targets = g_slist_prepend (targets, (gpointer) g_intern_static_string (special_targets[j].x_target));
+            targets = g_slist_prepend (targets, (gpointer) g_intern_string (special_targets[j].x_target));
         }
       targets = g_slist_prepend (targets, (gpointer) mime_types[i]);
     }
@@ -238,8 +238,6 @@ gdk_x11_clipboard_formats_to_atoms (GdkDisplay        *display,
   for (l = targets; l; l = l->next)
     atoms[i++] = gdk_x11_get_xatom_by_name_for_display (display, l->data);
 
-  g_slist_free (targets);
-
   return atoms;
 }
 

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/gl/gskglrenderjob.c

@@ -1245,9 +1245,9 @@ gsk_gl_render_job_visit_as_fallback (GskGLRenderJob      *job,
 done:
   if (scale_x < 0 || scale_y < 0)
     {
-      GskTransform *transform = gsk_transform_translate (gsk_transform_scale (NULL, scale_x < 0 ? -1 : 1, scale_y < 0 ? -1 : 1),
-                                                         &GRAPHENE_POINT_INIT (scale_x < 0 ? - (node->bounds.size.width + 2 * node->bounds.origin.x) : 0,
-                                                                               scale_y < 0 ? - (node->bounds.size.height + 2 * node->bounds.origin.y) : 0));
+      GskTransform *transform = gsk_transform_translate (NULL,
+                                                         &GRAPHENE_POINT_INIT (scale_x < 0 ? - surface_width : 0,
+                                                                               scale_y < 0 ? - surface_height : 0));
       gsk_gl_render_job_push_modelview (job, transform);
       gsk_transform_unref (transform);
     }

gsk/gskboundingboxprivate.h

@@ -97,19 +97,4 @@ gsk_bounding_box_intersection (const GskBoundingBox *a,
   return min.x <= max.x && min.y <= max.y;
 }
 
-static inline void
-gsk_bounding_box_union (const GskBoundingBox *a,
-                        const GskBoundingBox *b,
-                        GskBoundingBox       *res)
-{
-  graphene_point_t min, max;
-
-  min.x = MIN (a->min.x, b->min.x);
-  min.y = MIN (a->min.y, b->min.y);
-  max.x = MAX (a->max.x, b->max.x);
-  max.y = MAX (a->max.y, b->max.y);
-
-  gsk_bounding_box_init (res, &min, &max);
-}
-
 G_END_DECLS

gsk/gskcontourprivate.h

@@ -21,12 +21,17 @@
 #pragma once
 
 #include "gskpathprivate.h"
-#include "gskpathpoint.h"
+#include "gskpathpointprivate.h"
 #include "gskpathopprivate.h"
-#include "gskboundingboxprivate.h"
 
 G_BEGIN_DECLS
 
+GskContour *            gsk_rect_contour_new                    (const graphene_rect_t  *rect);
+GskContour *            gsk_rounded_rect_contour_new            (const GskRoundedRect   *rounded_rect);
+GskContour *            gsk_circle_contour_new                  (const graphene_point_t *center,
+                                                                 float                   radius,
+                                                                 float                   start_angle,
+                                                                 float                   end_angle);
 GskContour *            gsk_standard_contour_new                (GskPathFlags            flags,
                                                                  const graphene_point_t *points,
                                                                  gsize                   n_points,
@@ -34,12 +39,6 @@ GskContour *            gsk_standard_contour_new                (GskPathFlags
                                                                  gsize                   n_ops,
                                                                  gssize                  offset);
 
-GskContour *            gsk_circle_contour_new                  (const graphene_point_t *center,
-                                                                 float                   radius);
-GskContour *            gsk_rect_contour_new                    (const graphene_rect_t  *rect);
-GskContour *            gsk_rounded_rect_contour_new            (const GskRoundedRect   *rounded_rect);
-
-const char *            gsk_contour_get_type_name               (const GskContour       *self);
 void                    gsk_contour_copy                        (GskContour *            dest,
                                                                  const GskContour       *src);
 GskContour *            gsk_contour_dup                         (const GskContour       *src);
@@ -50,52 +49,58 @@ GskPathFlags            gsk_contour_get_flags                   (const GskContou
 void                    gsk_contour_print                       (const GskContour       *self,
                                                                  GString                *string);
 gboolean                gsk_contour_get_bounds                  (const GskContour       *self,
-                                                                 GskBoundingBox         *bounds);
+                                                                 graphene_rect_t        *bounds);
 gboolean                gsk_contour_get_stroke_bounds           (const GskContour       *self,
                                                                  const GskStroke        *stroke,
-                                                                 GskBoundingBox         *bounds);
+                                                                 graphene_rect_t        *bounds);
 gboolean                gsk_contour_foreach                     (const GskContour       *self,
+                                                                 float                   tolerance,
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
+void                    gsk_contour_get_start_end               (const GskContour       *self,
+                                                                 graphene_point_t       *start,
+                                                                 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,
-                                                                 GskPathPoint           *result,
+                                                                 GskRealPathPoint       *result,
                                                                  float                  *out_dist);
+
 void                    gsk_contour_get_position                (const GskContour       *self,
-                                                                 const GskPathPoint     *point,
+                                                                 GskRealPathPoint       *point,
                                                                  graphene_point_t       *pos);
+
 void                    gsk_contour_get_tangent                 (const GskContour       *self,
-                                                                 const GskPathPoint     *point,
+                                                                 GskRealPathPoint       *point,
                                                                  GskPathDirection        direction,
                                                                  graphene_vec2_t        *tangent);
 float                   gsk_contour_get_curvature               (const GskContour       *self,
-                                                                 const GskPathPoint     *point,
-                                                                 GskPathDirection        direction,
+                                                                 GskRealPathPoint       *point,
                                                                  graphene_point_t       *center);
-void                    gsk_contour_add_segment                 (const GskContour       *self,
-                                                                 GskPathBuilder         *builder,
-                                                                 gboolean                emit_move_to,
-                                                                 const GskPathPoint     *start,
-                                                                 const GskPathPoint     *end);
-
 gpointer                gsk_contour_init_measure                (const GskContour       *self,
                                                                  float                   tolerance,
                                                                  float                  *out_length);
 void                    gsk_contour_free_measure                (const GskContour       *self,
                                                                  gpointer                data);
+void                    gsk_contour_add_segment                 (const GskContour       *self,
+                                                                 GskPathBuilder         *builder,
+                                                                 gpointer                measure_data,
+                                                                 gboolean                emit_move_to,
+                                                                 float                   start,
+                                                                 float                   end);
 void                    gsk_contour_get_point                   (const GskContour       *self,
                                                                  gpointer                measure_data,
-                                                                 float                   distance,
-                                                                 GskPathPoint           *result);
+                                                                 float                   offset,
+                                                                 GskRealPathPoint       *result);
 float                   gsk_contour_get_distance                (const GskContour       *self,
-                                                                 const GskPathPoint     *point,
+                                                                 GskRealPathPoint       *point,
                                                                  gpointer                measure_data);
 gboolean                gsk_contour_dash                        (const GskContour       *contour,
                                                                  GskStroke              *stroke,
+                                                                 float                   tolerance,
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
 

gsk/gskcurve-ct-values.c

@@ -1,272 +0,0 @@
-/* Legendre-Gauss values,
- * see https://pomax.github.io/bezierinfo/legendre-gauss.html
- */
-
-#if defined(USE_64_SAMPLES)
-/* n = 64 */
-static const double T[] = {
-	-0.0243502926634244325089558428537156614268871093149758091634531663960566965166295288529853061657116894882370493013671717560479926679408068852617342586968190919443025679363843727751902756254975073084367002129407854253246662805532069172532219089321005870178809284335033318073251039701073379759,
-	0.0243502926634244325089558428537156614268871093149758091634531663960566965166295288529853061657116894882370493013671717560479926679408068852617342586968190919443025679363843727751902756254975073084367002129407854253246662805532069172532219089321005870178809284335033318073251039701073379759,
-	-0.0729931217877990394495429419403374932441261816687788533563163323377395217254429050181833064967505478802134768007678458612956459126148837496307967995621683597067400860540057918571357609346700883624064782909888895547912499697295335516804810990011835717296819569741981551097569810739977931249,
-	0.0729931217877990394495429419403374932441261816687788533563163323377395217254429050181833064967505478802134768007678458612956459126148837496307967995621683597067400860540057918571357609346700883624064782909888895547912499697295335516804810990011835717296819569741981551097569810739977931249,
-	-0.1214628192961205544703764634922478782186836383371912940423495826006931832245070944213952236889690237679661122848626352437115925113582515415979746598665681268376919737373113667247142315234607397986222184384307059013512155412722263090766858403726100735651684437098923088469949297570988091677,
-	0.1214628192961205544703764634922478782186836383371912940423495826006931832245070944213952236889690237679661122848626352437115925113582515415979746598665681268376919737373113667247142315234607397986222184384307059013512155412722263090766858403726100735651684437098923088469949297570988091677,
-	-0.1696444204239928180373136297482698441999902667343778505894178746884342357796505591325925801106834127602396624627746208498838190598644711533868179088757129652678801285453336384132061358206434768209251779433993367981112053126660575920785488821886662635718276505127786854167528795165050389903,
-	0.1696444204239928180373136297482698441999902667343778505894178746884342357796505591325925801106834127602396624627746208498838190598644711533868179088757129652678801285453336384132061358206434768209251779433993367981112053126660575920785488821886662635718276505127786854167528795165050389903,
-	-0.217423643740007084149648748988822617578485831141222348630380401885689634737659235537163737740243604800759921292790013642836998201691226098978544332296437547642195961469059807833597096166848933098833151166287901339013986496737408125314858259377210847115061960167857239951500335854820530586,
-	0.217423643740007084149648748988822617578485831141222348630380401885689634737659235537163737740243604800759921292790013642836998201691226098978544332296437547642195961469059807833597096166848933098833151166287901339013986496737408125314858259377210847115061960167857239951500335854820530586,
-	-0.2646871622087674163739641725100201179804131362950932439559895448126206429452852982016450901649805445999078728714943692622330016257776575354105370883948495294882935681426154386660616476411740312465060150591301869544672050088454083442813632094277160007745547301572849406353682760306061929911,
-	0.2646871622087674163739641725100201179804131362950932439559895448126206429452852982016450901649805445999078728714943692622330016257776575354105370883948495294882935681426154386660616476411740312465060150591301869544672050088454083442813632094277160007745547301572849406353682760306061929911,
-	-0.3113228719902109561575126985601568835577153578680501269954571709858169098868398268719654999460149709757804582988077747605532896065842023340674450299515989484487746153929299031759475919924980452933324186984188982046762542556035347023744560814177013801414889023264804693830155588690576492164,
-	0.3113228719902109561575126985601568835577153578680501269954571709858169098868398268719654999460149709757804582988077747605532896065842023340674450299515989484487746153929299031759475919924980452933324186984188982046762542556035347023744560814177013801414889023264804693830155588690576492164,
-	-0.357220158337668115950442615046202531626264464640909112021237019340099177403802509741325589540743874845093675632547750287037622834793938695456980400958079292460482315821150714268593539935795231095157602025909339384694681190969656053235824652679875951093689200190014853543993102190088381483,
-	0.357220158337668115950442615046202531626264464640909112021237019340099177403802509741325589540743874845093675632547750287037622834793938695456980400958079292460482315821150714268593539935795231095157602025909339384694681190969656053235824652679875951093689200190014853543993102190088381483,
-	-0.4022701579639916036957667712601588487132652056150208082760431843129087214967261515969669708970990221669508217089555714806012046537594438323569293594638517933840725639831594134038262580440842200076281605641993773325072728778928440394419613403725280285705765326861533477990551765453978736181,
-	0.4022701579639916036957667712601588487132652056150208082760431843129087214967261515969669708970990221669508217089555714806012046537594438323569293594638517933840725639831594134038262580440842200076281605641993773325072728778928440394419613403725280285705765326861533477990551765453978736181,
-	-0.4463660172534640879849477147589151892067507578262501763082606820212937626970791295735937384813941473610238854736863966831464694923749954564921955859791688348936235671762050333408576202492209167272366373825152067680845198006626563761196191045700093968519269790165913301841545609485952718504,
-	0.4463660172534640879849477147589151892067507578262501763082606820212937626970791295735937384813941473610238854736863966831464694923749954564921955859791688348936235671762050333408576202492209167272366373825152067680845198006626563761196191045700093968519269790165913301841545609485952718504,
-	-0.4894031457070529574785263070219213908493732974637398373316540793240315585537584844752851087115581833443158831657759501916744927211636581386025171070582998790865902140901838128045602667002106847665927788023098753138400106615804847725751247952878407027140260429761863258319891988431055536872,
-	0.4894031457070529574785263070219213908493732974637398373316540793240315585537584844752851087115581833443158831657759501916744927211636581386025171070582998790865902140901838128045602667002106847665927788023098753138400106615804847725751247952878407027140260429761863258319891988431055536872,
-	-0.531279464019894545658013903544455247408525588734180238053268047166041778398245121448843253296460411619816073385211875151397248937264089998182375345915413219579220233566173902955487674957069948591213673456625912506280248298229907928060620469290406581396192419570799497688513058132396498814,
-	0.531279464019894545658013903544455247408525588734180238053268047166041778398245121448843253296460411619816073385211875151397248937264089998182375345915413219579220233566173902955487674957069948591213673456625912506280248298229907928060620469290406581396192419570799497688513058132396498814,
-	-0.5718956462026340342838781166591886431831910060912509932273284719418912212643223327597417735844776972648163821225207266145263395898251858906124801356522395225326954546582593857056725545247314092886133249957455688586118199388064447508712958637376347457406936802691416300157802889354368128467,
-	0.5718956462026340342838781166591886431831910060912509932273284719418912212643223327597417735844776972648163821225207266145263395898251858906124801356522395225326954546582593857056725545247314092886133249957455688586118199388064447508712958637376347457406936802691416300157802889354368128467,
-	-0.6111553551723932502488529710185489186961245593079718443367976666933088374650288148448667879830703867726577720666491772560110368248450475818132595468834493579434418252468978282181164008820769765174450056817468275783966537351796625224747700783378315186174632657840114512887287754747902924865,
-	0.6111553551723932502488529710185489186961245593079718443367976666933088374650288148448667879830703867726577720666491772560110368248450475818132595468834493579434418252468978282181164008820769765174450056817468275783966537351796625224747700783378315186174632657840114512887287754747902924865,
-	-0.6489654712546573398577612319934048855296904334732011728792502624366057598865738239773166627826358871699142531853930525866830933399401844502541092962631127742267449897116125748014270680393024011359139031312062573520509858894743036198986443014969748157931850178889912972291202354657382925509,
-	0.6489654712546573398577612319934048855296904334732011728792502624366057598865738239773166627826358871699142531853930525866830933399401844502541092962631127742267449897116125748014270680393024011359139031312062573520509858894743036198986443014969748157931850178889912972291202354657382925509,
-	-0.6852363130542332425635583710313763019356410785396718681324042749913611976548967332647625541234155413035075739348863233240851709341392873173633850612006618690218164007761541855237208605116527909791956398350719463021018362527198358286721239529091637248252469435642287693207506339068528700205,
-	0.6852363130542332425635583710313763019356410785396718681324042749913611976548967332647625541234155413035075739348863233240851709341392873173633850612006618690218164007761541855237208605116527909791956398350719463021018362527198358286721239529091637248252469435642287693207506339068528700205,
-	-0.7198818501716108268489402178319472447581380033149019526220473151184468592486433646042300919262498902882179891494724046747921544602557246455427317830132976771174504209146835854012577372395960646854355024460204286901035470812684876587693044068989973704915078171158689213412715251485203442313,
-	0.7198818501716108268489402178319472447581380033149019526220473151184468592486433646042300919262498902882179891494724046747921544602557246455427317830132976771174504209146835854012577372395960646854355024460204286901035470812684876587693044068989973704915078171158689213412715251485203442313,
-	-0.7528199072605318966118637748856939855517142713220871932461987761167722639636968539390413583009467924995905147153923286347693864945784890119950315095740891764880991728646942920208355501445550654259850385377192973526980795946453961077798744753892199929235882097232836682421729944934586281945,
-	0.7528199072605318966118637748856939855517142713220871932461987761167722639636968539390413583009467924995905147153923286347693864945784890119950315095740891764880991728646942920208355501445550654259850385377192973526980795946453961077798744753892199929235882097232836682421729944934586281945,
-	-0.7839723589433414076102205252137682840564141249898259334132759617476816578705098509357116190608002325895348207611752987335385494893726027026038902508685496606160441965948835252795524014713290879877269643684102005605450140247125536147801312017065532602835003540212221564314236937509990182173,
-	0.7839723589433414076102205252137682840564141249898259334132759617476816578705098509357116190608002325895348207611752987335385494893726027026038902508685496606160441965948835252795524014713290879877269643684102005605450140247125536147801312017065532602835003540212221564314236937509990182173,
-	-0.8132653151227975597419233380863033406981418225655972166956485149356586346082019870309280128411412936411423614767918756843380999442447282903502051218203273573634847203121451086379808399639198510674436238195505371716160648058477202993836014352158139813219612968106205248494087577632573534973,
-	0.8132653151227975597419233380863033406981418225655972166956485149356586346082019870309280128411412936411423614767918756843380999442447282903502051218203273573634847203121451086379808399639198510674436238195505371716160648058477202993836014352158139813219612968106205248494087577632573534973,
-	-0.840629296252580362751691544695873302982489823801755353928202683075593465893922171840726147868117503717663799561956411215937924134571068943700343442753760445948626598735504632170407243376224222403038093781056024445977626666740664628412660960413062370047183186652885532589557452614451434048,
-	0.840629296252580362751691544695873302982489823801755353928202683075593465893922171840726147868117503717663799561956411215937924134571068943700343442753760445948626598735504632170407243376224222403038093781056024445977626666740664628412660960413062370047183186652885532589557452614451434048,
-	-0.8659993981540928197607833850701575024125019187582496425664279511808356713122188567857456842034906362573453815878913951040194915987006979015304835979058725276345799813088989383312475641092775164460639450521468294104011206574786429237252678172922104036725327539940502197291939132802457917836,
-	0.8659993981540928197607833850701575024125019187582496425664279511808356713122188567857456842034906362573453815878913951040194915987006979015304835979058725276345799813088989383312475641092775164460639450521468294104011206574786429237252678172922104036725327539940502197291939132802457917836,
-	-0.8893154459951141058534040382728516224291944615104521893194744566084811090577722526400445910623711480590529533188832105988657269430913287263821624762648137092066620632787986348052306840101775313644572400860845559833367997001666659907951051347410546710134120144598833115095140475669485797579,
-	0.8893154459951141058534040382728516224291944615104521893194744566084811090577722526400445910623711480590529533188832105988657269430913287263821624762648137092066620632787986348052306840101775313644572400860845559833367997001666659907951051347410546710134120144598833115095140475669485797579,
-	-0.9105221370785028057563806680083298610134880848883640292531723714467102234556291968179018775780308458024302103848451312741663820589200520720207891653884985710130867134073520525932445557074805974235006810370309087879564826639263972805682465506594098949560288847385983395160311034445386606259,
-	0.9105221370785028057563806680083298610134880848883640292531723714467102234556291968179018775780308458024302103848451312741663820589200520720207891653884985710130867134073520525932445557074805974235006810370309087879564826639263972805682465506594098949560288847385983395160311034445386606259,
-	-0.9295691721319395758214901545592256073474270144297154975928116833612430986265594515998834499355844736686512805129688214992047597092114291955925880175797899765980745854426738149516325837607227287481909072315347776012991222301207304052068204069335766550173941103055407746774520789612843561385,
-	0.9295691721319395758214901545592256073474270144297154975928116833612430986265594515998834499355844736686512805129688214992047597092114291955925880175797899765980745854426738149516325837607227287481909072315347776012991222301207304052068204069335766550173941103055407746774520789612843561385,
-	-0.9464113748584028160624814913472647952793949717952331902317789712973664402149436591260928179188420533516264142755452159723722786167537167514691534968355366202934342465086995943893699962972237343218079763936958985487264411542890941861254842843026890160131607678957282346112697993618567018237,
-	0.9464113748584028160624814913472647952793949717952331902317789712973664402149436591260928179188420533516264142755452159723722786167537167514691534968355366202934342465086995943893699962972237343218079763936958985487264411542890941861254842843026890160131607678957282346112697993618567018237,
-	-0.9610087996520537189186141218971572067621146110378459494461586158623919945488992563976780806866203786216001498788310714552847469661399216303755820947005848739467276644122915754949838610353627723679982220628115164983443994552616161584523205789167087822341423097206088828267065770404672828066,
-	0.9610087996520537189186141218971572067621146110378459494461586158623919945488992563976780806866203786216001498788310714552847469661399216303755820947005848739467276644122915754949838610353627723679982220628115164983443994552616161584523205789167087822341423097206088828267065770404672828066,
-	-0.9733268277899109637418535073522726680261452944551741758819139781978152256958453749994966038154125547612207903105020176172420237675899907788807087542221018040460410464083361271842759039530092449625891215101984663282728542290395875313124045226564547294745437773482395329023327909760431499638,
-	0.9733268277899109637418535073522726680261452944551741758819139781978152256958453749994966038154125547612207903105020176172420237675899907788807087542221018040460410464083361271842759039530092449625891215101984663282728542290395875313124045226564547294745437773482395329023327909760431499638,
-	-0.9833362538846259569312993021568311169452475066237403837464872131233426128415470535606559721330818003585532628124845662897410684694651251174207713020897795837892725294581710205598344576799985346970638130204876060998657059283079767876980544166132523941283823202290746667358872631036031924711,
-	0.9833362538846259569312993021568311169452475066237403837464872131233426128415470535606559721330818003585532628124845662897410684694651251174207713020897795837892725294581710205598344576799985346970638130204876060998657059283079767876980544166132523941283823202290746667358872631036031924711,
-	-0.9910133714767443207393823834433031136413494453907904852225427459378131658644129997345108950133770434340330151289100150097018332483423277136039914249575686591612502752158650205954671083696496347591169012794322303027309768195334920157669446268175983954105533989275308193580349506657360682085,
-	0.9910133714767443207393823834433031136413494453907904852225427459378131658644129997345108950133770434340330151289100150097018332483423277136039914249575686591612502752158650205954671083696496347591169012794322303027309768195334920157669446268175983954105533989275308193580349506657360682085,
-	-0.9963401167719552793469245006763991232098575063402266121352522199507030568202208530946066801021703916301511794658310735397567341036554686814952726523955953805437164277655915410358813984246580862850974195805395101678543649116458555272523253307828290553873260588621490898443701779725568118502,
-	0.9963401167719552793469245006763991232098575063402266121352522199507030568202208530946066801021703916301511794658310735397567341036554686814952726523955953805437164277655915410358813984246580862850974195805395101678543649116458555272523253307828290553873260588621490898443701779725568118502,
-	-0.9993050417357721394569056243456363119697121916756087760628072954617646543505331997843242376462639434945376776512170265314011232493020401570891594274831367800115383317335285468800574240152992751785027563437707875403545865305271045717258142571193695943317890367167086616955235477529427992282,
-	0.9993050417357721394569056243456363119697121916756087760628072954617646543505331997843242376462639434945376776512170265314011232493020401570891594274831367800115383317335285468800574240152992751785027563437707875403545865305271045717258142571193695943317890367167086616955235477529427992282
-};
-
-static const double C[] = {
-	0.0486909570091397203833653907347499124426286922838743305086688042456914190998246107310291565645676057401607079939845156005172257043376703767287395573765236401039685866479381075274920900511719320271157129622463682509122641788910270632229694394595885032921037399187298767076084601033342936131,
-	0.0486909570091397203833653907347499124426286922838743305086688042456914190998246107310291565645676057401607079939845156005172257043376703767287395573765236401039685866479381075274920900511719320271157129622463682509122641788910270632229694394595885032921037399187298767076084601033342936131,
-	0.0485754674415034269347990667839781136875565447049294857111516761025158193093697039229163427633930410186232149083923688162761488505704450697417589593116703853157329164894580165517236877241308351214870169600093357854651930986960906313726182992933363325614247750209880050786299287510692780499,
-	0.0485754674415034269347990667839781136875565447049294857111516761025158193093697039229163427633930410186232149083923688162761488505704450697417589593116703853157329164894580165517236877241308351214870169600093357854651930986960906313726182992933363325614247750209880050786299287510692780499,
-	0.048344762234802957169769527158017809703692550609501080629442201445249828946429202156764153264348308119169811534137999799779908820312744765416129733427088646813066886130539178187597540312913636916139844188190193872629488730769015964208394624398401975043997268903006190530430762197842013971,
-	0.048344762234802957169769527158017809703692550609501080629442201445249828946429202156764153264348308119169811534137999799779908820312744765416129733427088646813066886130539178187597540312913636916139844188190193872629488730769015964208394624398401975043997268903006190530430762197842013971,
-	0.0479993885964583077281261798713460699543167134714936209446323930933335214619650277588138568504103427609283146728470455041360837549685364869161566863222680599110109210456299588352028330169041000166382937545505655464884266691630625402297821494221827392164049587946530563778771030124675514431,
-	0.0479993885964583077281261798713460699543167134714936209446323930933335214619650277588138568504103427609283146728470455041360837549685364869161566863222680599110109210456299588352028330169041000166382937545505655464884266691630625402297821494221827392164049587946530563778771030124675514431,
-	0.0475401657148303086622822069442231716408252512625387521584740318784735191312349586041971325618543660076682369564304738487584849740943805934034367382833518752314207901993991333786062812015195073547884746598535775062676699885664167707011249029305697669004958515813436770491520105115843742005,
-	0.0475401657148303086622822069442231716408252512625387521584740318784735191312349586041971325618543660076682369564304738487584849740943805934034367382833518752314207901993991333786062812015195073547884746598535775062676699885664167707011249029305697669004958515813436770491520105115843742005,
-	0.0469681828162100173253262857545810751998975284738125649829240886861900500181800807437012381630302198876925642461830694029139318555787845567143614289552410495903601238284556145544858090965965782916339169651505119399637862876053945518410353459767034026687936026945199383607112976484520939933,
-	0.0469681828162100173253262857545810751998975284738125649829240886861900500181800807437012381630302198876925642461830694029139318555787845567143614289552410495903601238284556145544858090965965782916339169651505119399637862876053945518410353459767034026687936026945199383607112976484520939933,
-	0.0462847965813144172959532492322611849696503075324468007778340818364698861774606986244241539105685321088517142947579291476238551538798963436740600968513359005801910700069462154098456091711311098901749803777735222026075473081311483686560830539773763176758567914860207820170792365910140063798,
-	0.0462847965813144172959532492322611849696503075324468007778340818364698861774606986244241539105685321088517142947579291476238551538798963436740600968513359005801910700069462154098456091711311098901749803777735222026075473081311483686560830539773763176758567914860207820170792365910140063798,
-	0.0454916279274181444797709969712690588873234618023998968168834081606504637618082102750954507142497706775055424364453740562113890878382679420378787427100982909191308430750899201141096789461078632697297091763378573830284133736378128577579722120264252594541491899441765769262904055702701625378,
-	0.0454916279274181444797709969712690588873234618023998968168834081606504637618082102750954507142497706775055424364453740562113890878382679420378787427100982909191308430750899201141096789461078632697297091763378573830284133736378128577579722120264252594541491899441765769262904055702701625378,
-	0.0445905581637565630601347100309448432940237999912217256432193286861948363377761089569585678875932857237669096941854082976565514031401996407675401022860761183118504326746863327792604337217763335682212515058414863183914930810334329596384915832703655935958010948424747251920190851700662833367,
-	0.0445905581637565630601347100309448432940237999912217256432193286861948363377761089569585678875932857237669096941854082976565514031401996407675401022860761183118504326746863327792604337217763335682212515058414863183914930810334329596384915832703655935958010948424747251920190851700662833367,
-	0.0435837245293234533768278609737374809227888974971180150532193925502569499020021803936448815937567079991401855477391110804568848623412043870399620479222000249538880795788245633051476595555730388360811011823841525667998427392843673284072004068821750061964976796287623004834501604656318714989,
-	0.0435837245293234533768278609737374809227888974971180150532193925502569499020021803936448815937567079991401855477391110804568848623412043870399620479222000249538880795788245633051476595555730388360811011823841525667998427392843673284072004068821750061964976796287623004834501604656318714989,
-	0.0424735151236535890073397679088173661655466481806496697314607722055245433487169327182398988553670128358787507582463602377168227019625334754497484024668087975720049504975593281010888062806587161032924284354938115463233015024659299046001504100674918329532481611571863222497170398830691222425,
-	0.0424735151236535890073397679088173661655466481806496697314607722055245433487169327182398988553670128358787507582463602377168227019625334754497484024668087975720049504975593281010888062806587161032924284354938115463233015024659299046001504100674918329532481611571863222497170398830691222425,
-	0.0412625632426235286101562974736380477399306355305474105429034779122704951178045914463267035032832336161816547420067160277921114474557623647771372636679857599931025531633255548770293397336318597716427093310378312957479805159734598610664983115148350548735211568465338522875618805992499897174,
-	0.0412625632426235286101562974736380477399306355305474105429034779122704951178045914463267035032832336161816547420067160277921114474557623647771372636679857599931025531633255548770293397336318597716427093310378312957479805159734598610664983115148350548735211568465338522875618805992499897174,
-	0.0399537411327203413866569261283360739186769506703336301114037026981570543670430333260307390357287606111017588757685176701688554806178713759519003171090525332423003042251947304213502522332118258365256241174986409729902714098049024753746340158430732115642207673265332738358717839602955875715,
-	0.0399537411327203413866569261283360739186769506703336301114037026981570543670430333260307390357287606111017588757685176701688554806178713759519003171090525332423003042251947304213502522332118258365256241174986409729902714098049024753746340158430732115642207673265332738358717839602955875715,
-	0.0385501531786156291289624969468089910127871122017180319662378854088005271323682681394418540442928363090545214563022868422017877042243007014244875098498616146404178795110038170109976252865902624380463581094085479557660525450020049773872343621719025128277593787164021147974906095237533202082,
-	0.0385501531786156291289624969468089910127871122017180319662378854088005271323682681394418540442928363090545214563022868422017877042243007014244875098498616146404178795110038170109976252865902624380463581094085479557660525450020049773872343621719025128277593787164021147974906095237533202082,
-	0.0370551285402400460404151018095833750834649453056563021747536272028091562122966687178302646649066832960609370472485057031765338738734008482025086366647963664178752038995704175623165041724901843573087856883034472545386037691055680911138721623610172486110313241291773258491882452773847899443,
-	0.0370551285402400460404151018095833750834649453056563021747536272028091562122966687178302646649066832960609370472485057031765338738734008482025086366647963664178752038995704175623165041724901843573087856883034472545386037691055680911138721623610172486110313241291773258491882452773847899443,
-	0.0354722132568823838106931467152459479480946310024100946926514848199381113651392962399922996268087884509143420993419937430515415557908457195618550238075571721209638845910166697234073788332647695349442265578792857058786796417110738673392400570019770741873271724201517438135222598792344040215,
-	0.0354722132568823838106931467152459479480946310024100946926514848199381113651392962399922996268087884509143420993419937430515415557908457195618550238075571721209638845910166697234073788332647695349442265578792857058786796417110738673392400570019770741873271724201517438135222598792344040215,
-	0.0338051618371416093915654821107254310210499263140045346675500650400323727745785853730452808963944098691936344225349051741060036935288424090581463711756382878498537611980973238606529148664990420534952057130296232922368792280098852092993207644225150541876980292972087619863453425206929192216,
-	0.0338051618371416093915654821107254310210499263140045346675500650400323727745785853730452808963944098691936344225349051741060036935288424090581463711756382878498537611980973238606529148664990420534952057130296232922368792280098852092993207644225150541876980292972087619863453425206929192216,
-	0.032057928354851553585467504347898716966221573881398062250169407854535275399124366530227987935629046729162364779969274126431870966979526186907589490002269660893281421728773647001279141626157958271220102615163092206489916992120482595587916535390136003611498634162765724522022671474313619317,
-	0.032057928354851553585467504347898716966221573881398062250169407854535275399124366530227987935629046729162364779969274126431870966979526186907589490002269660893281421728773647001279141626157958271220102615163092206489916992120482595587916535390136003611498634162765724522022671474313619317,
-	0.030234657072402478867974059819548659158281397768481241636026542045969161851838118212761980885178641520596873511042783163461341979185470882574743804555268086640389062237383427702813367624714014426121485626242067362445894463989335423458464954799181190120473168677930333898873084606011285311,
-	0.030234657072402478867974059819548659158281397768481241636026542045969161851838118212761980885178641520596873511042783163461341979185470882574743804555268086640389062237383427702813367624714014426121485626242067362445894463989335423458464954799181190120473168677930333898873084606011285311,
-	0.0283396726142594832275113052002373519812075841257543359907955185084500175712880712901834579816476269393013386531176072296695948860841466158639973753393323262188023471133258509422081952937349849822864752636994881600343083839805990853930436233762729622213044478376753949590318846038229829528,
-	0.0283396726142594832275113052002373519812075841257543359907955185084500175712880712901834579816476269393013386531176072296695948860841466158639973753393323262188023471133258509422081952937349849822864752636994881600343083839805990853930436233762729622213044478376753949590318846038229829528,
-	0.0263774697150546586716917926252251856755993308422457184496156736853021592428967790284780487213653480867620409279447766944383920384284787790772384251090745670478105870527396429136326932261251511732466974897397268573168068852344129736214469830280087710575094607457344820944885011053938108899,
-	0.0263774697150546586716917926252251856755993308422457184496156736853021592428967790284780487213653480867620409279447766944383920384284787790772384251090745670478105870527396429136326932261251511732466974897397268573168068852344129736214469830280087710575094607457344820944885011053938108899,
-	0.0243527025687108733381775504090689876499784155133784119819985685535536787083770723737264828464464223276155821319330210193549896426801083040150047332857692873011433649334477370145389017577189505240415125600908800786897201425473757275187332157593198572919772969833130729981971352463730545469,
-	0.0243527025687108733381775504090689876499784155133784119819985685535536787083770723737264828464464223276155821319330210193549896426801083040150047332857692873011433649334477370145389017577189505240415125600908800786897201425473757275187332157593198572919772969833130729981971352463730545469,
-	0.0222701738083832541592983303841550024229592905997594051455205429744914460867081990116647982811451138592401156680063927909718825845915896692701716212710541472344073624315399429951255221519263275095347974129106415903376085208797420439500915674568159744176912567285070988940509294826076696882,
-	0.0222701738083832541592983303841550024229592905997594051455205429744914460867081990116647982811451138592401156680063927909718825845915896692701716212710541472344073624315399429951255221519263275095347974129106415903376085208797420439500915674568159744176912567285070988940509294826076696882,
-	0.0201348231535302093723403167285438970895266801007919519220072343276769828211923597982299498416998597995443052252531684909219367615574440281549241161294448697202959593344989612626641188010558013085389491205901106884167596038790695150496733123662891637942237462337673353651179115491957031948,
-	0.0201348231535302093723403167285438970895266801007919519220072343276769828211923597982299498416998597995443052252531684909219367615574440281549241161294448697202959593344989612626641188010558013085389491205901106884167596038790695150496733123662891637942237462337673353651179115491957031948,
-	0.0179517157756973430850453020011193688971673570364158572977184273569247295870620984743089140579199272107974903016785911970727080884655646148340637373001805876560334052431930062983734905886704331100259778249929425439377011315288821865303197904492848823994202996722656114004109123107733596987,
-	0.0179517157756973430850453020011193688971673570364158572977184273569247295870620984743089140579199272107974903016785911970727080884655646148340637373001805876560334052431930062983734905886704331100259778249929425439377011315288821865303197904492848823994202996722656114004109123107733596987,
-	0.0157260304760247193219659952975397944260290098431565121528943932284210502164124556525745628476326997189475680077625258949765335021586482683126547283634704087193102431454662772463321304938516661086261262080252305539171654570677889578063634007609097342035360186636479612243231917699790225637,
-	0.0157260304760247193219659952975397944260290098431565121528943932284210502164124556525745628476326997189475680077625258949765335021586482683126547283634704087193102431454662772463321304938516661086261262080252305539171654570677889578063634007609097342035360186636479612243231917699790225637,
-	0.0134630478967186425980607666859556841084257719773496708184682785221983598894666268489697837056105038485845901773961664652581563686185523959473293683490869846700009741156668864960127745507806046701586435579547632680339906665338521813319281296935586498194608460412423723103161161922347608637,
-	0.0134630478967186425980607666859556841084257719773496708184682785221983598894666268489697837056105038485845901773961664652581563686185523959473293683490869846700009741156668864960127745507806046701586435579547632680339906665338521813319281296935586498194608460412423723103161161922347608637,
-	0.011168139460131128818590493019208135072778797816827287215251362273969701224836131369547661822970774719521543690039908073147476182135228738610704246958518755712518444434075738269866120460156365855324768445411463643114925829148750923090201475035559533993035986264487097245733097728698218563,
-	0.011168139460131128818590493019208135072778797816827287215251362273969701224836131369547661822970774719521543690039908073147476182135228738610704246958518755712518444434075738269866120460156365855324768445411463643114925829148750923090201475035559533993035986264487097245733097728698218563,
-	0.0088467598263639477230309146597306476951762660792204997984715769296110380005985367341694286322550520156167431790573509593010611842062630262878798782558974712042810219159674181580449655112696028911646066461502678711637780164986283350190669684468398617127841853445303466680698660632269500149,
-	0.0088467598263639477230309146597306476951762660792204997984715769296110380005985367341694286322550520156167431790573509593010611842062630262878798782558974712042810219159674181580449655112696028911646066461502678711637780164986283350190669684468398617127841853445303466680698660632269500149,
-	0.0065044579689783628561173603999812667711317610549523400952448792575685125717613068203530526491113296049409911387320826711045787146267036866881961532403342811327869183281273743976710008917886491097375367147212074243884772614562628844975421736416404173672075979097191581386023407454532945934,
-	0.0065044579689783628561173603999812667711317610549523400952448792575685125717613068203530526491113296049409911387320826711045787146267036866881961532403342811327869183281273743976710008917886491097375367147212074243884772614562628844975421736416404173672075979097191581386023407454532945934,
-	0.0041470332605624676352875357285514153133028192536848024628763661431834776690157393776820933106187137592011723199002845429836606307797425496666456172753165824787973801175029578301513761259541022471768825518482406145696380621686627285992715643614469568410535180218496973657001203470470418364,
-	0.0041470332605624676352875357285514153133028192536848024628763661431834776690157393776820933106187137592011723199002845429836606307797425496666456172753165824787973801175029578301513761259541022471768825518482406145696380621686627285992715643614469568410535180218496973657001203470470418364,
-	0.0017832807216964329472960791449719331799593472719279556695308063655858546954239803486698215802150348282744786016134857283616955449868451969230490863774274598030023211055562492709717566919237924255297982774711177411074145151155610163293142044147991553384925940046957893721166251082473659733,
-	0.0017832807216964329472960791449719331799593472719279556695308063655858546954239803486698215802150348282744786016134857283616955449868451969230490863774274598030023211055562492709717566919237924255297982774711177411074145151155610163293142044147991553384925940046957893721166251082473659733
-};
-
-#elif defined(USE_32_SAMPLES)
-/* n = 32 */
-
-static double T[] = {
-	-0.0483076656877383162348125704405021636908472517308488971677937345463685926042778777794060365911173780988289503411375793689757446357461295741679964108035347980667582792392651327368009453047606446744575790523465655622949909588624860214137051585425884056992683442137333250625173849291299678673,
-	0.0483076656877383162348125704405021636908472517308488971677937345463685926042778777794060365911173780988289503411375793689757446357461295741679964108035347980667582792392651327368009453047606446744575790523465655622949909588624860214137051585425884056992683442137333250625173849291299678673,
-	-0.1444719615827964934851863735988106522038459913156355521379528938242184438164519731102406769974924713989580220758441301598578946580142268413547299935841673092513202403499286272686350814272974392746706128556678811982653393383080797337231702069432462445053984587997153683967433095128570624414,
-	0.1444719615827964934851863735988106522038459913156355521379528938242184438164519731102406769974924713989580220758441301598578946580142268413547299935841673092513202403499286272686350814272974392746706128556678811982653393383080797337231702069432462445053984587997153683967433095128570624414,
-	-0.2392873622521370745446032091655015206088554219602530155470960995597029133039943915553593695844147813728958071901224632260145752503694970545640339873418480550362677768010887468668377893757173424222709744116861683634989914911762187599464033126988486345234374380695224452457957624756811128321,
-	0.2392873622521370745446032091655015206088554219602530155470960995597029133039943915553593695844147813728958071901224632260145752503694970545640339873418480550362677768010887468668377893757173424222709744116861683634989914911762187599464033126988486345234374380695224452457957624756811128321,
-	-0.3318686022821276497799168057301879961957751368050598360182296306285376829657438169809731852312743263005943551508559377834274303920771100489026913715847854727626540340157368609696698131829681988642689780208633461925468064919389286805624602715005948661328152252049795463242055567997437182143,
-	0.3318686022821276497799168057301879961957751368050598360182296306285376829657438169809731852312743263005943551508559377834274303920771100489026913715847854727626540340157368609696698131829681988642689780208633461925468064919389286805624602715005948661328152252049795463242055567997437182143,
-	-0.4213512761306353453641194361724264783358772886324433305416613404557190462549837315607633055675740638739884093394574651160978879545562247406839036854173715776910866941643197988581928900702286425821151586000969947406313405310082646561917980302543820974679501841964453794193724645925031841919,
-	0.4213512761306353453641194361724264783358772886324433305416613404557190462549837315607633055675740638739884093394574651160978879545562247406839036854173715776910866941643197988581928900702286425821151586000969947406313405310082646561917980302543820974679501841964453794193724645925031841919,
-	-0.5068999089322293900237474743778212301802836995994354639743662809707712640478764442266190213124522047999876916596854537447047905434649918210338296049592120273725464263651562560829050004258268002241145951271730860506703690843719936432852920782304931272053564539127514959875734718036950073563,
-	0.5068999089322293900237474743778212301802836995994354639743662809707712640478764442266190213124522047999876916596854537447047905434649918210338296049592120273725464263651562560829050004258268002241145951271730860506703690843719936432852920782304931272053564539127514959875734718036950073563,
-	-0.5877157572407623290407454764018268584509401154544205727031788473129228586684474311408145102018661764979429510790747919023774933113319119601088669936958908618326367715806216053155906936017362413244183150445492317940727345571648726363597097311647731726438279098059670236086983675374932643925,
-	0.5877157572407623290407454764018268584509401154544205727031788473129228586684474311408145102018661764979429510790747919023774933113319119601088669936958908618326367715806216053155906936017362413244183150445492317940727345571648726363597097311647731726438279098059670236086983675374932643925,
-	-0.6630442669302152009751151686632383689770222859605053010170834964924461749232229404368981536611965356686820332804126742949900731319113817214392193185613161549689934301410316417342588149871686184296988807305719690974644891055567340650986465615021143958920599684258616066247948224049997371166,
-	0.6630442669302152009751151686632383689770222859605053010170834964924461749232229404368981536611965356686820332804126742949900731319113817214392193185613161549689934301410316417342588149871686184296988807305719690974644891055567340650986465615021143958920599684258616066247948224049997371166,
-	-0.732182118740289680387426665091267146630270483506629100821139573270385253587797727611292298988652560055905228466313310601075333829094630570926240639601009902567982815376254840388565733846030450161774620971196087756484387383432502715118096615117242484073636640563609696801484680439912327302,
-	0.732182118740289680387426665091267146630270483506629100821139573270385253587797727611292298988652560055905228466313310601075333829094630570926240639601009902567982815376254840388565733846030450161774620971196087756484387383432502715118096615117242484073636640563609696801484680439912327302,
-	-0.7944837959679424069630972989704289020954794016388354532507582449720593922816426654241878967890821228397041480126630294067578180914548706957761322921470535094589673860419616615738928385807346185892317514562489971543238450942224396667500582904031225063621511429185567036727089257387570529468,
-	0.7944837959679424069630972989704289020954794016388354532507582449720593922816426654241878967890821228397041480126630294067578180914548706957761322921470535094589673860419616615738928385807346185892317514562489971543238450942224396667500582904031225063621511429185567036727089257387570529468,
-	-0.849367613732569970133693004967742538954886793049759233100219598613724656141562558741881463752754991143937635778596582088915769685796612254240615386941355933272723068952531445772190363422003834495043219316062885999846179078139659341918527603834809670576387535564876596379488780285979062125,
-	0.849367613732569970133693004967742538954886793049759233100219598613724656141562558741881463752754991143937635778596582088915769685796612254240615386941355933272723068952531445772190363422003834495043219316062885999846179078139659341918527603834809670576387535564876596379488780285979062125,
-	-0.8963211557660521239653072437192122684789964967957595765636154129650249794910409173494503783167666654202705333374285522819507600044591355080910768854012859468015827508424619812224062460791781333400979810176198916239783226706506012473250929962326307746466256167673927887144428859779028909399,
-	0.8963211557660521239653072437192122684789964967957595765636154129650249794910409173494503783167666654202705333374285522819507600044591355080910768854012859468015827508424619812224062460791781333400979810176198916239783226706506012473250929962326307746466256167673927887144428859779028909399,
-	-0.9349060759377396891709191348354093255286714322828372184584037398118161947182932855418880831417927728359606280450921427988850058691931014887248988124656348299653052688344696135840215712191162135178273756415771123010111796122671724143565383396162107206772781551029308751511942924942333859805,
-	0.9349060759377396891709191348354093255286714322828372184584037398118161947182932855418880831417927728359606280450921427988850058691931014887248988124656348299653052688344696135840215712191162135178273756415771123010111796122671724143565383396162107206772781551029308751511942924942333859805,
-	-0.9647622555875064307738119281182749603888952204430187193220113218370995254867038008243801877562227002840740910741483519987441236283464394249183812395373150090695515823078220949436846111682404866338388944248976976566275875721000356873959697266702651250019105084704924793016185368873243713355,
-	0.9647622555875064307738119281182749603888952204430187193220113218370995254867038008243801877562227002840740910741483519987441236283464394249183812395373150090695515823078220949436846111682404866338388944248976976566275875721000356873959697266702651250019105084704924793016185368873243713355,
-	-0.9856115115452683354001750446309019786323957143358063182107821705820305847193755946663846485510970266115353839862364606643634021712823093784875255943834038377710426488328772047833289470320023596895438028281274741367781028592272459887917924171204666683239464005128153533797603112851826904814,
-	0.9856115115452683354001750446309019786323957143358063182107821705820305847193755946663846485510970266115353839862364606643634021712823093784875255943834038377710426488328772047833289470320023596895438028281274741367781028592272459887917924171204666683239464005128153533797603112851826904814,
-	-0.9972638618494815635449811286650407271385376637294611593011185457862359083917418520130456693085426416474280482200936551645510686196373231416035137741332968299789863385253514914078766236061488136738023162574655835389902337937054326098485227311719825229066712510246574949376367552421728646398,
-	0.9972638618494815635449811286650407271385376637294611593011185457862359083917418520130456693085426416474280482200936551645510686196373231416035137741332968299789863385253514914078766236061488136738023162574655835389902337937054326098485227311719825229066712510246574949376367552421728646398
-};
-
-static double C[] = {
-	0.0965400885147278005667648300635757947368606312355700687323182099577497758679466512968173871061464644599963197828969869820251559172455698832434930732077927850876632725829187045819145660710266452161095406358159608874152584850413283587913891015545638518881205600825069096855488296437485836866,
-	0.0965400885147278005667648300635757947368606312355700687323182099577497758679466512968173871061464644599963197828969869820251559172455698832434930732077927850876632725829187045819145660710266452161095406358159608874152584850413283587913891015545638518881205600825069096855488296437485836866,
-	0.0956387200792748594190820022041311005948905081620055509529898509437067444366006256133614167190847508238474888230077112990752876436158047205555474265705582078453283640212465537132165041268773645168746774530146140911679782502276289938840330631903789120176765314495900053061764438990021439069,
-	0.0956387200792748594190820022041311005948905081620055509529898509437067444366006256133614167190847508238474888230077112990752876436158047205555474265705582078453283640212465537132165041268773645168746774530146140911679782502276289938840330631903789120176765314495900053061764438990021439069,
-	0.0938443990808045656391802376681172600361000757462364500506275696355695118623098075097804207682530277555307864917078828352419853248607668520631751470962234105835015158485760721979732297206950719908744248285672032436598213262204039212897239890934116841559005147755270269705682414708355646603,
-	0.0938443990808045656391802376681172600361000757462364500506275696355695118623098075097804207682530277555307864917078828352419853248607668520631751470962234105835015158485760721979732297206950719908744248285672032436598213262204039212897239890934116841559005147755270269705682414708355646603,
-	0.0911738786957638847128685771116370625448614132753900053231278739777031520613017513597426417145878622654027367650308019870251963114683369110451524174258161390823876554910693202594383388549640738095422966058367070348943662290656339592299608558384147559830707904449930677260444604329157917977,
-	0.0911738786957638847128685771116370625448614132753900053231278739777031520613017513597426417145878622654027367650308019870251963114683369110451524174258161390823876554910693202594383388549640738095422966058367070348943662290656339592299608558384147559830707904449930677260444604329157917977,
-	0.0876520930044038111427714627518022875484497217017572223192228034747061150211380239263021665771581379364685191248848158059408000065275041643745927401342920150588893827207354226012701872322225514682178439577327346929209121046816487338309068375228210705166692551938339727096609740531893725675,
-	0.0876520930044038111427714627518022875484497217017572223192228034747061150211380239263021665771581379364685191248848158059408000065275041643745927401342920150588893827207354226012701872322225514682178439577327346929209121046816487338309068375228210705166692551938339727096609740531893725675,
-	0.0833119242269467552221990746043486115387468839428344598401864047287594069244380966536255650452315042012372905572506028852130723585016898197140339352228963465326746426938359210160503509807644396182380868089959855742801355208471205261406307895519604387550841954817025499019984032594036141439,
-	0.0833119242269467552221990746043486115387468839428344598401864047287594069244380966536255650452315042012372905572506028852130723585016898197140339352228963465326746426938359210160503509807644396182380868089959855742801355208471205261406307895519604387550841954817025499019984032594036141439,
-	0.078193895787070306471740918828306671039786798482159190307481553869493700115196435401943819761440851294456424770323467367505109006517482028994114252939401250416132320553639542341400437522236191275346323130525969269563653003188829786549728825182082678498917784036375053244425839341945385297,
-	0.078193895787070306471740918828306671039786798482159190307481553869493700115196435401943819761440851294456424770323467367505109006517482028994114252939401250416132320553639542341400437522236191275346323130525969269563653003188829786549728825182082678498917784036375053244425839341945385297,
-	0.0723457941088485062253993564784877916043369833018248707397632823511765345816800402874475958591657429073027694582930574378890633404841054620298756279975430795706338162404545590689277985270140590721779502609564199074051863640176937117952488466002340085264819537808079947788437998042296495822,
-	0.0723457941088485062253993564784877916043369833018248707397632823511765345816800402874475958591657429073027694582930574378890633404841054620298756279975430795706338162404545590689277985270140590721779502609564199074051863640176937117952488466002340085264819537808079947788437998042296495822,
-	0.0658222227763618468376500637069387728775364473732465153710916696852412442018627316280044447764609054151761388378861151807154113495715653711918644796313239555117970398473141615070299152284100887258072240524028885129828725430021172354299810423059697133688823072212214503334259555369485963074,
-	0.0658222227763618468376500637069387728775364473732465153710916696852412442018627316280044447764609054151761388378861151807154113495715653711918644796313239555117970398473141615070299152284100887258072240524028885129828725430021172354299810423059697133688823072212214503334259555369485963074,
-	0.0586840934785355471452836373001708867501204674575467587150032786132877518019090643743123653437052116901895704813134467814193905269714480573030647540887991405215103758723074481312705449946311993670933802369300463315125015975216910705047901943865293781921122370996257470349807212516159332678,
-	0.0586840934785355471452836373001708867501204674575467587150032786132877518019090643743123653437052116901895704813134467814193905269714480573030647540887991405215103758723074481312705449946311993670933802369300463315125015975216910705047901943865293781921122370996257470349807212516159332678,
-	0.0509980592623761761961632446895216952601847767397628437069071236525030510385137821267442193868358292147899714519363571211100873456269865150186456681043804358654826791768545393024953758025593924464295555854744882720755747096079325496814455853004350452095212995888025282619932613606999567133,
-	0.0509980592623761761961632446895216952601847767397628437069071236525030510385137821267442193868358292147899714519363571211100873456269865150186456681043804358654826791768545393024953758025593924464295555854744882720755747096079325496814455853004350452095212995888025282619932613606999567133,
-	0.0428358980222266806568786466061255284928108575989407395620219408911043916962572261359138025961596979511472539467367407419206021900868371610612953162236233351132214438513203223655531564777278515080476421262443325932320214191168239648611793958596884827086182431203349730049744697408543115307,
-	0.0428358980222266806568786466061255284928108575989407395620219408911043916962572261359138025961596979511472539467367407419206021900868371610612953162236233351132214438513203223655531564777278515080476421262443325932320214191168239648611793958596884827086182431203349730049744697408543115307,
-	0.0342738629130214331026877322523727069948402029116274337814057454192310522168984446294442724624445760666244242305266023810860790282088335398182296698622433517061843276344829146573593201201081743714879684153735672789104567624853712011151505225193933019375481618760594889854480408562043658635,
-	0.0342738629130214331026877322523727069948402029116274337814057454192310522168984446294442724624445760666244242305266023810860790282088335398182296698622433517061843276344829146573593201201081743714879684153735672789104567624853712011151505225193933019375481618760594889854480408562043658635,
-	0.0253920653092620594557525897892240292875540475469487209362512822192154788532376645960457016338988332029324531233401833547954942765653767672102838323550828207273795044402516181251040411735351747299230615776597356956641506445501689924551185923348003766988424170511157069264716719906995309826,
-	0.0253920653092620594557525897892240292875540475469487209362512822192154788532376645960457016338988332029324531233401833547954942765653767672102838323550828207273795044402516181251040411735351747299230615776597356956641506445501689924551185923348003766988424170511157069264716719906995309826,
-	0.0162743947309056706051705622063866181795429637952095664295931749613369651752917857651844425586692833071042366002861684552859449530958901379260437604156888337987656773068694383447504913457771896770689760342192010638946676879735404121702279005140285599424477022083127753774756520463311689155,
-	0.0162743947309056706051705622063866181795429637952095664295931749613369651752917857651844425586692833071042366002861684552859449530958901379260437604156888337987656773068694383447504913457771896770689760342192010638946676879735404121702279005140285599424477022083127753774756520463311689155,
-	0.0070186100094700966004070637388531825133772207289396032320082356192151241454178686953297376907573215077936155545790593837513204206518026084505878987243348925784479817181234617862457418214505322067610482902501455504204433524520665822704844582452877416001060465891907497519632353148380799619,
-	0.0070186100094700966004070637388531825133772207289396032320082356192151241454178686953297376907573215077936155545790593837513204206518026084505878987243348925784479817181234617862457418214505322067610482902501455504204433524520665822704844582452877416001060465891907497519632353148380799619
-};
-
-#else
-
-/* n = 24 */
-
-static double T[] = {
-	-0.0640568928626056260850430826247450385909991954207473934243510817897392835939101078028928761342525090823242273835115756994869112500371756765277735374378372436515481804668409746233647956019276711845937319580510697455314397618513360822351096139837050674073737720614748330506959387258141490546,
-	0.0640568928626056260850430826247450385909991954207473934243510817897392835939101078028928761342525090823242273835115756994869112500371756765277735374378372436515481804668409746233647956019276711845937319580510697455314397618513360822351096139837050674073737720614748330506959387258141490546,
-	-0.1911188674736163091586398207570696318404051033147533561489185765880859526918717419824911112452097307135934146013595461392721542943443689459384015952736491888634107638852139839821480663334386199430823059446316182589874503457282270169922471283825305735240671464262733609193984099421023790425,
-	0.1911188674736163091586398207570696318404051033147533561489185765880859526918717419824911112452097307135934146013595461392721542943443689459384015952736491888634107638852139839821480663334386199430823059446316182589874503457282270169922471283825305735240671464262733609193984099421023790425,
-	-0.3150426796961633743867932913198102407864782608248172687542301295298821563412434083438735095552082106072251617364030643536658931791308690387340350108862316429911426633492164449851684039691011610681827256891467485494251442677599304969349712405008328365242087382043028815467866505618650936915,
-	0.3150426796961633743867932913198102407864782608248172687542301295298821563412434083438735095552082106072251617364030643536658931791308690387340350108862316429911426633492164449851684039691011610681827256891467485494251442677599304969349712405008328365242087382043028815467866505618650936915,
-	-0.4337935076260451384870842319133497124524215109279688080808012846567644070336309140577354304660756168836170633415002629755076381975174699198632370585889341378575229685577710965327823199539830928400741454067377627746745635503614810834602257701251585352190552527778684113280867150779959852524,
-	0.4337935076260451384870842319133497124524215109279688080808012846567644070336309140577354304660756168836170633415002629755076381975174699198632370585889341378575229685577710965327823199539830928400741454067377627746745635503614810834602257701251585352190552527778684113280867150779959852524,
-	-0.5454214713888395356583756172183723700107839925876181754336143898305648391795708970958348674408062501977746653313676778948810297400650828985504068941547021866808914316854182653519436295728612315264181208390018064915325250677148594855874434492614547180849377989457776201862945948751249939033,
-	0.5454214713888395356583756172183723700107839925876181754336143898305648391795708970958348674408062501977746653313676778948810297400650828985504068941547021866808914316854182653519436295728612315264181208390018064915325250677148594855874434492614547180849377989457776201862945948751249939033,
-	-0.6480936519369755692524957869107476266696582986189567802989336650244483175685397719281177703657272433990519954414744003453347794058626075519074876962003580684127104697893556584036149935275154534232685850207671594298434446955488396349075497667624732345971957611938685137884801129695447597312,
-	0.6480936519369755692524957869107476266696582986189567802989336650244483175685397719281177703657272433990519954414744003453347794058626075519074876962003580684127104697893556584036149935275154534232685850207671594298434446955488396349075497667624732345971957611938685137884801129695447597312,
-	-0.7401241915785543642438281030999784255232924870141854568663823682719003386409229324413313561311287943298526270745398288213617461973439599491355223046073660810109486527571776420522757185953076208759863287235084614803697918067466580746275122563457575959399650481778575563118955957829855078072,
-	0.7401241915785543642438281030999784255232924870141854568663823682719003386409229324413313561311287943298526270745398288213617461973439599491355223046073660810109486527571776420522757185953076208759863287235084614803697918067466580746275122563457575959399650481778575563118955957829855078072,
-	-0.8200019859739029219539498726697452080761264776678555872439810260013829789535545400822605211725837960666424765858309152369975956748693910897310401393217997751433463343851603146734984964062776585418194561809063555489816762580329418137298754264378316716417347949040725111554705589243953692169,
-	0.8200019859739029219539498726697452080761264776678555872439810260013829789535545400822605211725837960666424765858309152369975956748693910897310401393217997751433463343851603146734984964062776585418194561809063555489816762580329418137298754264378316716417347949040725111554705589243953692169,
-	-0.8864155270044010342131543419821967550873330433089200403710379167756748343989591721041235019961817012535295108910075024175885664874383567124270976139069615059721185542370372118538064873468961679956606315961988138722471292807573552657465373246065266349095264290446955886450980216411579068464,
-	0.8864155270044010342131543419821967550873330433089200403710379167756748343989591721041235019961817012535295108910075024175885664874383567124270976139069615059721185542370372118538064873468961679956606315961988138722471292807573552657465373246065266349095264290446955886450980216411579068464,
-	-0.9382745520027327585236490017087214496548196580774513466350271759095894960525356709599646415358699555094267057623515929895997449470704383076095012442349544937551633313675972481722466159802428487600880633341786121580661077521685134893546419567859808853944866142065617471979973235700469563606,
-	0.9382745520027327585236490017087214496548196580774513466350271759095894960525356709599646415358699555094267057623515929895997449470704383076095012442349544937551633313675972481722466159802428487600880633341786121580661077521685134893546419567859808853944866142065617471979973235700469563606,
-	-0.9747285559713094981983919930081690617411830530401787198115935651071811212809802245386374742817154549827412585755713491144798180281062083910290010368962899139003272102551955405455775700818480561392470581718221938768668731616756379649281934548623489251537698395239432800432811839537332490367,
-	0.9747285559713094981983919930081690617411830530401787198115935651071811212809802245386374742817154549827412585755713491144798180281062083910290010368962899139003272102551955405455775700818480561392470581718221938768668731616756379649281934548623489251537698395239432800432811839537332490367,
-	-0.9951872199970213601799974097007368118745976925960028774416005451142838320694577378833972893371157088623453462978965853994497237745715598401409351804188189455255566266162142239452364851560816782389596967291836243391359167365098731808888455424405665558369621091780571617968925046375452278564,
-	0.9951872199970213601799974097007368118745976925960028774416005451142838320694577378833972893371157088623453462978965853994497237745715598401409351804188189455255566266162142239452364851560816782389596967291836243391359167365098731808888455424405665558369621091780571617968925046375452278564,
-};
-
-static double C[] = {
-	0.1279381953467521569740561652246953718517112395416678824212995763723475915405364024120919775667347423307078678605027534354336365506630173201256407760369958705384835762891562911475479559477218918074170718365754182501974550951925484331523758090745471505157505768499921691572488912345533434646,
-	0.1279381953467521569740561652246953718517112395416678824212995763723475915405364024120919775667347423307078678605027534354336365506630173201256407760369958705384835762891562911475479559477218918074170718365754182501974550951925484331523758090745471505157505768499921691572488912345533434646,
-	0.1258374563468282961213753825111836887264033255813454041780915168813938726666625968820381792564211407244125340112283619371640023694354842556219623307075721695505167028832011944572440814161265754364153991752782846305315778293182951298508346824950922490384565834525141570991957343073460241123,
-	0.1258374563468282961213753825111836887264033255813454041780915168813938726666625968820381792564211407244125340112283619371640023694354842556219623307075721695505167028832011944572440814161265754364153991752782846305315778293182951298508346824950922490384565834525141570991957343073460241123,
-	0.1216704729278033912044631534762624256070295592038057787774717545126253937177169619177578034307728419129571458407698685455109927385962626203664197972099671299080663146992247474377374928428629909818345130957392521139337403891946990001210368274459006298591636884893163373907763429334385715701,
-	0.1216704729278033912044631534762624256070295592038057787774717545126253937177169619177578034307728419129571458407698685455109927385962626203664197972099671299080663146992247474377374928428629909818345130957392521139337403891946990001210368274459006298591636884893163373907763429334385715701,
-	0.1155056680537256013533444839067835598622703113764964705844493600886702535513185499403442576468127956599599096047023274406552399890629831050388267870570157536484442644788074009392626299528272339158271789101012709245867329169327356527615681351864802567093740938014246237226139721687821239517,
-	0.1155056680537256013533444839067835598622703113764964705844493600886702535513185499403442576468127956599599096047023274406552399890629831050388267870570157536484442644788074009392626299528272339158271789101012709245867329169327356527615681351864802567093740938014246237226139721687821239517,
-	0.107444270115965634782577342446606222794628690134220021766541640886821866394437105980586727120915236672945076498454815476823439901643102885282830543962266851556251956709331696682107380679861280071851870323872823740641856241992841364843152888380035317713347953732555881218806283399463124951,
-	0.107444270115965634782577342446606222794628690134220021766541640886821866394437105980586727120915236672945076498454815476823439901643102885282830543962266851556251956709331696682107380679861280071851870323872823740641856241992841364843152888380035317713347953732555881218806283399463124951,
-	0.097618652104113888269880664464247154427918968853685944083310610022954338577591978348020039690718187482414745713364268645676642419728572107043424944384211806071042042791689191672508012725933985685876262715739521302925263010913644942223616059647289160432915821120275634713911721781926285332,
-	0.097618652104113888269880664464247154427918968853685944083310610022954338577591978348020039690718187482414745713364268645676642419728572107043424944384211806071042042791689191672508012725933985685876262715739521302925263010913644942223616059647289160432915821120275634713911721781926285332,
-	0.0861901615319532759171852029837426671850805882379330055884071438612868844607805312688886562972816971732787465671984327992158782827038381983594380916492525003385563462630861694048857276454548529177279961693054540872738963763950131372564031674654030737773100525128451496727198421916322556908,
-	0.0861901615319532759171852029837426671850805882379330055884071438612868844607805312688886562972816971732787465671984327992158782827038381983594380916492525003385563462630861694048857276454548529177279961693054540872738963763950131372564031674654030737773100525128451496727198421916322556908,
-	0.0733464814110803057340336152531165181193365098484994714027024906600413884758709348323251422694445551958844309079341158927693012247996928526423877450601776912550600854944985229487704917122675007345403564777169078420148392438502785281584325129303566997853186794893103931008654660416023204965,
-	0.0733464814110803057340336152531165181193365098484994714027024906600413884758709348323251422694445551958844309079341158927693012247996928526423877450601776912550600854944985229487704917122675007345403564777169078420148392438502785281584325129303566997853186794893103931008654660416023204965,
-	0.0592985849154367807463677585001085845412001265652134910373765512940983031775082415660683556106090092998654733952492642466909653073834070291103432919838456250955380753837859345492817299145644958959367291816621761687898337760987530926613795554356869343124524696513178977787335055019515914172,
-	0.0592985849154367807463677585001085845412001265652134910373765512940983031775082415660683556106090092998654733952492642466909653073834070291103432919838456250955380753837859345492817299145644958959367291816621761687898337760987530926613795554356869343124524696513178977787335055019515914172,
-	0.0442774388174198061686027482113382288593128418338578967413972297210243762822664396343947170155594934934611803046066530352490769669525012630503089839091175520932522330681764807671830570648211944799908348398720715944900305481342571090714940628894962186599515560606956040614089479788668773348,
-	0.0442774388174198061686027482113382288593128418338578967413972297210243762822664396343947170155594934934611803046066530352490769669525012630503089839091175520932522330681764807671830570648211944799908348398720715944900305481342571090714940628894962186599515560606956040614089479788668773348,
-	0.0285313886289336631813078159518782864491977979319081166016648047576440056374291434256854254228098755422737224452711633426188506404779428430343631052424983978091405445557790206527391293478807818130301641760878492678184457761229065303399826533483010921962299302202888714000294545957159715602,
-	0.0285313886289336631813078159518782864491977979319081166016648047576440056374291434256854254228098755422737224452711633426188506404779428430343631052424983978091405445557790206527391293478807818130301641760878492678184457761229065303399826533483010921962299302202888714000294545957159715602,
-	0.0123412297999871995468056670700372915759100408913665168172873209410917255178811137917987186719204245118391668507179752021919736085531955203240536027970786521356478573832633493407323107496772162595516230980489700767963287958540270795597236457014112169997285946194632806836898378754527134097,
-	0.0123412297999871995468056670700372915759100408913665168172873209410917255178811137917987186719204245118391668507179752021919736085531955203240536027970786521356478573832633493407323107496772162595516230980489700767963287958540270795597236457014112169997285946194632806836898378754527134097,
-};
-
-#endif

gsk/gskcurve.c

@@ -77,23 +77,10 @@ struct _GskCurveClass
                                                          GskBoundingBox         *bounds);
   void                          (* get_tight_bounds)    (const GskCurve         *curve,
                                                          GskBoundingBox         *bounds);
-  void                          (* get_derivative_at)   (const GskCurve         *curve,
-                                                         float                   t,
-                                                         graphene_point_t       *value);
-  int                           (* get_crossing)        (const GskCurve         *curve,
-                                                         const graphene_point_t *point);
-  float                         (* get_length_to)       (const GskCurve         *curve,
-                                                         float                   t);
-  float                         (* get_at_length)       (const GskCurve         *curve,
-                                                         float                   distance,
-                                                         float                   epsilon);
 };
 
 /* {{{ Utilities */
 
-#define RAD_TO_DEG(r) ((r)*180.f/M_PI)
-#define DEG_TO_RAD(d) ((d)*M_PI/180.f)
-
 static void
 get_tangent (const graphene_point_t *p0,
              const graphene_point_t *p1,
@@ -103,51 +90,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.
  */
@@ -187,67 +129,8 @@ gsk_curve_elevate (const GskCurve *curve,
     g_assert_not_reached ();
 }
 
-/* Compute arclength by using Gauss quadrature on
- *
- * \int_0^z \sqrt{ (dx/dt)^2 + (dy/dt)^2 } dt
- */
-
-#include "gskcurve-ct-values.c"
-
-static float
-get_length_by_approximation (const GskCurve *curve,
-                             float           t)
-{
-  double z = t / 2;
-  double sum = 0;
-  graphene_point_t d;
-
-  for (unsigned int i = 0; i < G_N_ELEMENTS (T); i++)
-    {
-      gsk_curve_get_derivative_at (curve, z * T[i] + z, &d);
-      sum += C[i] * sqrt (d.x * d.x + d.y * d.y);
-    }
-
-  return z * sum;
-}
-
-/* Compute the inverse of the arclength using bisection,
- * to a given precision
- */
-static float
-get_t_by_bisection (const GskCurve *curve,
-                    float           length,
-                    float           epsilon)
-{
-  float t1, t2, t, l;
-  GskCurve c1;
-
-  g_assert (epsilon >= FLT_EPSILON);
-
-  t1 = 0;
-  t2 = 1;
-
-  while (t1 < t2)
-    {
-      t = (t1 + t2) / 2;
-      if (t == t1 || t == t2)
-        break;
-
-      gsk_curve_split (curve, t, &c1, NULL);
-
-      l = gsk_curve_get_length (&c1);
-      if (fabsf (length - l) < epsilon)
-        break;
-      else if (l < length)
-        t1 = t;
-      else
-        t2 = t;
-    }
-
-  return t;
-}
 /* }}} */
-/* {{{ Line */
+/* {{{ Line  */
 
 static void
 gsk_line_curve_init_from_points (GskLineCurve           *self,
@@ -389,13 +272,12 @@ gsk_line_curve_segment (const GskCurve *curve,
                         GskCurve       *segment)
 {
   const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
-  graphene_point_t p0, p1;
+  graphene_point_t start_point, end_point;
 
-  graphene_point_interpolate (&pts[0], &pts[1], start, &p0);
-  graphene_point_interpolate (&pts[0], &pts[1], end, &p1);
+  graphene_point_interpolate (&self->points[0], &self->points[1], start, &start_point);
+  graphene_point_interpolate (&self->points[0], &self->points[1], end, &end_point);
 
-  gsk_line_curve_init_from_points (&segment->line, GSK_PATH_LINE, &p0, &p1);
+  gsk_line_curve_init_from_points (&segment->line, GSK_PATH_LINE, &start_point, &end_point);
 }
 
 static gboolean
@@ -405,9 +287,8 @@ gsk_line_curve_decompose (const GskCurve      *curve,
                           gpointer             user_data)
 {
   const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
 
-  return add_line_func (&pts[0], &pts[1], 0.f, 1.f, GSK_CURVE_LINE_REASON_STRAIGHT, user_data);
+  return add_line_func (&self->points[0], &self->points[1], 0.0f, 1.0f, GSK_CURVE_LINE_REASON_STRAIGHT, user_data);
 }
 
 static gboolean
@@ -432,55 +313,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_at (const GskCurve   *curve,
-                                  float             t,
-                                  graphene_point_t *value)
-{
-  const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
-
-  value->x = pts[1].x - pts[0].x;
-  value->y = pts[1].y - pts[0].y;
-}
-
-static int
-gsk_line_curve_get_crossing (const GskCurve         *curve,
-                             const graphene_point_t *point)
-{
-  const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
-
-  return line_get_crossing (point, &pts[0], &pts[1]);
-}
-
-static float
-gsk_line_curve_get_length_to (const GskCurve *curve,
-                              float           t)
-{
-  const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
-
-  return t * graphene_point_distance (&pts[0], &pts[1], NULL, NULL);
-}
-
-static float
-gsk_line_curve_get_at_length (const GskCurve *curve,
-                              float           distance,
-                              float           epsilon)
-{
-  const GskLineCurve *self = &curve->line;
-  const graphene_point_t *pts = self->points;
-  float length;
-
-  length = graphene_point_distance (&pts[0], &pts[1], NULL, NULL);
-
-  if (length == 0)
-    return 0;
-
-  return CLAMP (distance / length, 0, 1);
-}
-
 static const GskCurveClass GSK_LINE_CURVE_CLASS = {
   gsk_line_curve_init,
   gsk_line_curve_init_foreach,
@@ -500,10 +332,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_at,
-  gsk_line_curve_get_crossing,
-  gsk_line_curve_get_length_to,
-  gsk_line_curve_get_at_length,
 };
 
 /* }}} */
@@ -777,19 +605,6 @@ gsk_quad_curve_decompose_curve (const GskCurve       *curve,
 
   if (flags & GSK_PATH_FOREACH_ALLOW_QUAD)
     return add_curve_func (GSK_PATH_QUAD, self->points, 3, 0.f, user_data);
-  else if (graphene_point_equal (&curve->conic.points[0], &curve->conic.points[1]) ||
-           graphene_point_equal (&curve->conic.points[1], &curve->conic.points[2]))
-    {
-      if (!graphene_point_equal (&curve->conic.points[0], &curve->conic.points[2]))
-        return add_curve_func (GSK_PATH_LINE,
-                               (graphene_point_t[2]) {
-                                 curve->conic.points[0],
-                                 curve->conic.points[2],
-                               },
-                               2, 0.f, user_data);
-      else
-        return TRUE;
-    }
   else if (flags & GSK_PATH_FOREACH_ALLOW_CUBIC)
     {
       GskCurve c;
@@ -797,6 +612,13 @@ gsk_quad_curve_decompose_curve (const GskCurve       *curve,
       gsk_curve_elevate (curve, &c);
       return add_curve_func (GSK_PATH_CUBIC, c.cubic.points, 4, 0.f, user_data);
     }
+  else if (flags & GSK_PATH_FOREACH_ALLOW_CONIC)
+    {
+      GskCurve c;
+
+      gsk_curve_init_foreach (&c, GSK_PATH_CONIC, self->points, 3, 1.f);
+      return add_curve_func (GSK_PATH_CUBIC, c.cubic.points, 4, 0.f, user_data);
+    }
   else
     {
       return gsk_quad_curve_decompose (curve,
@@ -858,53 +680,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 void
-gsk_quad_curve_get_derivative_at (const GskCurve   *curve,
-                                  float             t,
-                                  graphene_point_t *value)
-{
-  GskCurve d;
-  gsk_quad_curve_get_derivative (curve, &d);
-  gsk_curve_get_point (&d, t, value);
-}
-
-static int
-gsk_quad_curve_get_crossing (const GskCurve         *curve,
-                             const graphene_point_t *point)
-{
-  return get_crossing_by_bisection (curve, point);
-}
-
-static float
-gsk_quad_curve_get_length_to (const GskCurve *curve,
-                              float           t)
-{
-  return get_length_by_approximation (curve, t);
-}
-
-static float
-gsk_quad_curve_get_at_length (const GskCurve *curve,
-                              float           t,
-                              float           epsilon)
-{
-  return get_t_by_bisection (curve, t, epsilon);
-}
-
 static const GskCurveClass GSK_QUAD_CURVE_CLASS = {
   gsk_quad_curve_init,
   gsk_quad_curve_init_foreach,
@@ -924,10 +699,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_at,
-  gsk_quad_curve_get_crossing,
-  gsk_quad_curve_get_length_to,
-  gsk_quad_curve_get_at_length,
 };
 
 /* }}} */
@@ -1099,6 +870,62 @@ 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:
+    case GSK_PATH_CONIC:
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static inline float
 cross (const graphene_vec2_t *v1,
        const graphene_vec2_t *v2)
@@ -1113,23 +940,6 @@ pow3 (float w)
   return w * w * w;
 }
 
-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 float
 gsk_cubic_curve_get_curvature (const GskCurve *curve,
                                float           t)
@@ -1139,8 +949,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);
@@ -1260,7 +1070,7 @@ gsk_cubic_curve_decompose_curve (const GskCurve       *curve,
   if (flags & GSK_PATH_FOREACH_ALLOW_CUBIC)
     return add_curve_func (GSK_PATH_CUBIC, self->points, 4, 0.f, user_data);
 
-  /* FIXME: Quadratic or arc approximation */
+  /* FIXME: Quadratic (or conic?) approximation */
   return gsk_cubic_curve_decompose (curve,
                                     tolerance,
                                     gsk_curve_add_line_cb,
@@ -1352,38 +1162,6 @@ gsk_cubic_curve_get_tight_bounds (const GskCurve  *curve,
     }
 }
 
-static void
-gsk_cubic_curve_get_derivative_at (const GskCurve   *curve,
-                                   float             t,
-                                   graphene_point_t *value)
-{
-  GskCurve d;
-  gsk_cubic_curve_get_derivative (curve, &d);
-  gsk_curve_get_point (&d, t, value);
-}
-
-static int
-gsk_cubic_curve_get_crossing (const GskCurve         *curve,
-                              const graphene_point_t *point)
-{
-  return get_crossing_by_bisection (curve, point);
-}
-
-static float
-gsk_cubic_curve_get_length_to (const GskCurve *curve,
-                               float           t)
-{
-  return get_length_by_approximation (curve, t);
-}
-
-static float
-gsk_cubic_curve_get_at_length (const GskCurve *curve,
-                               float           t,
-                               float           epsilon)
-{
-  return get_t_by_bisection (curve, t, epsilon);
-}
-
 static const GskCurveClass GSK_CUBIC_CURVE_CLASS = {
   gsk_cubic_curve_init,
   gsk_cubic_curve_init_foreach,
@@ -1403,13 +1181,9 @@ 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_at,
-  gsk_cubic_curve_get_crossing,
-  gsk_cubic_curve_get_length_to,
-  gsk_cubic_curve_get_at_length,
 };
 
- /*  }}} */
+/* }}} */
 /* {{{ Conic */
 
 static inline float
@@ -1569,53 +1343,35 @@ gsk_conic_curve_get_point (const GskCurve   *curve,
   gsk_conic_curve_eval_point (self, t, pos);
 }
 
-/* See M. Floater, Derivatives of rational Bezier curves */
-static void
-gsk_conic_curve_get_derivative_at (const GskCurve   *curve,
-                                   float             t,
-                                   graphene_point_t *value)
-{
-  const GskConicCurve *self = &curve->conic;
-  float w = gsk_conic_curve_get_weight (self);
-  const graphene_point_t *pts = self->points;
-  graphene_point_t p[3], p1[2];
-  float w1[2], w2;
-
-  /* The tangent will be 0 in these corner cases, just
-   * treat it like a line here.
-   */
-  if ((t <= 0.f && graphene_point_equal (&pts[0], &pts[1])) ||
-      (t >= 1.f && graphene_point_equal (&pts[1], &pts[3])))
-    {
-      graphene_point_init (value, pts[3].x - pts[0].x, pts[3].y - pts[0].y);
-      return;
-    }
-
-  p[0] = pts[0];
-  p[1] = pts[1];
-  p[2] = pts[3];
-
-  w1[0] = (1 - t) + t*w;
-  w1[1] = (1 - t)*w + t;
-
-  w2 = (1 - t) * w1[0] + t * w1[1];
-
-  p1[0].x = ((1 - t)*p[0].x + t*w*p[1].x)/w1[0];
-  p1[0].y = ((1 - t)*p[0].y + t*w*p[1].y)/w1[0];
-  p1[1].x = ((1 - t)*w*p[1].x + t*p[2].x)/w1[1];
-  p1[1].y = ((1 - t)*w*p[1].y + t*p[2].y)/w1[1];
-
-  value->x = 2 * (w1[0] * w1[1])/(w2*w2) * (p1[1].x - p1[0].x);
-  value->y = 2 * (w1[0] * w1[1])/(w2*w2) * (p1[1].y - p1[0].y);
-}
-
 static void
 gsk_conic_curve_get_tangent (const GskCurve   *curve,
                              float             t,
                              graphene_vec2_t  *tangent)
 {
+  const GskConicCurve *self = &curve->conic;
   graphene_point_t tmp;
-  gsk_conic_curve_get_derivative_at (curve, t, &tmp);
+  float w = gsk_conic_curve_get_weight (self);
+  const graphene_point_t *pts = self->points;
+
+  /* The tangent will be 0 in these corner cases, just
+   * treat it like a line here. */
+  if ((t <= 0.f && graphene_point_equal (&pts[0], &pts[1])) ||
+      (t >= 1.f && graphene_point_equal (&pts[1], &pts[3])))
+    {
+      graphene_vec2_init (tangent, pts[3].x - pts[0].x, pts[3].y - pts[0].y);
+      return;
+    }
+
+  gsk_curve_eval_quad ((graphene_point_t[3]) {
+                         GRAPHENE_POINT_INIT ((w - 1) * (pts[3].x - pts[0].x),
+                                              (w - 1) * (pts[3].y - pts[0].y)),
+                         GRAPHENE_POINT_INIT (pts[3].x - pts[0].x - 2 * w * (pts[1].x - pts[0].x),
+                                              pts[3].y - pts[0].y - 2 * w * (pts[1].y - pts[0].y)),
+                         GRAPHENE_POINT_INIT (w * (pts[1].x - pts[0].x),
+                                              w * (pts[1].y - pts[0].y))
+                       },
+                       t,
+                       &tmp);
   graphene_vec2_init (tangent, tmp.x, tmp.y);
   graphene_vec2_normalize (tangent, tangent);
 }
@@ -1940,20 +1696,7 @@ gsk_conic_curve_decompose_or_add (const GskCurve       *curve,
                                   GskCurveAddCurveFunc  add_curve_func,
                                   gpointer              user_data)
 {
-  if (graphene_point_equal (&curve->conic.points[0], &curve->conic.points[1]) ||
-      graphene_point_equal (&curve->conic.points[1], &curve->conic.points[3]))
-    {
-      if (!graphene_point_equal (&curve->conic.points[0], &curve->conic.points[3]))
-        return add_curve_func (GSK_PATH_LINE,
-                               (graphene_point_t[2]) {
-                                 curve->conic.points[0],
-                                 curve->conic.points[3],
-                               },
-                               2, 0.f, user_data);
-      else
-        return TRUE;
-    }
-  else if (gsk_conic_is_close_to_cubic (curve, cubic, tolerance))
+  if (gsk_conic_is_close_to_cubic (curve, cubic, tolerance))
     return add_curve_func (GSK_PATH_CUBIC, cubic->cubic.points, 4, 0.f, user_data);
   else
     {
@@ -1995,7 +1738,7 @@ gsk_conic_curve_decompose_curve (const GskCurve       *curve,
       return gsk_conic_curve_decompose_or_add (curve, &c, tolerance, add_curve_func, user_data);
     }
 
-  /* FIXME: Quadratic approximation */
+  /* FIXME: Quadratic (or conic?) approximation */
   return gsk_conic_curve_decompose (curve,
                                     tolerance,
                                     gsk_curve_add_line_cb,
@@ -2078,28 +1821,6 @@ gsk_conic_curve_get_tight_bounds (const GskCurve *curve,
     }
 }
 
-static int
-gsk_conic_curve_get_crossing (const GskCurve         *curve,
-                              const graphene_point_t *point)
-{
-  return get_crossing_by_bisection (curve, point);
-}
-
-static float
-gsk_conic_curve_get_length_to (const GskCurve *curve,
-                               float           t)
-{
-  return get_length_by_approximation (curve, t);
-}
-
-static float
-gsk_conic_curve_get_at_length (const GskCurve *curve,
-                               float           t,
-                               float           epsilon)
-{
-  return get_t_by_bisection (curve, t, epsilon);
-}
-
 static const GskCurveClass GSK_CONIC_CURVE_CLASS = {
   gsk_conic_curve_init,
   gsk_conic_curve_init_foreach,
@@ -2119,13 +1840,9 @@ static const GskCurveClass GSK_CONIC_CURVE_CLASS = {
   gsk_conic_curve_decompose_curve,
   gsk_conic_curve_get_bounds,
   gsk_conic_curve_get_tight_bounds,
-  gsk_conic_curve_get_derivative_at,
-  gsk_conic_curve_get_crossing,
-  gsk_conic_curve_get_length_to,
-  gsk_conic_curve_get_at_length,
 };
 
-/*  }}} */
+/* }}} */
 /* {{{ API */
 
 static const GskCurveClass *
@@ -2315,19 +2032,52 @@ gsk_curve_get_tight_bounds (const GskCurve  *curve,
   get_class (curve->op)->get_tight_bounds (curve, bounds);
 }
 
-void
-gsk_curve_get_derivative_at (const GskCurve  *curve,
-                             float            t,
-                             graphene_point_t *value)
+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_at (curve, t, value);
+  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
@@ -2397,7 +2147,7 @@ find_closest_point (const GskCurve         *curve,
   d = INFINITY;
   t = (t1 + t2) / 2;
 
-  if (fabs (t1 - t2) < 0.001)
+  if (radius < 1)
     {
       graphene_point_t p;
       gsk_curve_get_point (curve, t, &p);
@@ -2451,136 +2201,6 @@ gsk_curve_get_closest_point (const GskCurve         *curve,
     return find_closest_point (curve, point, threshold, 0, 1, out_dist, out_t);
 }
 
-float
-gsk_curve_get_length_to (const GskCurve *curve,
-                         float           t)
-{
-  return get_class (curve->op)->get_length_to (curve, t);
-}
-
-float
-gsk_curve_get_length (const GskCurve *curve)
-{
-  return gsk_curve_get_length_to (curve, 1);
-}
-
-/* Compute the inverse of the arclength using bisection,
- * to a given precision
- */
-float
-gsk_curve_at_length (const GskCurve *curve,
-                     float           length,
-                     float           epsilon)
-{
-  return get_class (curve->op)->get_at_length (curve, length, epsilon);
-}
-
-static inline void
-_sincosf (float  angle,
-          float *out_s,
-          float *out_c)
-{
-#ifdef HAVE_SINCOSF
-      sincosf (angle, out_s, out_c);
-#else
-      *out_s = sinf (angle);
-      *out_c = cosf (angle);
-#endif
-}
-
-static void
-align_points (const graphene_point_t *p,
-              const graphene_point_t *a,
-              const graphene_point_t *b,
-              graphene_point_t       *q,
-              int                     n)
-{
-  graphene_vec2_t n1;
-  float angle;
-  float s, c;
-
-  get_tangent (a, b, &n1);
-  angle = - atan2f (graphene_vec2_get_y (&n1), graphene_vec2_get_x (&n1));
-  _sincosf (angle, &s, &c);
-
-  for (int i = 0; i < n; i++)
-    {
-      q[i].x = (p[i].x - a->x) * c - (p[i].y - a->y) * s;
-      q[i].y = (p[i].x - a->x) * s + (p[i].y - a->y) * c;
-    }
-}
-
-static int
-filter_allowable (float t[3],
-                  int   n)
-{
-  float g[3];
-  int j = 0;
-
-  for (int i = 0; i < n; i++)
-    if (0 < t[i] && t[i] < 1)
-      g[j++] = t[i];
-  for (int i = 0; i < j; i++)
-    t[i] = g[i];
-  return j;
-}
-
-/* find solutions for at^2 + bt + c = 0 */
-static int
-solve_quadratic (float a, float b, float c, float t[2])
-{
-  float d;
-  int n = 0;
-
-  if (fabsf (a) > 0.0001)
-    {
-      if (b*b > 4*a*c)
-        {
-          d = sqrtf (b*b - 4*a*c);
-          t[n++] = (-b + d)/(2*a);
-          t[n++] = (-b - d)/(2*a);
-        }
-      else
-        {
-          t[n++] = -b / (2*a);
-        }
-    }
-  else if (fabsf (b) > 0.0001)
-    {
-      t[n++] = -c / b;
-    }
-
-  return n;
-}
-
-int
-gsk_curve_get_curvature_points (const GskCurve *curve,
-                                float           t[3])
-{
-  const graphene_point_t *pts = curve->cubic.points;
-  graphene_point_t p[4];
-  float a, b, c, d;
-  float x, y, z;
-  int n;
-
-  if (curve->op != GSK_PATH_CUBIC)
-    return 0; /* FIXME */
-
-  align_points (pts, &pts[0], &pts[3], p, 4);
-
-  a = p[2].x * p[1].y;
-  b = p[3].x * p[1].y;
-  c = p[1].x * p[2].y;
-  d = p[3].x * p[2].y;
-
-  x = - 3*a + 2*b + 3*c - d;
-  y = 3*a - b - 3*c;
-  z = c - a;
-
-  n = solve_quadratic (x, y, z, t);
-  return filter_allowable (t, n);
-}
-
 /* }}} */
 
 /* vim:set foldmethod=marker expandtab: */

gsk/gskcurveprivate.h

@@ -164,9 +164,6 @@ void                    gsk_curve_get_bounds                    (const GskCurve
 void                    gsk_curve_get_tight_bounds              (const GskCurve         *curve,
                                                                  GskBoundingBox         *bounds);
 
-void                    gsk_curve_get_derivative_at             (const GskCurve         *curve,
-                                                                 float                   t,
-                                                                 graphene_point_t       *value);
 int                     gsk_curve_get_crossing                  (const GskCurve         *curve,
                                                                  const graphene_point_t *point);
 gboolean                gsk_curve_get_closest_point             (const GskCurve         *curve,
@@ -174,16 +171,6 @@ gboolean                gsk_curve_get_closest_point             (const GskCurve
                                                                  float                   threshold,
                                                                  float                  *out_dist,
                                                                  float                  *out_t);
-float                  gsk_curve_get_length                     (const GskCurve         *curve);
-float                  gsk_curve_get_length_to                  (const GskCurve         *curve,
-                                                                 float                   t);
-float                  gsk_curve_at_length                      (const GskCurve         *curve,
-                                                                 float                   distance,
-                                                                 float                   epsilon);
-
-int                    gsk_curve_get_curvature_points           (const GskCurve *        curve,
-                                                                 float                   t[3]);
-
 
 G_END_DECLS
 

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 {
@@ -241,6 +233,7 @@ typedef enum {
 /**
  * GskLineJoin:
  * @GSK_LINE_JOIN_MITER: Use a sharp angled corner
+ * @GSK_LINE_JOIN_MITER_CLIP: Use a sharp, angled corner, at a distance
  * @GSK_LINE_JOIN_ROUND: Use a round join, the center of the circle is
  *   the join point
  * @GSK_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
@@ -248,22 +241,18 @@ typedef enum {
  *
  * Specifies how to render the junction of two lines when stroking.
  *
+ * See [method@Gsk.Stroke.set_miter_limit] for details on the difference
+ * between `GSK_LINE_JOIN_MITER` and `GSK_LINE_JOIN_MITER_CLIP`.
+ *
  * The default line join style is `GSK_LINE_JOIN_MITER`.
  *
  * 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 {
   GSK_LINE_JOIN_MITER,
+  GSK_LINE_JOIN_MITER_CLIP,
   GSK_LINE_JOIN_ROUND,
   GSK_LINE_JOIN_BEVEL,
 } GskLineJoin;
@@ -281,11 +270,11 @@ typedef enum {
  * @GSK_PATH_CUBIC: A curve-to operation describing a cubic Bézier curve with 4
  *   points describing the start point, the two control points and the end point
  *   of the curve.
- * @GSK_PATH_CONIC: A rational quadratic Bézier curve with 3 points describing
+ * @GSK_PATH_CONIC: A weighted quadratic Bézier curve with 3 points describing
  *   the start point, control point and end point of the curve. A weight for the
  *   curve will be passed, too.
  *
- * Path operations are used to describe the segments of a `GskPath`.
+ * Path operations are used to described segments of a `GskPath`.
  *
  * More values may be added in the future.
  *
@@ -302,34 +291,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

@@ -23,33 +23,24 @@
 
 #include "gskcurveprivate.h"
 #include "gskpathbuilder.h"
-#include "gskpathpoint.h"
-#include "gskcontourprivate.h"
+#include "gskpathpointprivate.h"
 
 /**
  * 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
@@ -66,8 +57,6 @@ struct _GskPath
 
 G_DEFINE_BOXED_TYPE (GskPath, gsk_path, gsk_path_ref, gsk_path_unref)
 
-/* {{{ Private API */
-
 GskPath *
 gsk_path_new_from_contours (const GSList *contours)
 {
@@ -112,31 +101,6 @@ gsk_path_new_from_contours (const GSList *contours)
   return path;
 }
 
-const GskContour *
-gsk_path_get_contour (const GskPath *self,
-                      gsize          i)
-{
-  if (i < self->n_contours)
-    return self->contours[i];
-  else
-    return NULL;
-}
-
-GskPathFlags
-gsk_path_get_flags (const GskPath *self)
-{
-  return self->flags;
-}
-
-gsize
-gsk_path_get_n_contours (const GskPath *self)
-{
-  return self->n_contours;
-}
-
-/* }}} */
-/* {{{ Public API */
-
 /**
  * gsk_path_ref:
  * @self: a `GskPath`
@@ -180,6 +144,19 @@ gsk_path_unref (GskPath *self)
   g_free (self);
 }
 
+const GskContour *
+gsk_path_get_contour (GskPath *path,
+                      gsize    i)
+{
+  return path->contours[i];
+}
+
+GskPathFlags
+gsk_path_get_flags (GskPath *self)
+{
+  return self->flags;
+}
+
 /**
  * gsk_path_print:
  * @self: a `GskPath`
@@ -188,9 +165,11 @@ gsk_path_unref (GskPath *self)
  * Converts @self into a human-readable string representation suitable
  * for printing.
  *
- * The string is compatible with (a superset of)
+ * The string is compatible with
  * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData),
- * see [func@Gsk.Path.parse] for a summary of the syntax.
+ * with the exception that conic curves will generate a string of the
+ * form "O x1 y1, x2 y2, w" where x1, y1 is the control point, x2, y2
+ * is the end point, and w is the weight.
  *
  * Since: 4.14
  */
@@ -262,11 +241,21 @@ gsk_path_to_cairo_add_op (GskPathOperation        op,
       cairo_line_to (cr, pts[1].x, pts[1].y);
       break;
 
+    case GSK_PATH_QUAD:
+      {
+        double x, y;
+        cairo_get_current_point (cr, &x, &y);
+        cairo_curve_to (cr,
+                        1/3.f * x + 2/3.f * pts[1].x, 1/3.f * y + 2/3.f * pts[1].y,
+                        2/3.f * pts[1].x + 1/3.f * pts[2].x, 2/3.f * pts[1].y + 1/3.f * pts[2].y,
+                        pts[2].x, pts[2].y);
+      }
+      break;
+
     case GSK_PATH_CUBIC:
       cairo_curve_to (cr, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
       break;
 
-    case GSK_PATH_QUAD:
     case GSK_PATH_CONIC:
     default:
       g_assert_not_reached ();
@@ -306,6 +295,20 @@ gsk_path_to_cairo (GskPath *self,
                                    cr);
 }
 
+/*< private >
+ * gsk_path_get_n_contours:
+ * @path: a `GskPath`
+ *
+ * Gets the number of contours @path is composed out of.
+ *
+ * Returns: the number of contours in @path
+ */
+gsize
+gsk_path_get_n_contours (GskPath *path)
+{
+  return path->n_contours;
+}
+
 /**
  * gsk_path_is_empty:
  * @self: a `GskPath`
@@ -365,7 +368,7 @@ gsk_path_is_closed (GskPath *self)
  * If the path is empty, `FALSE` is returned and @bounds are set to
  * graphene_rect_zero(). This is different from the case where the path
  * is a single point at the origin, where the @bounds will also be set to
- * the zero rectangle but `TRUE` will be returned.
+ * the zero rectangle but 0 will be returned.
  *
  * Returns: `TRUE` if the path has bounds, `FALSE` if the path is known
  *   to be empty and have no bounds.
@@ -376,33 +379,35 @@ gboolean
 gsk_path_get_bounds (GskPath         *self,
                      graphene_rect_t *bounds)
 {
-  GskBoundingBox b;
+  gsize i;
 
   g_return_val_if_fail (self != NULL, FALSE);
   g_return_val_if_fail (bounds != NULL, FALSE);
 
-  if (self->n_contours == 0)
+  for (i = 0; i < self->n_contours; i++)
+    {
+      if (gsk_contour_get_bounds (self->contours[i], bounds))
+        break;
+    }
+
+  if (i >= self->n_contours)
     {
       graphene_rect_init_from_rect (bounds, graphene_rect_zero ());
       return FALSE;
     }
 
-  gsk_contour_get_bounds (self->contours[0], &b);
-
-  for (gsize i = 1; i < self->n_contours; i++)
+  for (i++; i < self->n_contours; i++)
     {
-      GskBoundingBox tmp;
+      graphene_rect_t tmp;
 
-      gsk_contour_get_bounds (self->contours[i], &tmp);
-      gsk_bounding_box_union (&b, &tmp, &b);
+      if (gsk_contour_get_bounds (self->contours[i], &tmp))
+        graphene_rect_union (bounds, &tmp, bounds);
     }
 
-  gsk_bounding_box_to_rect (&b, bounds);
-
   return TRUE;
 }
 
-/**
+/*< private >
  * gsk_path_get_stroke_bounds:
  * @self: a #GtkPath
  * @stroke: stroke parameters
@@ -417,38 +422,38 @@ gsk_path_get_bounds (GskPath         *self,
  * like miters.
  *
  * Returns: `TRUE` if the path has bounds, `FALSE` if the path is known
- *   to be empty and have no bounds.
- *
- * Since: 4.14
+ *     to be empty and have no bounds.
  */
 gboolean
 gsk_path_get_stroke_bounds (GskPath         *self,
                             const GskStroke *stroke,
                             graphene_rect_t *bounds)
 {
-  GskBoundingBox b;
+  gsize i;
 
   g_return_val_if_fail (self != NULL, FALSE);
   g_return_val_if_fail (bounds != NULL, FALSE);
 
-  if (self->n_contours == 0)
+  for (i = 0; i < self->n_contours; i++)
+    {
+      if (gsk_contour_get_stroke_bounds (self->contours[i], stroke, bounds))
+        break;
+    }
+
+  if (i >= self->n_contours)
     {
       graphene_rect_init_from_rect (bounds, graphene_rect_zero ());
       return FALSE;
     }
 
-  gsk_contour_get_stroke_bounds (self->contours[0], stroke, &b);
-
-  for (gsize i = 1; i < self->n_contours; i++)
+  for (i++; i < self->n_contours; i++)
     {
-      GskBoundingBox tmp;
+      graphene_rect_t tmp;
 
       if (gsk_contour_get_stroke_bounds (self->contours[i], stroke, &tmp))
-        gsk_bounding_box_union (&b, &tmp, &b);
+        graphene_rect_union (bounds, &tmp, bounds);
     }
 
-  gsk_bounding_box_to_rect (&b, bounds);
-
   return TRUE;
 }
 
@@ -490,79 +495,12 @@ 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)
-{
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  /* Conceptually, there is always a move at the
-   * beginning, which jumps from where to the start
-   * point of the contour, so we use idx == 1 here.
-   */
-  result->contour = 0;
-  result->idx = 1;
-  result->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)
-{
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  result->contour = self->n_contours - 1;
-  result->idx = gsk_contour_get_n_ops (self->contours[self->n_contours - 1]) - 1;
-  result->t = 1;
-
-  return TRUE;
-}
-
 /**
  * gsk_path_get_closest_point:
  * @self: a `GskPath`
  * @point: the point
  * @threshold: maximum allowed distance
  * @result: (out caller-allocates): return location for the closest point
- * @distance: (out) (optional): return location for the distance
  *
  * Computes the closest point on the path to the given point
  * and sets the @result to it.
@@ -579,39 +517,31 @@ gboolean
 gsk_path_get_closest_point (GskPath                *self,
                             const graphene_point_t *point,
                             float                   threshold,
-                            GskPathPoint           *result,
-                            float                  *distance)
+                            GskPathPoint           *result)
 {
-  gboolean found;
+  GskRealPathPoint *res = (GskRealPathPoint *) result;
 
   g_return_val_if_fail (self != NULL, FALSE);
   g_return_val_if_fail (point != NULL, FALSE);
   g_return_val_if_fail (threshold >= 0, FALSE);
   g_return_val_if_fail (result != NULL, FALSE);
 
-  found = FALSE;
-
   for (int i = 0; i < self->n_contours; i++)
     {
-      float dist;
+      float distance;
 
-      if (gsk_contour_get_closest_point (self->contours[i], point, threshold, result, &dist))
+      if (gsk_contour_get_closest_point (self->contours[i], point, threshold, res, &distance))
         {
-          found = TRUE;
-          g_assert (0 <= result->t && result->t <= 1);
-          result->contour = i;
-          threshold = dist;
-
-          if (distance)
-            *distance = dist;
+          res->contour = self->contours[i];
+          threshold = distance;
         }
     }
 
-  return found;
-}
+  if (res->contour != NULL)
+    return TRUE;
 
-/* }}} */
-/* {{{ Foreach and decomposition */
+  return FALSE;
+}
 
 /**
  * gsk_path_foreach:
@@ -623,17 +553,10 @@ gsk_path_get_closest_point (GskPath                *self,
  *
  * Calls @func for every operation of the path.
  *
- * Note that this may only approximate @self, because paths can contain
- * optimizations for various specialized contours, and depending on the
- * @flags, the path may be decomposed into simpler curves than the ones
- * that it contained originally.
- *
- * This function serves two purposes:
- *
- * - When the @flags allow everything, it provides access to the raw,
- *   unmodified data of the path.
- * - When the @flags disallow certain operations, it provides
- *   an approximation of the path using just the allowed operations.
+ * Note that this only approximates @self, because paths can contain
+ * optimizations for various specialized contours, and depending on
+ * the @flags, the path may be decomposed into simpler curves than
+ * the ones that it contained originally.
  *
  * Returns: `FALSE` if @func returned FALSE`, `TRUE` otherwise.
  *
@@ -677,7 +600,7 @@ gsk_path_foreach_trampoline_add_line (const graphene_point_t *from,
   return trampoline->func (GSK_PATH_LINE,
                            (graphene_point_t[2]) { *from, *to },
                            2,
-                           0.f,
+                           0.0f,
                            trampoline->user_data);
 }
 
@@ -715,21 +638,6 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
 
         if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_QUAD)
           return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);
-        else if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CUBIC)
-          {
-            return trampoline->func (GSK_PATH_CUBIC,
-                                     (graphene_point_t[4]) {
-                                       pts[0],
-                                       GRAPHENE_POINT_INIT ((pts[0].x + 2 * pts[1].x) / 3,
-                                                            (pts[0].y + 2 * pts[1].y) / 3),
-                                       GRAPHENE_POINT_INIT ((pts[2].x + 2 * pts[1].x) / 3,
-                                                            (pts[2].y + 2 * pts[1].y) / 3),
-                                       pts[2],
-                                     },
-                                     4,
-                                     weight,
-                                     trampoline->user_data);
-          }
 
         gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_QUAD, pts));
         return gsk_curve_decompose (&curve,
@@ -766,7 +674,7 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
         if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CONIC)
           return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);
 
-        gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CONIC, (graphene_point_t[4]) { pts[0], pts[1], { weight, 0.f }, pts[2] } ));
+        gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CONIC, (graphene_point_t[4]) { pts[0], pts[1], { weight, }, pts[2] } ));
         if (trampoline->flags & (GSK_PATH_FOREACH_ALLOW_QUAD|GSK_PATH_FOREACH_ALLOW_CUBIC))
           return gsk_curve_decompose_curve (&curve,
                                             trampoline->flags,
@@ -774,20 +682,21 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
                                             gsk_path_foreach_trampoline_add_curve,
                                             trampoline);
 
-        return gsk_curve_decompose (&curve,
+        return gsk_curve_decompose (&curve, 
                                     trampoline->tolerance,
                                     gsk_path_foreach_trampoline_add_line,
                                     trampoline);
       }
 
+
     default:
       g_assert_not_reached ();
       return FALSE;
     }
 }
 
-#define ALLOW_ANY (GSK_PATH_FOREACH_ALLOW_QUAD  | \
-                   GSK_PATH_FOREACH_ALLOW_CUBIC | \
+#define ALLOW_ANY (GSK_PATH_FOREACH_ALLOW_QUAD| \
+                   GSK_PATH_FOREACH_ALLOW_CUBIC| \
                    GSK_PATH_FOREACH_ALLOW_CONIC)
 
 gboolean
@@ -810,15 +719,14 @@ gsk_path_foreach_with_tolerance (GskPath             *self,
 
   for (i = 0; i < self->n_contours; i++)
     {
-      if (!gsk_contour_foreach (self->contours[i], func, user_data))
+      if (!gsk_contour_foreach (self->contours[i], tolerance, func, user_data))
         return FALSE;
     }
 
   return TRUE;
 }
 
-/* }}} */
-/* {{{ Parser and utilities */
+/* path parser and utilities */
 
 static void
 skip_whitespace (const char **p)
@@ -947,7 +855,7 @@ parse_command (const char **p,
   if (*cmd == 'X')
     allowed = "mM";
   else
-    allowed = "mMhHvVzZlLcCsStTqQaAoO";
+    allowed = "mMhHvVzZlLcCsStTqQoOaA";
 
   skip_whitespace (p);
   s = _strchr (allowed, **p);
@@ -963,7 +871,7 @@ parse_command (const char **p,
 static gboolean
 parse_string (const char **p,
               const char  *s)
-{ 
+{
   int len = strlen (s);
   if (strncmp (*p, s, len) != 0)
     return FALSE;
@@ -971,33 +879,6 @@ parse_string (const char **p,
   return TRUE;
 }
 
-#define NEAR(x, y) (fabs ((x) - (y)) < 0.001)
-
-static gboolean
-is_rect (double x0, double y0,
-         double x1, double y1,
-         double x2, double y2,
-         double x3, double y3)
-{
-  return NEAR (x0, x3) && NEAR (x1, x2) &&
-         NEAR (y0, y1) && NEAR (y2, y3) &&
-         x0 < x1 && y1 < y2;
-}
-
-static gboolean
-is_line (double x0, double y0,
-         double x1, double y1,
-         double x2, double y2,
-         double x3, double y3)
-{
-  if (NEAR (y0, y3))
-    return x0 <= x1 && x1 <= x2 && x2 <= x3 &&
-           NEAR (y0, y1) && NEAR (y0, y2) && NEAR (y0, y3);
-  else
-    return y0 <= y1 && y1 <= y2 && y2 <= y3 &&
-           NEAR (x0, x1) && NEAR (x0, x2) && NEAR (x0, x3);
-}
-
 static gboolean
 parse_rectangle (const char **p,
                  double      *x,
@@ -1008,6 +889,7 @@ parse_rectangle (const char **p,
   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) &&
@@ -1016,7 +898,7 @@ parse_rectangle (const char **p,
       parse_string (p, "h") &&
       parse_coordinate (p, &w2) &&
       parse_string (p, "z") &&
-      w2 == -*w && *w >= 0 && *h >= 0)
+      w2 == - *w)
     {
       skip_whitespace (p);
 
@@ -1029,126 +911,38 @@ parse_rectangle (const char **p,
 
 static gboolean
 parse_circle (const char **p,
-              double      *cx,
-              double      *cy,
+              double      *sx,
+              double      *sy,
               double      *r)
 {
   const char *o = *p;
-  double x0, y0, x1, y1, x2, y2, x3, y3;
-  double x4, y4, x5, y5, x6, y6, x7, y7;
-  double x8, y8, w0, w1, w2, w3;
-  double rr;
+  double r1, r2, r3, mx, my, ex, ey;
 
-  if (parse_coordinate_pair (p, &x0, &y0) &&
-      parse_string (p, "o") &&
-      parse_coordinate_pair (p, &x1, &y1) &&
-      parse_coordinate_pair (p, &x2, &y2) &&
-      parse_nonnegative_number (p, &w0) &&
-      parse_string (p, "o") &&
-      parse_coordinate_pair (p, &x3, &y3) &&
-      parse_coordinate_pair (p, &x4, &y4) &&
-      parse_nonnegative_number (p, &w1) &&
-      parse_string (p, "o") &&
-      parse_coordinate_pair (p, &x5, &y5) &&
-      parse_coordinate_pair (p, &x6, &y6) &&
-      parse_nonnegative_number (p, &w2) &&
-      parse_string (p, "o") &&
-      parse_coordinate_pair (p, &x7, &y7) &&
-      parse_coordinate_pair (p, &x8, &y8) &&
-      parse_nonnegative_number (p, &w3) &&
-      parse_string (p, "z"))
+  /* 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)
     {
-      rr = y1;
+      skip_whitespace (p);
 
-      if (x1 == 0   && y1 == rr  &&
-          x2 == -rr && y2 == rr  &&
-          x3 == -rr && y3 == 0   &&
-          x4 == -rr && y4 == -rr &&
-          x5 == 0   && y5 == -rr &&
-          x6 == rr  && y6 == -rr &&
-          x7 == rr  && y7 == 0   &&
-          x8 == rr  && y8 == rr &&
-          NEAR (w0, M_SQRT1_2) && NEAR (w1, M_SQRT1_2) &&
-          NEAR (w2, M_SQRT1_2) && NEAR (w3, M_SQRT1_2))
-        {
-          *cx = x0 - rr;
-          *cy = y0;
-          *r = rr;
-
-          skip_whitespace (p);
-
-          return TRUE;
-        }
+      return TRUE;
     }
 
   *p = o;
   return FALSE;
 }
 
-static gboolean
-parse_rounded_rect (const char     **p,
-                    GskRoundedRect  *rr)
-{
-  const char *o = *p;
-  double x0, y0, x1, y1, x2, y2, x3, y3;
-  double x4, y4, x5, y5, x6, y6, x7, y7;
-  double x8, y8, x9, y9, x10, y10, x11, y11;
-  double x12, y12, w0, w1, w2, w3;
-
-  if (parse_coordinate_pair (p, &x0, &y0) &&
-      parse_string (p, "L") &&
-      parse_coordinate_pair (p, &x1, &y1) &&
-      parse_string (p, "O") &&
-      parse_coordinate_pair (p, &x2, &y2) &&
-      parse_coordinate_pair (p, &x3, &y3) &&
-      parse_nonnegative_number (p, &w0) &&
-      parse_string (p, "L") &&
-      parse_coordinate_pair (p, &x4, &y4) &&
-      parse_string (p, "O") &&
-      parse_coordinate_pair (p, &x5, &y5) &&
-      parse_coordinate_pair (p, &x6, &y6) &&
-      parse_nonnegative_number (p, &w1) &&
-      parse_string (p, "L") &&
-      parse_coordinate_pair (p, &x7, &y7) &&
-      parse_string (p, "O") &&
-      parse_coordinate_pair (p, &x8, &y8) &&
-      parse_coordinate_pair (p, &x9, &y9) &&
-      parse_nonnegative_number (p, &w2) &&
-      parse_string (p, "L") &&
-      parse_coordinate_pair (p, &x10, &y10) &&
-      parse_string (p, "O") &&
-      parse_coordinate_pair (p, &x11, &y11) &&
-      parse_coordinate_pair (p, &x12, &y12) &&
-      parse_nonnegative_number (p, &w3) &&
-      parse_string (p, "Z"))
-    {
-      if (NEAR (x0, x12) && NEAR (y0, y12) &&
-          is_rect (x11, y11, x2, y2, x5, y5, x8, y8) &&
-          is_line (x11, y11, x0, y0, x1, y1, x2, y2) &&
-          is_line (x2, y2, x3, y3, x4, y4, x5, y5) &&
-          is_line (x8, y8, x7, y7, x6, y6, x5, y5) &&
-          is_line (x11, y11, x10, y10, x9, y9, x8, y8) &&
-          NEAR (w0, M_SQRT1_2) && NEAR (w1, M_SQRT1_2) &&
-          NEAR (w2, M_SQRT1_2) && NEAR (w3, M_SQRT1_2))
-        {
-          rr->bounds = GRAPHENE_RECT_INIT (x11, y11, x5 - x11, y5 - y11);
-          rr->corner[GSK_CORNER_TOP_LEFT] = GRAPHENE_SIZE_INIT (x12 - x11, y10 - y11);
-          rr->corner[GSK_CORNER_TOP_RIGHT] = GRAPHENE_SIZE_INIT (x2 - x1, y3 - y2);
-          rr->corner[GSK_CORNER_BOTTOM_RIGHT] = GRAPHENE_SIZE_INIT (x5 - x6, y5 - y4);
-          rr->corner[GSK_CORNER_BOTTOM_LEFT] = GRAPHENE_SIZE_INIT (x7 - x8, y8 - y7);
-
-          skip_whitespace (p);
-
-          return TRUE;
-        }
-    }
-
-  *p = o;
-  return FALSE;
-}
-
-#undef NEAR
-
 /**
  * gsk_path_parse:
  * @string: a string
@@ -1156,30 +950,12 @@ parse_rounded_rect (const char     **p,
  * This is a convenience function that constructs a `GskPath`
  * from a serialized form.
  *
- * The string is expected to be in (a superset of)
+ * The string is expected to be in
  * [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.
- * - `O x1 y1 x2 y2 w` Add a rational quadratic Bézier from the current point to `(x2, y2)` with control point `(x1, y1)` and weight `w`.
- *
- * All the commands have lowercase variants that interpret coordinates
- * relative to the current point.
- *
- * The `O` command is an extension that is not supported in SVG.
- *
- * Returns: (nullable): a new `GskPath`, or `NULL` if @string could not be parsed
+ * Returns: (nullable): a new `GskPath`, or `NULL`
+ *   if @string could not be parsed
  *
  * Since: 4.14
  */
@@ -1234,9 +1010,7 @@ gsk_path_parse (const char *string)
         case 'm':
           {
             double x1, y1, w, h, r;
-            GskRoundedRect rr;
 
-            /* Look for special contours */
             if (parse_rectangle (&p, &x1, &y1, &w, &h))
               {
                 gsk_path_builder_add_rect (builder, &GRAPHENE_RECT_INIT (x1, y1, w, h));
@@ -1245,36 +1019,20 @@ gsk_path_parse (const char *string)
                     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, y1), r);
-
+                gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (x1 - r, y1), r);
                 if (_strchr ("zZX", prev_cmd))
                   {
-                    path_x = x1 + r;
+                    path_x = x1;
                     path_y = y1;
                   }
-
-                x = x1 + r;
+                x = x1;
                 y = y1;
               }
-            else if (parse_rounded_rect (&p, &rr))
-              {
-                gsk_path_builder_add_rounded_rect (builder, &rr);
-
-                if (_strchr ("zZX", prev_cmd))
-                  {
-                    path_x = rr.bounds.origin.x + rr.corner[GSK_CORNER_TOP_LEFT].width;
-                    path_y = rr.bounds.origin.y;
-                  }
-
-                x = rr.bounds.origin.x + rr.corner[GSK_CORNER_TOP_LEFT].width;
-                y = rr.bounds.origin.y;
-              }
             else if (parse_coordinate_pair (&p, &x1, &y1))
               {
                 if (cmd == 'm')
@@ -1282,7 +1040,6 @@ gsk_path_parse (const char *string)
                     x1 += x;
                     y1 += y;
                   }
-
                 if (repeat)
                   gsk_path_builder_line_to (builder, x1, y1);
                 else
@@ -1294,7 +1051,6 @@ gsk_path_parse (const char *string)
                         path_y = y1;
                       }
                   }
-
                 x = x1;
                 y = y1;
               }
@@ -1534,7 +1290,7 @@ gsk_path_parse (const char *string)
                 parse_coordinate_pair (&p, &x2, &y2) &&
                 parse_nonnegative_number (&p, &weight))
               {
-                if (cmd == 'o')
+                if (cmd == 'c')
                   {
                     x1 += x;
                     y1 += y;
@@ -1542,7 +1298,7 @@ gsk_path_parse (const char *string)
                     y2 += y;
                   }
                 if (_strchr ("zZ", prev_cmd))
-                  { 
+                  {
                     gsk_path_builder_move_to (builder, x, y);
                     path_x = x;
                     path_y = y;
@@ -1613,7 +1369,3 @@ error:
 
   return NULL;
 }
-
-/* }}} */
-
-/* vim:set foldmethod=marker expandtab: */

gsk/gskpath.h

@@ -30,50 +30,37 @@ G_BEGIN_DECLS
 
 /**
  * GskPathForeachFlags:
- * @GSK_PATH_FOREACH_ALLOW_ONLY_LINES: The default behavior, only allow lines.
  * @GSK_PATH_FOREACH_ALLOW_QUAD: Allow emission of `GSK_PATH_QUAD` operations
  * @GSK_PATH_FOREACH_ALLOW_CUBIC: Allow emission of `GSK_PATH_CUBIC` operations.
  * @GSK_PATH_FOREACH_ALLOW_CONIC: Allow emission of `GSK_PATH_CONIC` operations.
  *
- * Flags that can be passed to gsk_path_foreach() to influence what
- * kinds of operations the path is decomposed into.
+ * Flags that can be passed to gsk_path_foreach() to enable additional
+ * features.
  *
- * 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
+ * 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`.
  */
 typedef enum
 {
-  GSK_PATH_FOREACH_ALLOW_ONLY_LINES = 0,
-  GSK_PATH_FOREACH_ALLOW_QUAD       = (1 << 0),
-  GSK_PATH_FOREACH_ALLOW_CUBIC      = (1 << 1),
-  GSK_PATH_FOREACH_ALLOW_CONIC      = (1 << 2),
+  GSK_PATH_FOREACH_ALLOW_QUAD  = (1 << 0),
+  GSK_PATH_FOREACH_ALLOW_CUBIC = (1 << 1),
+  GSK_PATH_FOREACH_ALLOW_CONIC = (1 << 2),
 } GskPathForeachFlags;
 
 /**
  * GskPathForeachFunc:
- * @op: The operation
+ * @op: The operation to perform
  * @pts: The points of the operation
  * @n_pts: The number of points
- * @weight: The weight for conic curves, or unused if not a conic curve
+ * @weight: The weight for conic curves, or unused if not a conic curve.
  * @user_data: The user data provided with the function
  *
- * Prototype of the callback to iterate through the operations of
+ * Prototype of the callback to iterate throught the operations of
  * a path.
  *
- * For each operation, the callback is given the @op itself, the points
- * that the operation is applied to in @pts, and a @weight for conic
- * curves. The @n_pts argument is somewhat redundant, since the number
- * of points can be inferred from the operation.
- *
- * Each contour of the path starts with a @GSK_PATH_MOVE operation.
- * Closed contours end with a @GSK_PATH_CLOSE operation.
- *
- * Returns: %TRUE to continue iterating the path, %FALSE to
- *   immediately abort and not call the function again.
+ * Returns: %TRUE to continue evaluating the path, %FALSE to
+ *     immediately abort and not call the function again.
  */
 typedef gboolean (* GskPathForeachFunc) (GskPathOperation        op,
                                          const graphene_point_t *pts,
@@ -114,29 +101,16 @@ GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_get_bounds                     (GskPath                *self,
                                                                  graphene_rect_t        *bounds);
 
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_stroke_bounds              (GskPath                *self,
-                                                                 const GskStroke        *stroke,
-                                                                 graphene_rect_t        *bounds);
-
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_in_fill                        (GskPath                *self,
                                                                  const graphene_point_t *point,
                                                                  GskFillRule             fill_rule);
 
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_start_point                (GskPath                *self,
-                                                                 GskPathPoint           *result);
-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,
-                                                                 float                  *distance);
+                                                                 GskPathPoint           *result);
 
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_foreach                        (GskPath                *self,
@@ -147,6 +121,7 @@ gboolean                gsk_path_foreach                        (GskPath
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_dash                           (GskPath                *self,
                                                                  GskStroke              *stroke,
+                                                                 float                   tolerance,
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
 

gsk/gskpathbuilder.c

@@ -24,7 +24,6 @@
 #include "gskpathbuilder.h"
 
 #include "gskpathprivate.h"
-#include "gskpathpointprivate.h"
 #include "gskcontourprivate.h"
 
 /**
@@ -54,9 +53,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
@@ -65,9 +61,7 @@
  * [method@Gsk.PathBuilder.close] to close the path by connecting it
  * back with a line to the starting point.
  *
- * This is similar to how paths are drawn in Cairo.
- *
- * Since: 4.14
+ * This is similar for how paths are drawn in Cairo.
  */
 
 struct _GskPathBuilder
@@ -241,7 +235,7 @@ gsk_path_builder_unref (GskPathBuilder *self)
  * @self: a `GskPathBuilder`
  *
  * Creates a new `GskPath` from the current state of the
- * given builder, and unrefs the @builder instance.
+ * given builder, and frees the @builder instance.
  *
  * Returns: (transfer full): the newly created `GskPath`
  *   with all the contours added to the builder
@@ -311,14 +305,10 @@ gsk_path_builder_add_contour (GskPathBuilder *self,
  * gsk_path_builder_get_current_point:
  * @self: a `GskPathBuilder`
  *
- * Gets the current point.
+ * Gets the current point. The current point is used for relative
+ * drawing commands and updated after every operation.
  *
- * The current point is used for relative drawing commands and
- * updated after every operation.
- *
- * When the builder is created, the default current point is set
- * to `0, 0`. Note that this is different from cairo, which starts
- * out without a current point.
+ * When the builder is created, the default current point is set to (0, 0).
  *
  * Returns: (transfer none): The current point
  *
@@ -395,13 +385,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];
@@ -432,9 +418,6 @@ gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
           break;
         }
     }
-
-  gsk_path_builder_end_current (self);
-  self->current_point = current;
 }
 
 /**
@@ -444,7 +427,8 @@ 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.
  *
  * If the the width or height are 0, the path will be a closed
  * horizontal or vertical line. If both are 0, it'll be a closed dot.
@@ -455,13 +439,14 @@ void
 gsk_path_builder_add_rect (GskPathBuilder        *self,
                            const graphene_rect_t *rect)
 {
-  graphene_rect_t r;
+  GskContour *contour;
 
   g_return_if_fail (self != NULL);
-  g_return_if_fail (rect != NULL);
 
-  graphene_rect_normalize_r (rect, &r);
-  gsk_path_builder_add_contour (self, gsk_rect_contour_new (&r));
+  contour = gsk_rect_contour_new (rect);
+  gsk_path_builder_add_contour (self, contour);
+
+  gsk_contour_get_start_end (contour, NULL, &self->current_point);
 }
 
 /**
@@ -471,18 +456,19 @@ gsk_path_builder_add_rect (GskPathBuilder        *self,
  *
  * 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)
 {
+  GskContour *contour;
+
   g_return_if_fail (self != NULL);
   g_return_if_fail (rect != NULL);
 
-  gsk_path_builder_add_contour (self, gsk_rounded_rect_contour_new (rect));
+  contour = gsk_rounded_rect_contour_new (rect);
+  gsk_path_builder_add_contour (self, contour);
 }
 
 /**
@@ -493,10 +479,6 @@ gsk_path_builder_add_rounded_rect (GskPathBuilder       *self,
  *
  * Adds a circle with the @center and @radius.
  *
- * The path is going around the circle in clockwise direction.
- *
- * If @radius is zero, the contour will be a closed point.
- *
  * Since: 4.14
  */
 void
@@ -504,11 +486,58 @@ gsk_path_builder_add_circle (GskPathBuilder         *self,
                              const graphene_point_t *center,
                              float                   radius)
 {
+  GskContour *contour;
+
   g_return_if_fail (self != NULL);
   g_return_if_fail (center != NULL);
-  g_return_if_fail (radius >= 0);
+  g_return_if_fail (radius > 0);
 
-  gsk_path_builder_add_contour (self, gsk_circle_contour_new (center, radius));
+  contour = gsk_circle_contour_new (center, radius, 0, 360);
+  gsk_path_builder_add_contour (self, contour);
+}
+
+/**
+ * gsk_path_builder_add_ellipse:
+ * @self: a #GskPathBuilder
+ * @center: the center point of the ellipse
+ * @radius: the radius of the ellipse in x/y direction
+ *
+ * Adds an ellipse with the given @center and the @radius in
+ * x/y direction.
+ *
+ * Since: 4.14
+ */
+void
+gsk_path_builder_add_ellipse (GskPathBuilder         *self,
+                              const graphene_point_t *center,
+                              const graphene_size_t  *radius)
+{
+  const float weight = M_SQRT1_2;
+  graphene_point_t pts[8];
+  float w, h;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (center != NULL);
+  g_return_if_fail (radius != NULL);
+
+  w = radius->width / 2;
+  h = radius->height / 2;
+
+  pts[0] = GRAPHENE_POINT_INIT (center->x + w, center->y);
+  pts[1] = GRAPHENE_POINT_INIT (center->x + w, center->y + h);
+  pts[2] = GRAPHENE_POINT_INIT (center->x,     center->y + h);
+  pts[3] = GRAPHENE_POINT_INIT (center->x - w, center->y + h);
+  pts[4] = GRAPHENE_POINT_INIT (center->x - w, center->y);
+  pts[5] = GRAPHENE_POINT_INIT (center->x - w, center->y - h);
+  pts[6] = GRAPHENE_POINT_INIT (center->x,     center->y - h);
+  pts[7] = GRAPHENE_POINT_INIT (center->x + w, center->y - h);
+
+  gsk_path_builder_move_to (self, pts[0].x, pts[0].y);
+  gsk_path_builder_conic_to (self, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
+  gsk_path_builder_conic_to (self, pts[3].x, pts[3].y, pts[4].x, pts[4].y, weight);
+  gsk_path_builder_conic_to (self, pts[5].x, pts[5].y, pts[6].x, pts[6].y, weight);
+  gsk_path_builder_conic_to (self, pts[7].x, pts[7].y, pts[0].x, pts[0].y, weight);
+  gsk_path_builder_close (self);
 }
 
 /**
@@ -545,8 +574,8 @@ gsk_path_builder_move_to (GskPathBuilder *self,
  * @x: x offset
  * @y: y offset
  *
- * Starts a new contour by placing the pen at @x, @y
- * relative to the current point.
+ * Starts a new contour by placing the pen at @x, @y relative to the current
+ * point.
  *
  * This is the relative version of [method@Gsk.PathBuilder.move_to].
  *
@@ -573,11 +602,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
@@ -605,8 +629,8 @@ gsk_path_builder_line_to (GskPathBuilder *self,
  * @x: x offset
  * @y: y offset
  *
- * Draws a line from the current point to a point offset from it
- * by @x, @y and makes it the new current point.
+ * Draws a line from the current point to a point offset to it by @x, @y
+ * and makes it the new current point.
  *
  * This is the relative version of [method@Gsk.PathBuilder.line_to].
  *
@@ -637,11 +661,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
@@ -711,11 +730,6 @@ gsk_path_builder_rel_quad_to (GskPathBuilder *self,
  *
  * After this, @x3, @y3 will be the new current point.
  *
- * <picture>
- *   <source srcset="cubic-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Cubic To" src="cubic-light.png">
- * </picture>
- *
  * Since: 4.14
  */
 void
@@ -751,9 +765,7 @@ gsk_path_builder_cubic_to (GskPathBuilder *self,
  *
  * Adds a [cubic Bézier curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve)
  * from the current point to @x3, @y3 with @x1, @y1 and @x2, @y2 as the control
- * points.
- *
- * All coordinates are given relative to the current point.
+ * points. All coordinates are given relative to the current point.
  *
  * This is the relative version of [method@Gsk.PathBuilder.cubic_to].
  *
@@ -786,25 +798,16 @@ gsk_path_builder_rel_cubic_to (GskPathBuilder *self,
  * @y1: y coordinate of control point
  * @x2: x coordinate of the end of the curve
  * @y2: y coordinate of the end of the curve
- * @weight: weight of the control point, must be greater than zero
+ * @weight: weight of the curve
  *
  * Adds a [conic curve](https://en.wikipedia.org/wiki/Non-uniform_rational_B-spline)
- * from the current point to @x2, @y2 with the given @weight and @x1, @y1 as the
- * control point.
+ * from the current point to @x2, @y2 with the given
+ * @weight and @x1, @y1 as the single control point.
  *
- * The weight determines how strongly the curve is pulled towards the control point.
- * A conic with weight 1 is identical to a quadratic Bézier curve with the same points.
- *
- * Conic curves can be used to draw ellipses and circles. They are also known as
- * rational quadratic Bézier curves.
+ * Conic curves can be used to draw ellipses and circles.
  *
  * After this, @x2, @y2 will be the new current point.
  *
- * <picture>
- *   <source srcset="conic-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Conic To" src="conic-light.png">
- * </picture>
- *
  * Since: 4.14
  */
 void
@@ -816,7 +819,7 @@ gsk_path_builder_conic_to (GskPathBuilder *self,
                            float           weight)
 {
   g_return_if_fail (self != NULL);
-  g_return_if_fail (weight > 0);
+  g_return_if_fail (weight >= 0);
 
   self->flags &= ~GSK_PATH_FLAT;
   gsk_path_builder_append_current (self,
@@ -835,13 +838,11 @@ gsk_path_builder_conic_to (GskPathBuilder *self,
  * @y1: y offset of control point
  * @x2: x offset of the end of the curve
  * @y2: y offset of the end of the curve
- * @weight: weight of the curve, must be greater than zero
+ * @weight: weight of the curve
  *
  * Adds a [conic curve](https://en.wikipedia.org/wiki/Non-uniform_rational_B-spline)
- * from the current point to @x2, @y2 with the given @weight and @x1, @y1 as the
- * control point.
- *
- * All coordinates are given relative to the current point.
+ * from the current point to @x2, @y2 with the given
+ * @weight and @x1, @y1 as the single control point.
  *
  * This is the relative version of [method@Gsk.PathBuilder.conic_to].
  *
@@ -856,7 +857,7 @@ gsk_path_builder_rel_conic_to (GskPathBuilder *self,
                                float           weight)
 {
   g_return_if_fail (self != NULL);
-  g_return_if_fail (weight > 0);
+  g_return_if_fail (weight >= 0);
 
   gsk_path_builder_conic_to (self,
                              self->current_point.x + x1,
@@ -866,76 +867,6 @@ gsk_path_builder_rel_conic_to (GskPathBuilder *self,
                              weight);
 }
 
-/**
- * gsk_path_builder_arc_to:
- * @self: a `GskPathBuilder`
- * @x1: x coordinate of first control point
- * @y1: y coordinate of first control point
- * @x2: x coordinate of second control point
- * @y2: y coordinate of second control point
- *
- * Adds an elliptical arc from the current point to @x3, @y3
- * with @x1, @y1 determining the tangent directions.
- *
- * After this, @x3, @y3 will be the new current point.
- *
- * Note: Two points and their tangents do not determine
- * a unique ellipse, so GSK just picks one. If you need more
- * precise control, use [method@Gsk.PathBuilder.conic_to]
- * or [method@Gsk.PathBuilder.svg_arc_to].
- *
- * <picture>
- *   <source srcset="arc-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Arc To" src="arc-light.png">
- * </picture>
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_arc_to (GskPathBuilder *self,
-                         float           x1,
-                         float           y1,
-                         float           x2,
-                         float           y2)
-{
-  g_return_if_fail (self != NULL);
-
-  gsk_path_builder_conic_to (self, x1, y1, x2, y2, M_SQRT1_2);
-}
-
-/**
- * gsk_path_builder_rel_arc_to:
- * @self: a `GskPathBuilder`
- * @x1: x coordinate of first control point
- * @y1: y coordinate of first control point
- * @x2: x coordinate of second control point
- * @y2: y coordinate of second control point
- *
- * Adds an elliptical arc from the current point to @x3, @y3
- * with @x1, @y1 determining the tangent directions.
- *
- * All coordinates are given relative to the current point.
- *
- * This is the relative version of [method@Gsk.PathBuilder.arc_to].
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_rel_arc_to (GskPathBuilder *self,
-                             float           x1,
-                             float           y1,
-                             float           x2,
-                             float           y2)
-{
-  g_return_if_fail (self != NULL);
-
-  gsk_path_builder_arc_to (self,
-                           self->current_point.x + x1,
-                           self->current_point.y + y1,
-                           self->current_point.x + x2,
-                           self->current_point.y + y2);
-}
-
 /**
  * gsk_path_builder_close:
  * @self: a `GskPathBuilder`
@@ -944,9 +875,9 @@ gsk_path_builder_rel_arc_to (GskPathBuilder *self,
  *
  * Note that this is different from calling [method@Gsk.PathBuilder.line_to]
  * with the start point in that the contour will be closed. A closed
- * contour behaves differently from an open one. When stroking, its
- * start and end point are considered connected, so they will be
- * joined via the line join, and not ended with line caps.
+ * contour behaves different from an open one when stroking its start
+ * and end point are considered connected, so they will be joined
+ * via the line join, and not ended with line caps.
  *
  * Since: 4.14
  */
@@ -1013,27 +944,6 @@ _sincos (double angle,
 #endif
 }
 
-/**
- * gsk_path_builder_svg_arc_to:
- * @self: a `GskPathBuilder`
- * @rx: X radius
- * @ry: Y radius
- * @x_axis_rotation: the rotation of the ellipsis
- * @large_arc: whether to add the large arc
- * @positive_sweep: whether to sweep in the positive direction
- * @x: the X coordinate of the endpoint
- * @y: the Y coordinate of the endpoint
- *
- * Implements arc-to according to the SVG spec.
- *
- * A convenience function that implements the
- * [SVG arc_to](https://www.w3.org/TR/SVG11/paths.html#PathDataEllipticalArcCommands)
- * functionality.
- *
- * After this, @x, @y will be the new current point.
- *
- * Since: 4.14
- */
 void
 gsk_path_builder_svg_arc_to (GskPathBuilder *self,
                              float           rx,
@@ -1066,8 +976,6 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
   double th_half;
   double t;
 
-  g_return_if_fail (self != NULL);
-
   if (self->points->len > 0)
     {
       current = &g_array_index (self->points, graphene_point_t, self->points->len - 1);
@@ -1167,184 +1075,13 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
     }
 }
 
-/**
- * gsk_path_builder_rel_svg_arc_to:
- * @self: a `GskPathBuilder`
- * @rx: X radius
- * @ry: Y radius
- * @x_axis_rotation: the rotation of the ellipsis
- * @large_arc: whether to add the large arc
- * @positive_sweep: whether to sweep in the positive direction
- * @x: the X coordinate of the endpoint
- * @y: the Y coordinate of the endpoint
- *
- * Implements arc-to according to the SVG spec.
- *
- * All coordinates are given relative to the current point.
- *
- * This is the relative version of [method@Gsk.PathBuilder.svg_arc_to].
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_rel_svg_arc_to (GskPathBuilder *self,
-                                 float           rx,
-                                 float           ry,
-                                 float           x_axis_rotation,
-                                 gboolean        large_arc,
-                                 gboolean        positive_sweep,
-                                 float           x,
-                                 float           y)
-{
-  gsk_path_builder_svg_arc_to (self,
-                               rx, ry,
-                               x_axis_rotation,
-                               large_arc,
-                               positive_sweep,
-                               self->current_point.x + x,
-                               self->current_point.y + y);
-}
-
-/* Return the angle between t1 and t2 in radians, such that
- * 0 means straight continuation
- * < 0 means right turn
- * > 0 means left turn
- */
-static float
-angle_between (const graphene_vec2_t *t1,
-               const graphene_vec2_t *t2)
-{
-  float angle = atan2 (graphene_vec2_get_y (t2), graphene_vec2_get_x (t2))
-                - atan2 (graphene_vec2_get_y (t1), graphene_vec2_get_x (t1));
-
-  if (angle > M_PI)
-    angle -= 2 * M_PI;
-  if (angle < - M_PI)
-    angle += 2 * M_PI;
-
-  return angle;
-}
-
-#define RAD_TO_DEG(r) ((r)*180.f/M_PI)
-#define DEG_TO_RAD(d) ((d)*M_PI/180.f)
-
-static float
-angle_between_points (const graphene_point_t *c,
-                      const graphene_point_t *a,
-                      const graphene_point_t *b)
-{
-  graphene_vec2_t t1, t2;
-
-  graphene_vec2_init (&t1, a->x - c->x, a->y - c->y);
-  graphene_vec2_init (&t2, b->x - c->x, b->y - c->y);
-
-  return (float) RAD_TO_DEG (angle_between (&t1, &t2));
-}
-
-/**
- * gsk_path_builder_html_arc_to:
- * @self: a `GskPathBuilder`
- * @x1: X coordinate of first control point
- * @y1: Y coordinate of first control point
- * @x2: X coordinate of second control point
- * @y2: Y coordinate of second control point
- * @radius: Radius of the circle
- *
- * Implements arc-to according to the HTML Canvas spec.
- *
- * A convenience function that implements the
- * [HTML arc_to](https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-arcto-dev)
- * functionality.
- *
- * After this, the current point will be the point where
- * the circle with the given radius touches the line from
- * @x1, @y1 to @x2, @y2.
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_html_arc_to (GskPathBuilder *self,
-                              float           x1,
-                              float           y1,
-                              float           x2,
-                              float           y2,
-                              float           radius)
-{
-  float angle, b;
-  graphene_vec2_t t;
-  graphene_point_t p, q;
-
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (radius > 0);
-
-  angle = angle_between_points (&GRAPHENE_POINT_INIT (x1, y1),
-                                &self->current_point,
-                                &GRAPHENE_POINT_INIT (x2, y2));
-
-  if (fabsf (angle) < 3)
-    {
-      gsk_path_builder_line_to (self, x2, y2);
-      return;
-    }
-
-  b = radius / tanf (fabsf ((float) DEG_TO_RAD (angle / 2)));
-
-  graphene_vec2_init (&t, self->current_point.x - x1, self->current_point.y - y1);
-  graphene_vec2_normalize (&t, &t);
-
-  p.x = x1 + b * graphene_vec2_get_x (&t);
-  p.y = y1 + b * graphene_vec2_get_y (&t);
-
-  graphene_vec2_init (&t, x2 - x1, y2 - y1);
-  graphene_vec2_normalize (&t, &t);
-
-  q.x = x1 + b * graphene_vec2_get_x (&t);
-  q.y = y1 + b * graphene_vec2_get_y (&t);
-
-  gsk_path_builder_line_to (self, p.x, p.y);
-
-  gsk_path_builder_svg_arc_to (self, radius, radius, 0, FALSE, angle < 0, q.x, q.y);
-}
-
-/**
- * gsk_path_builder_rel_html_arc_to:
- * @self: a `GskPathBuilder`
- * @x1: X coordinate of first control point
- * @y1: Y coordinate of first control point
- * @x2: X coordinate of second control point
- * @y2: Y coordinate of second control point
- * @radius: Radius of the circle
- *
- * Implements arc-to according to the HTML Canvas spec.
- *
- * All coordinates are given relative to the current point.
- *
- * This is the relative version of [method@Gsk.PathBuilder.html_arc_to].
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_rel_html_arc_to (GskPathBuilder *self,
-                                  float           x1,
-                                  float           y1,
-                                  float           x2,
-                                  float           y2,
-                                  float           radius)
-{
-  gsk_path_builder_html_arc_to (self,
-                                self->current_point.x + x1,
-                                self->current_point.y + y1,
-                                self->current_point.x + x2,
-                                self->current_point.y + y2,
-                                radius);
-}
-
 /**
  * gsk_path_builder_add_layout:
  * @self: a #GskPathBuilder
  * @layout: the pango layout to add
  *
- * Adds the outlines for the glyphs in @layout to the builder.
+ * Adds the outlines for the glyphs in @layout to
+ * the builder.
  *
  * Since: 4.14
  */
@@ -1368,84 +1105,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].
- *
- * Since: 4.14
- */
-void
-gsk_path_builder_add_segment (GskPathBuilder     *self,
-                              GskPath            *path,
-                              const GskPathPoint *start,
-                              const GskPathPoint *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 (gsk_path_point_valid (start, path));
-  g_return_if_fail (gsk_path_point_valid (end, path));
-
-  current = self->current_point;
-
-  contour = gsk_path_get_contour (path, start->contour);
-  n_ops = gsk_contour_get_n_ops (contour);
-
-  if (start->contour == end->contour)
-    {
-      if (gsk_path_point_compare (start, end) < 0)
-        {
-          gsk_contour_add_segment (contour, self, TRUE, start, end);
-          goto out;
-        }
-      else if (n_contours == 1)
-        {
-          if (n_ops > 1)
-            gsk_contour_add_segment (contour, self, TRUE,
-                                     start,
-                                     &GSK_PATH_POINT_INIT (start->contour, n_ops - 1, 1.f));
-          gsk_contour_add_segment (contour, self, n_ops <= 1,
-                                   &GSK_PATH_POINT_INIT (start->contour, 1, 0.f),
-                                   end);
-          goto out;
-        }
-    }
-
-  if (n_ops > 1)
-    gsk_contour_add_segment (contour, self, TRUE,
-                             start,
-                             &GSK_PATH_POINT_INIT (start->contour, n_ops - 1, 1.f));
-
-  for (gsize i = (start->contour + 1) % n_contours; i != end->contour; i = (i + 1) % n_contours)
-    gsk_path_builder_add_contour (self, gsk_contour_dup (gsk_path_get_contour (path, i)));
-
-  contour = gsk_path_get_contour (path, end->contour);
-  n_ops = gsk_contour_get_n_ops (contour);
-
-  if (n_ops > 1)
-    gsk_contour_add_segment (contour, self, TRUE,
-                             &GSK_PATH_POINT_INIT (end->contour, 1, 0.f),
-                             end);
-
-out:
-  gsk_path_builder_end_current (self);
-  self->current_point = current;
-}

gsk/gskpathbuilder.h

@@ -60,7 +60,6 @@ void                    gsk_path_builder_add_cairo_path         (GskPathBuilder
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_layout             (GskPathBuilder         *self,
                                                                  PangoLayout            *layout);
-
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_rect               (GskPathBuilder         *self,
                                                                  const graphene_rect_t  *rect);
@@ -72,10 +71,16 @@ void                    gsk_path_builder_add_circle             (GskPathBuilder
                                                                  const graphene_point_t *center,
                                                                  float                   radius);
 GDK_AVAILABLE_IN_4_14
+void                    gsk_path_builder_add_ellipse            (GskPathBuilder         *self,
+                                                                 const graphene_point_t *center,
+                                                                 const graphene_size_t  *radius);
+
+GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_segment            (GskPathBuilder         *self,
-                                                                 GskPath                *path,
-                                                                 const GskPathPoint     *start,
-                                                                 const GskPathPoint     *end);
+                                                                 GskPathMeasure         *measure,
+                                                                 float                   start,
+                                                                 float                   end);
+
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_move_to                (GskPathBuilder         *self,
                                                                  float                   x,
@@ -120,7 +125,6 @@ void                    gsk_path_builder_rel_cubic_to           (GskPathBuilder
                                                                  float                   y2,
                                                                  float                   x3,
                                                                  float                   y3);
-
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_conic_to               (GskPathBuilder         *self,
                                                                  float                   x1,
@@ -135,55 +139,6 @@ void                    gsk_path_builder_rel_conic_to           (GskPathBuilder
                                                                  float                   x2,
                                                                  float                   y2,
                                                                  float                   weight);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_arc_to                 (GskPathBuilder         *self,
-                                                                 float                   x1,
-                                                                 float                   y1,
-                                                                 float                   x2,
-                                                                 float                   y2);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_rel_arc_to             (GskPathBuilder         *self,
-                                                                 float                   x1,
-                                                                 float                   y1,
-                                                                 float                   x2,
-                                                                 float                   y2);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_svg_arc_to             (GskPathBuilder         *self,
-                                                                 float                   rx,
-                                                                 float                   ry,
-                                                                 float                   x_axis_rotation,
-                                                                 gboolean                large_arc,
-                                                                 gboolean                positive_sweep,
-                                                                 float                   x,
-                                                                 float                   y);
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_rel_svg_arc_to         (GskPathBuilder         *self,
-                                                                 float                   rx,
-                                                                 float                   ry,
-                                                                 float                   x_axis_rotation,
-                                                                 gboolean                large_arc,
-                                                                 gboolean                positive_sweep,
-                                                                 float                   x,
-                                                                 float                   y);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_html_arc_to            (GskPathBuilder         *self,
-                                                                 float                   x1,
-                                                                 float                   y1,
-                                                                 float                   x2,
-                                                                 float                   y2,
-                                                                 float                   radius);
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_builder_rel_html_arc_to        (GskPathBuilder         *self,
-                                                                 float                   x1,
-                                                                 float                   y1,
-                                                                 float                   x2,
-                                                                 float                   y2,
-                                                                 float                   radius);
-
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_close                  (GskPathBuilder         *self);
 

gsk/gskpathdash.c

@@ -28,8 +28,7 @@ typedef struct
 {
   float offset;                 /* how much of the current dash we've spent */
   gsize dash_index;             /* goes from 0 to n_dash * 2, so we don't have to care about on/off
-                                 * for uneven dashes
-                                 */
+                                   for uneven dashes */
   gboolean on;                  /* If we're currently dashing or not */
   gboolean may_close;           /* TRUE if we haven't turned the dash off in this contour */
   gboolean needs_move_to;       /* If we have emitted the initial move_to() yet */
@@ -39,9 +38,12 @@ typedef struct
     ONLY,   /* only do the first dash */
     DONE    /* done with the first dash */
   } first_dash_behavior;        /* How to handle the first dash in the loop. We loop closed contours
-                                 * twice to make sure the first dash and the last dash can get joined
-                                 */
+                                   twice to make sure the first dash and the last dash can get joined */
+
+  GskCurve curve;               /* Curve we are currently processing */
+
   float collect_start;          /* We're collecting multiple line segments when decomposing. */
+  float collect_length;         /* No need to emit a curve for every line segment when the dash is long enough. */
 
   /* from the stroke */
   float *dash;
@@ -49,6 +51,7 @@ typedef struct
   float dash_length;
   float dash_offset;
 
+  float tolerance;
   GskPathForeachFunc func;
   gpointer user_data;
 } GskPathDash;
@@ -78,7 +81,7 @@ gsk_path_dash_ensure_move_to (GskPathDash            *self,
   if (!self->needs_move_to)
     return TRUE;
 
-  if (!self->func (GSK_PATH_MOVE, pt, 1, 0.f, self->user_data))
+  if (!self->func (GSK_PATH_MOVE, pt, 1, 0, self->user_data))
     return FALSE;
 
   self->needs_move_to = FALSE;
@@ -86,36 +89,58 @@ gsk_path_dash_ensure_move_to (GskPathDash            *self,
 }
 
 static gboolean
-gsk_path_dash_add_curve (const GskCurve *curve,
-                         GskPathDash    *self)
+gsk_path_dash_add_line_segment (const graphene_point_t *start,
+                                const graphene_point_t *end,
+                                float                   t_start,
+                                float                   t_end,
+                                GskCurveLineReason      reason,
+                                gpointer                user_data)
 {
-  float remaining, t_start, t_end;
-  float used;
+  GskPathDash *self = user_data;
+  float remaining, length, t_step;
 
-  remaining = gsk_curve_get_length (curve);
-  used = 0;
-  t_start = 0;
+  length = graphene_point_distance (start, end, NULL, NULL);
+  if (self->collect_length)
+    {
+      t_start = self->collect_start;
+      length += self->collect_length;
+      self->collect_length = 0;
+    }
 
-  while (remaining > 0)
+  t_step = t_end - t_start;
+  remaining = length;
+
+  while (remaining)
     {
       float piece;
 
       if (self->offset + remaining <= self->dash[self->dash_index % self->n_dash])
-        piece = remaining;
+        {
+          /* try collecting multiple line segments */
+          if (t_end < 1.0)
+            {
+              self->collect_start = t_start + t_step * (length - remaining) / length;
+              self->collect_length = remaining;
+              return TRUE;
+            }
+
+          piece = remaining;
+        }
       else
         piece = self->dash[self->dash_index % self->n_dash] - self->offset;
 
-      t_end = gsk_curve_at_length (curve, used + piece, 0.001);
-
       if (self->on)
         {
           if (self->first_dash_behavior != SKIP)
             {
               GskCurve segment;
 
-              if (piece > 0)
+              if (piece)
                 {
-                  gsk_curve_segment (curve, t_start, t_end, &segment);
+                  gsk_curve_segment (&self->curve,
+                                     t_start + t_step * (length - remaining) / length,
+                                     t_start + t_step * (length - (remaining - piece)) / length,
+                                     &segment);
                   if (!gsk_path_dash_ensure_move_to (self, gsk_curve_get_start_point (&segment)))
                     return FALSE;
 
@@ -126,7 +151,7 @@ gsk_path_dash_add_curve (const GskCurve *curve,
                 {
                   graphene_point_t p;
 
-                  gsk_curve_get_point (curve, t_start, &p);
+                  gsk_curve_get_point (&self->curve, t_start + t_step * (length - remaining) / length, &p);
                   if (!gsk_path_dash_ensure_move_to (self, &p))
                     return FALSE;
                 }
@@ -150,9 +175,7 @@ gsk_path_dash_add_curve (const GskCurve *curve,
         }
       else
         {
-          t_start = t_end;
           remaining -= piece;
-          used += piece;
           self->offset = 0;
           self->dash_index++;
           self->dash_index %= 2 * self->n_dash;
@@ -172,7 +195,6 @@ gsk_path_dash_foreach (GskPathOperation        op,
                        gpointer                user_data)
 {
   GskPathDash *self = user_data;
-  GskCurve curve;
 
   switch (op)
   {
@@ -184,7 +206,7 @@ gsk_path_dash_foreach (GskPathOperation        op,
       if (self->may_close)
         {
           if (graphene_point_equal (&pts[0], &pts[1]))
-            return self->func (GSK_PATH_CLOSE, pts, 2, weight, self->user_data);
+            return self->func (GSK_PATH_CLOSE, pts, 2, 0, self->user_data);
         }
       else
         op = GSK_PATH_LINE;
@@ -194,8 +216,8 @@ gsk_path_dash_foreach (GskPathOperation        op,
     case GSK_PATH_QUAD:
     case GSK_PATH_CUBIC:
     case GSK_PATH_CONIC:
-      gsk_curve_init_foreach (&curve, op, pts, n_pts, weight);
-      if (!gsk_path_dash_add_curve (&curve, self))
+      gsk_curve_init_foreach (&self->curve, op, pts, n_pts, weight);
+      if (!gsk_curve_decompose (&self->curve, self->tolerance, gsk_path_dash_add_line_segment, self))
         return FALSE;
       break;
 
@@ -210,6 +232,7 @@ gsk_path_dash_foreach (GskPathOperation        op,
 gboolean
 gsk_contour_dash (const GskContour   *contour,
                   GskStroke          *stroke,
+                  float               tolerance,
                   GskPathForeachFunc  func,
                   gpointer            user_data)
 {
@@ -219,13 +242,14 @@ gsk_contour_dash (const GskContour   *contour,
     .n_dash = stroke->n_dash,
     .dash_length = stroke->dash_length,
     .dash_offset = stroke->dash_offset,
+    .tolerance = tolerance,
     .func = func,
     .user_data = user_data
   };
   gboolean is_closed = gsk_contour_get_flags (contour) & GSK_PATH_CLOSED ? TRUE : FALSE;
 
   self.first_dash_behavior = is_closed ? SKIP : NORMAL;
-  if (!gsk_contour_foreach (contour, gsk_path_dash_foreach, &self))
+  if (!gsk_contour_foreach (contour, tolerance, gsk_path_dash_foreach, &self))
     return FALSE;
 
   if (is_closed)
@@ -235,7 +259,7 @@ gsk_contour_dash (const GskContour   *contour,
       else
         self.first_dash_behavior = NORMAL;
       self.needs_move_to = !self.on;
-      if (!gsk_contour_foreach (contour, gsk_path_dash_foreach, &self) &&
+      if (!gsk_contour_foreach (contour, tolerance, gsk_path_dash_foreach, &self) &&
           self.first_dash_behavior != DONE)
         return FALSE;
     }
@@ -247,6 +271,7 @@ gsk_contour_dash (const GskContour   *contour,
  * gsk_path_dash:
  * @self: the `GskPath` to dash
  * @stroke: the stroke containing the dash parameters
+ * @tolerance: tolerance to use while dashing
  * @func: (scope call) (closure user_data): the function to call for operations
  * @user_data: (nullable): user data passed to @func
  *
@@ -260,6 +285,7 @@ gsk_contour_dash (const GskContour   *contour,
 gboolean
 gsk_path_dash (GskPath            *self,
                GskStroke          *stroke,
+               float               tolerance,
                GskPathForeachFunc  func,
                gpointer            user_data)
 {
@@ -271,7 +297,7 @@ gsk_path_dash (GskPath            *self,
 
   for (i = 0; i < gsk_path_get_n_contours (self); i++)
     {
-      if (!gsk_contour_dash (gsk_path_get_contour (self, i), stroke, func, user_data))
+      if (!gsk_contour_dash (gsk_path_get_contour (self, i), stroke, tolerance, func, user_data))
         return FALSE;
     }
 

gsk/gskpathmeasure.c

@@ -23,7 +23,6 @@
 
 #include "gskpathbuilder.h"
 #include "gskpathpointprivate.h"
-#include "gskcontourprivate.h"
 #include "gskpathprivate.h"
 
 /**
@@ -32,15 +31,13 @@
  * `GskPathMeasure` is an object that allows measurements
  * on `GskPath`s such as determining the length of the path.
  *
- * Many measuring operations require sampling the path length
- * at intermediate points. Therefore, a `GskPathMeasure` has
+ * 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.
- *
- * Since: 4.14
  */
 
 typedef struct _GskContourMeasure GskContourMeasure;
@@ -72,8 +69,7 @@ G_DEFINE_BOXED_TYPE (GskPathMeasure, gsk_path_measure,
  * gsk_path_measure_new:
  * @path: the path to measure
  *
- * Creates a measure object for the given @path with the
- * default tolerance.
+ * Creates a measure object for the given @path.
  *
  * Returns: a new `GskPathMeasure` representing @path
  *
@@ -240,6 +236,104 @@ gsk_path_measure_clamp_distance (GskPathMeasure *self,
   return CLAMP (distance, 0, self->length);
 }
 
+static void
+gsk_path_builder_add_segment_chunk (GskPathBuilder *self,
+                                    GskPathMeasure *measure,
+                                    gboolean        emit_move_to,
+                                    float           start,
+                                    float           end)
+{
+  g_assert (start < end);
+
+  for (gsize i = 0; i < measure->n_contours; i++)
+    {
+      if (measure->measures[i].length < start)
+        {
+          start -= measure->measures[i].length;
+          end -= measure->measures[i].length;
+        }
+      else if (start > 0 || end < measure->measures[i].length)
+        {
+          float len = MIN (end, measure->measures[i].length);
+          gsk_contour_add_segment (gsk_path_get_contour (measure->path, i),
+                                   self,
+                                   measure->measures[i].contour_data,
+                                   emit_move_to,
+                                   start,
+                                   len);
+          end -= len;
+          start = 0;
+          if (end <= 0)
+            break;
+        }
+      else
+        {
+          end -= measure->measures[i].length;
+          gsk_path_builder_add_contour (self, gsk_contour_dup (gsk_path_get_contour (measure->path, i)));
+        }
+      emit_move_to = TRUE;
+    }
+}
+
+/**
+ * gsk_path_builder_add_segment:
+ * @self: a `GskPathBuilder`
+ * @measure: the `GskPathMeasure` to take the segment to
+ * @start: start distance into the path
+ * @end: end distance into the path
+ *
+ * Adds to @self the segment of @measure from @start to @end.
+ *
+ * The distances are given relative to the length of @measure's path,
+ * from 0 for the beginning of the path to its length for the end
+ * of the path. The values will be clamped to that range. The length
+ * can be obtained with [method@Gsk.PathMeasure.get_length].
+ *
+ * If @start >= @end after clamping, 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,
+                              GskPathMeasure *measure,
+                              float           start,
+                              float           end)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (measure != NULL);
+
+  start = gsk_path_measure_clamp_distance (measure, start);
+  end = gsk_path_measure_clamp_distance (measure, end);
+
+  if (start < end)
+    {
+      gsk_path_builder_add_segment_chunk (self, measure, TRUE, start, end);
+    }
+  else
+    {
+      /* If the path is closed, we can connect the 2 subpaths. */
+      gboolean closed = gsk_path_is_closed (measure->path);
+      gboolean need_move_to = !closed;
+
+      if (start < measure->length)
+        gsk_path_builder_add_segment_chunk (self, measure,
+                                            TRUE,
+                                            start, measure->length);
+      else
+        need_move_to = TRUE;
+
+      if (end > 0)
+        gsk_path_builder_add_segment_chunk (self, measure,
+                                            need_move_to,
+                                            0, end);
+      if (start == end && closed)
+        gsk_path_builder_close (self);
+    }
+}
+
 /**
  * gsk_path_measure_get_point:
  * @self: a `GskPathMeasure`
@@ -259,7 +353,9 @@ 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);
@@ -268,60 +364,47 @@ gsk_path_measure_get_point (GskPathMeasure *self,
   if (self->n_contours == 0)
     return FALSE;
 
-  distance = gsk_path_measure_clamp_distance (self, distance);
+  offset = gsk_path_measure_clamp_distance (self, distance);
 
   for (i = 0; i < self->n_contours - 1; i++)
     {
-      if (distance < self->measures[i].length)
+      if (offset < self->measures[i].length)
         break;
 
-      distance -= self->measures[i].length;
+      offset -= self->measures[i].length;
     }
 
   g_assert (0 <= i && i < self->n_contours);
 
-  distance = CLAMP (distance, 0, self->measures[i].length);
+  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, distance, result);
-
-  g_assert (0 <= result->t && result->t <= 1);
-
-  result->contour = i;
+  gsk_contour_get_point (contour, self->measures[i].contour_data, offset, res);
 
   return TRUE;
 }
 
-/**
- * gsk_path_point_get_distance:
- * @point: a `GskPathPoint on the path
- * @measure: a `GskPathMeasure` for the path
- *
- * 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 (const GskPathPoint *point,
-                             GskPathMeasure     *measure)
+gsk_path_measure_get_distance (GskPathMeasure *self,
+                               GskPathPoint   *point)
 {
+  GskRealPathPoint *p = (GskRealPathPoint *)point;
+  const GskContour *contour = p->contour;
   float contour_offset = 0;
 
-  g_return_val_if_fail (measure != NULL, 0);
-  g_return_val_if_fail (gsk_path_point_valid (point, measure->path), 0);
+  g_return_val_if_fail (self != NULL, 0);
+  g_return_val_if_fail (point != NULL, 0);
+  g_return_val_if_fail (self->path == p->path, 0);
 
-  for (gsize i = 0; i < measure->n_contours; i++)
+  for (gsize i = 0; i < self->n_contours; i++)
     {
-      if (i == point->contour)
-        return contour_offset + gsk_contour_get_distance (gsk_path_get_contour (measure->path, i),
-                                                          point,
-                                                          measure->measures[i].contour_data);
+      if (contour == gsk_path_get_contour (self->path, i))
+        return contour_offset + gsk_contour_get_distance (contour,
+                                                          p,
+                                                          self->measures[i].contour_data);
 
-      contour_offset += measure->measures[i].length;
+      contour_offset += self->measures[i].length;
     }
 
   g_return_val_if_reached (0);

gsk/gskpathmeasure.h

@@ -55,7 +55,11 @@ float                   gsk_path_measure_get_length             (GskPathMeasure
 GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_measure_get_point              (GskPathMeasure         *self,
                                                                  float                   distance,
-                                                                 GskPathPoint           *result);
+                                                                 GskPathPoint           *point);
+
+GDK_AVAILABLE_IN_4_14
+float                   gsk_path_measure_get_distance           (GskPathMeasure         *self,
+                                                                 GskPathPoint           *point);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPathMeasure, gsk_path_measure_unref)
 

gsk/gskpathopprivate.h

@@ -50,13 +50,6 @@ void                    gsk_path_builder_pathop_reverse_to      (GskPathBuilder
 
 /* IMPLEMENTATION */
 
-/* Note:
- *
- * The weight of conics is encoded as p[2].x, and the endpoint is p[3].
- * This is important, since contours store the points of adjacent
- * operations overlapping, so we can't put the weight at the end.
- */
-
 #define GSK_PATHOP_OPERATION_MASK (0x7)
 
 static inline gskpathop

gsk/gskpathpoint.c

@@ -19,38 +19,36 @@
 
 #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:
  *
  * `GskPathPoint` is an opaque type representing a point on a path.
  *
- * It can be queried for properties of the path at that point, such as
- * its tangent or its curvature.
+ * 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],
- * [method@Gsk.Path.get_start_point], [method@Gsk.Path.get_end_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 hold 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
+ * 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.
  */
 
 G_DEFINE_BOXED_TYPE (GskPathPoint, gsk_path_point,
                      gsk_path_point_copy,
                      gsk_path_point_free)
 
+
 GskPathPoint *
 gsk_path_point_copy (GskPathPoint *point)
 {
@@ -58,7 +56,7 @@ gsk_path_point_copy (GskPathPoint *point)
 
   copy = g_new0 (GskPathPoint, 1);
 
-  memcpy (copy, point, sizeof (GskPathPoint));
+  memcpy (copy, point, sizeof (GskRealPathPoint));
 
   return copy;
 }
@@ -69,79 +67,25 @@ 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
- *
- * Since: 4.14
- */
-gboolean
-gsk_path_point_equal (const GskPathPoint *point1,
-                      const GskPathPoint *point2)
+GskPath *
+gsk_path_point_get_path (GskPathPoint *point)
 {
-  if (point1->contour == point2->contour)
-    {
-      if ((point1->idx     == point2->idx     && point1->t == point2->t) ||
-          (point1->idx + 1 == point2->idx     && point1->t == 1 && point2->t == 0) ||
-          (point1->idx     == point2->idx + 1 && point1->t == 0 && point2->t == 1))
-        return TRUE;
-    }
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
 
-  return FALSE;
+  return self->path;
 }
 
-/**
- * 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
- *
- * Since: 4.14
- */
-int
-gsk_path_point_compare (const GskPathPoint *point1,
-                        const GskPathPoint *point2)
+const GskContour *
+gsk_path_point_get_contour (GskPathPoint *point)
 {
-  if (gsk_path_point_equal (point1, point2))
-    return 0;
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
 
-  if (point1->contour < point2->contour)
-    return -1;
-  else if (point1->contour > point2->contour)
-    return 1;
-  else if (point1->idx < point2->idx)
-    return -1;
-  else if (point1->idx > point2->idx)
-    return 1;
-  else if (point1->t < point2->t)
-    return -1;
-  else if (point1->t > point2->t)
-    return 1;
-
-  return 0;
+  return self->contour;
 }
 
 /**
  * gsk_path_point_get_position:
  * @point: a `GskPathPoint`
- * @path: the path that @point is on
  * @position: (out caller-allocates): Return location for
  *   the coordinates of the point
  *
@@ -150,24 +94,17 @@ gsk_path_point_compare (const GskPathPoint *point1,
  * Since: 4.14
  */
 void
-gsk_path_point_get_position (const GskPathPoint *point,
-                             GskPath            *path,
-                             graphene_point_t   *position)
+gsk_path_point_get_position (GskPathPoint     *point,
+                             graphene_point_t *position)
 {
-  const GskContour *contour;
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
 
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (gsk_path_point_valid (point, path));
-  g_return_if_fail (position != NULL);
-
-  contour = gsk_path_get_contour (path, point->contour),
-  gsk_contour_get_position (contour, point, position);
+  gsk_contour_get_position (self->contour, self, position);
 }
 
 /**
  * gsk_path_point_get_tangent:
  * @point: a `GskPathPoint`
- * @path: the path that @point is on
  * @direction: the direction for which to return the tangent
  * @tangent: (out caller-allocates): Return location for
  *   the tangent at the point
@@ -180,105 +117,49 @@ 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,
-                            GskPathDirection    direction,
-                            graphene_vec2_t    *tangent)
+gsk_path_point_get_tangent (GskPathPoint     *point,
+                            GskPathDirection  direction,
+                            graphene_vec2_t  *tangent)
 {
-  const GskContour *contour;
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
 
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (gsk_path_point_valid (point, path));
-  g_return_if_fail (tangent != NULL);
-
-  contour = gsk_path_get_contour (path, point->contour),
-  gsk_contour_get_tangent (contour, point, 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
- * [gtk_snapshot_rotate()](../gtk4/method.Snapshot.rotate.html).
- *
- * 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)
-{
-  graphene_vec2_t tangent;
-
-  g_return_val_if_fail (path != NULL, 0);
-  g_return_val_if_fail (gsk_path_point_valid (point, 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_contour_get_tangent (self->contour, self, direction, tangent);
 }
 
 /**
  * gsk_path_point_get_curvature:
  * @point: a `GskPathPoint`
- * @path: the path that @point is on
- * @direction: the direction for which to return the curvature
- * @center: (out caller-allocates) (nullable): Return location for
+ * @center: (out caller-allocates): Return location for
  *   the center of the osculating circle
  *
  * Calculates the curvature of the path at the point.
  *
  * Optionally, returns the center of the osculating circle as well.
- * The curvature is the inverse of the radius of the osculating circle.
  *
- * Lines have a curvature of zero (indicating an osculating circle of
- * infinite radius. In this case, the @center is not modified.
+ * If the curvature is infinite (at line segments), zero is returned,
+ * and @center is not modified.
  *
- * Circles with a radius of zero have `INFINITY` as curvature
- *
- * Note that certain points on a path may not have a single curvature,
- * such as sharp turns. At such points, there are two curvatures --
- * the (limit of) the curvature of the path going into the point,
- * and the (limit of) the curvature of the path coming out of it.
- * The @direction argument lets you choose which one to get.
- *
- * <picture>
- *   <source srcset="curvature-dark.png" media="(prefers-color-scheme: dark)">
- *   <img alt="Osculating circle" src="curvature-light.png">
- * </picture>
-
  * Returns: The curvature of the path at the given point
  *
  * Since: 4.14
  */
 float
-gsk_path_point_get_curvature (const GskPathPoint *point,
-                              GskPath            *path,
-                              GskPathDirection    direction,
-                              graphene_point_t   *center)
+gsk_path_point_get_curvature (GskPathPoint     *point,
+                              graphene_point_t *center)
 {
-  const GskContour *contour;
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
 
-  g_return_val_if_fail (path != NULL, 0);
-  g_return_val_if_fail (gsk_path_point_valid (point, path), 0);
-
-  contour = gsk_path_get_contour (path, point->contour);
-  return gsk_contour_get_curvature (contour, point, direction, center);
+  return gsk_contour_get_curvature (self->contour, self, center);
+}
+
+float
+gsk_path_point_get_distance (GskPathPoint *point,
+                             gpointer      measure_data)
+{
+  GskRealPathPoint *self = (GskRealPathPoint *) point;
+
+  return gsk_contour_get_distance (self->contour, self, measure_data);
 }

gsk/gskpathpoint.h

@@ -34,57 +34,31 @@ typedef struct _GskPathPoint GskPathPoint;
 struct _GskPathPoint {
   /*< private >*/
   union {
-    struct {
-      gsize contour;
-      gsize idx;
-      float t;
-    };
-    gpointer padding[8];
-    graphene_vec4_t alignment;
-  };
+    float f[8];
+    gpointer p[8];
+  } data;
 };
 
 GDK_AVAILABLE_IN_4_14
 GType                   gsk_path_point_get_type        (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_4_14
-GskPathPoint *          gsk_path_point_copy            (GskPathPoint       *point);
+GskPathPoint *          gsk_path_point_copy            (GskPathPoint     *point);
 
 GDK_AVAILABLE_IN_4_14
-void                    gsk_path_point_free            (GskPathPoint       *point);
+void                    gsk_path_point_free            (GskPathPoint     *point);
 
 GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_point_equal           (const GskPathPoint *point1,
-                                                        const GskPathPoint *point2);
+void                    gsk_path_point_get_position    (GskPathPoint     *point,
+                                                        graphene_point_t *position);
 
 GDK_AVAILABLE_IN_4_14
-int                     gsk_path_point_compare         (const GskPathPoint *point1,
-                                                        const GskPathPoint *point2);
+void                    gsk_path_point_get_tangent     (GskPathPoint     *point,
+                                                        GskPathDirection  direction,
+                                                        graphene_vec2_t  *tangent);
 
 GDK_AVAILABLE_IN_4_14
-void                    gsk_path_point_get_position    (const GskPathPoint *point,
-                                                        GskPath            *path,
-                                                        graphene_point_t   *position);
-
-GDK_AVAILABLE_IN_4_14
-void                    gsk_path_point_get_tangent     (const GskPathPoint *point,
-                                                        GskPath            *path,
-                                                        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,
-                                                        GskPathDirection    direction,
-                                                        graphene_point_t   *center);
-
-GDK_AVAILABLE_IN_4_14
-float                   gsk_path_point_get_distance    (const GskPathPoint *point,
-                                                        GskPathMeasure     *measure);
+float                   gsk_path_point_get_curvature   (GskPathPoint     *point,
+                                                        graphene_point_t *center);
 
 G_END_DECLS

gsk/gskpathpointprivate.h

@@ -5,35 +5,29 @@
 
 G_BEGIN_DECLS
 
-#define GSK_PATH_POINT_INIT(c,i,tt) ((GskPathPoint){ .contour=(c), .idx=(i), .t=(tt) })
-
-static inline gboolean
-gsk_path_point_valid (const GskPathPoint *point,
-                      GskPath            *path)
+struct _GskRealPathPoint
 {
+  GskPath *path;
   const GskContour *contour;
-  gsize n_ops;
 
-  if (point == NULL)
-    return FALSE;
+  union {
+    struct {
+      unsigned int idx;
+      float t;
+    } std;
+    struct {
+      float distance;
+    } rect;
+    struct {
+      float angle;
+    } circle;
+  } data;
+};
 
-  if (path == NULL)
-    return TRUE;
-
-  if (point->contour >= gsk_path_get_n_contours (path))
-    return FALSE;
-
-  contour = gsk_path_get_contour (path, point->contour);
-  n_ops = gsk_contour_get_n_ops (contour);
-  if ((n_ops > 1 && point->idx >= n_ops) ||
-      (n_ops == 1 && point->idx > n_ops))
-    return FALSE;
-
-  if (point->t < 0 || point->t > 1)
-    return FALSE;
-
-  return TRUE;
-}
+GskPath          * gsk_path_point_get_path     (GskPathPoint     *self);
+const GskContour * gsk_path_point_get_contour  (GskPathPoint     *self);
+float              gsk_path_point_get_distance (GskPathPoint     *self,
+                                                gpointer          measure_data);
 
 G_END_DECLS
 

gsk/gskpathprivate.h

@@ -40,11 +40,11 @@ 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                   gsk_path_get_n_contours                 (GskPath                *path);
+const GskContour *      gsk_path_get_contour                    (GskPath                *path,
                                                                  gsize                   i);
 
-GskPathFlags            gsk_path_get_flags                      (const GskPath          *self);
+GskPathFlags            gsk_path_get_flags                      (GskPath                *self);
 
 gboolean                gsk_path_foreach_with_tolerance         (GskPath                *self,
                                                                  GskPathForeachFlags     flags,
@@ -56,5 +56,18 @@ gboolean                gsk_path_foreach_with_tolerance         (GskPath
 void                    gsk_path_builder_add_contour            (GskPathBuilder         *builder,
                                                                  GskContour             *contour);
 
+void                    gsk_path_builder_svg_arc_to             (GskPathBuilder         *builder,
+                                                                 float                   rx,
+                                                                 float                   ry,
+                                                                 float                   x_axis_rotation,
+                                                                 gboolean                large_arc,
+                                                                 gboolean                positive_sweep,
+                                                                 float                   x,
+                                                                 float                   y);
+
+gboolean                gsk_path_get_stroke_bounds              (GskPath                *self,
+                                                                 const GskStroke        *stroke,
+                                                                 graphene_rect_t        *bounds);
+
 G_END_DECLS
 

gsk/gskrectprivate.h

@@ -26,13 +26,3 @@ gsk_rect_intersects (const graphene_rect_t *r1,
     return TRUE;
 }
 
-static inline void
-gsk_rect_to_float (const graphene_rect_t *rect,
-                   float                  values[4])
-{
-  values[0] = rect->origin.x;
-  values[1] = rect->origin.y;
-  values[2] = rect->size.width;
-  values[3] = rect->size.height;
-}
-

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

@@ -26,7 +26,6 @@
 #include "gskdiffprivate.h"
 #include "gl/gskglrenderer.h"
 #include "gskpathprivate.h"
-#include "gskrectprivate.h"
 #include "gskrendererprivate.h"
 #include "gskroundedrectprivate.h"
 #include "gskstrokeprivate.h"
@@ -3841,12 +3840,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 +3969,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 +4140,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 +4371,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;
@@ -4424,17 +4413,9 @@ gsk_fill_node_draw (GskRenderNode *node,
       break;
   }
   gsk_path_to_cairo (self->path, cr);
-  if (gsk_render_node_get_node_type (self->child) == GSK_COLOR_NODE &&
-      gsk_rect_contains_rect (&self->child->bounds, &node->bounds))
-    {
-      gdk_cairo_set_source_rgba (cr, gsk_color_node_get_color (self->child));
-      cairo_fill (cr);
-    }
-  else
-    {
-      cairo_clip (cr);
-      gsk_render_node_draw (self->child, cr);
-    }
+  cairo_clip (cr);
+
+  gsk_render_node_draw (self->child, cr);
 
   cairo_restore (cr);
 }
@@ -4451,10 +4432,12 @@ gsk_fill_node_diff (GskRenderNode  *node1,
     {
       cairo_region_t *sub;
       cairo_rectangle_int_t clip_rect;
+      graphene_rect_t rect;
 
       sub = cairo_region_create();
       gsk_render_node_diff (self1->child, self2->child, sub);
-      rectangle_init_from_graphene (&clip_rect, &node1->bounds);
+      graphene_rect_union (&node1->bounds, &node2->bounds, &rect);
+      rectangle_init_from_graphene (&clip_rect, &rect);
       cairo_region_intersect_rectangle (sub, &clip_rect);
       cairo_region_union (region, sub);
       cairo_region_destroy (sub);
@@ -4582,15 +4565,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;
@@ -4621,19 +4595,12 @@ gsk_stroke_node_draw (GskRenderNode *node,
 
   cairo_save (cr);
 
-  if (gsk_render_node_get_node_type (self->child) == GSK_COLOR_NODE &&
-      gsk_rect_contains_rect (&self->child->bounds, &node->bounds))
-    {
-      gdk_cairo_set_source_rgba (cr, gsk_color_node_get_color (self->child));
-    }
-  else
-    {
-      gsk_cairo_rectangle (cr, &self->child->bounds);
-      cairo_clip (cr);
-      cairo_push_group (cr);
-      gsk_render_node_draw (self->child, cr);
-      cairo_pop_group_to_source (cr);
-    }
+  gsk_cairo_rectangle (cr, &self->child->bounds);
+  cairo_clip (cr);
+
+  cairo_push_group (cr);
+  gsk_render_node_draw (self->child, cr);
+  cairo_pop_group_to_source (cr);
 
   gsk_stroke_to_cairo (&self->stroke, cr);
 
@@ -4655,12 +4622,9 @@ gsk_stroke_node_diff (GskRenderNode  *node1,
       gsk_stroke_equal (&self1->stroke, &self2->stroke))
     {
       cairo_region_t *sub;
-      cairo_rectangle_int_t clip_rect;
 
       sub = cairo_region_create();
       gsk_render_node_diff (self1->child, self2->child, sub);
-      rectangle_init_from_graphene (&clip_rect, &node1->bounds);
-      cairo_region_intersect_rectangle (sub, &clip_rect);
       cairo_region_union (region, sub);
       cairo_region_destroy (sub);
     }
@@ -4689,10 +4653,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/gskrendernodeparser.c

@@ -24,12 +24,10 @@
 #include "gskrendernodeparserprivate.h"
 
 #include "gskpath.h"
-#include "gskpathbuilder.h"
 #include "gskroundedrectprivate.h"
 #include "gskrendernodeprivate.h"
 #include "gskstroke.h"
 #include "gsktransformprivate.h"
-#include "gskenumtypes.h"
 
 #include "gdk/gdkrgbaprivate.h"
 #include "gdk/gdktextureprivate.h"
@@ -1172,36 +1170,10 @@ create_default_texture (void)
   return texture;
 }
 
-static GskRenderNode *
-create_default_render_node_with_bounds (const graphene_rect_t *rect)
-{
-  return gsk_color_node_new (&GDK_RGBA("FF00CC"), rect);
-}
-
 static GskRenderNode *
 create_default_render_node (void)
 {
-  return create_default_render_node_with_bounds (&GRAPHENE_RECT_INIT (0, 0, 50, 50));
-}
-
-static GskPath *
-create_default_path (void)
-{
-  GskPathBuilder *builder;
-  guint i;
-
-  builder = gsk_path_builder_new ();
-
-  gsk_path_builder_move_to (builder, 25, 0);
-  for (i = 1; i < 5; i++)
-    {
-      gsk_path_builder_line_to (builder,
-                                sin (i * G_PI * 0.8) * 25 + 25,
-                                -cos (i * G_PI * 0.8) * 25 + 25);
-    }
-  gsk_path_builder_close (builder);
-
-  return gsk_path_builder_free_to_path (builder);
+  return gsk_color_node_new (&GDK_RGBA("FF00CC"), &GRAPHENE_RECT_INIT (0, 0, 50, 50));
 }
 
 static GskRenderNode *
@@ -2127,230 +2099,6 @@ parse_rounded_clip_node (GtkCssParser *parser,
   return result;
 }
 
-static gboolean
-parse_path (GtkCssParser *parser,
-            Context      *context,
-            gpointer      out_path)
-{
-  GskPath *path;
-  char *str = NULL;
-
-  if (!parse_string (parser, context, &str))
-    return FALSE;
-
-  path = gsk_path_parse (str);
-  g_free (str);
-
-  if (path == NULL)
-    {
-      gtk_css_parser_error_value (parser, "Invalid path");
-      return FALSE;
-    }
-
-  *((GskPath **) out_path) = path;
-
-  return TRUE;
-}
-
-static void
-clear_path (gpointer inout_path)
-{
-  g_clear_pointer ((GskPath **) inout_path, gsk_path_unref);
-}
-
-static gboolean
-parse_dash (GtkCssParser *parser,
-            Context      *context,
-            gpointer      out_dash)
-{
-  GArray *dash;
-  double d;
-
-  /* because CSS does this, too */
-  if (gtk_css_parser_try_ident (parser, "none"))
-    {
-      *((GArray **) out_dash) = NULL;
-      return TRUE;
-    }
-
-  dash = g_array_new (FALSE, FALSE, sizeof (float));
-  while (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SIGNLESS_NUMBER) ||
-         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SIGNLESS_INTEGER))
-    {
-      if (!gtk_css_parser_consume_number (parser, &d))
-        {
-          g_array_free (dash, TRUE);
-          return FALSE;
-        }
-
-      g_array_append_vals (dash, (float[1]) { d }, 1);
-    }
-
-  if (dash->len == 0)
-    {
-      gtk_css_parser_error_syntax (parser, "Empty dash array");
-      g_array_free (dash, TRUE);
-      return FALSE;
-    }
-
-  *((GArray **) out_dash) = dash;
-
-  return TRUE;
-}
-
-static void
-clear_dash (gpointer inout_array)
-{
-  g_clear_pointer ((GArray **) inout_array, g_array_unref);
-}
-
-static gboolean
-parse_enum (GtkCssParser *parser,
-            GType         type,
-            gpointer      out_value)
-{
-  GEnumClass *class;
-  GEnumValue *v;
-  char *enum_name;
-
-  enum_name = gtk_css_parser_consume_ident (parser);
-  if (enum_name == NULL)
-    return FALSE;
-
-  class = g_type_class_ref (type);
-
-  v = g_enum_get_value_by_nick (class, enum_name);
-  if (v == NULL)
-    {
-      gtk_css_parser_error_value (parser, "Unknown value \"%s\" for enum \"%s\"",
-                                  enum_name, g_type_name (type));
-      g_free (enum_name);
-      g_type_class_unref (class);
-      return FALSE;
-    }
-
-  *(int*)out_value = v->value;
-
-  g_free (enum_name);
-  g_type_class_unref (class);
-
-  return TRUE;
-}
-
-static gboolean
-parse_fill_rule (GtkCssParser *parser,
-                 Context      *context,
-                 gpointer      out_rule)
-{
-  return parse_enum (parser, GSK_TYPE_FILL_RULE, out_rule);
-}
-
-static GskRenderNode *
-parse_fill_node (GtkCssParser *parser,
-                 Context      *context)
-{
-  GskRenderNode *child = NULL;
-  GskPath *path = NULL;
-  int rule = GSK_FILL_RULE_WINDING;
-  const Declaration declarations[] = {
-    { "child", parse_node, clear_node, &child },
-    { "path", parse_path, clear_path, &path },
-    { "fill-rule", parse_fill_rule, NULL, &rule },
-  };
-  GskRenderNode *result;
-
-  parse_declarations (parser, context, declarations, G_N_ELEMENTS (declarations));
-  if (path == NULL)
-    path = create_default_path ();
-  if (child == NULL)
-    {
-      graphene_rect_t bounds;
-      gsk_path_get_bounds (path, &bounds);
-      child = create_default_render_node_with_bounds (&bounds);
-    }
-
-  result = gsk_fill_node_new (child, path, rule);
-
-  gsk_path_unref (path);
-
-  gsk_render_node_unref (child);
-
-  return result;
-}
-
-static gboolean
-parse_line_cap (GtkCssParser *parser,
-                Context      *context,
-                gpointer      out)
-{
-  return parse_enum (parser, GSK_TYPE_LINE_CAP, out);
-}
-
-static gboolean
-parse_line_join (GtkCssParser *parser,
-                 Context      *context,
-                 gpointer      out)
-{
-  return parse_enum (parser, GSK_TYPE_LINE_JOIN, out);
-}
-
-static GskRenderNode *
-parse_stroke_node (GtkCssParser *parser,
-                   Context      *context)
-{
-  GskRenderNode *child = NULL;
-  GskPath *path = NULL;
-  double line_width = 1.0;
-  int line_cap = GSK_LINE_CAP_BUTT;
-  int line_join = GSK_LINE_JOIN_MITER;
-  double miter_limit = 4.0;
-  GArray *dash = NULL;
-  double dash_offset = 0.0;
-  GskStroke *stroke;
-
-  const Declaration declarations[] = {
-    { "child", parse_node, clear_node, &child },
-    { "path", parse_path, clear_path, &path },
-    { "line-width", parse_positive_double, NULL, &line_width },
-    { "line-cap", parse_line_cap, NULL, &line_cap },
-    { "line-join", parse_line_join, NULL, &line_join },
-    { "miter-limit", parse_positive_double, NULL, &miter_limit },
-    { "dash", parse_dash, clear_dash, &dash },
-    { "dash-offset", parse_double, NULL, &dash_offset}
-  };
-  GskRenderNode *result;
-
-  parse_declarations (parser, context, declarations, G_N_ELEMENTS (declarations));
-  if (path == NULL)
-    path = create_default_path ();
-
-  stroke = gsk_stroke_new (line_width);
-  gsk_stroke_set_line_cap (stroke, line_cap);
-  gsk_stroke_set_line_join (stroke, line_join);
-  gsk_stroke_set_miter_limit (stroke, miter_limit);
-  if (dash)
-    {
-      gsk_stroke_set_dash (stroke, (float *) dash->data, dash->len);
-      g_array_free (dash, TRUE);
-    }
-  gsk_stroke_set_dash_offset (stroke, dash_offset);
-
-  if (child == NULL)
-    {
-      graphene_rect_t bounds;
-      gsk_path_get_stroke_bounds (path, stroke, &bounds);
-      child = create_default_render_node_with_bounds (&bounds);
-    }
-
-  result = gsk_stroke_node_new (child, path, stroke);
-
-  gsk_path_unref (path);
-  gsk_stroke_free (stroke);
-  gsk_render_node_unref (child);
-
-  return result;
-}
-
 static GskRenderNode *
 parse_shadow_node (GtkCssParser *parser,
                    Context      *context)
@@ -2433,8 +2181,6 @@ parse_node (GtkCssParser *parser,
     { "repeating-linear-gradient", parse_repeating_linear_gradient_node },
     { "repeating-radial-gradient", parse_repeating_radial_gradient_node },
     { "rounded-clip", parse_rounded_clip_node },
-    { "fill", parse_fill_node },
-    { "stroke", parse_stroke_node },
     { "shadow", parse_shadow_node },
     { "text", parse_text_node },
     { "texture", parse_texture_node },
@@ -3097,11 +2843,8 @@ append_escaping_newlines (GString    *str,
     len = strcspn (string, "\n");
     g_string_append_len (str, string, len);
     string += len;
-    if (*string)
-      {
-        g_string_append (str, "\\\n");
-        string++;
-      }
+    g_string_append (str, "\\\n");
+    string++;
   } while (*string);
 }
 
@@ -3302,83 +3045,6 @@ gsk_text_node_serialize_glyphs (GskRenderNode *node,
     pango_glyph_string_free (ascii);
 }
 
-static const char *
-enum_to_nick (GType type,
-              int   value)
-{
-  GEnumClass *class;
-  GEnumValue *v;
-
-  class = g_type_class_ref (type);
-  v = g_enum_get_value (class, value);
-  g_type_class_unref (class);
-
-  return v->value_nick;
-}
-
-static void
-append_enum_param (Printer    *p,
-                   const char *param_name,
-                   GType       type,
-                   int         value)
-{
-  _indent (p);
-  g_string_append_printf (p->str, "%s: ", param_name);
-  g_string_append (p->str, enum_to_nick (type, value));
-  g_string_append_c (p->str, ';');
-  g_string_append_c (p->str, '\n');
-}
-
-static void
-append_path_param (Printer    *p,
-                   const char *param_name,
-                   GskPath    *path)
-{
-  char *str, *s;
-
-  _indent (p);
-  g_string_append (p->str, "path: \"\\\n");
-  str = gsk_path_to_string (path);
-  /* Put each command on a new line */
-  for (s = str; *s; s++)
-    {
-      if (*s == ' ' &&
-          (s[1] == 'M' || s[1] == 'C' || s[1] == 'Z' || s[1] == 'L'))
-        *s = '\n';
-    }
-  append_escaping_newlines (p->str, str);
-  g_string_append (p->str, "\";\n");
-  g_free (str);
-}
-
-static void
-append_dash_param (Printer     *p,
-                   const char  *param_name,
-                   const float *dash,
-                   gsize        n_dash)
-{
-  _indent (p);
-  g_string_append (p->str, "dash: ");
-
-  if (n_dash == 0)
-    {
-      g_string_append (p->str, "none");
-    }
-  else
-    {
-      gsize i;
-
-      string_append_double (p->str, dash[0]);
-      for (i = 1; i < n_dash; i++)
-        {
-          g_string_append_c (p->str, ' ');
-          string_append_double (p->str, dash[i]);
-        }
-    }
-
-  g_string_append (p->str, ";\n");
-}
-
 static void
 render_node_print (Printer       *p,
                    GskRenderNode *node)
@@ -3554,11 +3220,14 @@ render_node_print (Printer       *p,
 
     case GSK_FILL_NODE:
       {
+        char *path_str;
+
         start_node (p, "fill", node_name);
 
         append_node_param (p, "child", gsk_fill_node_get_child (node));
-        append_path_param (p, "path", gsk_fill_node_get_path (node));
-        append_enum_param (p, "fill-rule", GSK_TYPE_FILL_RULE, gsk_fill_node_get_fill_rule (node));
+        path_str = gsk_path_to_string (gsk_fill_node_get_path (node));
+        append_string_param (p, "path", path_str);
+        g_free (path_str);
 
         end_node (p);
       }
@@ -3567,23 +3236,17 @@ render_node_print (Printer       *p,
     case GSK_STROKE_NODE:
       {
         const GskStroke *stroke;
-        const float *dash;
-        gsize n_dash;
+        char *path_str;
 
         start_node (p, "stroke", node_name);
 
         append_node_param (p, "child", gsk_stroke_node_get_child (node));
-        append_path_param (p, "path", gsk_stroke_node_get_path (node));
+        path_str = gsk_path_to_string (gsk_stroke_node_get_path (node));
+        append_string_param (p, "path", path_str);
+        g_free (path_str);
 
         stroke = gsk_stroke_node_get_stroke (node);
-        append_float_param (p, "line-width", gsk_stroke_get_line_width (stroke), 0.0f);
-        append_enum_param (p, "line-cap", GSK_TYPE_LINE_CAP, gsk_stroke_get_line_cap (stroke));
-        append_enum_param (p, "line-join", GSK_TYPE_LINE_JOIN, gsk_stroke_get_line_join (stroke));
-        append_float_param (p, "miter-limit", gsk_stroke_get_miter_limit (stroke), 4.0f);
-        dash = gsk_stroke_get_dash (stroke, &n_dash);
-        if (dash)
-          append_dash_param (p, "dash", dash, n_dash);
-        append_float_param (p, "dash-offset", gsk_stroke_get_dash_offset (stroke), 0.0f);
+        append_float_param (p, "line-width", gsk_stroke_get_line_width (stroke), 0.0);
 
         end_node (p);
       }

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[];