[gegl] ops: move generated ops to gegl-op.h



commit 6bc8d2d678600ae053e65308130f81a87d5155d8
Author: Øyvind Kolås <pippin gimp org>
Date:   Tue May 20 22:11:07 2014 +0200

    ops: move generated ops to gegl-op.h

 operations/generated/add.c                 |   29 ++++++++++---------
 operations/generated/clear.c               |   31 +++++++++-----------
 operations/generated/color-burn.c          |   25 +++++++---------
 operations/generated/color-dodge.c         |   25 +++++++---------
 operations/generated/darken.c              |   25 +++++++---------
 operations/generated/difference.c          |   25 +++++++---------
 operations/generated/divide.c              |   29 ++++++++++---------
 operations/generated/dst-atop.c            |   31 +++++++++-----------
 operations/generated/dst-in.c              |   31 +++++++++-----------
 operations/generated/dst-out.c             |   31 +++++++++-----------
 operations/generated/dst-over.c            |   31 +++++++++-----------
 operations/generated/dst.c                 |   31 +++++++++-----------
 operations/generated/exclusion.c           |   25 +++++++---------
 operations/generated/gamma.c               |   29 ++++++++++---------
 operations/generated/hard-light.c          |   25 +++++++---------
 operations/generated/lighten.c             |   25 +++++++---------
 operations/generated/math.rb               |   29 ++++++++++---------
 operations/generated/multiply.c            |   29 ++++++++++---------
 operations/generated/overlay.c             |   25 +++++++---------
 operations/generated/plus.c                |   25 +++++++---------
 operations/generated/screen.c              |   25 +++++++---------
 operations/generated/soft-light.c          |   25 +++++++---------
 operations/generated/src-atop.c            |   31 +++++++++-----------
 operations/generated/src-in.c              |   31 +++++++++-----------
 operations/generated/src-out.c             |   31 +++++++++-----------
 operations/generated/src.c                 |   31 +++++++++-----------
 operations/generated/subtract.c            |   29 ++++++++++---------
 operations/generated/svg-12-blend.rb       |   43 +++++++++++++---------------
 operations/generated/svg-12-porter-duff.rb |   37 +++++++++++-------------
 operations/generated/svg-multiply.c        |   25 +++++++---------
 operations/generated/xor.c                 |   31 +++++++++-----------
 operations/workshop/generated/blend.rb     |   10 +++---
 32 files changed, 418 insertions(+), 487 deletions(-)
---
diff --git a/operations/generated/add.c b/operations/generated/add.c
index 06a44fc..088017b 100644
--- a/operations/generated/add.c
+++ b/operations/generated/add.c
@@ -24,16 +24,17 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _("Value"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, _("global value used if aux doesn't 
contain data"))
+property_double (value, _("Value"), 0.0)
+   description(_("global value used if aux doesn't contain data"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "add.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "add.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -51,13 +52,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -66,7 +67,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -107,7 +108,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/clear.c b/operations/generated/clear.c
index e01dca4..452e1d7 100644
--- a/operations/generated/clear.c
+++ b/operations/generated/clear.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "clear.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "clear.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -108,7 +105,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/color-burn.c b/operations/generated/color-burn.c
index c017220..6182aff 100644
--- a/operations/generated/color-burn.c
+++ b/operations/generated/color-burn.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "color-burn.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "color-burn.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -156,7 +153,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -165,8 +162,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:color-burn",
diff --git a/operations/generated/color-dodge.c b/operations/generated/color-dodge.c
index b29d0c5..cbca350 100644
--- a/operations/generated/color-dodge.c
+++ b/operations/generated/color-dodge.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "color-dodge.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "color-dodge.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -156,7 +153,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -165,8 +162,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:color-dodge",
diff --git a/operations/generated/darken.c b/operations/generated/darken.c
index dd2a791..323ebfe 100644
--- a/operations/generated/darken.c
+++ b/operations/generated/darken.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "darken.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "darken.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:darken",
diff --git a/operations/generated/difference.c b/operations/generated/difference.c
index 78f27b0..333e29a 100644
--- a/operations/generated/difference.c
+++ b/operations/generated/difference.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "difference.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "difference.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:difference",
diff --git a/operations/generated/divide.c b/operations/generated/divide.c
index dbce77e..c8f994e 100644
--- a/operations/generated/divide.c
+++ b/operations/generated/divide.c
@@ -24,16 +24,17 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _("Value"), -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, _("global value used if aux doesn't 
contain data"))
+property_double (value, _("Value"), 1.0)
+   description(_("global value used if aux doesn't contain data"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "divide.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "divide.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -51,13 +52,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -66,7 +67,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -107,7 +108,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/dst-atop.c b/operations/generated/dst-atop.c
index 31a66cf..0cbd312 100644
--- a/operations/generated/dst-atop.c
+++ b/operations/generated/dst-atop.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "dst-atop.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "dst-atop.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -108,7 +105,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/dst-in.c b/operations/generated/dst-in.c
index 8f9b1aa..7531178 100644
--- a/operations/generated/dst-in.c
+++ b/operations/generated/dst-in.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "dst-in.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "dst-in.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -108,7 +105,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/dst-out.c b/operations/generated/dst-out.c
index 9b3195b..f9ba0c0 100644
--- a/operations/generated/dst-out.c
+++ b/operations/generated/dst-out.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "dst-out.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "dst-out.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -130,7 +127,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/dst-over.c b/operations/generated/dst-over.c
index 8b76418..1cc8e16 100644
--- a/operations/generated/dst-over.c
+++ b/operations/generated/dst-over.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "dst-over.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "dst-over.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -130,7 +127,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/dst.c b/operations/generated/dst.c
index c05b864..41bac88 100644
--- a/operations/generated/dst.c
+++ b/operations/generated/dst.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "dst.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "dst.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -130,7 +127,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/exclusion.c b/operations/generated/exclusion.c
index 1cab7bb..d1b97d0 100644
--- a/operations/generated/exclusion.c
+++ b/operations/generated/exclusion.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "exclusion.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "exclusion.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:exclusion",
diff --git a/operations/generated/gamma.c b/operations/generated/gamma.c
index 64ba54a..0f6943f 100644
--- a/operations/generated/gamma.c
+++ b/operations/generated/gamma.c
@@ -24,16 +24,17 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _("Value"), -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, _("global value used if aux doesn't 
contain data"))
+property_double (value, _("Value"), 1.0)
+   description(_("global value used if aux doesn't contain data"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "gamma.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "gamma.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -51,13 +52,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -66,7 +67,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -107,7 +108,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/hard-light.c b/operations/generated/hard-light.c
index 22b0a7a..9a982e1 100644
--- a/operations/generated/hard-light.c
+++ b/operations/generated/hard-light.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "hard-light.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "hard-light.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -156,7 +153,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -165,8 +162,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:hard-light",
diff --git a/operations/generated/lighten.c b/operations/generated/lighten.c
index 8b5d218..bed901b 100644
--- a/operations/generated/lighten.c
+++ b/operations/generated/lighten.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "lighten.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "lighten.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:lighten",
diff --git a/operations/generated/math.rb b/operations/generated/math.rb
index a0555f6..250c430 100755
--- a/operations/generated/math.rb
+++ b/operations/generated/math.rb
@@ -54,16 +54,17 @@ a.each do
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _(\"Value\"), -G_MAXDOUBLE, G_MAXDOUBLE, #{item[2]}, _(\"global value used if aux 
doesn't contain data\"))
+property_double (value, _(\"Value\"), #{item[2]})
+   description(_(\"global value used if aux doesn't contain data\"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -81,13 +82,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -96,7 +97,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -137,7 +138,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/multiply.c b/operations/generated/multiply.c
index 032c522..8bb9790 100644
--- a/operations/generated/multiply.c
+++ b/operations/generated/multiply.c
@@ -24,16 +24,17 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _("Value"), -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, _("global value used if aux doesn't 
contain data"))
+property_double (value, _("Value"), 1.0)
+   description(_("global value used if aux doesn't contain data"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "multiply.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "multiply.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -51,13 +52,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -66,7 +67,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -107,7 +108,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/overlay.c b/operations/generated/overlay.c
index 45cd4cd..15a2f4e 100644
--- a/operations/generated/overlay.c
+++ b/operations/generated/overlay.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "overlay.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "overlay.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -156,7 +153,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -165,8 +162,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:overlay",
diff --git a/operations/generated/plus.c b/operations/generated/plus.c
index 592dff2..8c72596 100644
--- a/operations/generated/plus.c
+++ b/operations/generated/plus.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "plus.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "plus.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
 
   gegl_operation_class_set_keys (operation_class,
diff --git a/operations/generated/screen.c b/operations/generated/screen.c
index 6c4b2f8..eba34da 100644
--- a/operations/generated/screen.c
+++ b/operations/generated/screen.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "screen.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "screen.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:screen",
diff --git a/operations/generated/soft-light.c b/operations/generated/soft-light.c
index 223acc8..3dc8ddd 100644
--- a/operations/generated/soft-light.c
+++ b/operations/generated/soft-light.c
@@ -33,27 +33,24 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "soft-light.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "soft-light.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 #include <math.h>
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -72,7 +69,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -159,7 +156,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -168,8 +165,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "gegl:soft-light",
diff --git a/operations/generated/src-atop.c b/operations/generated/src-atop.c
index 84d2c19..48b424c 100644
--- a/operations/generated/src-atop.c
+++ b/operations/generated/src-atop.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "src-atop.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "src-atop.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -130,7 +127,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/src-in.c b/operations/generated/src-in.c
index 23611cb..374cdfc 100644
--- a/operations/generated/src-in.c
+++ b/operations/generated/src-in.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "src-in.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "src-in.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -114,7 +111,7 @@ static GeglRectangle get_bounding_box (GeglOperation *self)
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/src-out.c b/operations/generated/src-out.c
index 5ecac6c..1e499d3 100644
--- a/operations/generated/src-out.c
+++ b/operations/generated/src-out.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "src-out.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "src-out.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -108,7 +105,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/src.c b/operations/generated/src.c
index 5feef9e..a84d29e 100644
--- a/operations/generated/src.c
+++ b/operations/generated/src.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "src.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "src.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -108,7 +105,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/subtract.c b/operations/generated/subtract.c
index 1779f9a..b71ab65 100644
--- a/operations/generated/subtract.c
+++ b/operations/generated/subtract.c
@@ -24,16 +24,17 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_double (value, _("Value"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, _("global value used if aux doesn't 
contain data"))
+property_double (value, _("Value"), 0.0)
+   description(_("global value used if aux doesn't contain data"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       "subtract.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       "subtract.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 #include <math.h>
 #ifdef _MSC_VER
@@ -51,13 +52,13 @@ static void prepare (GeglOperation *operation)
 }
 
 static gboolean
-process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+process (GeglOperation       *op,
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gfloat * GEGL_ALIGNED in = in_buf;
   gfloat * GEGL_ALIGNED out = out_buf;
@@ -66,7 +67,7 @@ process (GeglOperation        *op,
 
   if (aux == NULL)
     {
-      gfloat value = GEGL_CHANT_PROPERTIES (op)->value;
+      gfloat value = GEGL_PROPERTIES (op)->value;
       for (i=0; i<n_pixels; i++)
         {
           gint   j;
@@ -107,7 +108,7 @@ process (GeglOperation        *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/generated/svg-12-blend.rb b/operations/generated/svg-12-blend.rb
index 6ea6564..2f8d9e4 100755
--- a/operations/generated/svg-12-blend.rb
+++ b/operations/generated/svg-12-blend.rb
@@ -76,11 +76,10 @@ file_head1 = '
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 '
@@ -88,11 +87,9 @@ gegl_chant_boolean (srgb, _("sRGB"),
 file_head2 = '
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R\'aG\'aB\'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -111,7 +108,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -172,7 +169,7 @@ file_tail1 = '
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -181,8 +178,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 '
 
 file_tail2 = '  gegl_operation_class_set_key (operation_class, "categories", "compositors:svgfilter");
@@ -210,10 +207,10 @@ a.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 "
     file.write file_head2
     file.write "
@@ -272,10 +269,10 @@ b.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 "
     file.write file_head2
     file.write "
@@ -339,10 +336,10 @@ c.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 #include <math.h>
 "
     file.write file_head2
@@ -405,10 +402,10 @@ d.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE       \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE       \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 "
     file.write file_head2
     file.write "
diff --git a/operations/generated/svg-12-porter-duff.rb b/operations/generated/svg-12-porter-duff.rb
index 8b67241..74441c6 100755
--- a/operations/generated/svg-12-porter-duff.rb
+++ b/operations/generated/svg-12-porter-duff.rb
@@ -78,11 +78,10 @@ file_head1 = '
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 '
@@ -90,11 +89,9 @@ gegl_chant_boolean (srgb, _("sRGB"),
 file_head2 = '
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R\'aG\'aB\'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -106,12 +103,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -122,7 +119,7 @@ process (GeglOperation        *op,
 file_tail1 = '
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -160,10 +157,10 @@ a.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 "
     file.write file_head2
 
@@ -265,10 +262,10 @@ b.each do
     file.write copyright
     file.write file_head1
     file.write "
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 "
     file.write file_head2
     file.write "
diff --git a/operations/generated/svg-multiply.c b/operations/generated/svg-multiply.c
index 233b9ef..1a2675e 100644
--- a/operations/generated/svg-multiply.c
+++ b/operations/generated/svg-multiply.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "svg-multiply.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "svg-multiply.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -71,7 +68,7 @@ static gboolean operation_process (GeglOperation        *operation,
 {
   GeglOperationClass  *operation_class;
   gpointer input, aux;
-  operation_class = GEGL_OPERATION_CLASS (gegl_chant_parent_class);
+  operation_class = GEGL_OPERATION_CLASS (gegl_op_parent_class);
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -153,7 +150,7 @@ process (GeglOperation       *op,
 }
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
@@ -162,8 +159,8 @@ gegl_chant_class_init (GeglChantClass *klass)
   point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
 
   point_composer_class->process = process;
-  operation_class->process = operation_process;
-  operation_class->prepare = prepare;
+  operation_class->process      = operation_process;
+  operation_class->prepare      = prepare;
 
   gegl_operation_class_set_keys (operation_class,
   "name"        , "svg:multiply",
diff --git a/operations/generated/xor.c b/operations/generated/xor.c
index 9525726..d8c8068 100644
--- a/operations/generated/xor.c
+++ b/operations/generated/xor.c
@@ -33,26 +33,23 @@
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
-gegl_chant_boolean (srgb, _("sRGB"),
-                    FALSE,
-                    _("Use sRGB gamma instead of linear"))
+property_boolean (srgb, _("sRGB"), FALSE)
+    description (_("Use sRGB gamma instead of linear"))
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE        "xor.c"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE        "xor.c"
 
-#include "gegl-chant.h"
+#include "gegl-op.h"
 
 static void prepare (GeglOperation *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-
   const Babl *format;
 
-  if (o->srgb)
+  if (GEGL_PROPERTIES (operation))
     format = babl_format ("R'aG'aB'aA float");
   else
     format = babl_format ("RaGaBaA float");
@@ -64,12 +61,12 @@ static void prepare (GeglOperation *operation)
 
 static gboolean
 process (GeglOperation        *op,
-          void                *in_buf,
-          void                *aux_buf,
-          void                *out_buf,
-          glong                n_pixels,
-          const GeglRectangle *roi,
-          gint                 level)
+         void                *in_buf,
+         void                *aux_buf,
+         void                *out_buf,
+         glong                n_pixels,
+         const GeglRectangle *roi,
+         gint                 level)
 {
   gint i;
   gfloat * GEGL_ALIGNED in = in_buf;
@@ -130,7 +127,7 @@ process (GeglOperation        *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;
diff --git a/operations/workshop/generated/blend.rb b/operations/workshop/generated/blend.rb
index 5ece5cf..4fd5f87 100755
--- a/operations/workshop/generated/blend.rb
+++ b/operations/workshop/generated/blend.rb
@@ -65,16 +65,16 @@ a.each do
 #include <glib/gi18n-lib.h>
 
 
-#ifdef GEGL_CHANT_PROPERTIES
+#ifdef GEGL_PROPERTIES
 
 /* no properties */
 
 #else
 
-#define GEGL_CHANT_TYPE_POINT_COMPOSER
-#define GEGL_CHANT_C_FILE          \"#{filename}\"
+#define GEGL_OP_POINT_COMPOSER
+#define GEGL_OP_C_FILE          \"#{filename}\"
 
-#include \"gegl-chant.h\"
+#include \"gegl-op.h\"
 #include <math.h>
 
 static void prepare (GeglOperation *self)
@@ -129,7 +129,7 @@ process (GeglOperation       *op,
 
 
 static void
-gegl_chant_class_init (GeglChantClass *klass)
+gegl_op_class_init (GeglOpClass *klass)
 {
   GeglOperationClass              *operation_class;
   GeglOperationPointComposerClass *point_composer_class;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]