[gtk+] docs: use |[ ]| instead of <programlisting></programlisting>



commit 768bc44081550be18ee19697ed36b5f92298ef11
Author: William Jon McCann <william jon mccann gmail com>
Date:   Mon Jan 27 12:12:55 2014 -0500

    docs: use |[ ]| instead of <programlisting></programlisting>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=723119

 gdk/gdk.c                       |   12 +++-------
 gdk/gdkapplaunchcontext.c       |    6 +---
 gdk/gdkdisplay.c                |    4 +-
 gdk/gdkdisplaymanager.c         |    8 +++---
 gdk/gdkevents.h                 |   18 +++++----------
 gdk/gdkkeys.c                   |    8 +++---
 gdk/gdkpango.c                  |    4 +-
 gdk/gdkwindow.h                 |    4 +-
 gdk/wayland/gdkwindow-wayland.c |    6 +---
 gtk/deprecated/gtkactiongroup.c |    4 +-
 gtk/deprecated/gtkactivatable.c |    4 +-
 gtk/deprecated/gtkiconfactory.c |    5 +--
 gtk/deprecated/gtkrc.c          |   44 +++++++++++++++++++-------------------
 gtk/deprecated/gtkstyle.c       |    4 +-
 gtk/deprecated/gtktable.c       |    4 +-
 gtk/deprecated/gtkuimanager.c   |   14 +++++-------
 gtk/gtkaboutdialog.c            |    4 +-
 gtk/gtkaccellabel.c             |    4 +-
 gtk/gtkapplication.c            |    4 +-
 gtk/gtkapplicationwindow.c      |    9 +++----
 gtk/gtkbindings.c               |   20 ++++++++--------
 gtk/gtkbuilder.c                |    8 +++---
 gtk/gtkcellarea.c               |   20 ++++++++--------
 gtk/gtkcelllayout.c             |   16 +++++++-------
 gtk/gtkcomboboxtext.c           |    4 +-
 gtk/gtkcontainer.c              |   12 +++++-----
 gtk/gtkcsscustomproperty.c      |    4 +-
 gtk/gtkcssprovider.c            |   40 +++++++++++++++++-----------------
 gtk/gtkdialog.c                 |    8 +++---
 gtk/gtkdrawingarea.c            |    4 +-
 gtk/gtkeditable.c               |    4 +-
 gtk/gtkentry.c                  |   16 +++++++-------
 gtk/gtkexpander.c               |   10 +++-----
 gtk/gtkfilechooser.c            |   12 +++++-----
 gtk/gtkfilechooserbutton.c      |    4 +-
 gtk/gtkfilechooserdialog.c      |   12 +++++-----
 gtk/gtkfilefilter.c             |    4 +-
 gtk/gtkframe.c                  |    4 +-
 gtk/gtkicontheme.c              |    6 +---
 gtk/gtkimage.c                  |    8 +++---
 gtk/gtkimcontext.c              |   16 +++++++-------
 gtk/gtkinfobar.c                |    4 +-
 gtk/gtklabel.c                  |   32 ++++++++++-----------------
 gtk/gtklevelbar.c               |    4 +-
 gtk/gtkliststore.c              |    8 +++---
 gtk/gtkmain.c                   |   12 +++++-----
 gtk/gtkmenu.c                   |    8 +++---
 gtk/gtkmenuitem.c               |    8 +++---
 gtk/gtkmenutoolbutton.c         |    4 +-
 gtk/gtkmessagedialog.c          |   12 +++++-----
 gtk/gtknotebook.c               |    4 +-
 gtk/gtkpagesetup.c              |    4 +-
 gtk/gtkpaned.c                  |    4 +-
 gtk/gtkprintcontext.c           |    4 +-
 gtk/gtkprintoperation.c         |    4 +-
 gtk/gtkprintunixdialog.c        |    4 +-
 gtk/gtkradiobutton.c            |    4 +-
 gtk/gtkradiomenuitem.c          |    4 +-
 gtk/gtkrecentchooserdialog.c    |    4 +-
 gtk/gtkrecentfilter.c           |    4 +-
 gtk/gtksearchbar.c              |    8 +++---
 gtk/gtksettings.c               |   12 +++++-----
 gtk/gtksizegroup.c              |    4 +-
 gtk/gtksocket.c                 |    4 +-
 gtk/gtkspinbutton.c             |    8 +++---
 gtk/gtkstylecontext.c           |   36 ++++++++++++++++----------------
 gtk/gtktexttagtable.c           |    4 +-
 gtk/gtkthemingengine.c          |    4 +-
 gtk/gtktogglebutton.c           |    4 +-
 gtk/gtktreemodel.c              |    8 +++---
 gtk/gtktreemodelfilter.c        |    4 +-
 gtk/gtktreemodelsort.c          |    8 +++---
 gtk/gtktreestore.c              |    4 +-
 gtk/gtktreeview.c               |    4 +-
 gtk/gtkwidget.c                 |   28 ++++++++++++------------
 gtk/gtkwidgetpath.c             |    8 +++---
 gtk/gtkwindow.c                 |    4 +-
 77 files changed, 328 insertions(+), 358 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index a1fee6c..3bc27f5 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -502,8 +502,7 @@ gdk_init (int *argc, char ***argv)
  *
  * A minimal main program for a threaded GTK+ application
  * looks like:
- * <informalexample>
- * <programlisting role="C">
+ * |[
  * int
  * main (int argc, char *argv[])
  * {
@@ -522,8 +521,7 @@ gdk_init (int *argc, char ***argv)
  *
  *   return 0;
  * }
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * Callbacks require a bit of attention. Callbacks from GTK+ signals
  * are made within the GTK+ lock. However callbacks from GLib (timeouts,
@@ -534,8 +532,7 @@ gdk_init (int *argc, char ***argv)
  *
  * Erik Mouw contributed the following code example to
  * illustrate how to use threads within GTK+ programs.
- * <informalexample>
- * <programlisting role="C">
+ * |[
  * /<!---->*-------------------------------------------------------------------------
  *  * Filename:      gtk-thread.c
  *  * Version:       0.99.1
@@ -672,8 +669,7 @@ gdk_init (int *argc, char ***argv)
  *
  *   return 0;
  * }
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * Unfortunately, all of the above documentation holds with the X11
  * backend only. With the Win32 or Quartz backends, GDK and GTK+ calls
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 3fbcf72..bfad9ba 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -36,8 +36,7 @@
  * screen or workspace.
  * <example>
  * <title>Launching an application</title>
- * <informalexample>
- * <programlisting>
+ * |[
  * GdkAppLaunchContext *context;
  *
  * context = gdk_display_get_app_launch_context (display);
@@ -49,8 +48,7 @@
  *   g_warning ("Launching failed: %s\n", error->message);
  *
  * g_object_unref (context);
- * </programlisting>
- * </informalexample>
+ * ]|
  * </example>
  */
 
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6e9bd20..a29c106 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -2115,7 +2115,7 @@ static GQueue gdk_error_traps = G_QUEUE_INIT;
  *
 * <example>
  * <title>Trapping an X error</title>
- * <programlisting>
+ * |[
  * gdk_error_trap_push (<!-- -->);
  *
  *  // ... Call the X function which may cause an error here ...
@@ -2125,7 +2125,7 @@ static GQueue gdk_error_traps = G_QUEUE_INIT;
  *  {
  *    // ... Handle the error here ...
  *  }
- * </programlisting>
+ * ]|
  * </example>
  */
 void
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 94f857e..2262722 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -87,7 +87,7 @@
  *
  * <example id="backend-specific">
  * <title>Backend-specific code</title>
- * <programlisting>
+ * |[
  * #ifdef GDK_WINDOWING_X11
  *   if (GDK_IS_X11_DISPLAY (display))
  *     {
@@ -103,7 +103,7 @@
  *   else
  * #endif
  *   g_error ("Unsupported GDK backend");
- * </programlisting>
+ * ]|
  * </example>
  */
 
@@ -225,9 +225,9 @@ static const gchar *allowed_backends;
  * By default, GDK tries all included backends.
  *
  * For example,
- * <programlisting>
+ * |[
  * gdk_set_allowed_backends ("wayland,quartz,*");
- * </programlisting>
+ * ]|
  * instructs GDK to try the Wayland backend first,
  * followed by the Quartz backend, and then all
  * others.
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 8425466..d3209b7 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -1142,36 +1142,30 @@ struct _GdkEventDND {
  * The event type is always the first field in all of the event types, and
  * can always be accessed with the following code, no matter what type of
  * event it is:
- * <informalexample>
- * <programlisting>
+ * |[
  *   GdkEvent *event;
  *   GdkEventType type;
  *
  *   type = event->type;
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * To access other fields of the event, the pointer to the event
  * can be cast to the appropriate event type, or the union member
  * name can be used. For example if the event type is %GDK_BUTTON_PRESS
  * then the x coordinate of the button press can be accessed with:
- * <informalexample>
- * <programlisting>
+ * |[
  *   GdkEvent *event;
  *   gdouble x;
  *
  *   x = ((GdkEventButton*)event)->x;
- * </programlisting>
- * </informalexample>
+ * ]|
  * or:
- * <informalexample>
- * <programlisting>
+ * |[
  *   GdkEvent *event;
  *   gdouble x;
  *
  *   x = event->button.x;
- * </programlisting>
- * </informalexample>
+ * ]|
  */
 union _GdkEvent
 {
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index f29303f..1573f92 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -503,7 +503,7 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  * <literal>&lt;Control&gt;plus</literal> accelerator &lt;Shift&gt; should
  * be masked out.
  * </para>
- * <informalexample><programlisting>
+ * |[
  * &sol;* We want to ignore irrelevant modifiers like ScrollLock *&sol;
  * &num;define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
  * gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode,
@@ -512,18 +512,18 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  * if (keyval == GDK_PLUS &&
  *     (event->state &amp; ~consumed &amp; ALL_ACCELS_MASK) == GDK_CONTROL_MASK)
  *   &sol;* Control was pressed *&sol;
- * </programlisting></informalexample>
+ * ]|
  * <para>
  * An older interpretation @consumed_modifiers was that it contained
  * all modifiers that might affect the translation of the key;
  * this allowed accelerators to be stored with irrelevant consumed
  * modifiers, by doing:</para>
- * <informalexample><programlisting>
+ * |[
  * &sol;* XXX Don't do this XXX *&sol;
  * if (keyval == accel_keyval &&
  *     (event->state &amp; ~consumed &amp; ALL_ACCELS_MASK) == (accel_mods &amp; ~consumed))
  *   &sol;* Accelerator was pressed *&sol;
- * </programlisting></informalexample>
+ * ]|
  * <para>
  * However, this did not work if multi-modifier combinations were
  * used in the keymap, since, for instance, <literal>&lt;Control&gt;</literal>
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index ca5745b..68a21cb 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -53,7 +53,7 @@
  * <title>Draw transformed text with Pango and cairo</title>
  * <!-- Note that this example is basically the same as
  *      demos/gtk-demo/rotated_text.c -->
- * <programlisting>
+ * |[
  * #define RADIUS 100
  * #define N_WORDS 10
  * #define FONT "Sans Bold 18"
@@ -116,7 +116,7 @@
  *
  * g_object_unref (layout);
  * g_object_unref (context);
- * </programlisting>
+ * ]|
  * </example>
  * <figure>
  *   <title>Output of <xref linkend="rotated-example"/></title>
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 6bb66db..adf2d42 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -421,7 +421,7 @@ struct _GdkWindowAttr
  * Here's an example of how the terminal example would be implemented, assuming
  * a terminal area widget called "terminal" and a toplevel window "toplevel":
  *
- * <informalexample><programlisting><![CDATA[
+ * |[
  *     GdkGeometry hints;
  *
  *     hints.base_width = terminal->char_width;
@@ -437,7 +437,7 @@ struct _GdkWindowAttr
  *                                 GDK_HINT_RESIZE_INC |
  *                                 GDK_HINT_MIN_SIZE |
  *                                 GDK_HINT_BASE_SIZE);
- * ]]></programlisting></informalexample>
+ * ]|
  *
  * The other useful fields are the @min_aspect and @max_aspect fields; these
  * contain a width/height ratio as a floating point number. If a geometry widget
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 2b4325b..9ebb3b3 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2275,8 +2275,7 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window)
  * This function should be called before a #GdkWindow is shown. This is
  * best done by connecting to the #GtkWidget::realize signal:
  *
- * <informalexample>
- * <programlisting>
+ * |[
  *   static void
  *   widget_realize_cb (GtkWidget *widget)
  *   {
@@ -2297,8 +2296,7 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window)
  *   {
  *     g_signal_connect (window, "realize", G_CALLBACK (widget_realize_cb), NULL);
  *   }
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * Since: 3.10
  */
diff --git a/gtk/deprecated/gtkactiongroup.c b/gtk/deprecated/gtkactiongroup.c
index 01c2d53..6daf717 100644
--- a/gtk/deprecated/gtkactiongroup.c
+++ b/gtk/deprecated/gtkactiongroup.c
@@ -70,7 +70,7 @@
  * </para>
  * <example>
  * <title>A #GtkDialog UI definition fragment.</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkActionGroup" id="actiongroup">
  *   <child>
  *       <object class="GtkAction" id="About">
@@ -81,7 +81,7 @@
  *       <accelerator key="F1" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/deprecated/gtkactivatable.c b/gtk/deprecated/gtkactivatable.c
index 072b2cc..1a8fc80 100644
--- a/gtk/deprecated/gtkactivatable.c
+++ b/gtk/deprecated/gtkactivatable.c
@@ -41,7 +41,7 @@
  * </para>
  * <example>
  * <title>A class fragment implementing #GtkActivatable</title>
- * <programlisting><![CDATA[
+ * |[
  *
  * enum {
  * ...
@@ -253,7 +253,7 @@
  *     foo_bar_set_label (button, gtk_action_get_label (action));
  * 
  *   ...
- * }]]></programlisting>
+ * }]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index 8d4da50..accf8f1 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -122,7 +122,7 @@
  * </variablelist>
  * <example>
  * <title>A #GtkIconFactory UI definition fragment.</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkIconFactory" id="iconfactory1">
  *   <sources>
  *     <source stock-id="apple-red" filename="apple-red.png"/>
@@ -136,8 +136,7 @@
  *     </object>
  *   </child>
  * </object>
- * ]]>
- * </programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/deprecated/gtkrc.c b/gtk/deprecated/gtkrc.c
index 0639672..b763a1b 100644
--- a/gtk/deprecated/gtkrc.c
+++ b/gtk/deprecated/gtkrc.c
@@ -116,9 +116,9 @@
  * and <literal>class</literal> declarations. As an example
  * of such a statement:
  *
- * <informalexample><programlisting>
+ * |[
  * widget "mywindow.*.GtkEntry" style "my-entry-class"
- * </programlisting></informalexample>
+ * ]|
  *
  * attaches the style <literal>"my-entry-class"</literal> to all
  * widgets  whose <firstterm>widget path</firstterm> matches the
@@ -141,9 +141,9 @@
  * Since GTK+ 2.10, <literal>widget_class</literal> paths can also contain
  * <literal>&lt;classname&gt;</literal> substrings, which are matching
  * the class with the given name and any derived classes. For instance,
- * <informalexample><programlisting>
+ * |[
  * widget_class "*&lt;GtkMenuItem&gt;.GtkLabel" style "my-style"
- * </programlisting></informalexample>
+ * ]|
  * will match #GtkLabel widgets which are contained in any kind of menu item.
  *
  * So, if you have a #GtkEntry named <literal>"myentry"</literal>, inside of a
@@ -154,9 +154,9 @@
  * Matching against class is a little different. The pattern match is done
  * against all class names in the widgets class hierarchy (not the layout
  * hierarchy) in sequence, so the pattern:
- * <informalexample><programlisting>
+ * |[
  * class "GtkButton" style "my-style"
- * </programlisting></informalexample>
+ * ]|
  * will match not just #GtkButton widgets, but also #GtkToggleButton and
  * #GtkCheckButton widgets, since those classes derive from #GtkButton.
  *
@@ -221,17 +221,17 @@
  *   </para></listitem>
  *   <listitem><para>
  *   Merge multiple styles which use the same matching rule, for instance:
- *   <informalexample><programlisting>
+ *   |[
  *      style "Foo" { foo_content }
  *      class "X" style "Foo"
  *      style "Bar" { bar_content }
  *      class "X" style "Bar"
- *   </programlisting></informalexample>
+ *   ]|
  *   is faster to match as:
- *   <informalexample><programlisting>
+ *   |[
  *      style "FooBar" { foo_content bar_content }
  *      class "X" style "FooBar"
- *   </programlisting></informalexample>
+ *   ]|
  *   </para></listitem>
  *   <listitem><para>
  *   Use of wildcards should be avoided, this can reduce the individual RC style
@@ -589,11 +589,11 @@
  *
  * Here are some examples of color expressions:
  *
- * <informalexample><programlisting>
+ * |[
  *  mix (0.5, "red", "blue")
  *  shade (1.5, mix (0.3, "#0abbc0", { 0.3, 0.5, 0.9 }))
  *  lighter (@<!-- -->foreground)
- * </programlisting></informalexample>
+ * ]|
  *
  * In a <literal>stock</literal> definition, icon sources are specified as a
  * 4-tuple of image filename or icon name, text direction, widget state, and size, in that
@@ -607,34 +607,34 @@
  * <literal>*</literal>. So for example, the following specifies different icons to
  * use for left-to-right and right-to-left languages:
  *
- * <informalexample><programlisting>
+ * |[
  * stock["my-stock-item"] =
  * {
  *   { "itemltr.png", LTR, *, * },
  *   { "itemrtl.png", RTL, *, * }
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * This could be abbreviated as follows:
  *
- * <informalexample><programlisting>
+ * |[
  * stock["my-stock-item"] =
  * {
  *   { "itemltr.png", LTR },
  *   { "itemrtl.png", RTL }
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * You can specify custom icons for specific sizes, as follows:
  *
- * <informalexample><programlisting>
+ * |[
  * stock["my-stock-item"] =
  * {
  *   { "itemmenusize.png", *, *, "gtk-menu" },
  *   { "itemtoolbarsize.png", *, *, "gtk-large-toolbar" }
  *   { "itemgeneric.png" } // implicit *, *, * as a fallback
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * The sizes that come with GTK+ itself are <literal>"gtk-menu"</literal>,
  * <literal>"gtk-small-toolbar"</literal>, <literal>"gtk-large-toolbar"</literal>,
@@ -643,14 +643,14 @@
  *
  * It's also possible to use custom icons for a given state, for example:
  *
- * <informalexample><programlisting>
+ * |[
  * stock["my-stock-item"] =
  * {
  *   { "itemprelight.png", *, PRELIGHT },
  *   { "iteminsensitive.png", *, INSENSITIVE },
  *   { "itemgeneric.png" } // implicit *, *, * as a fallback
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * When selecting an icon source to use, GTK+ will consider text direction most
  * important, state second, and size third. It will select the best match based on
@@ -667,7 +667,7 @@
  * taken on particular key presses. The form of a binding
  * set declaration is:
  *
- * <informalexample><programlisting>
+ * |[
  * binding <replaceable>name</replaceable> {
  *   bind <replaceable>key</replaceable> {
  *     <replaceable>signalname</replaceable> (<replaceable>param</replaceable>, ...)
@@ -675,7 +675,7 @@
  *   }
  *   ...
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * <replaceable>key</replaceable> is a string consisting of a
  * series of modifiers followed by the name of a key. The
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 74abf0a..1ae5da8 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -4067,9 +4067,9 @@ gtk_widget_get_default_style (void)
  * This function attaches the widget's #GtkStyle to the widget's
  * #GdkWindow. It is a replacement for
  *
- * <programlisting>
+ * |[
  * widget->style = gtk_style_attach (widget->style, widget->window);
- * </programlisting>
+ * ]|
  *
  * and should only ever be called in a derived widget's "realize"
  * implementation which does not chain up to its parent class'
diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c
index cecb64a..55affca 100644
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
@@ -729,13 +729,13 @@ gtk_table_resize (GtkTable *table,
  * and row numbers of the table. (Columns and rows are indexed from zero).
  *
  * To make a button occupy the lower right cell of a 2x2 table, use
- * <informalexample><programlisting>
+ * |[
  * gtk_table_attach (table, button,
  *                   1, 2, // left, right attach
  *                   1, 2, // top, bottom attach
  *                   xoptions, yoptions,
  *                   xpadding, ypadding);
- * </programlisting></informalexample>
+ * ]|
  * If you want to make the button span the entire bottom row, use @left_attach == 0 and @right_attach = 2 
instead.
  *
  * Deprecated: 3.4: Use gtk_grid_attach() with #GtkGrid. Note that the attach
diff --git a/gtk/deprecated/gtkuimanager.c b/gtk/deprecated/gtkuimanager.c
index 4af0b34..207d019 100644
--- a/gtk/deprecated/gtkuimanager.c
+++ b/gtk/deprecated/gtkuimanager.c
@@ -72,8 +72,7 @@
  * Definitions</link>.
  * </para></note>
  *
- * <programlisting>
- * <![CDATA[
+ * |[
  * <!ELEMENT ui          (menubar|toolbar|popup|accelerator)* >
  * <!ELEMENT menubar     (menuitem|separator|placeholder|menu)* >
  * <!ELEMENT menu        (menuitem|separator|placeholder|menu)* >
@@ -108,8 +107,7 @@
  *                        position     (top|bot)    #IMPLIED >
  * <!ATTLIST accelerator  name                      #IMPLIED
  *                        action                    #REQUIRED >
- * ]]>
- * </programlisting>
+ * ]|
  * There are some additional restrictions beyond those specified in the
  * DTD, e.g. every toolitem must have a toolbar in its anchestry and
  * every menuitem must have a menubar or popup in its anchestry. Since
@@ -125,7 +123,7 @@
  *
  * <example>
  * <title>A UI definition</title>
- * <programlisting><![CDATA[
+ * |[
  * <ui>
  *   <menubar>
  *     <menu name="FileMenu" action="FileMenuAction">
@@ -150,7 +148,7 @@
  *     </placeholder>
  *   </toolbar>
  * </ui>
- * ]]></programlisting>
+ * ]|
  * </example>
  *
  * The constructed widget hierarchy is very similar to the element tree
@@ -273,7 +271,7 @@
  *
  * <example>
  * <title>An embedded GtkUIManager UI definition</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkUIManager" id="uiman">
  *   <child>
  *     <object class="GtkActionGroup" id="actiongroup">
@@ -296,7 +294,7 @@
  *     <object class="GtkMenuBar" id="menubar1" constructor="uiman"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index dd0f68f..1348ff9 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -84,13 +84,13 @@
  * application, but in order to ensure proper translation of the title,
  * applications should set the title property explicitly when constructing
  * a GtkAboutDialog, as shown in the following example:
- * <informalexample><programlisting>
+ * |[
  * gtk_show_about_dialog (NULL,
  *                        "program-name", "ExampleCode",
  *                        "logo", example_logo,
  *                        "title" _("About ExampleCode"),
  *                        NULL);
- * </programlisting></informalexample>
+ * ]|
  *
  * It is also possible to show a #GtkAboutDialog like any other #GtkDialog,
  * e.g. using gtk_dialog_run(). In this case, you might need to know that
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 13e5540..e4c9c2f 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -67,7 +67,7 @@
  * though it is almost always used to display just one accelerator key.
  * <example>
  * <title>Creating a simple menu item with an accelerator key.</title>
- * <programlisting>
+ * |[
  *   GtkWidget *save_item;
  *   GtkAccelGroup *accel_group;
  *
@@ -86,7 +86,7 @@
  *      accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. *<!---->/
  *   gtk_widget_add_accelerator (save_item, "activate", accel_group,
  *                               GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 2b5e0a5..38163ed 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -94,11 +94,11 @@
  * </figure>
  *
  * <example id="gtkapplication"><title>A simple application</title>
- * <programlisting>
+ * |[
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; parse="text" 
href="../../../../examples/bloatpad.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
- * </programlisting>
+ * ]|
  * </example>
  *
  * GtkApplication optionally registers with a session manager
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 93f1267..3396de2 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -79,7 +79,7 @@
  * using gtk_header_bar_set_show_close_button().
  *
  * <example><title>A GtkApplicationWindow with a menubar</title>
- * <programlisting><![CDATA[
+ * |[
  * app = gtk_application_new ();
  *
  * builder = gtk_builder_new ();
@@ -99,16 +99,15 @@
  * ...
  *
  * window = gtk_application_window_new (app);
- * ]]>
- * </programlisting>
+ * ]|
  * </example>
  *
  * <example><title>Handling fallback yourself</title>
- * <programlisting>
+ * |[
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; parse="text" href="../../../../examples/sunny.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
- * </programlisting>
+ * ]|
  * </example>
  *
  * The XML format understood by #GtkBuilder for #GMenuModel consists
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index a64c132..5cf894c 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -68,7 +68,7 @@
  * For example for binding Control and the left or right cursor keys
  * of a #GtkEntry widget to the #GtkEntry::move-cursor signal (so movement
  * occurs in 3-character steps), the following binding can be used:
- * <informalexample><programlisting>
+ * |[
  * @binding-set MoveCursor3
  * {
  *   bind "&lt;Control&gt;Right" { "move-cursor" (visual-positions, 3, 0) };
@@ -78,7 +78,7 @@
  * {
  *   gtk-key-bindings: MoveCursor3;
  * }
- * </programlisting></informalexample>
+ * ]|
  * </para>
  * </refsect2>
  * <refsect2 id="gtk-bindings-unbind">
@@ -91,7 +91,7 @@
  * <link linkend="gtk-bindings-install">Installing a key binding</link>
  * works as expected. The same mechanism can not be used to "unbind"
  * existing bindings, however.
- * <informalexample><programlisting>
+ * |[
  * @binding-set MoveCursor3
  * {
  *   bind "&lt;Control&gt;Right" {  };
@@ -101,7 +101,7 @@
  * {
  *   gtk-key-bindings: MoveCursor3;
  * }
- * </programlisting></informalexample>
+ * ]|
  * The above example will not have the desired effect of causing
  * "&lt;Control&gt;Right" and "&lt;Control&gt;Left" key presses to
  * be ignored by GTK+. Instead, it just causes any existing bindings
@@ -112,7 +112,7 @@
  * eventually lookup and find the default GTK+ bindings for entries which
  * implement word movement. To keep GTK+ from activating its default
  * bindings, the "unbind" keyword can be used like this:
- * <informalexample><programlisting>
+ * |[
  * @binding-set MoveCursor3
  * {
  *   unbind "&lt;Control&gt;Right";
@@ -122,7 +122,7 @@
  * {
  *   gtk-key-bindings: MoveCursor3;
  * }
- * </programlisting></informalexample>
+ * ]|
  * Now, GTK+ will find a match when looking up "&lt;Control&gt;Right"
  * and "&lt;Control&gt;Left" key presses before it resorts to its default
  * bindings, and the match instructs it to abort ("unbind") the search,
@@ -1357,17 +1357,17 @@ create_signal_scanner (void)
  *
  * Signal descriptions may either bind a key combination to
  * one or more signals:
- * <informalexample><programlisting>
+ * |[
  *   bind "key" {
  *     "signalname" (param, ...)
  *     ...
  *   }
- * </programlisting></informalexample>
+ * ]|
  *
  * Or they may also unbind a key combination:
- * <informalexample><programlisting>
+ * |[
  *   unbind "key"
- * </programlisting></informalexample>
+ * ]|
  *
  * Key combinations must be in a format that can be parsed by
  * gtk_accelerator_parse().
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 81b8413..f53f210 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -67,11 +67,11 @@
  * <link linkend="XML-UI">GtkUIManager UI Definitions</link>, which are more
  * limited in scope. It is common to use <filename>.ui</filename> as the filename extension for files 
containing GtkBuilder UI definitions.
  * </para>
- * <programlisting>
+ * |[
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; parse="text" href="../../../../gtk/gtkbuilder.rnc">
  *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
- * </programlisting>
+ * ]|
  * <para>
  * The toplevel element is &lt;interface&gt;. It optionally takes a "domain"
  * attribute, which will make the builder look for translated strings using
@@ -158,7 +158,7 @@
  * </para>
  * <example>
  * <title>A GtkBuilder UI Definition</title>
- * <programlisting><![CDATA[
+ * |[
  * <interface>
  *   <object class="GtkDialog" id="dialog1">
  *     <child internal-child="vbox">
@@ -180,7 +180,7 @@
  *     </child>
  *   </object>
  * </interface>
- * ]]></programlisting>
+ * ]|
  * </example>
  * <para>
  * Beyond this general structure, several object classes define their own XML
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 1365e65..583072f 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -74,7 +74,7 @@
  * of a #GtkTreeModel one would do the following:
  * <example>
  *   <title>Requesting the width of a handful of GtkTreeModel rows</title>
- *   <programlisting>
+ *   |[
  * GtkTreeIter iter;
  * gint        minimum_width;
  * gint        natural_width;
@@ -88,7 +88,7 @@
  *     valid = gtk_tree_model_iter_next (model, &iter);
  *   }
  * gtk_cell_area_context_get_preferred_width (context, &minimum_width, &natural_width);
- *   </programlisting>
+ *   ]|
  * </example>
  * Note that in this example it's not important to observe the
  * returned minimum and natural width of the area for each row
@@ -110,7 +110,7 @@
  * take up the full width of the layouting widget would look like:
  * <example>
  *   <title>A typical get_preferred_width(<!-- -->) implementation</title>
- *   <programlisting>
+ *   |[
  * static void
  * foo_get_preferred_width (GtkWidget       *widget,
  *                          gint            *minimum_size,
@@ -123,7 +123,7 @@
  *
  *   gtk_cell_area_context_get_preferred_width (priv->context, minimum_size, natural_size);
  * }
- *   </programlisting>
+ *   ]|
  * </example>
  * In the above example the Foo widget has to make sure that some
  * row sizes have been calculated (the amount of rows that Foo judged
@@ -142,7 +142,7 @@
  * root level of a #GtkTreeModel one would do the following:
  * <example>
  *   <title>Requesting the height for width of a handful of GtkTreeModel rows</title>
- *   <programlisting>
+ *   |[
  * GtkTreeIter iter;
  * gint        minimum_height;
  * gint        natural_height;
@@ -164,7 +164,7 @@
  *
  *     valid = gtk_tree_model_iter_next (model, &iter);
  *   }
- *   </programlisting>
+ *   ]|
  * </example>
  * Note that in the above example we would need to cache the heights
  * returned for each row so that we would know what sizes to render the
@@ -199,7 +199,7 @@
  * runs as follows:
  * <example>
  *   <title>Requesting the width of a handful of GtkTreeModel rows</title>
- *   <programlisting>
+ *   |[
  * GtkAllocation allocation;
  * GdkRectangle  cell_area = { 0, };
  * GtkTreeIter   iter;
@@ -222,7 +222,7 @@
  *
  *     valid = gtk_tree_model_iter_next (model, &iter);
  *   }
- *   </programlisting>
+ *   ]|
  * </example>
  * Note that the cached height in this example really depends on how
  * the layouting widget works. The layouting widget might decide to
@@ -264,7 +264,7 @@
  * should be implemented:
  * <example>
  *   <title>Implementing keyboard focus navigation</title>
- *   <programlisting>
+ *   |[
  * static gboolean
  * foo_focus (GtkWidget       *widget,
  *            GtkDirectionType direction)
@@ -320,7 +320,7 @@
  *     }
  *     return have_focus;
  * }
- *   </programlisting>
+ *   ]|
  * </example>
  * Note that the layouting widget is responsible for matching the
  * GtkDirectionType values to the way it lays out its cells.
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 41d9e2e..36958b2 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -48,7 +48,7 @@
  *
  * <example>
  * <title>A UI definition fragment specifying attributes</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkCellView">
  *   <child>
  *     <object class="GtkCellRendererText"/>
@@ -57,7 +57,7 @@
  *     </attributes>
  *   </child>"
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  *
  * Furthermore for implementations of GtkCellLayout that use a #GtkCellArea
@@ -67,7 +67,7 @@
  * can contain multiple &lt;property&gt; elements defined in the normal way.
  * <example>
  * <title>A UI definition fragment specifying cell properties</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkTreeViewColumn">
  *   <child>
  *     <object class="GtkCellRendererText"/>
@@ -77,7 +77,7 @@
  *     </cell-packing>
  *   </child>"
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
@@ -90,9 +90,9 @@
  * to the fact that these widgets internally use a #GtkCellArea.
  * The cell area is exposed as a construct-only property by these
  * widgets. This means that it is possible to e.g. do
- * <informalexample><programlisting>
+ * |[
  * combo = g_object_new (GTK_TYPE_COMBO_BOX, "cell-area", my_cell_area, NULL);
- * </programlisting></informalexample>
+ * ]|
  * to use a custom cell area with a combo box. But construct properties
  * are only initialized after instance init()
  * functions have run, which means that using functions which rely on
@@ -100,7 +100,7 @@
  * cause the default cell area to be instantiated. In this case, a provided
  * construct property value will be ignored (with a warning, to alert
  * you to the problem).
- * <informalexample><programlisting>
+ * |[
  * static void
  * my_combo_box_init (MyComboBox *b)
  * {
@@ -122,7 +122,7 @@
  *    &ast;/
  *   return g_object_new (MY_TYPE_COMBO_BOX, "cell-area", area, NULL);
  * }
- * </programlisting></informalexample>
+ * ]|
  * If supporting alternative cell areas with your derived widget is
  * not important, then this does not have to concern you. If you want
  * to support alternative cell areas, you can do so by moving the
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 0de9124..80325b6 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -64,7 +64,7 @@
  *
  * <example>
  * <title>A UI definition fragment specifying GtkComboBoxText items</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkComboBoxText">
  *   <items>
  *     <item translatable="yes" id="factory">Factory</item>
@@ -72,7 +72,7 @@
  *     <item translatable="yes" id="subway">Subway</item>
  *   </items>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ae759e9..de42b91 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -108,7 +108,7 @@
  * the container must return the height for its minimum width. This is easily achieved by
  * simply calling the reverse apis implemented for itself as follows:
  *
- * <programlisting><![CDATA[
+ * |[
  * static void
  * foo_container_get_preferred_height (GtkWidget *widget, gint *min_height, gint *nat_height)
  * {
@@ -127,12 +127,12 @@
  *        stacked vertically (or whatever is appropriate for this container) ...
  *      }
  * }
- * ]]></programlisting>
+ * ]|
  *
  * Similarly, when gtk_widget_get_preferred_width_for_height() is called for a container or widget
  * that is height-for-width, it then only needs to return the base minimum width like so:
  *
- * <programlisting><![CDATA[
+ * |[
  * static void
  * foo_container_get_preferred_width_for_height (GtkWidget *widget, gint for_height,
  *                                               gint *min_width, gint *nat_width)
@@ -147,7 +147,7 @@
  *        of the children collectively if the container were to be allocated the said height ...
  *      }
  * }
- * ]]></programlisting>
+ * ]|
  *
  * Height for width requests are generally implemented in terms of a virtual allocation
  * of widgets in the input orientation. Assuming an height-for-width request mode, a container
@@ -213,7 +213,7 @@
  * child properties for the child.
  * <example>
  * <title>Child properties in UI definitions</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkVBox">
  *   <child>
  *     <object class="GtkLabel"/>
@@ -222,7 +222,7 @@
  *     </packing>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * Since 2.16, child properties can also be marked as translatable using
  * the same "translatable", "comments" and "context" attributes that are used
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 4c04379..95efdd6 100644
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -202,12 +202,12 @@ gtk_css_custom_property_create_initial_value (GParamSpec *pspec)
  * the CSS file, make sure the engine is loaded first by specifying
  * the engine property, either in a previous rule or within the same
  * one.
- * <programlisting>
+ * |[
  * &ast; {
  *     engine: someengine;
  *     -SomeEngine-custom-property: 2;
  * }
- * </programlisting>
+ * ]|
  * </note>
  *
  * Since: 3.0
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f457b92..4f388ab 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -88,12 +88,12 @@
  * front of the block, separated by commas.
  * </para>
  * <example><title>A rule set with two selectors</title>
- * <programlisting language="text">
+ * |[
  * GtkButton, GtkEntry {
  *     color: &num;ff00ea;
  *     font: Comic Sans 12
  * }
- * </programlisting>
+ * ]|
  * </example>
  * </refsect2>
  * <refsect2 id="gtkcssprovider-selectors">
@@ -126,7 +126,7 @@
  * </para>
  * <example>
  * <title>Widget classes and names in selectors</title>
- * <programlisting language="text">
+ * |[
  * /&ast; Theme labels that are descendants of a window &ast;/
  * GtkWindow GtkLabel {
  *     background-color: &num;898989
@@ -159,7 +159,7 @@
  * &num;main-entry {
  *     background-color: &num;f0a810
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * Widgets may also define style classes, which can be used for matching.
@@ -179,7 +179,7 @@
  * </para>
  * <example>
  * <title>Style classes in selectors</title>
- * <programlisting language="text">
+ * |[
  * /&ast; Theme all widgets defining the class entry &ast;/
  * .entry {
  *     color: &num;39f1f9;
@@ -189,7 +189,7 @@
  * GtkSpinButton.entry {
  *     color: &num;900185
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * In complicated widgets like e.g. a GtkNotebook, it may be desirable
@@ -213,7 +213,7 @@
  * </para>
  * <example>
  * <title>Regions in selectors</title>
- * <programlisting language="text">
+ * |[
  * /&ast; Theme any label within a notebook &ast;/
  * GtkNotebook GtkLabel {
  *     color: &num;f90192;
@@ -230,7 +230,7 @@
  * GtkNotebook tab:first-child GtkLabel {
  *     color: &num;89d012;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * Another use of pseudo-classes is to match widgets depending on their
@@ -241,7 +241,7 @@
  * </para>
  * <example>
  * <title>Styling specific widget states</title>
- * <programlisting language="text">
+ * |[
  * /&ast; Theme active (pressed) buttons &ast;/
  * GtkButton:active {
  *     background-color: &num;0274d9;
@@ -274,7 +274,7 @@
  * GtkCheckButton:inconsistent {
  *     background-color: &num;20395a;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * Widget state pseudoclasses may only apply to the last element
@@ -295,9 +295,9 @@
  * </para>
  * <example>
  * <title>Using the &commat;import rule</title>
- * <programlisting language="text">
+ * |[
  * &commat;import url ("path/to/common.css");
- * </programlisting>
+ * ]|
  * </example>
  * <para id="css-binding-set">
  * In order to extend key bindings affecting different widgets, GTK+
@@ -314,7 +314,7 @@
  * </para>
  * <example>
  * <title>Using the &commat;binding rule</title>
- * <programlisting language="text">
+ * |[
  * &commat;binding-set binding-set1 {
  *   bind "&lt;alt&gt;Left" { "move-cursor" (visual-positions, -3, 0) };
  *   unbind "End";
@@ -329,7 +329,7 @@
  * GtkEntry {
  *   gtk-key-bindings: binding-set1, binding-set2;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * GTK+ also supports an additional &commat;define-color rule, in order
@@ -339,13 +339,13 @@
  * </para>
  * <example>
  * <title>Defining colors</title>
- * <programlisting language="text">
+ * |[
  * &commat;define-color bg_color &num;f9a039;
  *
  * &ast; {
  *     background-color: &commat;bg_color;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * </refsect2>
  * <refsect2 id="gtkcssprovider-symbolic-colors">
@@ -358,7 +358,7 @@
  * </para>
  * <example>
  * <title>Using symbolic colors</title>
- * <programlisting language="text">
+ * |[
  * &commat;define-color entry-color shade (&commat;bg_color, 0.7);
  *
  * GtkEntry {
@@ -370,7 +370,7 @@
  *                            shade (&num;fff, 0.5),
  *                            0.8);
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  *   The various ways to express colors in GTK+ CSS are:
@@ -965,14 +965,14 @@
  * </para>
  * <example>
  * <title>Using engine-specific style properties</title>
- * <programlisting>
+ * |[
  * * {
  *     engine: clearlooks;
  *     border-radius: 4;
  *     -GtkPaned-handle-size: 6;
  *     -clearlooks-colorize-scrollbar: false;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 2e7b607..ad9a378 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -98,7 +98,7 @@
  * in the dialog.
  * <example>
  * <title>Simple GtkDialog usage</title>
- * <programlisting>
+ * |[
  * /&ast; Function to open a dialog box displaying the message provided. &ast;/
  * void
  * quick_message (gchar *message)
@@ -126,7 +126,7 @@
  *    gtk_container_add (GTK_CONTAINER (content_area), label);
  *    gtk_widget_show_all (dialog);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * <refsect2 id="GtkDialog-BUILDER-UI"><title>GtkDialog as GtkBuildable</title>
@@ -143,7 +143,7 @@
  * </para>
  * <example>
  * <title>A #GtkDialog UI definition fragment.</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkDialog" id="dialog1">
  *   <child internal-child="vbox">
  *     <object class="GtkVBox" id="vbox">
@@ -164,7 +164,7 @@
  *     <action-widget response="cancel">button_cancel</action-widget>
  *   </action-widgets>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 9fa60e4..e5375bc 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -77,7 +77,7 @@
  *
  * <example>
  * <title>Simple GtkDrawingArea usage</title>
- * <programlisting>
+ * |[
  * gboolean
  * draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
  * {
@@ -105,7 +105,7 @@
  *   gtk_widget_set_size_request (drawing_area, 100, 100);
  *   g_signal_connect (G_OBJECT (drawing_area), "draw",
  *                     G_CALLBACK (draw_callback), NULL);
- * </programlisting>
+ * ]|
  * </example>
  *
  * Draw signals are normally delivered when a drawing area first comes
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index 93c83d1..9c41402 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -39,7 +39,7 @@
  *
  * <example>
  * <title>Forcing entry to uppercase.</title>
- * <programlisting>
+ * |[
  * #include &lt;ctype.h&gt;
  *
  * void
@@ -61,7 +61,7 @@
  *
  *   g_free (result);
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 76cc728..ae18ded 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7709,9 +7709,9 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * <informalexample><programlisting>
+ * |[
  * gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry));
- * </programlisting></informalexample>
+ * ]|
  *
  * Return value: a pointer to the contents of the widget as a
  *      string. This string points to internally allocated
@@ -7739,9 +7739,9 @@ gtk_entry_get_text (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * <informalexample><programlisting>
+ * |[
  * gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (entry), max);
- * </programlisting></informalexample>
+ * ]|
  **/
 void
 gtk_entry_set_max_length (GtkEntry     *entry,
@@ -7760,9 +7760,9 @@ gtk_entry_set_max_length (GtkEntry     *entry,
  *
  * This is equivalent to:
  *
- * <informalexample><programlisting>
+ * |[
  * gtk_entry_buffer_get_max_length (gtk_entry_get_buffer (entry));
- * </programlisting></informalexample>
+ * ]|
  *
  * Return value: the maximum allowed number of characters
  *               in #GtkEntry, or 0 if there is no maximum.
@@ -7784,9 +7784,9 @@ gtk_entry_get_max_length (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * <informalexample><programlisting>
+ * |[
  * gtk_entry_buffer_get_length (gtk_entry_get_buffer (entry));
- * </programlisting></informalexample>
+ * ]|
  *
  * Return value: the current number of characters
  *               in #GtkEntry, or 0 if there are none.
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index a9d728e..6667fb9 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -43,8 +43,7 @@
  * its expansion state. You should watch this property with a signal
  * connection as follows:
  * </para>
- * <informalexample>
- * <programlisting id="expander-callback-example">
+ * |[
  * expander = gtk_expander_new_with_mnemonic ("_More Options");
  * g_signal_connect (expander, "notify::expanded",
  *                   G_CALLBACK (expander_callback), NULL);
@@ -69,8 +68,7 @@
  *       /&ast; Hide or destroy widgets &ast;/
  *     }
  * }
- * </programlisting>
- * </informalexample>
+ * ]|
  * </refsect2>
  * <refsect2 id="GtkExpander-BUILDER-UI">
  * <title>GtkExpander as GtkBuildable</title>
@@ -83,7 +81,7 @@
  * </para>
  * <example>
  * <title>A UI definition fragment with GtkExpander</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkExpander">
  *   <child type="label">
  *     <object class="GtkLabel" id="expander-label"/>
@@ -92,7 +90,7 @@
  *     <object class="GtkEntry" id="expander-content"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  *
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index ad2dbe4..6619e78 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -111,7 +111,7 @@
  * </para>
  * <example id="example-gtkfilechooser-preview">
  * <title>Sample Usage</title>
- * <programlisting>
+ * |[
  * {
  *   GtkImage *preview;
  *
@@ -145,7 +145,7 @@
  *
  *   gtk_file_chooser_set_preview_widget_active (file_chooser, have_preview);
  * }
- * </programlisting>
+ * ]|
  * </example>
  * </refsect2>
  * <refsect2 id="gtkfilechooser-extra">
@@ -160,7 +160,7 @@
  * </para>
  * <example id="example-gtkfilechooser-extra">
  * <title>Sample Usage</title>
- * <programlisting>
+ * |[
  *
  *   GtkWidget *toggle;
  *
@@ -170,7 +170,7 @@
  *   gtk_widget_show (toggle);
  *   gtk_file_chooser_set_extra_widget (my_file_chooser, toggle);
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <note>
  *    If you want to set more than one extra widget in the file
@@ -347,7 +347,7 @@ gtk_file_chooser_default_init (GtkFileChooserInterface *iface)
    * illustrates this.
    * <example id="gtkfilechooser-confirmation">
    * <title>Custom confirmation</title>
-   * <programlisting>
+   * |[
    * static GtkFileChooserConfirmation
    * confirm_overwrite_callback (GtkFileChooser *chooser, gpointer data)
    * {
@@ -377,7 +377,7 @@ gtk_file_chooser_default_init (GtkFileChooserInterface *iface)
    *         save_to_file (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
    *
    * gtk_widget_destroy (chooser);
-   * </programlisting>
+   * ]|
    * </example>
    *
    * Returns: a #GtkFileChooserConfirmation value that indicates which
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 2fadbdd..b92262c 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -72,7 +72,7 @@
  *
  * <example>
  * <title>Create a button to let the user select a file in /etc</title>
- * <programlisting>
+ * |[
  * {
  *   GtkWidget *button;
  *
@@ -81,7 +81,7 @@
  *   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
  *                                        "/etc");
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 74e9c43..1ae2574 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -57,7 +57,7 @@
  * In the simplest of cases, you can the following code to use
  * #GtkFileChooserDialog to select a file for opening:
  * <para>
- * <informalexample><programlisting>
+ * |[
  * GtkWidget *dialog;
  *
  * dialog = gtk_file_chooser_dialog_new ("Open File",
@@ -77,11 +77,11 @@
  *   }
  *
  * gtk_widget_destroy (dialog);
- * </programlisting></informalexample>
+ * ]|
  * </para>
  * To use a dialog for saving, you can use this:
  * <para>
- * <informalexample><programlisting>
+ * |[
  * GtkWidget *dialog;
  *
  * dialog = gtk_file_chooser_dialog_new ("Save File",
@@ -107,7 +107,7 @@
  *   }
  *
  * gtk_widget_destroy (dialog);
- * </programlisting></informalexample>
+ * ]|
  * </para>
  * </example>
  * <section id="gtkfilechooserdialog-setting-up">
@@ -149,7 +149,7 @@
  * #GTK_RESPONSE_ACCEPT and #GTK_RESPONSE_CANCEL.  For example, you
  * could call gtk_file_chooser_dialog_new() as follows:
  * <para>
- * <informalexample><programlisting>
+ * |[
  * GtkWidget *dialog;
  *
  * dialog = gtk_file_chooser_dialog_new ("Open File",
@@ -158,7 +158,7 @@
  *                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
  *                                       _("_Open"), GTK_RESPONSE_ACCEPT,
  *                                       NULL);
- * </programlisting></informalexample>
+ * ]|
  * </para>
  * This will create buttons for "Cancel" and "Open" that use stock
  * response identifiers from #GtkResponseType.  For most dialog
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index f314bcd..03d1f56 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -49,7 +49,7 @@
  *
  * <example>
  * <title>A UI definition fragment specifying GtkFileFilter rules</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkFileFilter">
  *   <mime-types>
  *     <mime-type>text/plain</mime-type>
@@ -60,7 +60,7 @@
  *     <pattern>*.png</pattern>
  *   </patterns>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index b4b5dd2..3e302c3 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -56,7 +56,7 @@
  * </para>
  * <example>
  * <title>A UI definition fragment with GtkFrame</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkFrame">
  *   <child type="label">
  *     <object class="GtkLabel" id="frame-label"/>
@@ -65,7 +65,7 @@
  *     <object class="GtkEntry" id="frame-content"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 4b0c4c7..2e8ac6f 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -118,8 +118,7 @@
  * so that the icon information is shared with other people
  * looking up icons. In the case where the default screen is
  * being used, looking up an icon can be as simple as:
- * <informalexample>
- * <programlisting>
+ * |[
  * GError *error = NULL;
  * GtkIconTheme *icon_theme;
  * GdkPixbuf *pixbuf;
@@ -140,8 +139,7 @@
  *     // Use the pixbuf
  *     g_object_unref (pixbuf);
  *   }
- * </programlisting>
- * </informalexample>
+ * ]|
  */
 
 
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 4eead13..fdd859e 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -52,10 +52,10 @@
  * #GdkPixbuf ("pixel buffer") from a file, and then display that.
  * There's a convenience function to do this, gtk_image_new_from_file(),
  * used as follows:
- * <informalexample><programlisting>
+ * |[
  *   GtkWidget *image;
  *   image = gtk_image_new_from_file ("myfile.png");
- * </programlisting></informalexample>
+ * ]|
  * If the file isn't loaded successfully, the image will contain a
  * "broken image" icon similar to that used in many web browsers.
  * If you want to handle errors in loading the file yourself,
@@ -76,7 +76,7 @@
  * #GtkEventBox, then connect to the event signals on the event box.
  * <example>
  * <title>Handling button press events on a #GtkImage.</title>
- * <programlisting>
+ * |[
  *   static gboolean
  *   button_press_callback (GtkWidget      *event_box,
  *                          GdkEventButton *event,
@@ -112,7 +112,7 @@
  *
  *     return image;
  *   }
- * </programlisting>
+ * ]|
  * </example>
  *
  * When handling events on the event box, keep in mind that coordinates
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 37790b5..f44a00a 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -58,34 +58,34 @@
  * implements a subclass of #GtkIMContext or #GtkIMContextSimple and exports
  * these four functions:
  *
- * <informalexample><programlisting>
+ * |[
  * void im_module_init(#GTypeModule *module);
- * </programlisting></informalexample>
+ * ]|
  * This function should register the #GType of the #GtkIMContext subclass which
  * implements the input method by means of g_type_module_register_type(). Note
  * that g_type_register_static() cannot be used as the type needs to be
  * registered dynamically.
  *
- * <informalexample><programlisting>
+ * |[
  * void im_module_exit(void);
- * </programlisting></informalexample>
+ * ]|
  * Here goes any cleanup code your input method might require on module unload.
  *
- * <informalexample><programlisting>
+ * |[
  * void im_module_list(const #GtkIMContextInfo ***contexts, int *n_contexts)
  * {
  *   *contexts = info_list;
  *   *n_contexts = G_N_ELEMENTS (info_list);
  * }
- * </programlisting></informalexample>
+ * ]|
  * This function returns the list of input methods provided by the module. The
  * example implementation above shows a common solution and simply returns a
  * pointer to statically defined array of #GtkIMContextInfo items for each
  * provided input method.
  *
- * <informalexample><programlisting>
+ * |[
  * #GtkIMContext * im_module_create(const #gchar *context_id);
- * </programlisting></informalexample>
+ * ]|
  * This function should return a pointer to a newly created instance of the
  * #GtkIMContext subclass identified by @context_id. The context ID is the same
  * as specified in the #GtkIMContextInfo array returned by im_module_list().
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index a85412d..ef3ed80 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -74,7 +74,7 @@
  *
  * <example>
  * <title>Simple GtkInfoBar usage.</title>
- * <programlisting>
+ * |[
  * /&ast; set up info bar &ast;/
  * info_bar = gtk_info_bar_new ();
  * gtk_widget_set_no_show_all (info_bar, TRUE);
@@ -97,7 +97,7 @@
  * gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
  *                                GTK_MESSAGE_ERROR);
  * gtk_widget_show (info_bar);
- * </programlisting>
+ * ]|
  * </example>
  *
  * <refsect2 id="GtkInfoBar-BUILDER-UI">
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 4bc7131..b43636b 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -77,14 +77,14 @@
  *
  * <example>
  * <title>A UI definition fragment specifying Pango attributes</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkLabel">
  *   <attributes>
  *     <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
  *     <attribute name="background" value="red" start="5" end="10"/>"
  *   </attributes>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * The start and end attributes specify the range of characters to which the
  * Pango attribute applies. If start and end are not specified, the attribute is
@@ -109,37 +109,31 @@
  * using gtk_label_set_mnemonic_widget(). Here's a simple example where
  * the label is inside a button:
  *
- * <informalexample>
- * <programlisting>
+ * |[
  *   // Pressing Alt+H will activate this button
  *   button = gtk_button_new (<!-- -->);
  *   label = gtk_label_new_with_mnemonic ("_Hello");
  *   gtk_container_add (GTK_CONTAINER (button), label);
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * There's a convenience function to create buttons with a mnemonic label
  * already inside:
  *
- * <informalexample>
- * <programlisting>
+ * |[
  *   // Pressing Alt+H will activate this button
  *   button = gtk_button_new_with_mnemonic ("_Hello");
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * To create a mnemonic for a widget alongside the label, such as a
  * #GtkEntry, you have to point the label at the entry with
  * gtk_label_set_mnemonic_widget():
  *
- * <informalexample>
- * <programlisting>
+ * |[
  *   // Pressing Alt+H will focus the entry
  *   entry = gtk_entry_new (<!-- -->);
  *   label = gtk_label_new_with_mnemonic ("_Hello");
  *   gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
- * </programlisting>
- * </informalexample>
+ * ]|
  * </para>
  * </refsect2>
  * <refsect2>
@@ -150,12 +144,10 @@
  * linkend="PangoMarkupFormat">markup format</link>.
  * Here's how to create a label with a small font:
  *
- * <informalexample>
- * <programlisting>
+ * |[
  *   label = gtk_label_new (NULL);
  *   gtk_label_set_markup (GTK_LABEL (label), "<small>Small text</small>");
- * </programlisting>
- * </informalexample>
+ * ]|
  *
  * (See <link
  * linkend="PangoMarkupFormat">complete documentation</link> of available
@@ -224,9 +216,9 @@
  * way they appear in web browsers, with colored, underlined text. The title
  * attribute is displayed as a tooltip on the link. An example looks like this:
  *
- * <informalexample><programlisting>
+ * |[
  * gtk_label_set_markup (label, "Go to the <a href="http://www.gtk.org"; title="&lt;i&gt;Our&lt;/i&gt; 
website">GTK+ website</a> for more...");
- * </programlisting></informalexample>
+ * ]|
  *
  * It is possible to implement custom handling for links and their tooltips with
  * the #GtkLabel::activate-link signal and the gtk_label_get_current_uri() function.
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index 0156117..83f913c 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -35,7 +35,7 @@
  *
  * <example>
  * <title>Adding a custom offset on the bar</title>
- * <programlisting>
+ * |[
  *
  * static GtkWidget *
  * create_level_bar (void)
@@ -65,7 +65,7 @@
  *
  *   return level_bar;
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * The default interval of values is between zero and one, but it's possible to
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 6036164..c0a5ec2 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -55,7 +55,7 @@
  *
  * <example>
  * <title>Creating a simple list store.</title>
- * <programlisting>
+ * |[
  * enum {
  *   COLUMN_STRING,
  *   COLUMN_INT,
@@ -104,7 +104,7 @@
  *                       COLUMN_BOOLEAN, TRUE,
  *                       -1);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * <refsect2>
@@ -157,7 +157,7 @@
  *
  * <example>
  * <title>A UI Definition fragment for a list store</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkListStore">
  *   <columns>
  *     <column type="gchararray"/>
@@ -177,7 +177,7 @@
  *     </row>
  *   </data>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 0c32f13..c120544 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -55,7 +55,7 @@
  * </para>
  * <example>
  * <title>Typical main() function for a GTK+ application</title>
- * <programlisting>
+ * |[
  * int
  * main (int argc, char **argv)
  * {
@@ -80,7 +80,7 @@
  *   /&ast; The user lost interest &ast;/
  *   return 0;
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * It's OK to use the GLib main loop directly instead of gtk_main(), though it
@@ -1253,14 +1253,14 @@ gtk_main_quit (void)
  *
  * <example>
  * <title>Updating the UI during a long computation</title>
- * <programlisting>
+ * |[
  *  /&ast; computation going on... &ast;/
  *
  *  while (gtk_events_pending ())
  *    gtk_main_iteration ();
  *
  *  /&ast; ...computation continued &ast;/
- * </programlisting>
+ * ]|
  * </example>
  *
  * Returns: %TRUE if any events are pending, %FALSE otherwise
@@ -1828,7 +1828,7 @@ gtk_main_do_event (GdkEvent *event)
  *
  * <example>
  * <title>A persistent window</title>
- * <programlisting>
+ * |[
  * #include &lt;gtk/gtk.h>&lt;
  *
  * int
@@ -1855,7 +1855,7 @@ gtk_main_do_event (GdkEvent *event)
  *
  *   return 0;
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * Returns: %TRUE
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 22317cf..dfd217d 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -45,16 +45,16 @@
  *
  * <example>
  * <title>Connecting the popup signal handler.</title>
- * <programlisting>
+ * |[
  *   /<!---->* connect our handler which will popup the menu *<!---->/
  *   g_signal_connect_swapped (window, "button_press_event",
  *     G_CALLBACK (my_popup_handler), menu);
- * </programlisting>
+ * ]|
  * </example>
  *
  * <example>
  * <title>Signal handler which displays a popup menu.</title>
- * <programlisting>
+ * |[
  * static gint
  * my_popup_handler (GtkWidget *widget, GdkEvent *event)
  * {
@@ -83,7 +83,7 @@
  * 
  *   return FALSE;
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 80b9c5d..fdde639 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -66,11 +66,11 @@
  *
  * <example>
  * <title>Setting markup and accelerator on a MenuItem</title>
- * <programlisting><![CDATA[
+ * |[
  * GtkWidget *child = gtk_bin_get_child (GTK_BIN (menu_item));
  * gtk_label_set_markup (GTK_LABEL (child), "<i>new label</i> with <b>markup</b>");
  * gtk_accel_label_set_accel (GTK_ACCEL_LABEL (child), GDK_KEY_1, 0);
- * ]]></programlisting>
+ * ]|
  * </example>
  *
  * <refsect2 id="GtkMenuItem-BUILDER-UI">
@@ -80,13 +80,13 @@
  * attribute of a &lt;child&gt; element.
  * <example>
  * <title>A UI definition fragment with submenus</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkMenuItem">
  *   <child type="submenu">
  *     <object class="GtkMenu"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 0c47e14..7d9eae4 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -57,13 +57,13 @@
  *
  * <example>
  * <title>A UI definition fragment with menus</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkMenuToolButton">
  *   <child type="menu">
  *     <object class="GtkMenu"/>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 83ff9ff..4d4d9f0 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -59,7 +59,7 @@
  * returns when any dialog button is clicked.
  * <example>
  * <title>A modal dialog.</title>
- * <programlisting>
+ * |[
  *  dialog = gtk_message_dialog_new (main_application_window,
  *                                   GTK_DIALOG_DESTROY_WITH_PARENT,
  *                                   GTK_MESSAGE_ERROR,
@@ -68,12 +68,12 @@
  *                                   filename, g_strerror (errno));
  *  gtk_dialog_run (GTK_DIALOG (dialog));
  *  gtk_widget_destroy (dialog);
- * </programlisting>
+ * ]|
  * </example>
  * You might do a non-modal #GtkMessageDialog as follows:
  * <example>
  * <title>A non-modal dialog.</title>
- * <programlisting>
+ * |[
  *  dialog = gtk_message_dialog_new (main_application_window,
  *                                   GTK_DIALOG_DESTROY_WITH_PARENT,
  *                                   GTK_MESSAGE_ERROR,
@@ -85,7 +85,7 @@
  *  g_signal_connect_swapped (dialog, "response",
  *                            G_CALLBACK (gtk_widget_destroy),
  *                            dialog);
- * </programlisting>
+ * ]|
  * </example>
  *
  * <refsect2 id="GtkMessageDialog-BUILDER-UI">
@@ -800,13 +800,13 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
  * may contain special XML characters, you should use g_markup_printf_escaped()
  * to escape it.
 
- * <informalexample><programlisting>
+ * |[
  * gchar *msg;
  *
  * msg = g_markup_printf_escaped (message_format, ...);
  * gtk_message_dialog_format_secondary_markup (message_dialog, "&percnt;s", msg);
  * g_free (msg);
- * </programlisting></informalexample>
+ * ]|
  *
  * Since: 2.6
  */
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 21da499..0c216dc 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -80,7 +80,7 @@
  * </para>
  * <example>
  * <title>A UI definition fragment with GtkNotebook</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkNotebook">
  *   <child>
  *     <object class="GtkLabel" id="notebook-content">
@@ -93,7 +93,7 @@
  *     </object>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 346c16d..8bb1c40 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -50,7 +50,7 @@
  *
  * <example>
  * <title>A page setup dialog</title>
- * <programlisting>
+ * |[
  * static GtkPrintSettings *settings = NULL;
  * static GtkPageSetup *page_setup = NULL;
  *
@@ -70,7 +70,7 @@
  *
  *   page_setup = new_page_setup;
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * Printing support was added in GTK+ 2.10.
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 73aa1aa..7b9ceab 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -75,7 +75,7 @@
  *
  * <example>
  * <title>Creating a paned widget with minimum sizes.</title>
- * <programlisting>
+ * |[
  * GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
  * GtkWidget *frame1 = gtk_frame_new (NULL);
  * GtkWidget *frame2 = gtk_frame_new (NULL);
@@ -89,7 +89,7 @@
  *
  * gtk_paned_pack2 (GTK_PANED (hpaned), frame2, FALSE, FALSE);
  * gtk_widget_set_size_request (frame2, 50, -1);
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c
index 4d55b75..10c79d2 100644
--- a/gtk/gtkprintcontext.c
+++ b/gtk/gtkprintcontext.c
@@ -37,7 +37,7 @@
  *
  * <example>
  * <title>Using GtkPrintContext in a #GtkPrintOperation::draw-page callback</title>
- * <programlisting>
+ * |[
  * static void
  * draw_page (GtkPrintOperation *operation,
  *        GtkPrintContext   *context,
@@ -89,7 +89,7 @@
  *
  *   g_object_unref (layout);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * Printing support was added in GTK+ 2.10.
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 60f2a93..7c20bd8 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -61,7 +61,7 @@
  *
  * <example>
  * <title>The high-level printing API</title>
- * <programlisting>
+ * |[
  * static GtkPrintSettings *settings = NULL;
  *
  * static void
@@ -90,7 +90,7 @@
  *
  *   g_object_unref (print);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * By default GtkPrintOperation uses an external application to do
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index d7da951..4891cd4 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -100,7 +100,7 @@
  *
  * <example>
  * <title>A #GtkPrintUnixDialog UI definition fragment.</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkPrintUnixDialog" id="dialog1">
  *   <child internal-child="notebook">
  *     <object class="GtkNotebook" id="notebook">
@@ -121,7 +121,7 @@
  *     </object>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 5232ce4..3535b28 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -70,7 +70,7 @@
  *
  * <example>
  * <title>How to create a group of two radio buttons.</title>
- * <programlisting>
+ * |[
  * void create_radio_buttons (void) {
  *
  *    GtkWidget *window, *radio1, *radio2, *box, *entry;
@@ -95,7 +95,7 @@
  *    gtk_widget_show_all (window);
  *    return;
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * When an unselected button in the group is clicked the clicked button
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 607579b..008b337 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -48,7 +48,7 @@
  *
  * <example>
  * <title>How to create a group of radio menu items.</title>
- * <programlisting>
+ * |[
  * GSList *group = NULL;
  * GtkWidget *item;
  * gint i;
@@ -60,7 +60,7 @@
  *   if (i == 1)
  *     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 181bff5..85fba51 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -48,7 +48,7 @@
  * <title>Typical usage</title>
  * In the simplest of cases, you can use the following code to use
  * a #GtkRecentChooserDialog to select a recently used file:
- * <programlisting>
+ * |[
  * GtkWidget *dialog;
  *
  * dialog = gtk_recent_chooser_dialog_new ("Recent Documents",
@@ -67,7 +67,7 @@
  *   }
  *
  * gtk_widget_destroy (dialog);
- * </programlisting>
+ * ]|
  * </example>
  *
  * Recently used files are supported since GTK+ 2.10.
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index 08c260a..df69034 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -52,7 +52,7 @@
  *
  * <example>
  * <title>A UI definition fragment specifying GtkRecentFilter rules</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkRecentFilter">
  *   <mime-types>
  *     <mime-type>text/plain</mime-type>
@@ -68,7 +68,7 @@
  *     <application>glade</application>
  *   </applications>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index c5ee8bd..4cfee45 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -56,11 +56,11 @@
  *
  * <example>
  * <title>Creating a search bar</title>
- * <programlisting>
+ * |[
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; parse="text" 
href="../../../../examples/search-bar.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
- * </programlisting>
+ * ]|
  * </example>
  *
  * Since: 3.10
@@ -168,7 +168,7 @@ preedit_changed_cb (GtkEntry  *entry,
  *
  * <example>
  * <title>Showing the search bar on key presses</title>
- * <programlisting><![CDATA[
+ * |[
  * static gboolean
  * window_key_press_event_cb (GtkWidget *widget,
  *                            GdkEvent  *event,
@@ -179,7 +179,7 @@ preedit_changed_cb (GtkEntry  *entry,
  *
  * g_signal_connect (window, "key-press-event",
  *                   G_CALLBACK (window_key_press_event_cb), search_bar);
- * ]]></programlisting>
+ * ]|
  * </example>
  *
  * Return value: %GDK_EVENT_STOP if the key press event resulted
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 7e7028d..cce1066 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -86,14 +86,14 @@
  * need to be aware that settings that are specific to individual widgets
  * may not be available before the widget type has been realized at least
  * once. The following example demonstrates a way to do this:
- * <informalexample><programlisting>
+ * |[
  *   gtk_init (&argc, &argv);
  *
  *   /&ast; make sure the type is realized &ast;/
  *   g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM));
  *
  *   g_object_set (gtk_settings_get_default (), "gtk-enable-animations", FALSE, NULL);
- * </programlisting></informalexample>
+ * ]|
  *
  * There is one GtkSettings instance per screen. It can be obtained with
  * gtk_settings_get_for_screen(), but in many cases, it is more convenient
@@ -716,11 +716,11 @@ gtk_settings_class_init (GtkSettingsClass *class)
    * GtkSettings:gtk-color-scheme:
    *
    * A palette of named colors for use in themes. The format of the string is
-   * <programlisting>
+   * |[
    * name1: color1
    * name2: color2
    * ...
-   * </programlisting>
+   * ]|
    * Color names must be acceptable as identifiers in the
    * <link linkend="gtk3-Resource-Files">gtkrc</link> syntax, and
    * color specifications must be in the format accepted by
@@ -732,9 +732,9 @@ gtk_settings_class_init (GtkSettingsClass *class)
    *
    * Starting with GTK+ 2.12, the entries can alternatively be separated
    * by ';' instead of newlines:
-   * <programlisting>
+   * |[
    * name1: color1; name2: color2; ...
-   * </programlisting>
+   * ]|
    *
    * Since: 2.10
    *
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index bb949c6..e98cfef 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -94,7 +94,7 @@
  *
  * <example>
  * <title>A UI definition fragment with GtkSizeGroup</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkSizeGroup">
  *   <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
  *   <widgets>
@@ -102,7 +102,7 @@
  *     <widget name="radio2"/>
  *   </widgets>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index f87c31d..ebe3f7b 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -70,7 +70,7 @@
  *
  * <example>
  * <title>Obtaining the window ID of a socket.</title>
- * <programlisting>
+ * |[
  * GtkWidget *socket = gtk_socket_new (<!-- -->);
  * gtk_widget_show (socket);
  * gtk_container_add (GTK_CONTAINER (parent), socket);
@@ -81,7 +81,7 @@
  * gtk_widget_realize (socket);
  * g_print ("The ID of the sockets window is %#x\n",
  *          gtk_socket_get_id (socket));
- * </programlisting>
+ * ]|
  * </example>
  *
  * Note that if you pass the window ID of the socket to another
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 694d59b..5ef8e7d 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -80,7 +80,7 @@
  *
  * <example>
  * <title>Using a GtkSpinButton to get an integer</title>
- * <programlisting>
+ * |[
  * /&ast; Provides a function to retrieve an integer value from a
  *  &ast; GtkSpinButton and creates a spin button to model percentage
  *  &ast; values.
@@ -111,12 +111,12 @@
  *
  *   gtk_widget_show_all (window);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * <example>
  * <title>Using a GtkSpinButton to get a floating point value</title>
- * <programlisting>
+ * |[
  * /&ast; Provides a function to retrieve a floating point value from a
  *  &ast; GtkSpinButton, and creates a high precision spin button.
  *  &ast;/
@@ -145,7 +145,7 @@
  *
  *   gtk_widget_show_all (window);
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 21b3d6e..cee9d65 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -101,7 +101,7 @@
  * </para>
  * <example>
  * <title>Using an enumeration to identify  animatable regions</title>
- * <programlisting>
+ * |[
  * enum {
  *   REGION_ENTRY,
  *   REGION_BUTTON_UP,
@@ -128,7 +128,7 @@
  *
  *   ...
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * For complex widgets with an arbitrary number of animatable regions, it
@@ -138,7 +138,7 @@
  * </para>
  * <example>
  * <title>Using struct pointers to identify animatable regions</title>
- * <programlisting>
+ * |[
  * void
  * notebook_draw_tab (GtkWidget    *widget,
  *                    NotebookPage *page,
@@ -148,7 +148,7 @@
  *   gtk_render_extension (cr, page->x, page->y, page->width, page->height);
  *   gtk_style_context_pop_animatable_region (context);
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * The widget also needs to notify the style context about a state change
@@ -156,7 +156,7 @@
  * </para>
  * <example>
  * <title>Triggering a state change animation on a region</title>
- * <programlisting>
+ * |[
  * gboolean
  * notebook_motion_notify (GtkWidget      *widget,
  *                         GdkEventMotion *event)
@@ -173,7 +173,7 @@
  *                                          TRUE);
  *   ...
  * }
- * </programlisting>
+ * ]|
  * </example>
  * <para>
  * gtk_style_context_notify_state_change() accepts %NULL region IDs as a
@@ -1890,15 +1890,15 @@ region_find (GArray *array,
  * In the CSS file format, a #GtkEntry defining an "entry"
  * class, would be matched by:
  *
- * <programlisting>
+ * |[
  * GtkEntry.entry { ... }
- * </programlisting>
+ * ]|
  *
  * While any widget defining an "entry" class would be
  * matched by:
- * <programlisting>
+ * |[
  * .entry { ... }
- * </programlisting>
+ * ]|
  *
  * Since: 3.0
  **/
@@ -2115,16 +2115,16 @@ _gtk_style_context_check_region_name (const gchar *str)
  * In the CSS file format, a #GtkTreeView defining a "row"
  * region, would be matched by:
  *
- * <programlisting>
+ * |[
  * GtkTreeView row { ... }
- * </programlisting>
+ * ]|
  *
  * Pseudo-classes are used for matching @flags, so the two
  * following rules:
- * <programlisting>
+ * |[
  * GtkTreeView row:nth-child(even) { ... }
  * GtkTreeView row:nth-child(odd) { ... }
- * </programlisting>
+ * ]|
  *
  * would apply to even and odd rows, respectively.
  *
@@ -2940,16 +2940,16 @@ gtk_style_context_lookup_color (GtkStyleContext *context,
  *
  * As a practical example, a #GtkButton notifying a state transition on
  * the prelight state:
- * <programlisting>
+ * |[
  * gtk_style_context_notify_state_change (context,
  *                                        gtk_widget_get_window (widget),
  *                                        NULL,
  *                                        GTK_STATE_PRELIGHT,
  *                                        button->in_button);
- * </programlisting>
+ * ]|
  *
  * Can be handled in the CSS file like this:
- * <programlisting>
+ * |[
  * GtkButton {
  *     background-color: &num;f00
  * }
@@ -2958,7 +2958,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context,
  *     background-color: &num;fff;
  *     transition: 200ms linear
  * }
- * </programlisting>
+ * ]|
  *
  * This combination will animate the button background from red to white
  * if a pointer enters the button, and back to red if the pointer leaves
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index 571fdf8..ee1907b 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -53,13 +53,13 @@
  *
  * <example>
  * <title>A UI definition fragment specifying tags</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkTextTagTable">
  *  <child type="tag">
  *    <object class="GtkTextTag"/>
  *  </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 136fcc6..d6e40dc 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -250,9 +250,9 @@ gtk_theming_engine_class_init (GtkThemingEngineClass *klass)
    * custom properties, for a theming engine named "Clearlooks" registering
    * a "glossy" custom property, it could be referenced in the CSS file as
    *
-   * <programlisting>
+   * |[
    * -Clearlooks-glossy: true;
-   * </programlisting>
+   * ]|
    *
    * Since: 3.0
    */
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 21eab4a..ee65d2b 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -60,7 +60,7 @@
  *
  * <example>
  * <title>Creating two #GtkToggleButton widgets.</title>
- * <programlisting>
+ * |[
  * void make_toggles (void) {
  *    GtkWidget *dialog, *toggle1, *toggle2;
  *
@@ -84,7 +84,7 @@
  *
  *    gtk_widget_show_all (dialog);
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index d22eda6..14060f4 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -116,7 +116,7 @@
  *
  * <example>
  * <title>Acquiring a #GtkTreeIter-struct</title>
- * <programlisting>
+ * |[
  *  /&ast; Three ways of getting the iter pointing to the location &ast;/
  * GtkTreePath *path;
  * GtkTreeIter iter;
@@ -136,7 +136,7 @@
  * gtk_tree_model_iter_nth_child (model, &amp;iter, &amp;parent_iter, 2);
  * parent_iter = iter;
  * gtk_tree_model_iter_nth_child (model, &amp;iter, &amp;parent_iter, 5);
- * </programlisting>
+ * ]|
  * </example>
  *
  * This second example shows a quick way of iterating through a list
@@ -147,7 +147,7 @@
  *
  * <example>
  * <title>Reading data from a #GtkTreeModel</title>
- * <programlisting>
+ * |[
  * enum
  * {
  *   STRING_COLUMN,
@@ -191,7 +191,7 @@
  *
  *    row_count++;
  *  }
- * </programlisting>
+ * ]|
  * </example>
  *
  * The #GtkTreeModel interface contains two methods for reference
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 415a053..effdc3a 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3828,7 +3828,7 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
  * empty. The visible function should therefore take special care of empty
  * rows, like in the example below.
  *
- * <informalexample><programlisting>
+ * |[
  * static gboolean
  * visible_func (GtkTreeModel *model,
  *               GtkTreeIter  *iter,
@@ -3845,7 +3845,7 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
  *
  *   return visible;
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * Since: 2.4
  */
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 54b3696..3afe77d 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -52,7 +52,7 @@
  *
  * <example>
  * <title>Using a #GtkTreeModelSort</title>
- * <programlisting>
+ * |[
  * {
  *   GtkTreeView *tree_view1;
  *   GtkTreeView *tree_view2;
@@ -77,7 +77,7 @@
  *   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model2),
  *                                         COLUMN_1, GTK_SORT_DESCENDING);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * To demonstrate how to access the underlying child model from the sort
@@ -88,7 +88,7 @@
  *
  * <example>
  * <title>Accessing the child model of in a selection changed callback</title>
- * <programlisting>
+ * |[
  * void
  * selection_changed (GtkTreeSelection *selection, gpointer data)
  * {
@@ -130,7 +130,7 @@
  *                       -1);
  *   g_free (modified_data);
  * }
- * </programlisting>
+ * ]|
  * </example>
  */
 
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index a67a01e..9d002ad 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -49,7 +49,7 @@
  * column. The "type" attribute specifies the data type for the column.
  * <example>
  * <title>A UI Definition fragment for a tree store</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkTreeStore">
  *   <columns>
  *     <column type="gchararray"/>
@@ -57,7 +57,7 @@
  *     <column type="gint"/>
  *   </columns>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index a844543..43956f1 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -117,7 +117,7 @@
  * internal #GtkTreeSelection in UI definitions.
  * <example>
  * <title>A UI definition fragment with GtkTreeView</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkTreeView" id="treeview">
  *   <property name="model">liststore1</property>
  *   <child>
@@ -137,7 +137,7 @@
  *     </object>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </refsect2>
  */
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index fb6982d..68e87a2 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -155,7 +155,7 @@
  * Here are some examples of how a %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH widget
  * generally deals with width-for-height requests, for #GtkWidgetClass.get_preferred_height()
  * it will do:
- * <programlisting><![CDATA[
+ * |[
  * static void
  * foo_widget_get_preferred_height (GtkWidget *widget, gint *min_height, gint *nat_height)
  * {
@@ -173,12 +173,12 @@
  *         it will return the minimum and natural height for the rotated label here.
  *      }
  * }
- * ]]></programlisting>
+ * ]|
  *
  * And in #GtkWidgetClass.get_preferred_width_for_height() it will simply return
  * the minimum and natural width:
  *
- * <programlisting><![CDATA[
+ * |[
  * static void
  * foo_widget_get_preferred_width_for_height (GtkWidget *widget, gint for_height,
  *                                            gint *min_width, gint *nat_width)
@@ -194,7 +194,7 @@
  *         height calculation here.
  *      }
  * }
- * ]]></programlisting>
+ * ]|
  *
  * Often a widget needs to get its own request during size request or
  * allocation. For example, when computing height it may need to also
@@ -203,10 +203,10 @@
  * be careful to call its virtual methods directly, like this:
  * <example>
  *   <title>Widget calling its own size request method.</title>
- *   <programlisting>
+ *   |[
  * GTK_WIDGET_GET_CLASS(widget)-&gt;get_preferred_width (widget),
  *                                  &min, &natural);
- *   </programlisting>
+ *   ]|
  * </example>
  *
  * It will not work to use the wrapper functions, such as
@@ -273,11 +273,11 @@
  * </para>
  * <example>
  * <title>A UI definition fragment specifying an accelerator</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkButton">
  *   <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * <para>
  * In addition to accelerators, #GtkWidget also support a
@@ -287,7 +287,7 @@
  * </para>
  * <example>
  * <title>A UI definition fragment specifying an accessible</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkButton" id="label1"/>
  *   <property name="label">I am a Label for a Button</property>
  * </object>
@@ -302,21 +302,21 @@
  *     </object>
  *   </child>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * <para>
  * Finally, GtkWidget allows style information such as style classes to
  * be associated with widgets, using the custom &lt;style&gt; element:
  * <example>
  * <title>A UI definition fragment specifying an style class</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkButton" id="button1">
  *   <style>
  *     <class name="my-special-button-class"/>
  *     <class name="dark-button"/>
  *   </style>
  * </object>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
@@ -362,7 +362,7 @@
  * <para>
  * <example>
  * <title>A GtkBuilder Template Definition</title>
- * <programlisting><![CDATA[
+ * |[
  * <interface>
  *   <template class="FooWidget" parent="GtkBox">
  *     <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
@@ -379,7 +379,7 @@
  *     </child>
  *   </template>
  * </interface>
- * ]]></programlisting>
+ * ]|
  * </example>
  * </para>
  * </refsect2>
diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index 342ddec..7c56bd7 100644
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -42,7 +42,7 @@
  * The widget path generation is generally simple:
  * <example>
  * <title>Defining a button within a window</title>
- * <programlisting>
+ * |[
  * {
  *   GtkWidgetPath *path;
  *
@@ -50,7 +50,7 @@
  *   gtk_widget_path_append_type (path, GTK_TYPE_WINDOW);
  *   gtk_widget_path_append_type (path, GTK_TYPE_BUTTON);
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * Although more complex information, such as widget names, or
@@ -59,7 +59,7 @@
  *
  * <example>
  * <title>Defining the first tab widget in a notebook</title>
- * <programlisting>
+ * |[
  * {
  *   GtkWidgetPath *path;
  *   guint pos;
@@ -72,7 +72,7 @@
  *   pos = gtk_widget_path_append_type (path, GTK_TYPE_LABEL);
  *   gtk_widget_path_iter_set_name (path, pos, "first tab label");
  * }
- * </programlisting>
+ * ]|
  * </example>
  *
  * All this information will be used to match the style information
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index d557abb..6d43b26 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -100,7 +100,7 @@
  * </para>
  * <example>
  * <title>A UI definition fragment with accel groups</title>
- * <programlisting><![CDATA[
+ * |[
  * <object class="GtkWindow">
  *   <accel-groups>
  *     <group name="accelgroup1"/>
@@ -110,7 +110,7 @@
  * ...
  * <!-- -->
  * <object class="GtkAccelGroup" id="accelgroup1"/>
- * ]]></programlisting>
+ * ]|
  * </example>
  * <para>
  * The GtkWindow implementation of the GtkBuildable interface



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