]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktexttag.c
treeview: fix a critical warning
[~andy/gtk] / gtk / gtktexttag.c
index e7f89a35fba4fd2c72f77d9226478ff0c6a19813..8674e92c9f0cd74a2be7f9a049c56bfc5dd3e026 100644 (file)
@@ -1,5 +1,5 @@
 /* gtktexttag.c - text tag object
- * 
+ *
  * Copyright (c) 1992-1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  * Copyright (c) 2000      Red Hat, Inc.
@@ -9,7 +9,7 @@
  * California, Sun Microsystems, Inc., and other parties.  The
  * following terms apply to all files associated with the software
  * unless explicitly disclaimed in individual files.
- * 
+ *
  * The authors hereby grant permission to use, copy, modify,
  * distribute, and license this software and its documentation for any
  * purpose, provided that existing copyright notices are retained in
  * software may be copyrighted by their authors and need not follow
  * the licensing terms described here, provided that the new terms are
  * clearly indicated on the first page of each file where they apply.
- * 
+ *
  * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
  * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
  * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
  * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
  * foregoing, the authors grant the U.S. Government and others acting
  * in its behalf permission to use and distribute the software in
  * accordance with the terms specified in this license.
- * 
+ *
+ */
+
+/**
+ * SECTION:gtktexttag
+ * @Title: GtkTextTag
+ * @Short_description: A tag that can be applied to text in a GtkTextBuffer
+ *
+ * You may wish to begin by reading the <link linkend="TextWidget">text widget
+ * conceptual overview</link> which gives an overview of all the objects and
+ * data types related to the text widget and how they work together.
+ *
+ * Tags should be in the #GtkTextTagTable for a given #GtkTextBuffer
+ * before using them with that buffer.
+ *
+ * gtk_text_buffer_create_tag() is the best way to create tags.
+ * See <application>gtk3-demo</application> for numerous examples.
+ *
+ * For each property of #GtkTextTag, there is a "set" property, e.g.
+ * "font-set" corresponds to "font". These "set" properties reflect
+ * whether a property has been set or not.
+ * They are maintained by GTK+ and you should not set them independently.
  */
 
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
 #include "gtktexttagtable.h"
-#include "gtksignal.h"
-
-#include <stdlib.h>
+#include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtktypebuiltins.h"
 
 enum {
   EVENT,
@@ -60,825 +87,1792 @@ enum {
 };
 
 enum {
-  ARG_0,
+  PROP_0,
   /* Construct args */
-  ARG_NAME,
+  PROP_NAME,
 
   /* Style args */
-  ARG_BACKGROUND,
-  ARG_FOREGROUND,
-  ARG_BACKGROUND_GDK,
-  ARG_FOREGROUND_GDK,
-  ARG_BACKGROUND_STIPPLE,
-  ARG_FOREGROUND_STIPPLE,
-  ARG_FONT,
-  ARG_FONT_DESC,
-  ARG_PIXELS_ABOVE_LINES,
-  ARG_PIXELS_BELOW_LINES,
-  ARG_PIXELS_INSIDE_WRAP,
-  ARG_EDITABLE,
-  ARG_WRAP_MODE,
-  ARG_JUSTIFY,
-  ARG_DIRECTION,
-  ARG_LEFT_MARGIN,
-  ARG_LEFT_WRAPPED_LINE_MARGIN,
-  ARG_OVERSTRIKE,
-  ARG_RIGHT_MARGIN,
-  ARG_UNDERLINE,
-  ARG_OFFSET,
-  ARG_BG_FULL_HEIGHT,
+  PROP_BACKGROUND,
+  PROP_FOREGROUND,
+  PROP_BACKGROUND_GDK,
+  PROP_FOREGROUND_GDK,
+  PROP_BACKGROUND_RGBA,
+  PROP_FOREGROUND_RGBA,
+  PROP_FONT,
+  PROP_FONT_DESC,
+  PROP_FAMILY,
+  PROP_STYLE,
+  PROP_VARIANT,
+  PROP_WEIGHT,
+  PROP_STRETCH,
+  PROP_SIZE,
+  PROP_SIZE_POINTS,
+  PROP_SCALE,
+  PROP_PIXELS_ABOVE_LINES,
+  PROP_PIXELS_BELOW_LINES,
+  PROP_PIXELS_INSIDE_WRAP,
+  PROP_EDITABLE,
+  PROP_WRAP_MODE,
+  PROP_JUSTIFICATION,
+  PROP_DIRECTION,
+  PROP_LEFT_MARGIN,
+  PROP_INDENT,
+  PROP_STRIKETHROUGH,
+  PROP_RIGHT_MARGIN,
+  PROP_UNDERLINE,
+  PROP_RISE,
+  PROP_BACKGROUND_FULL_HEIGHT,
+  PROP_LANGUAGE,
+  PROP_TABS,
+  PROP_INVISIBLE,
+  PROP_PARAGRAPH_BACKGROUND,
+  PROP_PARAGRAPH_BACKGROUND_GDK,
+  PROP_PARAGRAPH_BACKGROUND_RGBA,
+
+  /* Behavior args */
+  PROP_ACCUMULATIVE_MARGIN,
   
   /* Whether-a-style-arg-is-set args */
-  ARG_BACKGROUND_SET,
-  ARG_FOREGROUND_SET,
-  ARG_BACKGROUND_GDK_SET,
-  ARG_FOREGROUND_GDK_SET,
-  ARG_BACKGROUND_STIPPLE_SET,
-  ARG_FOREGROUND_STIPPLE_SET,
-  ARG_FONT_SET,
-  ARG_PIXELS_ABOVE_LINES_SET,
-  ARG_PIXELS_BELOW_LINES_SET,
-  ARG_PIXELS_INSIDE_WRAP_SET,
-  ARG_EDITABLE_SET,
-  ARG_WRAP_MODE_SET,
-  ARG_JUSTIFY_SET,
-  ARG_LEFT_MARGIN_SET,
-  ARG_LEFT_WRAPPED_LINE_MARGIN_SET,
-  ARG_OVERSTRIKE_SET,
-  ARG_RIGHT_MARGIN_SET,
-  ARG_UNDERLINE_SET,
-  ARG_OFFSET_SET,
-  ARG_BG_FULL_HEIGHT_SET,
-  
+  PROP_BACKGROUND_SET,
+  PROP_FOREGROUND_SET,
+  PROP_FAMILY_SET,
+  PROP_STYLE_SET,
+  PROP_VARIANT_SET,
+  PROP_WEIGHT_SET,
+  PROP_STRETCH_SET,
+  PROP_SIZE_SET,
+  PROP_SCALE_SET,
+  PROP_PIXELS_ABOVE_LINES_SET,
+  PROP_PIXELS_BELOW_LINES_SET,
+  PROP_PIXELS_INSIDE_WRAP_SET,
+  PROP_EDITABLE_SET,
+  PROP_WRAP_MODE_SET,
+  PROP_JUSTIFICATION_SET,
+  PROP_LEFT_MARGIN_SET,
+  PROP_INDENT_SET,
+  PROP_STRIKETHROUGH_SET,
+  PROP_RIGHT_MARGIN_SET,
+  PROP_UNDERLINE_SET,
+  PROP_RISE_SET,
+  PROP_BACKGROUND_FULL_HEIGHT_SET,
+  PROP_LANGUAGE_SET,
+  PROP_TABS_SET,
+  PROP_INVISIBLE_SET,
+  PROP_PARAGRAPH_BACKGROUND_SET,
+
   LAST_ARG
 };
+static void gtk_text_tag_finalize     (GObject         *object);
+static void gtk_text_tag_set_property (GObject         *object,
+                                       guint            prop_id,
+                                       const GValue    *value,
+                                       GParamSpec      *pspec);
+static void gtk_text_tag_get_property (GObject         *object,
+                                       guint            prop_id,
+                                       GValue          *value,
+                                       GParamSpec      *pspec);
 
-static void gtk_text_tag_init       (GtkTextTag      *tkxt_tag);
-static void gtk_text_tag_class_init (GtkTextTagClass *klass);
-static void gtk_text_tag_destroy    (GtkObject       *object);
-static void gtk_text_tag_finalize   (GObject         *object);
-static void gtk_text_tag_set_arg    (GtkObject       *object,
-                                    GtkArg          *arg,
-                                    guint            arg_id);
-static void gtk_text_tag_get_arg    (GtkObject       *object,
-                                    GtkArg          *arg,
-                                    guint            arg_id);
-
-static GtkObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
-GtkType
-gtk_text_tag_get_type (void)
-{
-  static GtkType our_type = 0;
-
-  if (our_type == 0)
-    {
-      static const GtkTypeInfo our_info =
-      {
-        "GtkTextTag",
-        sizeof (GtkTextTag),
-        sizeof (GtkTextTagClass),
-        (GtkClassInitFunc) gtk_text_tag_class_init,
-        (GtkObjectInitFunc) gtk_text_tag_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL
-      };
-
-    our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
-  }
-
-  return our_type;
-}
+G_DEFINE_TYPE (GtkTextTag, gtk_text_tag, G_TYPE_OBJECT)
 
 static void
 gtk_text_tag_class_init (GtkTextTagClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
+  object_class->set_property = gtk_text_tag_set_property;
+  object_class->get_property = gtk_text_tag_get_property;
+  
+  object_class->finalize = gtk_text_tag_finalize;
 
   /* Construct */
-  gtk_object_add_arg_type ("GtkTextTag::name", GTK_TYPE_STRING,
-                           GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY,
-                           ARG_NAME);
+  g_object_class_install_property (object_class,
+                                   PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        P_("Tag name"),
+                                                        P_("Name used to refer to the text tag. NULL for anonymous tags"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   /* Style args */
-  gtk_object_add_arg_type ("GtkTextTag::background", GTK_TYPE_STRING,
-                           GTK_ARG_WRITABLE, ARG_BACKGROUND);
-  gtk_object_add_arg_type ("GtkTextTag::foreground", GTK_TYPE_STRING,
-                           GTK_ARG_WRITABLE, ARG_FOREGROUND);
-  gtk_object_add_arg_type ("GtkTextTag::background_gdk", GTK_TYPE_GDK_COLOR,
-                           GTK_ARG_READWRITE, ARG_BACKGROUND_GDK);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk", GTK_TYPE_GDK_COLOR,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK);
-  gtk_object_add_arg_type ("GtkTextTag::background_stipple",
-                           GDK_TYPE_PIXMAP,
-                           GTK_ARG_READWRITE, ARG_BACKGROUND_STIPPLE);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple",
-                           GDK_TYPE_PIXMAP,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE);
-  gtk_object_add_arg_type ("GtkTextTag::font", GTK_TYPE_STRING,
-                           GTK_ARG_READWRITE, ARG_FONT);
-  gtk_object_add_arg_type ("GtkTextTag::font_desc", GTK_TYPE_BOXED,
-                           GTK_ARG_READWRITE, ARG_FONT_DESC);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP);
-  gtk_object_add_arg_type ("GtkTextTag::editable", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_EDITABLE);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE);
-  gtk_object_add_arg_type ("GtkTextTag::justify", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_JUSTIFY);
-  gtk_object_add_arg_type ("GtkTextTag::direction", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_DIRECTION);
-  gtk_object_add_arg_type ("GtkTextTag::left_margin", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_LEFT_MARGIN);
-  gtk_object_add_arg_type ("GtkTextTag::left_wrapped_line_margin", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_LEFT_WRAPPED_LINE_MARGIN);
-  gtk_object_add_arg_type ("GtkTextTag::overstrike", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_OVERSTRIKE);
-  gtk_object_add_arg_type ("GtkTextTag::right_margin", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP);
-  gtk_object_add_arg_type ("GtkTextTag::underline", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_UNDERLINE);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE);
-  gtk_object_add_arg_type ("GtkTextTag::offset", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_OFFSET);
-  gtk_object_add_arg_type ("GtkTextTag::background_full_height", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT);
-
-  /* Style args are set or not */
-  gtk_object_add_arg_type ("GtkTextTag::background_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BACKGROUND_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_SET);
-  gtk_object_add_arg_type ("GtkTextTag::background_gdk_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BACKGROUND_GDK_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK_SET);
-  gtk_object_add_arg_type ("GtkTextTag::background_stipple_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BACKGROUND_STIPPLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::font_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FONT_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP_SET);
-  gtk_object_add_arg_type ("GtkTextTag::editable_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_EDITABLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::justify_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_JUSTIFY_SET);
-  gtk_object_add_arg_type ("GtkTextTag::left_margin_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_LEFT_MARGIN_SET);
-  gtk_object_add_arg_type ("GtkTextTag::left_wrapped_line_margin_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_LEFT_WRAPPED_LINE_MARGIN_SET);
-  gtk_object_add_arg_type ("GtkTextTag::overstrike_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_OVERSTRIKE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::right_margin_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP_SET);
-  gtk_object_add_arg_type ("GtkTextTag::underline_set", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_UNDERLINE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::offset_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_OFFSET_SET);  
-  gtk_object_add_arg_type ("GtkTextTag::background_full_height_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT_SET);
+
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND,
+                                   g_param_spec_string ("background",
+                                                        P_("Background color name"),
+                                                        P_("Background color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkTextTag:background-gdk:
+   *
+   * Background color as a #GdkColor.
+   *
+   * Deprecated: 3.4: Use #GtkTextTag:background-rgba instead.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_GDK,
+                                   g_param_spec_boxed ("background-gdk",
+                                                       P_("Background color"),
+                                                       P_("Background color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+  /**
+   * GtkTextTag:background-rgba:
+   *
+   * Background color as a #GdkRGBA.
+   *
+   * Since: 3.2
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_RGBA,
+                                   g_param_spec_boxed ("background-rgba",
+                                                       P_("Background RGBA"),
+                                                       P_("Background color as a GdkRGBA"),
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_FULL_HEIGHT,
+                                   g_param_spec_boolean ("background-full-height",
+                                                         P_("Background full height"),
+                                                         P_("Whether the background color fills the entire line height or only the height of the tagged characters"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND,
+                                   g_param_spec_string ("foreground",
+                                                        P_("Foreground color name"),
+                                                        P_("Foreground color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkTextTag:foreground-gdk:
+   *
+   * Foreground color as a #GdkColor.
+   *
+   * Deprecated: 3.4: Use #GtkTextTag:foreground-rgba instead.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND_GDK,
+                                   g_param_spec_boxed ("foreground-gdk",
+                                                       P_("Foreground color"),
+                                                       P_("Foreground color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+  /**
+   * GtkTextTag:foreground-rgba:
+   *
+   * Foreground color as a #GdkRGBA.
+   *
+   * Since: 3.2
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND_RGBA,
+                                   g_param_spec_boxed ("foreground-rgba",
+                                                       P_("Foreground RGBA"),
+                                                       P_("Foreground color as a GdkRGBA"),
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_DIRECTION,
+                                   g_param_spec_enum ("direction",
+                                                      P_("Text direction"),
+                                                      P_("Text direction, e.g. right-to-left or left-to-right"),
+                                                      GTK_TYPE_TEXT_DIRECTION,
+                                                      GTK_TEXT_DIR_NONE,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_EDITABLE,
+                                   g_param_spec_boolean ("editable",
+                                                         P_("Editable"),
+                                                         P_("Whether the text can be modified by the user"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextTag:font:
+   *
+   * Font description as string, e.g. \"Sans Italic 12\". 
+   *
+   * Note that the initial value of this property depends on
+   * the internals of #PangoFontDescription.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_FONT,
+                                   g_param_spec_string ("font",
+                                                        P_("Font"),
+                                                        P_("Font description as a string, e.g. \"Sans Italic 12\""),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FONT_DESC,
+                                   g_param_spec_boxed ("font-desc",
+                                                       P_("Font"),
+                                                       P_("Font description as a PangoFontDescription struct"),
+                                                       PANGO_TYPE_FONT_DESCRIPTION,
+                                                       GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_FAMILY,
+                                   g_param_spec_string ("family",
+                                                        P_("Font family"),
+                                                        P_("Name of the font family, e.g. Sans, Helvetica, Times, Monospace"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_STYLE,
+                                   g_param_spec_enum ("style",
+                                                      P_("Font style"),
+                                                      P_("Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"),
+                                                      PANGO_TYPE_STYLE,
+                                                      PANGO_STYLE_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_VARIANT,
+                                   g_param_spec_enum ("variant",
+                                                     P_("Font variant"),
+                                                     P_("Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"),
+                                                      PANGO_TYPE_VARIANT,
+                                                      PANGO_VARIANT_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_WEIGHT,
+                                   g_param_spec_int ("weight",
+                                                     P_("Font weight"),
+                                                     P_("Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     PANGO_WEIGHT_NORMAL,
+                                                     GTK_PARAM_READWRITE));
+  
+
+  g_object_class_install_property (object_class,
+                                   PROP_STRETCH,
+                                   g_param_spec_enum ("stretch",
+                                                      P_("Font stretch"),
+                                                      P_("Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"),
+                                                      PANGO_TYPE_STRETCH,
+                                                      PANGO_STRETCH_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_SIZE,
+                                   g_param_spec_int ("size",
+                                                     P_("Font size"),
+                                                     P_("Font size in Pango units"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SCALE,
+                                   g_param_spec_double ("scale",
+                                                        P_("Font scale"),
+                                                        P_("Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        1.0,
+                                                        GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_SIZE_POINTS,
+                                   g_param_spec_double ("size-points",
+                                                        P_("Font points"),
+                                                        P_("Font size in points"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (object_class,
+                                   PROP_JUSTIFICATION,
+                                   g_param_spec_enum ("justification",
+                                                      P_("Justification"),
+                                                      P_("Left, right, or center justification"),
+                                                      GTK_TYPE_JUSTIFICATION,
+                                                      GTK_JUSTIFY_LEFT,
+                                                      GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextTag:language:
+   *
+   * The language this text is in, as an ISO code. Pango can use this as a 
+   * hint when rendering the text. If not set, an appropriate default will be 
+   * used.
+   *
+   * Note that the initial value of this property depends on the current
+   * locale, see also gtk_get_default_language().
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_LANGUAGE,
+                                   g_param_spec_string ("language",
+                                                        P_("Language"),
+                                                        P_("The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (object_class,
+                                   PROP_LEFT_MARGIN,
+                                   g_param_spec_int ("left-margin",
+                                                     P_("Left margin"),
+                                                     P_("Width of the left margin in pixels"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_RIGHT_MARGIN,
+                                   g_param_spec_int ("right-margin",
+                                                     P_("Right margin"),
+                                                     P_("Width of the right margin in pixels"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  
+  g_object_class_install_property (object_class,
+                                   PROP_INDENT,
+                                   g_param_spec_int ("indent",
+                                                     P_("Indent"),
+                                                     P_("Amount to indent the paragraph, in pixels"),
+                                                     G_MININT,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  
+  g_object_class_install_property (object_class,
+                                   PROP_RISE,
+                                   g_param_spec_int ("rise",
+                                                     P_("Rise"),
+                                                     P_("Offset of text above the baseline (below the baseline if rise is negative) in Pango units"),
+                                                    G_MININT,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_PIXELS_ABOVE_LINES,
+                                   g_param_spec_int ("pixels-above-lines",
+                                                     P_("Pixels above lines"),
+                                                     P_("Pixels of blank space above paragraphs"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_PIXELS_BELOW_LINES,
+                                   g_param_spec_int ("pixels-below-lines",
+                                                     P_("Pixels below lines"),
+                                                     P_("Pixels of blank space below paragraphs"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_PIXELS_INSIDE_WRAP,
+                                   g_param_spec_int ("pixels-inside-wrap",
+                                                     P_("Pixels inside wrap"),
+                                                     P_("Pixels of blank space between wrapped lines in a paragraph"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_STRIKETHROUGH,
+                                   g_param_spec_boolean ("strikethrough",
+                                                         P_("Strikethrough"),
+                                                         P_("Whether to strike through the text"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_UNDERLINE,
+                                   g_param_spec_enum ("underline",
+                                                      P_("Underline"),
+                                                      P_("Style of underline for this text"),
+                                                      PANGO_TYPE_UNDERLINE,
+                                                      PANGO_UNDERLINE_NONE,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_WRAP_MODE,
+                                   g_param_spec_enum ("wrap-mode",
+                                                     P_("Wrap mode"),
+                                                     P_("Whether to wrap lines never, at word boundaries, or at character boundaries"),
+                                                      GTK_TYPE_WRAP_MODE,
+                                                      GTK_WRAP_NONE,
+                                                      GTK_PARAM_READWRITE));
+  
+
+  g_object_class_install_property (object_class,
+                                   PROP_TABS,
+                                   g_param_spec_boxed ("tabs",
+                                                       P_("Tabs"),
+                                                       P_("Custom tabs for this text"),
+                                                       PANGO_TYPE_TAB_ARRAY,
+                                                       GTK_PARAM_READWRITE));
+  
+  /**
+   * GtkTextTag:invisible:
+   *
+   * Whether this text is hidden.
+   *
+   * Note that there may still be problems with the support for invisible 
+   * text, in particular when navigating programmatically inside a buffer
+   * containing invisible segments. 
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_INVISIBLE,
+                                   g_param_spec_boolean ("invisible",
+                                                         P_("Invisible"),
+                                                         P_("Whether this text is hidden."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextTag:paragraph-background:
+   *
+   * The paragraph background color as a string.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PARAGRAPH_BACKGROUND,
+                                   g_param_spec_string ("paragraph-background",
+                                                        P_("Paragraph background color name"),
+                                                        P_("Paragraph background color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkTextTag:paragraph-background-gdk:
+   *
+   * The paragraph background color as a as a #GdkColor.
+   *
+   * Since: 2.8
+   *
+   * Deprecated: 3.4: Use #GtkTextTag:paragraph-background-rgba instead.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PARAGRAPH_BACKGROUND_GDK,
+                                   g_param_spec_boxed ("paragraph-background-gdk",
+                                                       P_("Paragraph background color"),
+                                                       P_("Paragraph background color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+  /**
+   * GtkTextTag:paragraph-background-rgba:
+   *
+   * The paragraph background color as a as a #GdkRGBA.
+   *
+   * Since: 3.2
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PARAGRAPH_BACKGROUND_RGBA,
+                                   g_param_spec_boxed ("paragraph-background-rgba",
+                                                       P_("Paragraph background RGBA"),
+                                                       P_("Paragraph background RGBA as a GdkRGBA"),
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextTag:accumulative-margin:
+   *
+   * Whether the margins accumulate or override each other.
+   *
+   * When set to %TRUE the margins of this tag are added to the margins 
+   * of any other non-accumulative margins present. When set to %FALSE 
+   * the margins override one another (the default).
+   *
+   * Since: 2.12
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_ACCUMULATIVE_MARGIN,
+                                   g_param_spec_boolean ("accumulative-margin",
+                                                         P_("Margin Accumulates"),
+                                                         P_("Whether left and right margins accumulate."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  /* Style props are set or not */
+
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
+
+  ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
+                P_("Background set"),
+                P_("Whether this tag affects the background color"));
+  
+  ADD_SET_PROP ("background-full-height-set", PROP_BACKGROUND_FULL_HEIGHT_SET,
+                P_("Background full height set"),
+                P_("Whether this tag affects background height"));
+
+  ADD_SET_PROP ("foreground-set", PROP_FOREGROUND_SET,
+                P_("Foreground set"),
+                P_("Whether this tag affects the foreground color"));
+
+  ADD_SET_PROP ("editable-set", PROP_EDITABLE_SET,
+                P_("Editability set"),
+                P_("Whether this tag affects text editability"));
+
+  ADD_SET_PROP ("family-set", PROP_FAMILY_SET,
+                P_("Font family set"),
+                P_("Whether this tag affects the font family"));  
+
+  ADD_SET_PROP ("style-set", PROP_STYLE_SET,
+                P_("Font style set"),
+                P_("Whether this tag affects the font style"));
+
+  ADD_SET_PROP ("variant-set", PROP_VARIANT_SET,
+                P_("Font variant set"),
+                P_("Whether this tag affects the font variant"));
+
+  ADD_SET_PROP ("weight-set", PROP_WEIGHT_SET,
+                P_("Font weight set"),
+                P_("Whether this tag affects the font weight"));
+
+  ADD_SET_PROP ("stretch-set", PROP_STRETCH_SET,
+                P_("Font stretch set"),
+                P_("Whether this tag affects the font stretch"));
+
+  ADD_SET_PROP ("size-set", PROP_SIZE_SET,
+                P_("Font size set"),
+                P_("Whether this tag affects the font size"));
+
+  ADD_SET_PROP ("scale-set", PROP_SCALE_SET,
+                P_("Font scale set"),
+                P_("Whether this tag scales the font size by a factor"));
+  
+  ADD_SET_PROP ("justification-set", PROP_JUSTIFICATION_SET,
+                P_("Justification set"),
+                P_("Whether this tag affects paragraph justification"));
+  
+  ADD_SET_PROP ("language-set", PROP_LANGUAGE_SET,
+                P_("Language set"),
+                P_("Whether this tag affects the language the text is rendered as"));
+
+  ADD_SET_PROP ("left-margin-set", PROP_LEFT_MARGIN_SET,
+                P_("Left margin set"),
+                P_("Whether this tag affects the left margin"));
+
+  ADD_SET_PROP ("indent-set", PROP_INDENT_SET,
+                P_("Indent set"),
+                P_("Whether this tag affects indentation"));
+
+  ADD_SET_PROP ("rise-set", PROP_RISE_SET,
+                P_("Rise set"),
+                P_("Whether this tag affects the rise"));
+
+  ADD_SET_PROP ("pixels-above-lines-set", PROP_PIXELS_ABOVE_LINES_SET,
+                P_("Pixels above lines set"),
+                P_("Whether this tag affects the number of pixels above lines"));
+
+  ADD_SET_PROP ("pixels-below-lines-set", PROP_PIXELS_BELOW_LINES_SET,
+                P_("Pixels below lines set"),
+                P_("Whether this tag affects the number of pixels above lines"));
+
+  ADD_SET_PROP ("pixels-inside-wrap-set", PROP_PIXELS_INSIDE_WRAP_SET,
+                P_("Pixels inside wrap set"),
+                P_("Whether this tag affects the number of pixels between wrapped lines"));
+
+  ADD_SET_PROP ("strikethrough-set", PROP_STRIKETHROUGH_SET,
+                P_("Strikethrough set"),
+                P_("Whether this tag affects strikethrough"));
   
+  ADD_SET_PROP ("right-margin-set", PROP_RIGHT_MARGIN_SET,
+                P_("Right margin set"),
+                P_("Whether this tag affects the right margin"));
+
+  ADD_SET_PROP ("underline-set", PROP_UNDERLINE_SET,
+                P_("Underline set"),
+                P_("Whether this tag affects underlining"));
+
+  ADD_SET_PROP ("wrap-mode-set", PROP_WRAP_MODE_SET,
+                P_("Wrap mode set"),
+                P_("Whether this tag affects line wrap mode"));
+
+  ADD_SET_PROP ("tabs-set", PROP_TABS_SET,
+                P_("Tabs set"),
+                P_("Whether this tag affects tabs"));
+
+  ADD_SET_PROP ("invisible-set", PROP_INVISIBLE_SET,
+                P_("Invisible set"),
+                P_("Whether this tag affects text visibility"));
+
+  ADD_SET_PROP ("paragraph-background-set", PROP_PARAGRAPH_BACKGROUND_SET,
+                P_("Paragraph background set"),
+                P_("Whether this tag affects the paragraph background color"));
+
+  /**
+   * GtkTextTag::event:
+   * @tag: the #GtkTextTag on which the signal is emitted
+   * @object: the object the event was fired from (typically a #GtkTextView)
+   * @event: the event which triggered the signal
+   * @iter: a #GtkTextIter pointing at the location the event occured
+   *
+   * The ::event signal is emitted when an event occurs on a region of the
+   * buffer marked with this tag.
+   *
+   * Returns: %TRUE to stop other handlers from being invoked for the
+   * event. %FALSE to propagate the event further.
+   */
   signals[EVENT] =
-    gtk_signal_new ("event",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextTagClass, event),
-                    gtk_marshal_INT__OBJECT_BOXED_POINTER,
-                    GTK_TYPE_INT,
-                    3,
-                    GTK_TYPE_OBJECT,
-                    GTK_TYPE_GDK_EVENT,
-                    GTK_TYPE_POINTER);
-
-  gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-  object_class->set_arg = gtk_text_tag_set_arg;
-  object_class->get_arg = gtk_text_tag_get_arg;
-
-  object_class->destroy = gtk_text_tag_destroy;
-  gobject_class->finalize = gtk_text_tag_finalize;
+    g_signal_new (I_("event"),
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTextTagClass, event),
+                  _gtk_boolean_handled_accumulator, NULL,
+                  _gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED,
+                  G_TYPE_BOOLEAN,
+                  3,
+                  G_TYPE_OBJECT,
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  GTK_TYPE_TEXT_ITER);
+
+  g_type_class_add_private (klass, sizeof (GtkTextTagPrivate));
 }
 
-void
-gtk_text_tag_init (GtkTextTag *tkxt_tag)
+static void
+gtk_text_tag_init (GtkTextTag *text_tag)
 {
-  /* 0 is basically a fine way to initialize everything in the
-     entire struct */
-  
+  GtkTextTagPrivate *priv;
+
+  text_tag->priv = G_TYPE_INSTANCE_GET_PRIVATE (text_tag,
+                                                GTK_TYPE_TEXT_TAG,
+                                                GtkTextTagPrivate);
+  priv = text_tag->priv;
+
+  priv->values = gtk_text_attributes_new ();
 }
 
+/**
+ * gtk_text_tag_new:
+ * @name: (allow-none): tag name, or %NULL
+ * 
+ * Creates a #GtkTextTag. Configure the tag using object arguments,
+ * i.e. using g_object_set().
+ * 
+ * Return value: a new #GtkTextTag
+ **/
 GtkTextTag*
 gtk_text_tag_new (const gchar *name)
 {
   GtkTextTag *tag;
 
-  tag = GTK_TEXT_TAG (gtk_type_new (gtk_text_tag_get_type ()));
-
-  tag->name = g_strdup(name);
+  tag = g_object_new (GTK_TYPE_TEXT_TAG, "name", name, NULL);
 
-  tag->values = gtk_text_view_style_values_new();
-  
   return tag;
 }
 
 static void
-gtk_text_tag_destroy (GtkObject *object)
+gtk_text_tag_finalize (GObject *object)
 {
-  GtkTextTag *tkxt_tag;
+  GtkTextTag *text_tag = GTK_TEXT_TAG (object);
+  GtkTextTagPrivate *priv = text_tag->priv;
 
-  tkxt_tag = GTK_TEXT_TAG (object);
+  if (priv->table)
+    gtk_text_tag_table_remove (priv->table, text_tag);
 
-  g_assert(!tkxt_tag->values->realized);
-  
-  if (tkxt_tag->table)
-    gtk_text_tag_table_remove(tkxt_tag->table, tkxt_tag->name);
+  g_assert (priv->table == NULL);
 
-  g_assert(tkxt_tag->table == NULL);
-  
-  gtk_text_view_style_values_unref(tkxt_tag->values);
-  tkxt_tag->values = NULL;
+  gtk_text_attributes_unref (priv->values);
+  priv->values = NULL;
+
+  g_free (priv->name);
+  priv->name = NULL;
 
-  (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
+  G_OBJECT_CLASS (gtk_text_tag_parent_class)->finalize (object);
 }
 
 static void
-gtk_text_tag_finalize (GObject *object)
+copy_rgba_to_gdk_color (GdkRGBA  *src,
+                       GdkColor *dest)
+{
+  dest->red   = CLAMP (src->red,   0.0, 1.0) * 65535.0;
+  dest->green = CLAMP (src->green, 0.0, 1.0) * 65535.0;
+  dest->blue  = CLAMP (src->blue,  0.0, 1.0) * 65535.0;
+}
+
+static void
+copy_gdk_color_to_rgba (GdkColor *src,
+                       GdkRGBA  *dest)
 {
-  GtkTextTag *tkxt_tag;
+  dest->red   = src->red / 65535.;
+  dest->green = src->green / 65535.;
+  dest->blue  = src->blue / 65535.;
+  dest->alpha = 1;
+}
+
+static void
+set_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
+{
+  GtkTextTagPrivate *priv = tag->priv;
+
+  if (priv->values->appearance.rgba[0])
+    gdk_rgba_free (priv->values->appearance.rgba[0]);
 
-  tkxt_tag = GTK_TEXT_TAG (object);
+  priv->values->appearance.rgba[0] = NULL;
 
-  g_free(tkxt_tag->name);
-  tkxt_tag->name = NULL;
+  if (rgba)
+    {
+      if (!priv->bg_color_set)
+        {
+          priv->bg_color_set = TRUE;
+          g_object_notify (G_OBJECT (tag), "background-set");
+        }
+
+      priv->values->appearance.rgba[0] = gdk_rgba_copy (rgba);
 
-  (* G_OBJECT_CLASS(parent_class)->finalize) (object);
+      copy_rgba_to_gdk_color (rgba, &priv->values->appearance.bg_color);
+    }
+  else
+    {
+      if (priv->bg_color_set)
+        {
+          priv->bg_color_set = FALSE;
+          g_object_notify (G_OBJECT (tag), "background-set");
+        }
+    }
 }
 
 static void
-set_bg_color(GtkTextTag *tag, GdkColor *color)
+set_fg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
+{
+  GtkTextTagPrivate *priv = tag->priv;
+
+  if (priv->values->appearance.rgba[1])
+    gdk_rgba_free (priv->values->appearance.rgba[1]);
+
+  priv->values->appearance.rgba[1] = NULL;
+
+  if (rgba)
+    {
+      if (!priv->fg_color_set)
+        {
+          priv->fg_color_set = TRUE;
+          g_object_notify (G_OBJECT (tag), "foreground-set");
+        }
+
+      priv->values->appearance.rgba[1] = gdk_rgba_copy (rgba);
+
+      copy_rgba_to_gdk_color (rgba, &priv->values->appearance.fg_color);
+    }
+  else
+    {
+      if (priv->fg_color_set)
+        {
+          priv->fg_color_set = FALSE;
+          g_object_notify (G_OBJECT (tag), "foreground-set");
+        }
+    }
+}
+
+static void
+set_pg_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
+{
+  GtkTextTagPrivate *priv = tag->priv;
+
+  if (priv->values->pg_bg_rgba)
+    gdk_rgba_free (priv->values->pg_bg_rgba);
+
+  if (priv->values->pg_bg_color)
+    gdk_color_free (priv->values->pg_bg_color);
+
+  priv->values->pg_bg_rgba = NULL;
+  priv->values->pg_bg_color = NULL;
+
+  if (rgba)
+    {
+      GdkColor color = { 0, };
+
+      if (!priv->pg_bg_color_set)
+        {
+          priv->pg_bg_color_set = TRUE;
+          g_object_notify (G_OBJECT (tag), "paragraph-background-set");
+        }
+
+      priv->values->pg_bg_rgba = gdk_rgba_copy (rgba);
+
+      copy_rgba_to_gdk_color (rgba, &color);
+      priv->values->pg_bg_color = gdk_color_copy (&color);
+    }
+  else
+    {
+      if (priv->pg_bg_color_set)
+        {
+          priv->pg_bg_color_set = FALSE;
+          g_object_notify (G_OBJECT (tag), "paragraph-background-set");
+        }
+    }
+}
+
+
+static void
+set_bg_color (GtkTextTag *tag, GdkColor *color)
 {
   if (color)
     {
-      tag->bg_color_set = TRUE;
-      tag->values->appearance.bg_color = *color;
+      GdkRGBA rgba;
+
+      copy_gdk_color_to_rgba (color, &rgba);
+      set_bg_rgba (tag, &rgba);
     }
   else
+    set_bg_rgba (tag, NULL);
+}
+
+static void
+set_fg_color (GtkTextTag *tag, GdkColor *color)
+{
+  if (color)
     {
-      tag->bg_color_set = FALSE;
+      GdkRGBA rgba;
+
+      copy_gdk_color_to_rgba (color, &rgba);
+      set_fg_rgba (tag, &rgba);
     }
+  else
+    set_fg_rgba (tag, NULL);
 }
 
 static void
-set_fg_color(GtkTextTag *tag, GdkColor *color)
+set_pg_bg_color (GtkTextTag *tag, GdkColor *color)
 {
   if (color)
     {
-      tag->fg_color_set = TRUE;
-      tag->values->appearance.fg_color = *color;
+      GdkRGBA rgba;
+
+      copy_gdk_color_to_rgba (color, &rgba);
+      set_pg_bg_rgba (tag, &rgba);
     }
   else
+    set_pg_bg_rgba (tag, NULL);
+}
+
+static PangoFontMask
+get_property_font_set_mask (guint prop_id)
+{
+  switch (prop_id)
+    {
+    case PROP_FAMILY_SET:
+      return PANGO_FONT_MASK_FAMILY;
+    case PROP_STYLE_SET:
+      return PANGO_FONT_MASK_STYLE;
+    case PROP_VARIANT_SET:
+      return PANGO_FONT_MASK_VARIANT;
+    case PROP_WEIGHT_SET:
+      return PANGO_FONT_MASK_WEIGHT;
+    case PROP_STRETCH_SET:
+      return PANGO_FONT_MASK_STRETCH;
+    case PROP_SIZE_SET:
+      return PANGO_FONT_MASK_SIZE;
+    }
+
+  return 0;
+}
+
+static PangoFontMask
+set_font_desc_fields (PangoFontDescription *desc,
+                     PangoFontMask         to_set)
+{
+  PangoFontMask changed_mask = 0;
+  
+  if (to_set & PANGO_FONT_MASK_FAMILY)
+    {
+      const char *family = pango_font_description_get_family (desc);
+      if (!family)
+       {
+         family = "sans";
+         changed_mask |= PANGO_FONT_MASK_FAMILY;
+       }
+
+      pango_font_description_set_family (desc, family);
+    }
+  if (to_set & PANGO_FONT_MASK_STYLE)
+    pango_font_description_set_style (desc, pango_font_description_get_style (desc));
+  if (to_set & PANGO_FONT_MASK_VARIANT)
+    pango_font_description_set_variant (desc, pango_font_description_get_variant (desc));
+  if (to_set & PANGO_FONT_MASK_WEIGHT)
+    pango_font_description_set_weight (desc, pango_font_description_get_weight (desc));
+  if (to_set & PANGO_FONT_MASK_STRETCH)
+    pango_font_description_set_stretch (desc, pango_font_description_get_stretch (desc));
+  if (to_set & PANGO_FONT_MASK_SIZE)
     {
-      tag->fg_color_set = FALSE;
+      gint size = pango_font_description_get_size (desc);
+      if (size <= 0)
+       {
+         size = 10 * PANGO_SCALE;
+         changed_mask |= PANGO_FONT_MASK_SIZE;
+       }
+      
+      pango_font_description_set_size (desc, size);
     }
+
+  return changed_mask;
 }
 
 static void
-gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+notify_set_changed (GObject       *object,
+                   PangoFontMask  changed_mask)
 {
-  GtkTextTag *tkxt_tag;
-  gboolean size_changed = FALSE;
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family-set");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style-set");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant-set");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight-set");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch-set");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size-set");
+}
+
+static void
+notify_fields_changed (GObject       *object,
+                      PangoFontMask  changed_mask)
+{
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size");
+}
+
+static void
+set_font_description (GtkTextTag           *text_tag,
+                      PangoFontDescription *font_desc)
+{
+  GtkTextTagPrivate *priv = text_tag->priv;
+  GObject *object = G_OBJECT (text_tag);
+  PangoFontDescription *new_font_desc;
+  PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
+  
+  if (font_desc)
+    new_font_desc = pango_font_description_copy (font_desc);
+  else
+    new_font_desc = pango_font_description_new ();
+
+  if (priv->values->font)
+    old_mask = pango_font_description_get_set_fields (priv->values->font);
+  else
+    old_mask = 0;
   
-  tkxt_tag = GTK_TEXT_TAG (object);
+  new_mask = pango_font_description_get_set_fields (new_font_desc);
+
+  changed_mask = old_mask | new_mask;
+  set_changed_mask = old_mask ^ new_mask;
+
+  if (priv->values->font)
+    pango_font_description_free (priv->values->font);
+  priv->values->font = new_font_desc;
+
+  g_object_freeze_notify (object);
+
+  g_object_notify (object, "font-desc");
+  g_object_notify (object, "font");
+  
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    {
+      g_object_notify (object, "size");
+      g_object_notify (object, "size-points");
+    }
 
-  g_return_if_fail(!tkxt_tag->values->realized);
+  notify_set_changed (object, set_changed_mask);
   
-  switch (arg_id)
+  g_object_thaw_notify (object);
+}
+
+static void
+gtk_text_tag_ensure_font (GtkTextTag *text_tag)
+{
+  GtkTextTagPrivate *priv = text_tag->priv;
+
+  if (!priv->values->font)
+    priv->values->font = pango_font_description_new ();
+}
+
+static void
+gtk_text_tag_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GtkTextTag *text_tag = GTK_TEXT_TAG (object);
+  GtkTextTagPrivate *priv = text_tag->priv;
+  gboolean size_changed = FALSE;
+
+  switch (prop_id)
     {
-    case ARG_NAME:
-      g_return_if_fail(tkxt_tag->name == NULL);
-      tkxt_tag->name = g_strdup(GTK_VALUE_STRING(*arg));
+    case PROP_NAME:
+      g_return_if_fail (priv->name == NULL);
+      priv->name = g_value_dup_string (value);
       break;
 
-    case ARG_BACKGROUND:
+    case PROP_BACKGROUND:
       {
-        GdkColor color;
+        GdkRGBA rgba;
 
-        if (gdk_color_parse(GTK_VALUE_STRING(*arg), &color))
-          set_bg_color(tkxt_tag, &color);
+        if (!g_value_get_string (value))
+          set_bg_rgba (text_tag, NULL);       /* reset background_set to FALSE */
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+          set_bg_rgba (text_tag, &rgba);
         else
-          g_warning("Don't know color `%s'", GTK_VALUE_STRING(*arg));
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "background-gdk");
       }
       break;
 
-    case ARG_FOREGROUND:
+    case PROP_FOREGROUND:
       {
-        GdkColor color;
+        GdkRGBA rgba;
 
-        if (gdk_color_parse(GTK_VALUE_STRING(*arg), &color))
-          set_fg_color(tkxt_tag, &color);
+        if (!g_value_get_string (value))
+          set_fg_rgba (text_tag, NULL);       /* reset to foreground_set to FALSE */
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+          set_fg_rgba (text_tag, &rgba);
         else
-          g_warning("Don't know color `%s'", GTK_VALUE_STRING(*arg));
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "foreground-gdk");
       }
       break;
-      
-    case ARG_BACKGROUND_GDK:
+
+    case PROP_BACKGROUND_GDK:
       {
-        GdkColor *color = GTK_VALUE_POINTER(*arg);
-        set_bg_color(tkxt_tag, color);
+        GdkColor *color = g_value_get_boxed (value);
+
+        set_bg_color (text_tag, color);
       }
       break;
 
-    case ARG_FOREGROUND_GDK:
+    case PROP_FOREGROUND_GDK:
       {
-        GdkColor *color = GTK_VALUE_POINTER(*arg);
-        set_fg_color(tkxt_tag, color);
+        GdkColor *color = g_value_get_boxed (value);
+
+        set_fg_color (text_tag, color);
       }
       break;
 
-    case ARG_BACKGROUND_STIPPLE:
+    case PROP_BACKGROUND_RGBA:
       {
-        GdkBitmap *bitmap = GTK_VALUE_POINTER(*arg);
+        GdkRGBA *color = g_value_get_boxed (value);
 
-        tkxt_tag->bg_stipple_set = TRUE;
-        
-        if (tkxt_tag->values->appearance.bg_stipple != bitmap)
-          {
-            if (bitmap != NULL)
-              gdk_bitmap_ref(bitmap);
-            
-            if (tkxt_tag->values->appearance.bg_stipple)
-              gdk_bitmap_unref(tkxt_tag->values->appearance.bg_stipple);
-            
-            tkxt_tag->values->appearance.bg_stipple = bitmap;
-          }
+        set_bg_rgba (text_tag, color);
       }
       break;
 
-    case ARG_FOREGROUND_STIPPLE:
+    case PROP_FOREGROUND_RGBA:
       {
-        GdkBitmap *bitmap = GTK_VALUE_POINTER(*arg);
+        GdkRGBA *color = g_value_get_boxed (value);
 
-        tkxt_tag->fg_stipple_set = TRUE;
-        
-        if (tkxt_tag->values->appearance.fg_stipple != bitmap)
-          {
-            if (bitmap != NULL)
-              gdk_bitmap_ref(bitmap);
-            
-            if (tkxt_tag->values->appearance.fg_stipple)
-              gdk_bitmap_unref(tkxt_tag->values->appearance.fg_stipple);
-            
-            tkxt_tag->values->appearance.fg_stipple = bitmap;
-          }
+        set_fg_rgba (text_tag, color);
       }
       break;
 
-    case ARG_FONT:
+    case PROP_FONT:
       {
         PangoFontDescription *font_desc = NULL;
         const gchar *name;
 
-        name = GTK_VALUE_STRING(*arg);        
+        name = g_value_get_string (value);
 
         if (name)
-         font_desc = pango_font_description_from_string (name);
-
-       if (tkxt_tag->values->font_desc)
-         pango_font_description_free (tkxt_tag->values->font_desc);
-       
-       tkxt_tag->font_set = (font_desc != NULL);
-       tkxt_tag->values->font_desc = font_desc;
+          font_desc = pango_font_description_from_string (name);
 
+        set_font_description (text_tag, font_desc);
+       if (font_desc)
+         pango_font_description_free (font_desc);
+        
         size_changed = TRUE;
       }
       break;
 
-    case ARG_FONT_DESC:
+    case PROP_FONT_DESC:
       {
         PangoFontDescription *font_desc;
 
-        font_desc = GTK_VALUE_BOXED(*arg);        
+        font_desc = g_value_get_boxed (value);
 
-       if (tkxt_tag->values->font_desc)
-         pango_font_description_free (tkxt_tag->values->font_desc);
-
-       if (font_desc)
-         tkxt_tag->values->font_desc = pango_font_description_copy (font_desc);
-       else
-         tkxt_tag->values->font_desc = NULL;
-       
-       tkxt_tag->font_set = (font_desc != NULL);
+        set_font_description (text_tag, font_desc);
 
         size_changed = TRUE;
       }
       break;
 
-    case ARG_PIXELS_ABOVE_LINES:
-      tkxt_tag->pixels_above_lines_set = TRUE;
-      tkxt_tag->values->pixels_above_lines = GTK_VALUE_INT(*arg);
+    case PROP_FAMILY:
+    case PROP_STYLE:
+    case PROP_VARIANT:
+    case PROP_WEIGHT:
+    case PROP_STRETCH:
+    case PROP_SIZE:
+    case PROP_SIZE_POINTS:
+      {
+       PangoFontMask old_set_mask;
+
+       gtk_text_tag_ensure_font (text_tag);
+       old_set_mask = pango_font_description_get_set_fields (priv->values->font);
+       switch (prop_id)
+         {
+         case PROP_FAMILY:
+           pango_font_description_set_family (priv->values->font,
+                                              g_value_get_string (value));
+           break;
+         case PROP_STYLE:
+           pango_font_description_set_style (priv->values->font,
+                                             g_value_get_enum (value));
+           break;
+         case PROP_VARIANT:
+           pango_font_description_set_variant (priv->values->font,
+                                               g_value_get_enum (value));
+           break;
+         case PROP_WEIGHT:
+           pango_font_description_set_weight (priv->values->font,
+                                              g_value_get_int (value));
+           break;
+         case PROP_STRETCH:
+           pango_font_description_set_stretch (priv->values->font,
+                                               g_value_get_enum (value));
+           break;
+         case PROP_SIZE:
+           pango_font_description_set_size (priv->values->font,
+                                            g_value_get_int (value));
+           g_object_notify (object, "size-points");
+           break;
+         case PROP_SIZE_POINTS:
+           pango_font_description_set_size (priv->values->font,
+                                            g_value_get_double (value) * PANGO_SCALE);
+           g_object_notify (object, "size");
+           break;
+         }
+
+       size_changed = TRUE;
+       notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (priv->values->font));
+       g_object_notify (object, "font-desc");
+       g_object_notify (object, "font");
+
+       break;
+      }
+      
+    case PROP_SCALE:
+      priv->values->font_scale = g_value_get_double (value);
+      priv->scale_set = TRUE;
+      g_object_notify (object, "scale-set");
+      size_changed = TRUE;
+      break;
+      
+    case PROP_PIXELS_ABOVE_LINES:
+      priv->pixels_above_lines_set = TRUE;
+      priv->values->pixels_above_lines = g_value_get_int (value);
+      g_object_notify (object, "pixels-above-lines-set");
       size_changed = TRUE;
       break;
 
-    case ARG_PIXELS_BELOW_LINES:
-      tkxt_tag->pixels_below_lines_set = TRUE;
-      tkxt_tag->values->pixels_below_lines = GTK_VALUE_INT(*arg);
+    case PROP_PIXELS_BELOW_LINES:
+      priv->pixels_below_lines_set = TRUE;
+      priv->values->pixels_below_lines = g_value_get_int (value);
+      g_object_notify (object, "pixels-below-lines-set");
       size_changed = TRUE;
       break;
 
-    case ARG_PIXELS_INSIDE_WRAP:
-      tkxt_tag->pixels_inside_wrap_set = TRUE;
-      tkxt_tag->values->pixels_inside_wrap = GTK_VALUE_INT(*arg);
+    case PROP_PIXELS_INSIDE_WRAP:
+      priv->pixels_inside_wrap_set = TRUE;
+      priv->values->pixels_inside_wrap = g_value_get_int (value);
+      g_object_notify (object, "pixels-inside-wrap-set");
       size_changed = TRUE;
       break;
 
-    case ARG_EDITABLE:
-      tkxt_tag->editable_set = TRUE;
-      tkxt_tag->values->editable = GTK_VALUE_BOOL(*arg);
+    case PROP_EDITABLE:
+      priv->editable_set = TRUE;
+      priv->values->editable = g_value_get_boolean (value);
+      g_object_notify (object, "editable-set");
       break;
 
-    case ARG_WRAP_MODE:
-      tkxt_tag->wrap_mode_set = TRUE;
-      tkxt_tag->values->wrap_mode = GTK_VALUE_ENUM(*arg);
+    case PROP_WRAP_MODE:
+      priv->wrap_mode_set = TRUE;
+      priv->values->wrap_mode = g_value_get_enum (value);
+      g_object_notify (object, "wrap-mode-set");
       size_changed = TRUE;
       break;
 
-    case ARG_JUSTIFY:
-      tkxt_tag->justify_set = TRUE;
-      tkxt_tag->values->justify = GTK_VALUE_ENUM(*arg);
+    case PROP_JUSTIFICATION:
+      priv->justification_set = TRUE;
+      priv->values->justification = g_value_get_enum (value);
+      g_object_notify (object, "justification-set");
       size_changed = TRUE;
       break;
 
-    case ARG_DIRECTION:
-      tkxt_tag->values->direction = GTK_VALUE_ENUM(*arg);
+    case PROP_DIRECTION:
+      priv->values->direction = g_value_get_enum (value);
       break;
 
-    case ARG_LEFT_MARGIN:
-      tkxt_tag->left_margin_set = TRUE;
-      tkxt_tag->values->left_margin = GTK_VALUE_INT(*arg);
+    case PROP_LEFT_MARGIN:
+      priv->left_margin_set = TRUE;
+      priv->values->left_margin = g_value_get_int (value);
+      g_object_notify (object, "left-margin-set");
       size_changed = TRUE;
       break;
 
-    case ARG_LEFT_WRAPPED_LINE_MARGIN:
-      tkxt_tag->left_wrapped_line_margin_set = TRUE;
-      tkxt_tag->values->left_wrapped_line_margin = GTK_VALUE_INT(*arg);
+    case PROP_INDENT:
+      priv->indent_set = TRUE;
+      priv->values->indent = g_value_get_int (value);
+      g_object_notify (object, "indent-set");
       size_changed = TRUE;
       break;
 
-    case ARG_OVERSTRIKE:
-      tkxt_tag->overstrike_set = TRUE;
-      tkxt_tag->values->appearance.overstrike = GTK_VALUE_BOOL(*arg);
+    case PROP_STRIKETHROUGH:
+      priv->strikethrough_set = TRUE;
+      priv->values->appearance.strikethrough = g_value_get_boolean (value);
+      g_object_notify (object, "strikethrough-set");
       break;
-      
-    case ARG_RIGHT_MARGIN:
-      tkxt_tag->right_margin_set = TRUE;
-      tkxt_tag->values->right_margin = GTK_VALUE_INT(*arg);
+
+    case PROP_RIGHT_MARGIN:
+      priv->right_margin_set = TRUE;
+      priv->values->right_margin = g_value_get_int (value);
+      g_object_notify (object, "right-margin-set");
       size_changed = TRUE;
       break;
-      
-    case ARG_UNDERLINE:
-      tkxt_tag->underline_set = TRUE;
-      tkxt_tag->values->appearance.underline = GTK_VALUE_ENUM(*arg);
+
+    case PROP_UNDERLINE:
+      priv->underline_set = TRUE;
+      priv->values->appearance.underline = g_value_get_enum (value);
+      g_object_notify (object, "underline-set");
       break;
-      
-    case ARG_OFFSET:
-      tkxt_tag->offset_set = TRUE;
-      tkxt_tag->values->offset = GTK_VALUE_INT(*arg);
-      size_changed = TRUE;
+
+    case PROP_RISE:
+      priv->rise_set = TRUE;
+      priv->values->appearance.rise = g_value_get_int (value);
+      g_object_notify (object, "rise-set");
+      size_changed = TRUE;      
       break;
 
-    case ARG_BG_FULL_HEIGHT:
-      tkxt_tag->bg_full_height_set = TRUE;
-      tkxt_tag->values->bg_full_height = GTK_VALUE_BOOL(*arg);
+    case PROP_BACKGROUND_FULL_HEIGHT:
+      priv->bg_full_height_set = TRUE;
+      priv->values->bg_full_height = g_value_get_boolean (value);
+      g_object_notify (object, "background-full-height-set");
       break;
 
+    case PROP_LANGUAGE:
+      priv->language_set = TRUE;
+      priv->values->language = pango_language_from_string (g_value_get_string (value));
+      g_object_notify (object, "language-set");
+      break;
+
+    case PROP_TABS:
+      priv->tabs_set = TRUE;
+
+      if (priv->values->tabs)
+        pango_tab_array_free (priv->values->tabs);
+
+      /* FIXME I'm not sure if this is a memleak or not */
+      priv->values->tabs =
+        pango_tab_array_copy (g_value_get_boxed (value));
+
+      g_object_notify (object, "tabs-set");
       
-      /* Whether the value should be used... */
-      
-    case ARG_BACKGROUND_SET:
-    case ARG_BACKGROUND_GDK_SET:
-      tkxt_tag->bg_color_set = GTK_VALUE_BOOL(*arg);
+      size_changed = TRUE;
+      break;
+
+    case PROP_INVISIBLE:
+      priv->invisible_set = TRUE;
+      priv->values->invisible = g_value_get_boolean (value);
+      g_object_notify (object, "invisible-set");
+      size_changed = TRUE;
       break;
+      
+    case PROP_PARAGRAPH_BACKGROUND:
+      {
+        GdkRGBA rgba;
 
-    case ARG_FOREGROUND_SET:
-    case ARG_FOREGROUND_GDK_SET:
-      tkxt_tag->fg_color_set = GTK_VALUE_BOOL(*arg);
+        if (!g_value_get_string (value))
+          set_pg_bg_rgba (text_tag, NULL);       /* reset paragraph_background_set to FALSE */
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+          set_pg_bg_rgba (text_tag, &rgba);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "paragraph-background-gdk");
+      }
       break;
 
-    case ARG_BACKGROUND_STIPPLE_SET:
-      tkxt_tag->bg_stipple_set = GTK_VALUE_BOOL(*arg);
+    case PROP_PARAGRAPH_BACKGROUND_GDK:
+      {
+        GdkColor *color = g_value_get_boxed (value);
+
+        set_pg_bg_color (text_tag, color);
+      }
       break;
 
-    case ARG_FOREGROUND_STIPPLE_SET:
-      tkxt_tag->fg_stipple_set = GTK_VALUE_BOOL(*arg);
+    case PROP_PARAGRAPH_BACKGROUND_RGBA:
+      {
+        GdkRGBA *color = g_value_get_boxed (value);
+
+        set_pg_bg_rgba (text_tag, color);
+      }
       break;
 
-    case ARG_FONT_SET:
-      tkxt_tag->font_set = GTK_VALUE_BOOL(*arg);
+    case PROP_ACCUMULATIVE_MARGIN:
+      priv->accumulative_margin = g_value_get_boolean (value);
+      g_object_notify (object, "accumulative-margin");
       size_changed = TRUE;
       break;
 
-    case ARG_PIXELS_ABOVE_LINES_SET:
-      tkxt_tag->pixels_above_lines_set = GTK_VALUE_BOOL(*arg);
+      /* Whether the value should be used... */
+
+    case PROP_BACKGROUND_SET:
+      priv->bg_color_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FOREGROUND_SET:
+      priv->fg_color_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      if (!g_value_get_boolean (value))
+       {
+         if (priv->values->font)
+           pango_font_description_unset_fields (priv->values->font,
+                                                get_property_font_set_mask (prop_id));
+       }
+      else
+       {
+         PangoFontMask changed_mask;
+         
+         gtk_text_tag_ensure_font (text_tag);
+         changed_mask = set_font_desc_fields (priv->values->font,
+                                              get_property_font_set_mask (prop_id));
+         notify_fields_changed (G_OBJECT (text_tag), changed_mask);
+       }
+      break;
+
+    case PROP_SCALE_SET:
+      priv->scale_set = g_value_get_boolean (value);
+      size_changed = TRUE;
+      break;
+      
+    case PROP_PIXELS_ABOVE_LINES_SET:
+      priv->pixels_above_lines_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_PIXELS_BELOW_LINES_SET:
-      tkxt_tag->pixels_below_lines_set = GTK_VALUE_BOOL(*arg);
+    case PROP_PIXELS_BELOW_LINES_SET:
+      priv->pixels_below_lines_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_PIXELS_INSIDE_WRAP_SET:
-      tkxt_tag->pixels_inside_wrap_set = GTK_VALUE_BOOL(*arg);
+    case PROP_PIXELS_INSIDE_WRAP_SET:
+      priv->pixels_inside_wrap_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_EDITABLE_SET:
-      tkxt_tag->editable_set = GTK_VALUE_BOOL(*arg);
+    case PROP_EDITABLE_SET:
+      priv->editable_set = g_value_get_boolean (value);
       break;
 
-    case ARG_WRAP_MODE_SET:
-      tkxt_tag->wrap_mode_set = GTK_VALUE_BOOL(*arg);
+    case PROP_WRAP_MODE_SET:
+      priv->wrap_mode_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_JUSTIFY_SET:
-      tkxt_tag->justify_set = GTK_VALUE_BOOL(*arg);
+    case PROP_JUSTIFICATION_SET:
+      priv->justification_set = g_value_get_boolean (value);
+      size_changed = TRUE;
+      break;
+      
+    case PROP_LEFT_MARGIN_SET:
+      priv->left_margin_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_LEFT_MARGIN_SET:
-      tkxt_tag->left_margin_set = GTK_VALUE_BOOL(*arg);
+    case PROP_INDENT_SET:
+      priv->indent_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_LEFT_WRAPPED_LINE_MARGIN_SET:
-      tkxt_tag->left_wrapped_line_margin_set = GTK_VALUE_BOOL(*arg);
+    case PROP_STRIKETHROUGH_SET:
+      priv->strikethrough_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_RIGHT_MARGIN_SET:
+      priv->right_margin_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_OVERSTRIKE_SET:
-      tkxt_tag->overstrike_set = GTK_VALUE_BOOL(*arg);
+    case PROP_UNDERLINE_SET:
+      priv->underline_set = g_value_get_boolean (value);
       break;
 
-    case ARG_RIGHT_MARGIN_SET:
-      tkxt_tag->right_margin_set = GTK_VALUE_BOOL(*arg);
+    case PROP_RISE_SET:
+      priv->rise_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_UNDERLINE_SET:
-      tkxt_tag->underline_set = GTK_VALUE_BOOL(*arg);
+    case PROP_BACKGROUND_FULL_HEIGHT_SET:
+      priv->bg_full_height_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_LANGUAGE_SET:
+      priv->language_set = g_value_get_boolean (value);
+      size_changed = TRUE;
       break;
 
-    case ARG_OFFSET_SET:
-      tkxt_tag->offset_set = GTK_VALUE_BOOL(*arg);
+    case PROP_TABS_SET:
+      priv->tabs_set = g_value_get_boolean (value);
       size_changed = TRUE;
       break;
 
-    case ARG_BG_FULL_HEIGHT_SET:
-      tkxt_tag->bg_full_height_set = TRUE;
-      tkxt_tag->values->bg_full_height = GTK_VALUE_BOOL(*arg);
+    case PROP_INVISIBLE_SET:
+      priv->invisible_set = g_value_get_boolean (value);
+      size_changed = TRUE;
       break;
       
+    case PROP_PARAGRAPH_BACKGROUND_SET:
+      priv->pg_bg_color_set = g_value_get_boolean (value);
+      break;
+
     default:
-      g_assert_not_reached();
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
-  
-  /* FIXME I would like to do this after all set_arg in a single
-     gtk_object_set() have been called. But an idle function
-     won't work; we need to emit when the tag is changed, not
-     when we get around to the event loop. So blah, we eat some
-     inefficiency. */
-  
+
+  /* FIXME I would like to do this after all set_property in a single
+   * g_object_set () have been called. But an idle function won't
+   * work; we need to emit when the tag is changed, not when we get
+   * around to the event loop. So blah, we eat some inefficiency.
+   */
+
   /* This is also somewhat weird since we emit another object's
-     signal here, but the two objects are already tightly bound. */
-  
-  if (tkxt_tag->table)
-    gtk_signal_emit_by_name(GTK_OBJECT(tkxt_tag->table),
-                            "tag_changed",
-                            tkxt_tag, size_changed);
-}
+   * signal here, but the two objects are already tightly bound.
+   */
 
-static void
-get_color_arg (GtkArg *arg, GdkColor *orig)
-{
-  GdkColor *color;
-  
-  color = g_new (GdkColor, 1);
-  *color = *orig;
-  GTK_VALUE_BOXED (*arg) = color;
+  if (priv->table)
+    g_signal_emit_by_name (priv->table,
+                           "tag_changed",
+                           text_tag, size_changed);
 }
 
 static void
-gtk_text_tag_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gtk_text_tag_get_property (GObject      *object,
+                           guint         prop_id,
+                           GValue       *value,
+                           GParamSpec   *pspec)
 {
-  GtkTextTag *tag;
-
-  tag = GTK_TEXT_TAG (object);
+  GtkTextTag *tag = GTK_TEXT_TAG (object);
+  GtkTextTagPrivate *priv = tag->priv;
 
-  switch (arg_id)
+  switch (prop_id)
     {
-    case ARG_NAME:
-      GTK_VALUE_STRING(*arg) = g_strdup(tag->name);
+    case PROP_NAME:
+      g_value_set_string (value, priv->name);
       break;
-      
-    case ARG_BACKGROUND_GDK:
-      get_color_arg(arg, &tag->values->appearance.bg_color);
+
+    case PROP_BACKGROUND_GDK:
+      g_value_set_boxed (value, &priv->values->appearance.bg_color);
       break;
 
-    case ARG_FOREGROUND_GDK:
-      get_color_arg(arg, &tag->values->appearance.fg_color);
+    case PROP_BACKGROUND_RGBA:
+      g_value_set_boxed (value, priv->values->appearance.rgba[0]);
       break;
 
-    case ARG_BACKGROUND_STIPPLE:
-      GTK_VALUE_BOXED(*arg) = tag->values->appearance.bg_stipple;
+    case PROP_FOREGROUND_GDK:
+      g_value_set_boxed (value, &priv->values->appearance.fg_color);
       break;
 
-    case ARG_FOREGROUND_STIPPLE:
-      GTK_VALUE_BOXED(*arg) = tag->values->appearance.fg_stipple;
+    case PROP_FOREGROUND_RGBA:
+      g_value_set_boxed (value, priv->values->appearance.rgba[1]);
       break;
 
-    case ARG_FONT:
-      if (tag->values->font_desc)
-       GTK_VALUE_STRING(*arg) = pango_font_description_to_string (tag->values->font_desc);
-      else
-       GTK_VALUE_STRING(*arg) = NULL;
+    case PROP_FONT:
+        {
+          gchar *str;
+
+         gtk_text_tag_ensure_font (tag);
+
+         str = pango_font_description_to_string (priv->values->font);
+          g_value_take_string (value, str);
+        }
       break;
 
-    case ARG_FONT_DESC:
-      if (tag->values->font_desc)
-       GTK_VALUE_BOXED(*arg) = pango_font_description_copy (tag->values->font_desc);
-      else
-       GTK_VALUE_BOXED(*arg) = NULL;
+    case PROP_FONT_DESC:
+      gtk_text_tag_ensure_font (tag);
+      g_value_set_boxed (value, priv->values->font);
+      break;
+
+    case PROP_FAMILY:
+    case PROP_STYLE:
+    case PROP_VARIANT:
+    case PROP_WEIGHT:
+    case PROP_STRETCH:
+    case PROP_SIZE:
+    case PROP_SIZE_POINTS:
+      gtk_text_tag_ensure_font (tag);
+      switch (prop_id)
+       {
+       case PROP_FAMILY:
+         g_value_set_string (value, pango_font_description_get_family (priv->values->font));
+         break;
+         
+       case PROP_STYLE:
+         g_value_set_enum (value, pango_font_description_get_style (priv->values->font));
+         break;
+         
+       case PROP_VARIANT:
+         g_value_set_enum (value, pango_font_description_get_variant (priv->values->font));
+         break;
+         
+       case PROP_WEIGHT:
+         g_value_set_int (value, pango_font_description_get_weight (priv->values->font));
+         break;
+         
+       case PROP_STRETCH:
+         g_value_set_enum (value, pango_font_description_get_stretch (priv->values->font));
+         break;
+         
+       case PROP_SIZE:
+         g_value_set_int (value, pango_font_description_get_size (priv->values->font));
+         break;
+         
+       case PROP_SIZE_POINTS:
+         g_value_set_double (value, ((double)pango_font_description_get_size (priv->values->font)) / (double)PANGO_SCALE);
+         break;
+       }
+      break;
+      
+    case PROP_SCALE:
+      g_value_set_double (value, priv->values->font_scale);
+      break;
+      
+    case PROP_PIXELS_ABOVE_LINES:
+      g_value_set_int (value,  priv->values->pixels_above_lines);
       break;
 
-    case ARG_PIXELS_ABOVE_LINES:
-      GTK_VALUE_INT(*arg) = tag->values->pixels_above_lines;
+    case PROP_PIXELS_BELOW_LINES:
+      g_value_set_int (value,  priv->values->pixels_below_lines);
       break;
 
-    case ARG_PIXELS_BELOW_LINES:
-      GTK_VALUE_INT(*arg) = tag->values->pixels_below_lines;
+    case PROP_PIXELS_INSIDE_WRAP:
+      g_value_set_int (value,  priv->values->pixels_inside_wrap);
       break;
 
-    case ARG_PIXELS_INSIDE_WRAP:
-      GTK_VALUE_INT(*arg) = tag->values->pixels_inside_wrap;
+    case PROP_EDITABLE:
+      g_value_set_boolean (value, priv->values->editable);
       break;
 
-    case ARG_EDITABLE:
-      GTK_VALUE_BOOL(*arg) = tag->values->editable;
-      break;      
+    case PROP_WRAP_MODE:
+      g_value_set_enum (value, priv->values->wrap_mode);
+      break;
 
-    case ARG_WRAP_MODE:
-      GTK_VALUE_ENUM(*arg) = tag->values->wrap_mode;
+    case PROP_JUSTIFICATION:
+      g_value_set_enum (value, priv->values->justification);
       break;
 
-    case ARG_JUSTIFY:
-      GTK_VALUE_ENUM(*arg) = tag->values->justify;
+    case PROP_DIRECTION:
+      g_value_set_enum (value, priv->values->direction);
+      break;
+      
+    case PROP_LEFT_MARGIN:
+      g_value_set_int (value,  priv->values->left_margin);
       break;
 
-    case ARG_LEFT_MARGIN:
-      GTK_VALUE_INT(*arg) = tag->values->left_margin;
+    case PROP_INDENT:
+      g_value_set_int (value,  priv->values->indent);
       break;
 
-    case ARG_LEFT_WRAPPED_LINE_MARGIN:
-      GTK_VALUE_INT(*arg) = tag->values->left_wrapped_line_margin;
+    case PROP_STRIKETHROUGH:
+      g_value_set_boolean (value, priv->values->appearance.strikethrough);
       break;
 
-    case ARG_OVERSTRIKE:
-      GTK_VALUE_BOOL(*arg) = tag->values->appearance.overstrike;
+    case PROP_RIGHT_MARGIN:
+      g_value_set_int (value, priv->values->right_margin);
       break;
-      
-    case ARG_RIGHT_MARGIN:
-      GTK_VALUE_INT(*arg) = tag->values->right_margin;
+
+    case PROP_UNDERLINE:
+      g_value_set_enum (value, priv->values->appearance.underline);
       break;
-      
-    case ARG_UNDERLINE:
-      GTK_VALUE_ENUM(*arg) = tag->values->appearance.underline;
+
+    case PROP_RISE:
+      g_value_set_int (value, priv->values->appearance.rise);
       break;
 
-    case ARG_OFFSET:
-      GTK_VALUE_INT(*arg) = tag->values->offset;
+    case PROP_BACKGROUND_FULL_HEIGHT:
+      g_value_set_boolean (value, priv->values->bg_full_height);
       break;
 
-    case ARG_BG_FULL_HEIGHT:
-      GTK_VALUE_BOOL(*arg) = tag->values->bg_full_height;
+    case PROP_LANGUAGE:
+      g_value_set_string (value, pango_language_to_string (priv->values->language));
+      break;
+
+    case PROP_TABS:
+      if (priv->values->tabs)
+        g_value_set_boxed (value, priv->values->tabs);
+      break;
+
+    case PROP_INVISIBLE:
+      g_value_set_boolean (value, priv->values->invisible);
       break;
       
-    case ARG_BACKGROUND_SET:
-    case ARG_BACKGROUND_GDK_SET:
-      GTK_VALUE_BOOL(*arg) = tag->bg_color_set;
+    case PROP_PARAGRAPH_BACKGROUND_GDK:
+      g_value_set_boxed (value, priv->values->pg_bg_color);
       break;
 
-    case ARG_FOREGROUND_SET:
-    case ARG_FOREGROUND_GDK_SET:
-      GTK_VALUE_BOOL(*arg) = tag->fg_color_set;
+    case PROP_PARAGRAPH_BACKGROUND_RGBA:
+      g_value_set_boxed (value, priv->values->pg_bg_rgba);
       break;
 
-    case ARG_BACKGROUND_STIPPLE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->bg_stipple_set;
+    case PROP_ACCUMULATIVE_MARGIN:
+      g_value_set_boolean (value, priv->accumulative_margin);
       break;
 
-    case ARG_FOREGROUND_STIPPLE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->fg_stipple_set;
+    case PROP_BACKGROUND_SET:
+      g_value_set_boolean (value, priv->bg_color_set);
       break;
 
-    case ARG_FONT_SET:
-      GTK_VALUE_BOOL(*arg) = tag->font_set;
+    case PROP_FOREGROUND_SET:
+      g_value_set_boolean (value, priv->fg_color_set);
+      break;
+
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      {
+       PangoFontMask set_mask = priv->values->font ? pango_font_description_get_set_fields (priv->values->font) : 0;
+       PangoFontMask test_mask = get_property_font_set_mask (prop_id);
+       g_value_set_boolean (value, (set_mask & test_mask) != 0);
+
+       break;
+      }
+
+    case PROP_SCALE_SET:
+      g_value_set_boolean (value, priv->scale_set);
+      break;
+      
+    case PROP_PIXELS_ABOVE_LINES_SET:
+      g_value_set_boolean (value, priv->pixels_above_lines_set);
       break;
 
-    case ARG_PIXELS_ABOVE_LINES_SET:
-      GTK_VALUE_BOOL(*arg) = tag->pixels_above_lines_set;
+    case PROP_PIXELS_BELOW_LINES_SET:
+      g_value_set_boolean (value, priv->pixels_below_lines_set);
       break;
 
-    case ARG_PIXELS_BELOW_LINES_SET:
-      GTK_VALUE_BOOL(*arg) = tag->pixels_below_lines_set;
+    case PROP_PIXELS_INSIDE_WRAP_SET:
+      g_value_set_boolean (value, priv->pixels_inside_wrap_set);
       break;
 
-    case ARG_PIXELS_INSIDE_WRAP_SET:
-      GTK_VALUE_BOOL(*arg) = tag->pixels_inside_wrap_set;
+    case PROP_EDITABLE_SET:
+      g_value_set_boolean (value, priv->editable_set);
       break;
 
-    case ARG_EDITABLE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->editable_set;
+    case PROP_WRAP_MODE_SET:
+      g_value_set_boolean (value, priv->wrap_mode_set);
       break;
 
-    case ARG_WRAP_MODE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->wrap_mode_set;
+    case PROP_JUSTIFICATION_SET:
+      g_value_set_boolean (value, priv->justification_set);
+      break;
+      
+    case PROP_LEFT_MARGIN_SET:
+      g_value_set_boolean (value, priv->left_margin_set);
       break;
 
-    case ARG_JUSTIFY_SET:
-      GTK_VALUE_BOOL(*arg) = tag->justify_set;
+    case PROP_INDENT_SET:
+      g_value_set_boolean (value, priv->indent_set);
       break;
 
-    case ARG_LEFT_MARGIN_SET:
-      GTK_VALUE_BOOL(*arg) = tag->left_margin_set;
+    case PROP_STRIKETHROUGH_SET:
+      g_value_set_boolean (value, priv->strikethrough_set);
       break;
 
-    case ARG_LEFT_WRAPPED_LINE_MARGIN_SET:
-      GTK_VALUE_BOOL(*arg) = tag->left_wrapped_line_margin_set;
+    case PROP_RIGHT_MARGIN_SET:
+      g_value_set_boolean (value, priv->right_margin_set);
       break;
 
-    case ARG_OVERSTRIKE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->overstrike_set;
+    case PROP_UNDERLINE_SET:
+      g_value_set_boolean (value, priv->underline_set);
       break;
 
-    case ARG_RIGHT_MARGIN_SET:
-      GTK_VALUE_BOOL(*arg) = tag->right_margin_set;
+    case PROP_RISE_SET:
+      g_value_set_boolean (value, priv->rise_set);
       break;
 
-    case ARG_UNDERLINE_SET:
-      GTK_VALUE_BOOL(*arg) = tag->underline_set;
+    case PROP_BACKGROUND_FULL_HEIGHT_SET:
+      g_value_set_boolean (value, priv->bg_full_height_set);
       break;
 
-    case ARG_OFFSET_SET:
-      GTK_VALUE_BOOL(*arg) = tag->offset_set;
+    case PROP_LANGUAGE_SET:
+      g_value_set_boolean (value, priv->language_set);
       break;
 
-    case ARG_BG_FULL_HEIGHT_SET:
-      GTK_VALUE_BOOL(*arg) = tag->bg_full_height_set;
+    case PROP_TABS_SET:
+      g_value_set_boolean (value, priv->tabs_set);
+      break;
+
+    case PROP_INVISIBLE_SET:
+      g_value_set_boolean (value, priv->invisible_set);
       break;
       
-    case ARG_BACKGROUND:
-    case ARG_FOREGROUND:
+    case PROP_PARAGRAPH_BACKGROUND_SET:
+      g_value_set_boolean (value, priv->pg_bg_color_set);
+      break;
+
+    case PROP_BACKGROUND:
+    case PROP_FOREGROUND:
+    case PROP_PARAGRAPH_BACKGROUND:
+      g_warning ("'foreground', 'background' and 'paragraph_background' properties are not readable, use 'foreground_gdk', 'background_gdk' and 'paragraph_background_gdk'");
+      break;
     default:
-      arg->type = GTK_TYPE_INVALID;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
-  /* FIXME */
-  arg->type = GTK_TYPE_INVALID;
 }
 
 /*
@@ -892,90 +1886,141 @@ typedef struct {
 } DeltaData;
 
 static void
-delta_priority_foreach(gpointer key, gpointer value, gpointer user_data)
+delta_priority_foreach (GtkTextTag *tag, gpointer user_data)
 {
-  GtkTextTag *tag;
+  GtkTextTagPrivate *priv = tag->priv;
   DeltaData *dd = user_data;
-  
-  tag = GTK_TEXT_TAG(value);
 
-  if (tag->priority >= dd->low && tag->priority <= dd->high)
-    tag->priority += dd->delta;
+  if (priv->priority >= dd->low && priv->priority <= dd->high)
+    priv->priority += dd->delta;
+}
+
+/**
+ * gtk_text_tag_get_priority:
+ * @tag: a #GtkTextTag
+ * 
+ * Get the tag priority.
+ * 
+ * Return value: The tag's priority.
+ **/
+gint
+gtk_text_tag_get_priority (GtkTextTag *tag)
+{
+  g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), 0);
+
+  return tag->priv->priority;
 }
 
+/**
+ * gtk_text_tag_set_priority:
+ * @tag: a #GtkTextTag
+ * @priority: the new priority
+ * 
+ * Sets the priority of a #GtkTextTag. Valid priorities are
+ * start at 0 and go to one less than gtk_text_tag_table_get_size().
+ * Each tag in a table has a unique priority; setting the priority
+ * of one tag shifts the priorities of all the other tags in the
+ * table to maintain a unique priority for each tag. Higher priority
+ * tags "win" if two tags both set the same text attribute. When adding
+ * a tag to a tag table, it will be assigned the highest priority in
+ * the table by default; so normally the precedence of a set of tags
+ * is the order in which they were added to the table, or created with
+ * gtk_text_buffer_create_tag(), which adds the tag to the buffer's table
+ * automatically.
+ **/
 void
-gtk_text_tag_set_priority(GtkTextTag *tag,
-                           gint priority)
+gtk_text_tag_set_priority (GtkTextTag *tag,
+                           gint        priority)
 {
-    DeltaData dd;
-    
-    g_return_if_fail(GTK_IS_TEXT_TAG(tag));
-    g_return_if_fail(tag->table != NULL);
-    g_return_if_fail(priority >= 0);
-    g_return_if_fail(priority < gtk_text_tag_table_size(tag->table));
+  GtkTextTagPrivate *priv;
+  DeltaData dd;
+
+  g_return_if_fail (GTK_IS_TEXT_TAG (tag));
 
-    if (priority == tag->priority)
-      return;
+  priv = tag->priv;
 
-    if (priority < tag->priority) {
+  g_return_if_fail (priv->table != NULL);
+  g_return_if_fail (priority >= 0);
+  g_return_if_fail (priority < gtk_text_tag_table_get_size (priv->table));
+
+  if (priority == priv->priority)
+    return;
+
+  if (priority < priv->priority)
+    {
       dd.low = priority;
-      dd.high = tag->priority - 1;
+      dd.high = priv->priority - 1;
       dd.delta = 1;
-    } else {
-      dd.low = tag->priority + 1;
+    }
+  else
+    {
+      dd.low = priv->priority + 1;
       dd.high = priority;
       dd.delta = -1;
     }
 
-    gtk_text_tag_table_foreach(tag->table, delta_priority_foreach,
-                                &dd);
-    
-    tag->priority = priority;
+  gtk_text_tag_table_foreach (priv->table,
+                              delta_priority_foreach,
+                              &dd);
+
+  priv->priority = priority;
 }
 
-gint
-gtk_text_tag_event(GtkTextTag *tag,
-                    GtkObject *event_object,
-                    GdkEvent *event,
+/**
+ * gtk_text_tag_event:
+ * @tag: a #GtkTextTag
+ * @event_object: object that received the event, such as a widget
+ * @event: the event
+ * @iter: location where the event was received
+ * 
+ * Emits the "event" signal on the #GtkTextTag.
+ * 
+ * Return value: result of signal emission (whether the event was handled)
+ **/
+gboolean
+gtk_text_tag_event (GtkTextTag        *tag,
+                    GObject           *event_object,
+                    GdkEvent          *event,
                     const GtkTextIter *iter)
 {
-  gint retval = FALSE;
+  gboolean retval = FALSE;
 
-  g_return_val_if_fail(GTK_IS_TEXT_TAG(tag), FALSE);
-  g_return_val_if_fail(GTK_IS_OBJECT(event_object), FALSE);
-  g_return_val_if_fail(event != NULL, FALSE);
-  
-  gtk_signal_emit(GTK_OBJECT(tag),
-                  signals[EVENT],
-                  event_object,
-                  event,
-                  iter,
-                  &retval);
+  g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE);
+  g_return_val_if_fail (G_IS_OBJECT (event_object), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  g_signal_emit (tag,
+                 signals[EVENT],
+                 0,
+                 event_object,
+                 event,
+                 iter,
+                 &retval);
 
   return retval;
 }
 
 static int
-tag_sort_func(gconstpointer first, gconstpointer second)
+tag_sort_func (gconstpointer first, gconstpointer second)
 {
-    GtkTextTag *tag1, *tag2;
+  GtkTextTag *tag1, *tag2;
 
-    tag1 = * (GtkTextTag **) first;
-    tag2 = * (GtkTextTag **) second;
-    return tag1->priority - tag2->priority;
+  tag1 = * (GtkTextTag **) first;
+  tag2 = * (GtkTextTag **) second;
+  return tag1->priv->priority - tag2->priv->priority;
 }
 
 void
-gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
-                         guint len)
+_gtk_text_tag_array_sort (GtkTextTag** tag_array_p,
+                          guint len)
 {
   int i, j, prio;
   GtkTextTag **tag;
   GtkTextTag **maxPtrPtr, *tmp;
 
-  g_return_if_fail(tag_array_p != NULL);
-  g_return_if_fail(len > 0);
-  
+  g_return_if_fail (tag_array_p != NULL);
+  g_return_if_fail (len > 0);
+
   if (len < 2) {
     return;
   }
@@ -984,10 +2029,10 @@ gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
 
     for (i = len-1; i > 0; i--, iter++) {
       maxPtrPtr = tag = iter;
-      prio = tag[0]->priority;
+      prio = tag[0]->priv->priority;
       for (j = i, tag++; j > 0; j--, tag++) {
-        if (tag[0]->priority < prio) {
-          prio = tag[0]->priority;
+        if (tag[0]->priv->priority < prio) {
+          prio = tag[0]->priv->priority;
           maxPtrPtr = tag;
         }
       }
@@ -996,277 +2041,22 @@ gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
       *iter = tmp;
     }
   } else {
-    qsort((void *) tag_array_p, (unsigned) len, sizeof (GtkTextTag *),
-          tag_sort_func);
+    qsort ((void *) tag_array_p, (unsigned) len, sizeof (GtkTextTag *),
+           tag_sort_func);
   }
 
 #if 0
   {
-    printf("Sorted tag array: \n");
+    printf ("Sorted tag array: \n");
     i = 0;
     while (i < len)
       {
         GtkTextTag *t = tag_array_p[i];
-        printf("  %s priority %d\n", t->name, t->priority);
-        
+        printf ("  %s priority %d\n", t->name, t->priority);
+
         ++i;
       }
   }
 #endif
 }
 
-/*
- * StyleValues
- */
-
-GtkTextStyleValues*
-gtk_text_view_style_values_new(void)
-{
-  GtkTextStyleValues *values;
-
-  values = g_new0(GtkTextStyleValues, 1);
-
-  /* 0 is a valid value for most of the struct */
-
-  values->refcount = 1;
-  
-  return values;
-}
-
-void
-gtk_text_view_style_values_copy(GtkTextStyleValues *src,
-                               GtkTextStyleValues *dest)
-{
-  guint orig_refcount;
-
-  g_return_if_fail(!dest->realized);
-
-  if (src == dest)
-    return;
-  
-  /* Add refs */
-  
-  if (src->appearance.bg_stipple)
-    gdk_bitmap_ref(src->appearance.bg_stipple);
-
-  if (src->appearance.fg_stipple)
-    gdk_bitmap_ref(src->appearance.fg_stipple);
-
-  if (src->tab_array)
-    gtk_text_view_tab_array_ref(src->tab_array);
-
-  /* Remove refs */
-  
-  if (dest->appearance.bg_stipple)
-    gdk_bitmap_unref(dest->appearance.bg_stipple);
-
-  if (dest->appearance.fg_stipple)
-    gdk_bitmap_unref(dest->appearance.fg_stipple);
-
-  if (dest->tab_array)
-    gtk_text_view_tab_array_unref(dest->tab_array);
-
-  /* Copy */
-  orig_refcount = dest->refcount;
-  
-  *dest = *src;
-
-  dest->font_desc = pango_font_description_copy (src->font_desc);
-
-  dest->refcount = orig_refcount;
-  dest->realized = FALSE;
-}
-
-void
-gtk_text_view_style_values_ref(GtkTextStyleValues *values)
-{
-  g_return_if_fail(values != NULL);
-
-  values->refcount += 1;
-}
-
-void
-gtk_text_view_style_values_unref(GtkTextStyleValues *values)
-{
-  g_return_if_fail(values != NULL);
-  g_return_if_fail(values->refcount > 0);
-
-  values->refcount -= 1;
-
-  if (values->refcount == 0)
-    {
-      g_assert(!values->realized);
-      
-      if (values->appearance.bg_stipple)
-        gdk_bitmap_unref(values->appearance.bg_stipple);
-      
-      if (values->font_desc)
-        pango_font_description_free (values->font_desc);
-      
-      if (values->appearance.fg_stipple)
-        gdk_bitmap_unref(values->appearance.fg_stipple);
-
-      if (values->tab_array)
-        gtk_text_view_tab_array_unref(values->tab_array);
-      
-      g_free(values);
-    }
-}
-
-void
-gtk_text_view_style_values_realize(GtkTextStyleValues *values,
-                                  GdkColormap *cmap,
-                                  GdkVisual *visual)
-{
-  g_return_if_fail(values != NULL);
-  g_return_if_fail(values->refcount > 0);
-  g_return_if_fail(!values->realized);
-  
-  /* It is wrong to use this colormap, FIXME */
-  gdk_colormap_alloc_color(cmap,
-                           &values->appearance.fg_color,
-                           FALSE, TRUE);
-
-  gdk_colormap_alloc_color(cmap,
-                           &values->appearance.bg_color,
-                           FALSE, TRUE);
-
-  values->realized = TRUE;
-}
-
-void
-gtk_text_view_style_values_unrealize(GtkTextStyleValues *values,
-                                    GdkColormap *cmap,
-                                    GdkVisual *visual)
-{
-  g_return_if_fail(values != NULL);
-  g_return_if_fail(values->refcount > 0);
-  g_return_if_fail(values->realized);
-  
-  gdk_colormap_free_colors(cmap,
-                           &values->appearance.fg_color, 1);
-  
-  
-  gdk_colormap_free_colors(cmap,
-                           &values->appearance.bg_color, 1);
-
-  values->appearance.fg_color.pixel = 0;
-  values->appearance.bg_color.pixel = 0;
-
-  values->realized = FALSE;
-}
-
-void
-gtk_text_view_style_values_fill_from_tags(GtkTextStyleValues *dest,
-                                         GtkTextTag**        tags,
-                                         guint               n_tags)
-{
-  guint n = 0;
-
-  g_return_if_fail(!dest->realized);  
-  
-  while (n < n_tags)
-    {
-      GtkTextTag *tag = tags[n];
-      GtkTextStyleValues *vals = tag->values;
-
-      if (n > 0)
-        g_assert(tags[n]->priority > tags[n-1]->priority);
-      
-      if (tag->bg_color_set)
-        {
-          dest->appearance.bg_color = vals->appearance.bg_color;
-          
-          dest->appearance.draw_bg = TRUE;
-        }
-      
-      if (tag->border_width_set)
-        dest->border_width = vals->border_width;
-
-      if (tag->relief_set)
-        dest->relief = vals->relief;
-
-      if (tag->bg_stipple_set)
-        {
-          gdk_bitmap_ref(vals->appearance.bg_stipple);
-          if (dest->appearance.bg_stipple)
-            gdk_bitmap_unref(dest->appearance.bg_stipple);
-          dest->appearance.bg_stipple = vals->appearance.bg_stipple;
-
-          dest->appearance.draw_bg = TRUE;
-        }
-
-      if (tag->fg_color_set)
-        dest->appearance.fg_color = vals->appearance.fg_color;
-         
-      if (tag->font_set)
-        {
-          if (dest->font_desc)
-            pango_font_description_free (dest->font_desc);
-          dest->font_desc = pango_font_description_copy (vals->font_desc);
-        }
-
-      if (tag->fg_stipple_set)
-        {
-          gdk_bitmap_ref(vals->appearance.fg_stipple);
-          if (dest->appearance.fg_stipple)
-            gdk_bitmap_unref(dest->appearance.fg_stipple);
-          dest->appearance.fg_stipple = vals->appearance.fg_stipple;
-        }
-
-      if (tag->justify_set)
-        dest->justify = vals->justify;
-
-      if (vals->direction != GTK_TEXT_DIR_NONE)
-        dest->direction = vals->direction;
-      
-      if (tag->left_margin_set)
-        dest->left_margin = vals->left_margin;
-
-      if (tag->left_wrapped_line_margin_set)
-        dest->left_wrapped_line_margin = vals->left_wrapped_line_margin;
-
-      if (tag->offset_set)
-        dest->offset = vals->offset;
-
-      if (tag->right_margin_set)
-        dest->right_margin = vals->right_margin;
-
-      if (tag->pixels_above_lines_set)
-        dest->pixels_above_lines = vals->pixels_above_lines;
-
-      if (tag->pixels_below_lines_set)
-        dest->pixels_below_lines = vals->pixels_below_lines;
-
-      if (tag->pixels_inside_wrap_set)
-        dest->pixels_inside_wrap = vals->pixels_inside_wrap;
-
-      if (tag->tab_array_set)
-        {
-          gtk_text_view_tab_array_ref(vals->tab_array);
-          if (dest->tab_array)
-            gtk_text_view_tab_array_unref(dest->tab_array);
-          dest->tab_array = vals->tab_array;
-        }
-
-      if (tag->wrap_mode_set)
-        dest->wrap_mode = vals->wrap_mode;
-
-      if (tag->underline_set)
-        dest->appearance.underline = vals->appearance.underline;
-
-      if (tag->overstrike_set)
-        dest->appearance.overstrike = vals->appearance.overstrike;
-
-      if (tag->elide_set)
-        dest->elide = vals->elide;
-
-      if (tag->editable_set)
-        dest->editable = vals->editable;
-
-      if (tag->bg_full_height_set)
-        dest->bg_full_height = vals->bg_full_height;
-      
-      ++n;
-    }
-}