RubyGems - glib2 - Versions diffs - 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32 - Mend

glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

Files changed (1810) hide show

data/vendor/local/share/gtk-doc/html/glib/glib-URI-Functions.html CHANGED

@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>URI Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
 <link rel="home" href="index.html" title="GLib Reference Manual">
 <link rel="up" href="glib-utilities.html" title="GLib Utilities">
 <link rel="prev" href="glib-File-Utilities.html" title="File Utilities">
 <link rel="next" href="glib-Hostname-Utilities.html" title="Hostname Utilities">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,7 +31,7 @@
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="glib-URI-Functions.top_of_page"></a>URI Functions</span></h2>
-<p>URI Functions — URI Functions</p>
+<p>URI Functions — manipulating URIs</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
@@ -66,7 +66,7 @@
 <div class="refsect1">
 <a name="glib-URI-Functions.description"></a><h2>Description</h2>
 <p>
-Functions for manipulating Universal Resource Identifiers (URIs) as
+Functions for manipulating Universal Resource Identifiers (URIs) as
 defined by <a class="ulink" href="http://www.ietf.org/rfc/rfc3986.txt" target="_top">
 RFC 3986</a>. It is highly recommended that you have read and
 understand RFC 3986 for understanding this API.
@@ -131,8 +131,11 @@ URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
 <p>
 Common schemes include "file", "http", "svn+ssh", etc.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
@@ -164,8 +167,11 @@ escaped. This is useful for the "reserved" characters in the URI
 specification, since those are allowed unescaped in some portions of
 a URI.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>unescaped</code></em> :</span></p></td>
@@ -205,8 +211,11 @@ will be returned. This is useful it you want to avoid for instance having a
 slash being expanded in an escaped path element, which might confuse pathname
 handling.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>escaped_string</code></em> :</span></p></td>
@@ -241,25 +250,33 @@ will be returned. This is useful it you want to avoid for instance having a
 slash being expanded in an escaped path element, which might confuse pathname
 handling.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>escaped_string</code></em> :</span></p></td>
-<td>a string.</td>
+<td>A string, may be <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>escaped_string_end</code></em> :</span></p></td>
-<td>a string.</td>
+<td>Pointer to end of <em class="parameter"><code>escaped_string</code></em>, may be <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>illegal_characters</code></em> :</span></p></td>
-<td>an optional string of illegal characters not to be allowed.</td>
+<td>An optional string of illegal characters not to be allowed, may be <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>an unescaped version of <em class="parameter"><code>escaped_string</code></em> or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> on error.
-The returned string should be freed when no longer needed.</td>
+The returned string should be freed when no longer needed.  As a
+special case if <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> is given for <em class="parameter"><code>escaped_string</code></em>, this function
+will return <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
@@ -274,8 +291,11 @@ Splits an URI list conforming to the text/uri-list
 mime type defined in RFC 2483 into individual URIs,
 discarding any comments. The URIs are not validated.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri_list</code></em> :</span></p></td>
@@ -283,9 +303,10 @@ discarding any comments. The URIs are not validated.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>-terminated list of
-strings holding the individual URIs. The array should
-be freed with <a class="link" href="glib-String-Utility-Functions.html#g-strfreev" title="g_strfreev ()"><code class="function">g_strfreev()</code></a>.</td>
+<td>a newly allocated <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>-terminated list
+of strings holding the individual URIs. The array should be freed
+with <a class="link" href="glib-String-Utility-Functions.html#g-strfreev" title="g_strfreev ()"><code class="function">g_strfreev()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
 </tr>
 </tbody>
 </table></div>
@@ -301,8 +322,11 @@ be freed with <a class="link" href="glib-String-Utility-Functions.html#g-strfree
 Converts an escaped ASCII-encoded URI to a local filename in the
 encoding used for filenames.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
@@ -312,17 +336,19 @@ encoding used for filenames.
 <td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
 <td>Location to store hostname for the URI, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 If there is no hostname in the URI, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> will be
-stored in this location.</td>
+stored in this location. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> may occur.</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly-allocated string holding the resulting
-filename, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> on an error.</td>
+<td>a newly-allocated string holding
+the resulting filename, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> on an error. <span class="annotation">[<acronym title="Override the parsed C type with given type"><span class="acronym">type</span></acronym> filename]</span>
+</td>
 </tr>
 </tbody>
 </table></div>
@@ -337,8 +363,11 @@ filename, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="N
 Converts an absolute filename to an escaped ASCII-encoded URI, with the path
 component following Section 3.3. of RFC 2396.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
@@ -348,11 +377,12 @@ Windows</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
-<td>A UTF-8 encoded hostname, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> for none.</td>
+<td>A UTF-8 encoded hostname, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> for none. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> may occur.</td>
 </tr>
 <tr>
@@ -367,6 +397,6 @@ URI, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL">
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/glib/glib-Unicode-Manipulation.html CHANGED

@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Unicode Manipulation</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
 <link rel="home" href="index.html" title="GLib Reference Manual">
 <link rel="up" href="glib-utilities.html" title="GLib Utilities">
 <link rel="prev" href="glib-Character-Set-Conversion.html" title="Character Set Conversion">
 <link rel="next" href="glib-Base64-Encoding.html" title="Base64 Encoding">
-<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,7 +31,8 @@
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="glib-Unicode-Manipulation.top_of_page"></a>Unicode Manipulation</span></h2>
-<p>Unicode Manipulation — functions operating on Unicode characters and UTF-8 strings</p>
+<p>Unicode Manipulation — functions operating on Unicode characters and
+    UTF-8 strings</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
@@ -66,7 +67,19 @@ typedef             <a class="link" href="glib-Unicode-Manipulation.html#gunicha
 <a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="returnvalue">gunichar</span></a>            <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-totitle" title="g_unichar_totitle ()">g_unichar_totitle</a>                   (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
 <a class="link" href="glib-Basic-Types.html#gint" title="gint"><span class="returnvalue">gint</span></a>                <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-digit-value" title="g_unichar_digit_value ()">g_unichar_digit_value</a>               (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
 <a class="link" href="glib-Basic-Types.html#gint" title="gint"><span class="returnvalue">gint</span></a>                <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-xdigit-value" title="g_unichar_xdigit_value ()">g_unichar_xdigit_value</a>              (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
+<a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-compose" title="g_unichar_compose ()">g_unichar_compose</a>                   (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> a</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> b</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *ch</code></em>);
+<a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-decompose" title="g_unichar_decompose ()">g_unichar_decompose</a>                 (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *a</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *b</code></em>);
+<a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="returnvalue">gsize</span></a>               <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-fully-decompose" title="g_unichar_fully_decompose ()">g_unichar_fully_decompose</a>           (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="type">gboolean</span></a> compat</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *result</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> result_len</code></em>);
+#define             <a class="link" href="glib-Unicode-Manipulation.html#G-UNICHAR-MAX-DECOMPOSITION-LENGTH:CAPS" title="G_UNICHAR_MAX_DECOMPOSITION_LENGTH">G_UNICHAR_MAX_DECOMPOSITION_LENGTH</a>
 enum                <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeType" title="enum GUnicodeType">GUnicodeType</a>;
+#define             <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-COMBINING-MARK:CAPS" title="G_UNICODE_COMBINING_MARK">G_UNICODE_COMBINING_MARK</a>
 <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeType" title="enum GUnicodeType"><span class="returnvalue">GUnicodeType</span></a>        <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-type" title="g_unichar_type ()">g_unichar_type</a>                      (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
 enum                <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeBreakType" title="enum GUnicodeBreakType">GUnicodeBreakType</a>;
 <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeBreakType" title="enum GUnicodeBreakType"><span class="returnvalue">GUnicodeBreakType</span></a>   <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-break-type" title="g_unichar_break_type ()">g_unichar_break_type</a>                (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
@@ -79,6 +92,8 @@ enum                <a class="link" href="glib-Unicode-Manipulation.html#GUnicod
                                                          <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *mirrored_ch</code></em>);
 enum                <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript">GUnicodeScript</a>;
 <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="returnvalue">GUnicodeScript</span></a>      <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-get-script" title="g_unichar_get_script ()">g_unichar_get_script</a>                (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>);
+<a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="returnvalue">GUnicodeScript</span></a>      <a class="link" href="glib-Unicode-Manipulation.html#g-unicode-script-from-iso15924" title="g_unicode_script_from_iso15924 ()">g_unicode_script_from_iso15924</a>      (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#guint32" title="guint32"><span class="type">guint32</span></a> iso15924</code></em>);
+<a class="link" href="glib-Basic-Types.html#guint32" title="guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="glib-Unicode-Manipulation.html#g-unicode-script-to-iso15924" title="g_unicode_script_to_iso15924 ()">g_unicode_script_to_iso15924</a>        (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="type">GUnicodeScript</span></a> script</code></em>);
 #define             <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-next-char" title="g_utf8_next_char()">g_utf8_next_char</a>                    (p)
 <a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="returnvalue">gunichar</span></a>            <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()">g_utf8_get_char</a>                     (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *p</code></em>);
@@ -106,6 +121,9 @@ enum                <a class="link" href="glib-Unicode-Manipulation.html#GUnicod
                                                          <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);
 <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-strreverse" title="g_utf8_strreverse ()">g_utf8_strreverse</a>                   (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>);
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-substring" title="g_utf8_substring ()">g_utf8_substring</a>                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#glong" title="glong"><span class="type">glong</span></a> start_pos</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#glong" title="glong"><span class="type">glong</span></a> end_pos</code></em>);
 <a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title="g_utf8_validate ()">g_utf8_validate</a>                     (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> max_len</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> **end</code></em>);
@@ -180,7 +198,8 @@ The implementations of the Unicode functions in GLib are based
 on the Unicode Character Data tables, which are available from
 <a class="ulink" href="http://www.unicode.org/" target="_top">www.unicode.org</a>.
 GLib 2.8 supports Unicode 4.0, GLib 2.10 supports Unicode 4.1,
-GLib 2.12 supports Unicode 5.0, GLib 2.16.3 supports Unicode 5.1.
+GLib 2.12 supports Unicode 5.0, GLib 2.16.3 supports Unicode 5.1,
+GLib 2.30 supports Unicode 6.0.
 </p>
 </div>
 <div class="refsect1">
@@ -190,26 +209,28 @@ GLib 2.12 supports Unicode 5.0, GLib 2.16.3 supports Unicode 5.1.
 <pre class="programlisting">typedef guint32 gunichar;
 </pre>
 <p>
-A type which can hold any UTF-32 or UCS-4 character code, also known
-as a Unicode code point.
+A type which can hold any UTF-32 or UCS-4 character code,
+also known as a Unicode code point.
 </p>
 <p>
 If you want to produce the UTF-8 representation of a <a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a>,
-use <a class="link" href="glib-Unicode-Manipulation.html#g-ucs4-to-utf8" title="g_ucs4_to_utf8 ()"><code class="function">g_ucs4_to_utf8()</code></a>. See also <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-to-ucs4" title="g_utf8_to_ucs4 ()"><code class="function">g_utf8_to_ucs4()</code></a> for the reverse process.
+use <a class="link" href="glib-Unicode-Manipulation.html#g-ucs4-to-utf8" title="g_ucs4_to_utf8 ()"><code class="function">g_ucs4_to_utf8()</code></a>. See also <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-to-ucs4" title="g_utf8_to_ucs4 ()"><code class="function">g_utf8_to_ucs4()</code></a> for the reverse
+process.
 </p>
 <p>
 To print/scan values of this type as integer, use
-<a class="link" href="glib-Miscellaneous-Macros.html#G-GINT32-MODIFIER:CAPS" title="G_GINT32_MODIFIER"><code class="literal">G_GINT32_MODIFIER</code></a> and/or <a class="link" href="glib-Miscellaneous-Macros.html#G-GUINT32-FORMAT:CAPS" title="G_GUINT32_FORMAT"><code class="literal">G_GUINT32_FORMAT</code></a>.
+<a class="link" href="glib-Basic-Types.html#G-GINT32-MODIFIER:CAPS" title="G_GINT32_MODIFIER"><code class="literal">G_GINT32_MODIFIER</code></a> and/or <a class="link" href="glib-Basic-Types.html#G-GUINT32-FORMAT:CAPS" title="G_GUINT32_FORMAT"><code class="literal">G_GUINT32_FORMAT</code></a>.
+</p>
+<p>
+The notation to express a Unicode code point in running text is
+as a hexadecimal number with four to six digits and uppercase
+letters, prefixed by the string "U+". Leading zeros are omitted,
+unless the code point would have fewer than four hexadecimal digits.
+For example, "U+0041 LATIN CAPITAL LETTER A". To print a code point
+in the U+-notation, use the format string "U+%04"G_GINT32_FORMAT"X".
+To scan, use the format string "U+%06"G_GINT32_FORMAT"X".
 </p>
 <p>
-The notation to express a Unicode code point in running text is as a
-hexadecimal number with four to six digits and uppercase letters, prefixed
-by the string "U+".  Leading zeros are omitted, unless the code point would
-have fewer than four hexadecimal digits.
-For example, "U+0041 LATIN CAPITAL LETTER A".
-To print a code point in the U+-notation, use the format string
-"U+<code class="literal">04</code>"G_GINT32_FORMAT"X".
-To scan, use the format string "U+<code class="literal">06</code>"G_GINT32_FORMAT"X".
 </p>
 <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -219,8 +240,8 @@ To scan, use the format string "U+<code class="literal">06</code>"G_GINT32_FORMA
 2
 3</pre></td>
         <td class="listing_code"><pre class="programlisting"><span class="usertype">gunichar</span><span class="normal"> c</span><span class="symbol">;</span>
-<span class="function">sscanf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"U+0041"</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"U+%06"</span><span class="normal"><a href="glib-Miscellaneous-Macros.html#G-GINT32-FORMAT:CAPS">G_GINT32_FORMAT</a></span><span class="string">"X"</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">c</span><span class="symbol">)</span>
-<span class="function"><a href="glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Read U+%04"</span><span class="normal"><a href="glib-Miscellaneous-Macros.html#G-GINT32-FORMAT:CAPS">G_GINT32_FORMAT</a></span><span class="string">"X"</span><span class="symbol">,</span><span class="normal"> c</span><span class="symbol">);</span></pre></td>
+<span class="function">sscanf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"U+0041"</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"U+%06"</span><span class="normal"><a href="glib-Basic-Types.html#G-GINT32-FORMAT:CAPS">G_GINT32_FORMAT</a></span><span class="string">"X"</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">c</span><span class="symbol">)</span>
+<span class="function"><a href="glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Read U+%04"</span><span class="normal"><a href="glib-Basic-Types.html#G-GINT32-FORMAT:CAPS">G_GINT32_FORMAT</a></span><span class="string">"X"</span><span class="symbol">,</span><span class="normal"> c</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -236,7 +257,7 @@ To scan, use the format string "U+<code class="literal">06</code>"G_GINT32_FORMA
 </pre>
 <p>
 A type which can hold any UTF-16 code
-point<sup>[<a name="utf16_surrogate_pairs" href="#ftn.utf16_surrogate_pairs" class="footnote">3</a>]</sup>.
+point<a href="#ftn.utf16_surrogate_pairs" class="footnote"><sup class="footnote"><a name="utf16_surrogate_pairs"></a>[4]</sup></a>.
 </p>
 <p>
 To print/scan values of this type to/from text you need to convert
@@ -244,7 +265,7 @@ to/from UTF-8, using <a class="link" href="glib-Unicode-Manipulation.html#g-utf1
 </p>
 <p>
 To print/scan values of this type as integer, use
-<a class="link" href="glib-Miscellaneous-Macros.html#G-GINT16-MODIFIER:CAPS" title="G_GINT16_MODIFIER"><code class="literal">G_GINT16_MODIFIER</code></a> and/or <a class="link" href="glib-Miscellaneous-Macros.html#G-GUINT16-FORMAT:CAPS" title="G_GUINT16_FORMAT"><code class="literal">G_GUINT16_FORMAT</code></a>.
+<a class="link" href="glib-Basic-Types.html#G-GINT16-MODIFIER:CAPS" title="G_GINT16_MODIFIER"><code class="literal">G_GINT16_MODIFIER</code></a> and/or <a class="link" href="glib-Basic-Types.html#G-GUINT16-FORMAT:CAPS" title="G_GUINT16_FORMAT"><code class="literal">G_GUINT16_FORMAT</code></a>.
 </p>
 </div>
 <hr>
@@ -256,8 +277,11 @@ Checks whether <em class="parameter"><code>ch</code></em> is a valid Unicode cha
 integer values of <em class="parameter"><code>ch</code></em> will not be valid. 0 is considered a valid
 character, though it's normally a string terminator.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
@@ -280,8 +304,11 @@ Determines whether a character is alphanumeric.
 Given some UTF-8 text, obtain a character value
 with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -304,8 +331,11 @@ Determines whether a character is alphabetic (i.e. a letter).
 Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -328,8 +358,11 @@ Determines whether a character is a control character.
 Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -351,8 +384,11 @@ Given some UTF-8 text, obtain a character value with
 Determines if a given character is assigned in the Unicode
 standard.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -375,8 +411,11 @@ Determines whether a character is numeric (i.e. a digit).  This
 covers ASCII 0-9 and also digits in other languages/scripts.  Given
 some UTF-8 text, obtain a character value with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -401,8 +440,11 @@ spaces). <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-isprint"
 spaces. Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -425,8 +467,11 @@ Determines whether a character is a lowercase letter.
 Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -456,8 +501,11 @@ ismark characters should be allowed to as they are essential
 for writing most European languages as well as many non-Latin
 scripts.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -482,8 +530,11 @@ Unlike <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-isgraph" t
 Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -506,8 +557,11 @@ Determines whether a character is punctuation or a symbol.
 Given some UTF-8 text, obtain a character value with
 <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char" title="g_utf8_get_char ()"><code class="function">g_utf8_get_char()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -535,8 +589,11 @@ character value with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8
 Pango or equivalent to get word breaking right, the algorithm
 is fairly complex.)
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -562,8 +619,11 @@ form is used at the beginning of a word where only the
 first letter is capitalized. The titlecase form of the DZ
 digraph is U+01F2 LATIN CAPITAL LETTTER D WITH SMALL LETTER Z.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -584,8 +644,11 @@ digraph is U+01F2 LATIN CAPITAL LETTTER D WITH SMALL LETTER Z.
 <p>
 Determines if a character is uppercase.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -606,8 +669,11 @@ Determines if a character is uppercase.
 <p>
 Determines if a character is a hexidecimal digit.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -629,8 +695,11 @@ Determines if a character is a hexidecimal digit.
 Determines if a character is typically rendered in a double-width
 cell.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -661,8 +730,11 @@ If a character passes the <a class="link" href="glib-Unicode-Manipulation.html#g
 this test, but not the other way around.  Note that some characters may
 pas both this test and <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-iszerowidth" title="g_unichar_iszerowidth ()"><code class="function">g_unichar_iszerowidth()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -693,8 +765,11 @@ A typical use of this function is with one of <a class="link" href="glib-Unicode
 when displayed on a grid display (terminals).  However, note that not all
 terminals support zero-width rendering of zero-width marks.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -716,8 +791,11 @@ terminals support zero-width rendering of zero-width marks.
 <p>
 Converts a character to uppercase.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -739,8 +817,11 @@ or has no upper case equivalent <em class="parameter"><code>c</code></em> is ret
 <p>
 Converts a character to lower case.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -762,8 +843,11 @@ or has no lowercase equivalent <em class="parameter"><code>c</code></em> is retu
 <p>
 Converts a character to the titlecase.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -786,8 +870,11 @@ If <em class="parameter"><code>c</code></em> is not an uppercase or lowercase ch
 Determines the numeric value of a character as a decimal
 digit.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -809,8 +896,11 @@ digit.
 Determines the numeric value of a character as a hexidecimal
 digit.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -826,9 +916,199 @@ digit.
 </div>
 <hr>
 <div class="refsect2">
+<a name="g-unichar-compose"></a><h3>g_unichar_compose ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            g_unichar_compose                   (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> a</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> b</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *ch</code></em>);</pre>
+<p>
+Performs a single composition step of the
+Unicode canonical composition algorithm.
+</p>
+<p>
+This function includes algorithmic Hangul Jamo composition,
+but it is not exactly the inverse of <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-decompose" title="g_unichar_decompose ()"><code class="function">g_unichar_decompose()</code></a>.
+No composition can have either of <em class="parameter"><code>a</code></em> or <em class="parameter"><code>b</code></em> equal to zero.
+To be precise, this function composes if and only if
+there exists a Primary Composite P which is canonically
+equivalent to the sequence &lt;<em class="parameter"><code>a</code></em>,<em class="parameter"><code>b</code></em>&gt;.  See the Unicode
+Standard for the definition of Primary Composite.
+</p>
+<p>
+If <em class="parameter"><code>a</code></em> and <em class="parameter"><code>b</code></em> do not compose a new character, <em class="parameter"><code>ch</code></em> is set to zero.
+</p>
+<p>
+See <a class="ulink" href="http://unicode.org/reports/tr15/" target="_top">UAX#15</a>
+for details.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
+<td>a Unicode character</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
+<td>a Unicode character</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
+<td>return location for the composed character</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a class="link" href="glib-Standard-Macros.html#TRUE:CAPS" title="TRUE"><code class="literal">TRUE</code></a> if the characters could be composed</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="g-unichar-decompose"></a><h3>g_unichar_decompose ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            g_unichar_decompose                 (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *a</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *b</code></em>);</pre>
+<p>
+Performs a single decomposition step of the
+Unicode canonical decomposition algorithm.
+</p>
+<p>
+This function does not include compatibility
+decompositions. It does, however, include algorithmic
+Hangul Jamo decomposition, as well as 'singleton'
+decompositions which replace a character by a single
+other character. In the case of singletons *<em class="parameter"><code>b</code></em> will
+be set to zero.
+</p>
+<p>
+If <em class="parameter"><code>ch</code></em> is not decomposable, *<em class="parameter"><code>a</code></em> is set to <em class="parameter"><code>ch</code></em> and *<em class="parameter"><code>b</code></em>
+is set to zero.
+</p>
+<p>
+Note that the way Unicode decomposition pairs are
+defined, it is guaranteed that <em class="parameter"><code>b</code></em> would not decompose
+further, but <em class="parameter"><code>a</code></em> may itself decompose.  To get the full
+canonical decomposition for <em class="parameter"><code>ch</code></em>, one would need to
+recursively call this function on <em class="parameter"><code>a</code></em>.  Or use
+<a class="link" href="glib-Unicode-Manipulation.html#g-unichar-fully-decompose" title="g_unichar_fully_decompose ()"><code class="function">g_unichar_fully_decompose()</code></a>.
+</p>
+<p>
+See <a class="ulink" href="http://unicode.org/reports/tr15/" target="_top">UAX#15</a>
+for details.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
+<td>a Unicode character</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
+<td>return location for the first component of <em class="parameter"><code>ch</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
+<td>return location for the second component of <em class="parameter"><code>ch</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a class="link" href="glib-Standard-Macros.html#TRUE:CAPS" title="TRUE"><code class="literal">TRUE</code></a> if the character could be decomposed</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="g-unichar-fully-decompose"></a><h3>g_unichar_fully_decompose ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="returnvalue">gsize</span></a>               g_unichar_fully_decompose           (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="type">gboolean</span></a> compat</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> *result</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> result_len</code></em>);</pre>
+<p>
+Computes the canonical or compatibility decomposition of a
+Unicode character.  For compatibility decomposition,
+pass <a class="link" href="glib-Standard-Macros.html#TRUE:CAPS" title="TRUE"><code class="literal">TRUE</code></a> for <em class="parameter"><code>compat</code></em>; for canonical decomposition
+pass <a class="link" href="glib-Standard-Macros.html#FALSE:CAPS" title="FALSE"><code class="literal">FALSE</code></a> for <em class="parameter"><code>compat</code></em>.
+</p>
+<p>
+The decomposed sequence is placed in <em class="parameter"><code>result</code></em>.  Only up to
+<em class="parameter"><code>result_len</code></em> characters are written into <em class="parameter"><code>result</code></em>.  The length
+of the full decomposition (irrespective of <em class="parameter"><code>result_len</code></em>) is
+returned by the function.  For canonical decomposition,
+currently all decompositions are of length at most 4, but
+this may change in the future (very unlikely though).
+At any rate, Unicode does guarantee that a buffer of length
+18 is always enough for both compatibility and canonical
+decompositions, so that is the size recommended. This is provided
+as <a class="link" href="glib-Unicode-Manipulation.html#G-UNICHAR-MAX-DECOMPOSITION-LENGTH:CAPS" title="G_UNICHAR_MAX_DECOMPOSITION_LENGTH"><code class="literal">G_UNICHAR_MAX_DECOMPOSITION_LENGTH</code></a>.
+</p>
+<p>
+See <a class="ulink" href="http://unicode.org/reports/tr15/" target="_top">UAX#15</a>
+for details.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
+<td>a Unicode character.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>compat</code></em> :</span></p></td>
+<td>whether perform canonical or compatibility decomposition</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>result</code></em> :</span></p></td>
+<td>location to store decomposed result, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>result_len</code></em> :</span></p></td>
+<td>length of <em class="parameter"><code>result</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the length of the full decomposition.</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="G-UNICHAR-MAX-DECOMPOSITION-LENGTH:CAPS"></a><h3>G_UNICHAR_MAX_DECOMPOSITION_LENGTH</h3>
+<pre class="programlisting">#define G_UNICHAR_MAX_DECOMPOSITION_LENGTH 18 /* codepoints */
+</pre>
+<p>
+The maximum length (in codepoints) of a compatibility or canonical
+decomposition of a single Unicode character.
+</p>
+<p>
+This is as defined by Unicode 6.1.
+</p>
+<p class="since">Since 2.32</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GUnicodeType"></a><h3>enum GUnicodeType</h3>
-<pre class="programlisting">typedef enum
-{
+<pre class="programlisting">typedef enum {
   G_UNICODE_CONTROL,
   G_UNICODE_FORMAT,
   G_UNICODE_UNASSIGNED,
@@ -839,7 +1119,7 @@ digit.
   G_UNICODE_OTHER_LETTER,
   G_UNICODE_TITLECASE_LETTER,
   G_UNICODE_UPPERCASE_LETTER,
-  G_UNICODE_COMBINING_MARK,
+  G_UNICODE_SPACING_MARK,
   G_UNICODE_ENCLOSING_MARK,
   G_UNICODE_NON_SPACING_MARK,
   G_UNICODE_DECIMAL_NUMBER,
@@ -866,8 +1146,11 @@ These are the possible character classifications from the
 Unicode specification.
 See <a class="ulink" href="http://www.unicode.org/Public/UNIDATA/UnicodeData.html" target="_top">http://www.unicode.org/Public/UNIDATA/UnicodeData.html</a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="G-UNICODE-CONTROL:CAPS"></a><span class="term"><code class="literal">G_UNICODE_CONTROL</code></span></p></td>
@@ -920,8 +1203,8 @@ See <a class="ulink" href="http://www.unicode.org/Public/UNIDATA/UnicodeData.htm
 </td>
 </tr>
 <tr>
-<td><p><a name="G-UNICODE-COMBINING-MARK:CAPS"></a><span class="term"><code class="literal">G_UNICODE_COMBINING_MARK</code></span></p></td>
-<td>General category "Mark, Spacing Combining" (Mc)
+<td><p><a name="G-UNICODE-SPACING-MARK:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SPACING_MARK</code></span></p></td>
+<td>General category "Mark, Spacing" (Mc)
 </td>
 </tr>
 <tr>
@@ -1024,13 +1307,29 @@ See <a class="ulink" href="http://www.unicode.org/Public/UNIDATA/UnicodeData.htm
 </div>
 <hr>
 <div class="refsect2">
+<a name="G-UNICODE-COMBINING-MARK:CAPS"></a><h3>G_UNICODE_COMBINING_MARK</h3>
+<pre class="programlisting">#define G_UNICODE_COMBINING_MARK G_UNICODE_SPACING_MARK
+</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">G_UNICODE_COMBINING_MARK</code> has been deprecated since version 2.30 and should not be used in newly-written code. Use <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-SPACING-MARK:CAPS"><code class="literal">G_UNICODE_SPACING_MARK</code></a>.</p>
+</div>
+<p>
+Older name for <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-SPACING-MARK:CAPS"><code class="literal">G_UNICODE_SPACING_MARK</code></a>.
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="g-unichar-type"></a><h3>g_unichar_type ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Unicode-Manipulation.html#GUnicodeType" title="enum GUnicodeType"><span class="returnvalue">GUnicodeType</span></a>        g_unichar_type                      (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> c</code></em>);</pre>
 <p>
 Classifies a Unicode character by type.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -1046,8 +1345,7 @@ Classifies a Unicode character by type.
 <hr>
 <div class="refsect2">
 <a name="GUnicodeBreakType"></a><h3>enum GUnicodeBreakType</h3>
-<pre class="programlisting">typedef enum
-{
+<pre class="programlisting">typedef enum {
   G_UNICODE_BREAK_MANDATORY,
   G_UNICODE_BREAK_CARRIAGE_RETURN,
   G_UNICODE_BREAK_LINE_FEED,
@@ -1084,19 +1382,27 @@ Classifies a Unicode character by type.
   G_UNICODE_BREAK_HANGUL_T_JAMO,
   G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
   G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
-  G_UNICODE_BREAK_CLOSE_PARANTHESIS
+  G_UNICODE_BREAK_CLOSE_PARANTHESIS,
+  G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
+  G_UNICODE_BREAK_HEBREW_LETTER,
+  G_UNICODE_BREAK_REGIONAL_INDICATOR
 } GUnicodeBreakType;
 </pre>
 <p>
 These are the possible line break classifications.
-The five Hangul types were added in Unicode 4.1, so, has been
-introduced in GLib 2.10.  Note that new types may be added in the future.
-Applications should be ready to handle unknown values.
-They may be regarded as <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-BREAK-UNKNOWN:CAPS"><code class="literal">G_UNICODE_BREAK_UNKNOWN</code></a>.
+</p>
+<p>
+Since new unicode versions may add new types here, applications should be ready
+to handle unknown values. They may be regarded as <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-BREAK-UNKNOWN:CAPS"><code class="literal">G_UNICODE_BREAK_UNKNOWN</code></a>.
+</p>
+<p>
 See <a class="ulink" href="http://www.unicode.org/unicode/reports/tr14/" target="_top">http://www.unicode.org/unicode/reports/tr14/</a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="G-UNICODE-BREAK-MANDATORY:CAPS"></a><span class="term"><code class="literal">G_UNICODE_BREAK_MANDATORY</code></span></p></td>
@@ -1283,6 +1589,21 @@ See <a class="ulink" href="http://www.unicode.org/unicode/reports/tr14/" target=
 <td>Closing Parenthesis (CP). Since 2.28
 </td>
 </tr>
+<tr>
+<td><p><a name="G-UNICODE-BREAK-CONDITIONAL-JAPANESE-STARTER:CAPS"></a><span class="term"><code class="literal">G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER</code></span></p></td>
+<td>Conditional Japanese Starter (CJ). Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-BREAK-HEBREW-LETTER:CAPS"></a><span class="term"><code class="literal">G_UNICODE_BREAK_HEBREW_LETTER</code></span></p></td>
+<td>Hebrew Letter (HL). Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-BREAK-REGIONAL-INDICATOR:CAPS"></a><span class="term"><code class="literal">G_UNICODE_BREAK_REGIONAL_INDICATOR</code></span></p></td>
+<td>Regional Indicator (RI). Since: 2.36
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1298,8 +1619,11 @@ breaks ("text boundaries"), Pango implements the Unicode boundary
 resolution algorithms and normally you would use a function such
 as <a href="/usr/share/gtk-doc/html/pango/pango-Text-Processing.html#pango-break"><code class="function">pango_break()</code></a> instead of caring about break types yourself.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -1320,8 +1644,11 @@ as <a href="/usr/share/gtk-doc/html/pango/pango-Text-Processing.html#pango-break
 <p>
 Determines the canonical combining class of a Unicode character.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uc</code></em> :</span></p></td>
@@ -1346,8 +1673,11 @@ This rearranges decomposed characters in the string
 according to their combining classes.  See the Unicode
 manual for more information.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
@@ -1365,11 +1695,19 @@ manual for more information.
 <a name="g-unicode-canonical-decomposition"></a><h3>g_unicode_canonical_decomposition ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="returnvalue">gunichar</span></a> *          g_unicode_canonical_decomposition   (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *result_len</code></em>);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">g_unicode_canonical_decomposition</code> has been deprecated since version 2.30 and should not be used in newly-written code. Use the more flexible <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-fully-decompose" title="g_unichar_fully_decompose ()"><code class="function">g_unichar_fully_decompose()</code></a>
+  instead.</p>
+</div>
 <p>
 Computes the canonical decomposition of a Unicode character.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
@@ -1404,8 +1742,11 @@ character that typically has a glyph that is the mirror image of <em class="para
 glyph and <em class="parameter"><code>mirrored_ch</code></em> is set, it puts that character in the address
 pointed to by <em class="parameter"><code>mirrored_ch</code></em>.  Otherwise the original character is put.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
@@ -1427,17 +1768,17 @@ pointed to by <em class="parameter"><code>mirrored_ch</code></em>.  Otherwise th
 <hr>
 <div class="refsect2">
 <a name="GUnicodeScript"></a><h3>enum GUnicodeScript</h3>
-<pre class="programlisting">typedef enum
-{                         /* ISO 15924 code */
+<pre class="programlisting">typedef enum {
+                         /* ISO 15924 code */
   G_UNICODE_SCRIPT_INVALID_CODE = -1,
   G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* Qaai */
+  G_UNICODE_SCRIPT_INHERITED,          /* Zinh (Qaai) */
   G_UNICODE_SCRIPT_ARABIC,             /* Arab */
   G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
   G_UNICODE_SCRIPT_BENGALI,            /* Beng */
   G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
   G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
-  G_UNICODE_SCRIPT_COPTIC,             /* Qaac */
+  G_UNICODE_SCRIPT_COPTIC,             /* Copt (Qaac) */
   G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
   G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
   G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
@@ -1537,7 +1878,16 @@ pointed to by <em class="parameter"><code>mirrored_ch</code></em>.  Otherwise th
   /* Unicode-6.0 additions */
   G_UNICODE_SCRIPT_BATAK,                  /* Batk */
   G_UNICODE_SCRIPT_BRAHMI,                 /* Brah */
-  G_UNICODE_SCRIPT_MANDAIC                 /* Mand */
+  G_UNICODE_SCRIPT_MANDAIC,                /* Mand */
+  /* Unicode-6.1 additions */
+  G_UNICODE_SCRIPT_CHAKMA,                 /* Cakm */
+  G_UNICODE_SCRIPT_MEROITIC_CURSIVE,       /* Merc */
+  G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS,   /* Mero */
+  G_UNICODE_SCRIPT_MIAO,                   /* Plrd */
+  G_UNICODE_SCRIPT_SHARADA,                /* Shrd */
+  G_UNICODE_SCRIPT_SORA_SOMPENG,           /* Sora */
+  G_UNICODE_SCRIPT_TAKRI                   /* Takr */
 } GUnicodeScript;
 </pre>
 <p>
@@ -1545,68 +1895,73 @@ The <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="
 systems. The values correspond to the names as defined in the
 Unicode standard. The enumeration has been added in GLib 2.14,
 and is interchangeable with <a href="/usr/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html#PangoScript"><span class="type">PangoScript</span></a>.
+</p>
+<p>
 Note that new types may be added in the future. Applications
 should be ready to handle unknown values.
 See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">Unicode Standard Annex
 #24: Script names</a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-INVALID-CODE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_INVALID_CODE</code></span></p></td>
-<td>a value never returned from <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-get-script" title="g_unichar_get_script ()"><code class="function">g_unichar_get_script()</code></a>
+<td>                              a value never returned from <a class="link" href="glib-Unicode-Manipulation.html#g-unichar-get-script" title="g_unichar_get_script ()"><code class="function">g_unichar_get_script()</code></a>
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-COMMON:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_COMMON</code></span></p></td>
-<td>    a character used by multiple different scripts
+<td>a character used by multiple different scripts
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-INHERITED:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_INHERITED</code></span></p></td>
-<td> a mark glyph that takes its script from the
-                              base glyph to which it is attached
+<td>a mark glyph that takes its script from the
+i                             base glyph to which it is attached
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-ARABIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_ARABIC</code></span></p></td>
-<td>    Arabic
+<td>Arabic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-ARMENIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_ARMENIAN</code></span></p></td>
-<td>  Armenian
+<td>Armenian
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BENGALI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BENGALI</code></span></p></td>
-<td>   Bengali
+<td>Bengali
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BOPOMOFO:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BOPOMOFO</code></span></p></td>
-<td>  Bopomofo
+<td>Bopomofo
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CHEROKEE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CHEROKEE</code></span></p></td>
-<td>  Cherokee
+<td>Cherokee
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-COPTIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_COPTIC</code></span></p></td>
-<td>    Coptic
+<td>Coptic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CYRILLIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CYRILLIC</code></span></p></td>
-<td>  Cyrillic
+<td>Cyrillic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-DESERET:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_DESERET</code></span></p></td>
-<td>   Deseret
+<td>Deseret
 </td>
 </tr>
 <tr>
@@ -1616,97 +1971,97 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-ETHIOPIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_ETHIOPIC</code></span></p></td>
-<td>  Ethiopic
+<td>Ethiopic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-GEORGIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_GEORGIAN</code></span></p></td>
-<td>  Georgian
+<td>Georgian
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-GOTHIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_GOTHIC</code></span></p></td>
-<td>    Gothic
+<td>Gothic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-GREEK:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_GREEK</code></span></p></td>
-<td>     Greek
+<td>Greek
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-GUJARATI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_GUJARATI</code></span></p></td>
-<td>  Gujarati
+<td>Gujarati
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-GURMUKHI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_GURMUKHI</code></span></p></td>
-<td>  Gurmukhi
+<td>Gurmukhi
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-HAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_HAN</code></span></p></td>
-<td>       Han
+<td>Han
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-HANGUL:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_HANGUL</code></span></p></td>
-<td>    Hangul
+<td>Hangul
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-HEBREW:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_HEBREW</code></span></p></td>
-<td>    Hebrew
+<td>Hebrew
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-HIRAGANA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_HIRAGANA</code></span></p></td>
-<td>  Hiragana
+<td>Hiragana
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-KANNADA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_KANNADA</code></span></p></td>
-<td>   Kannada
+<td>Kannada
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-KATAKANA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_KATAKANA</code></span></p></td>
-<td>  Katakana
+<td>Katakana
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-KHMER:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_KHMER</code></span></p></td>
-<td>     Khmer
+<td>Khmer
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LAO:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LAO</code></span></p></td>
-<td>       Lao
+<td>Lao
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LATIN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LATIN</code></span></p></td>
-<td>     Latin
+<td>Latin
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-MALAYALAM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MALAYALAM</code></span></p></td>
-<td> Malayalam
+<td>Malayalam
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-MONGOLIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MONGOLIAN</code></span></p></td>
-<td> Mongolian
+<td>Mongolian
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-MYANMAR:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MYANMAR</code></span></p></td>
-<td>   Myanmar
+<td>Myanmar
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OGHAM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OGHAM</code></span></p></td>
-<td>     Ogham
+<td>Ogham
 </td>
 </tr>
 <tr>
@@ -1716,128 +2071,127 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-ORIYA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_ORIYA</code></span></p></td>
-<td>     Oriya
+<td>Oriya
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-RUNIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_RUNIC</code></span></p></td>
-<td>     Runic
+<td>Runic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SINHALA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SINHALA</code></span></p></td>
-<td>   Sinhala
+<td>Sinhala
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SYRIAC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SYRIAC</code></span></p></td>
-<td>    Syriac
+<td>Syriac
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAMIL:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAMIL</code></span></p></td>
-<td>     Tamil
+<td>Tamil
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TELUGU:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TELUGU</code></span></p></td>
-<td>    Telugu
+<td>Telugu
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-THAANA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_THAANA</code></span></p></td>
-<td>    Thaana
+<td>Thaana
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-THAI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_THAI</code></span></p></td>
-<td>      Thai
+<td>Thai
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TIBETAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TIBETAN</code></span></p></td>
-<td>   Tibetan
+<td>Tibetan
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CANADIAN-ABORIGINAL:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL</code></span></p></td>
-<td>
-                              Canadian Aboriginal
+<td>                              Canadian Aboriginal
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-YI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_YI</code></span></p></td>
-<td>        Yi
+<td>Yi
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAGALOG:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAGALOG</code></span></p></td>
-<td>   Tagalog
+<td>Tagalog
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-HANUNOO:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_HANUNOO</code></span></p></td>
-<td>   Hanunoo
+<td>Hanunoo
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BUHID:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BUHID</code></span></p></td>
-<td>     Buhid
+<td>Buhid
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAGBANWA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAGBANWA</code></span></p></td>
-<td>  Tagbanwa
+<td>Tagbanwa
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BRAILLE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BRAILLE</code></span></p></td>
-<td>   Braille
+<td>Braille
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CYPRIOT:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CYPRIOT</code></span></p></td>
-<td>   Cypriot
+<td>Cypriot
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LIMBU:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LIMBU</code></span></p></td>
-<td>     Limbu
+<td>Limbu
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OSMANYA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OSMANYA</code></span></p></td>
-<td>   Osmanya
+<td>Osmanya
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SHAVIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SHAVIAN</code></span></p></td>
-<td>   Shavian
+<td>Shavian
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LINEAR-B:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LINEAR_B</code></span></p></td>
-<td>  Linear B
+<td>Linear B
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAI-LE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAI_LE</code></span></p></td>
-<td>    Tai Le
+<td>Tai Le
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-UGARITIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_UGARITIC</code></span></p></td>
-<td>  Ugaritic
+<td>Ugaritic
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-NEW-TAI-LUE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_NEW_TAI_LUE</code></span></p></td>
-<td>New Tai Lue
+<td>                              New Tai Lue
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BUGINESE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BUGINESE</code></span></p></td>
-<td>  Buginese
+<td>Buginese
 </td>
 </tr>
 <tr>
@@ -1847,17 +2201,17 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TIFINAGH:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TIFINAGH</code></span></p></td>
-<td>  Tifinagh
+<td>Tifinagh
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SYLOTI-NAGRI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SYLOTI_NAGRI</code></span></p></td>
-<td>Syloti Nagri
+<td>                              Syloti Nagri
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OLD-PERSIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OLD_PERSIAN</code></span></p></td>
-<td>Old Persian
+<td>                              Old Persian
 </td>
 </tr>
 <tr>
@@ -1867,17 +2221,17 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_UNKNOWN</code></span></p></td>
-<td>   an unassigned code point
+<td>an unassigned code point
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BALINESE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BALINESE</code></span></p></td>
-<td>  Balinese
+<td>Balinese
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CUNEIFORM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CUNEIFORM</code></span></p></td>
-<td> Cuneiform
+<td>Cuneiform
 </td>
 </tr>
 <tr>
@@ -1887,32 +2241,32 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-PHAGS-PA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_PHAGS_PA</code></span></p></td>
-<td>  Phags-pa
+<td>Phags-pa
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-NKO:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_NKO</code></span></p></td>
-<td>       N'Ko
+<td>N'Ko
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-KAYAH-LI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_KAYAH_LI</code></span></p></td>
-<td>  Kayah Li. Since 2.16.3
+<td>Kayah Li. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LEPCHA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LEPCHA</code></span></p></td>
-<td>    Lepcha. Since 2.16.3
+<td>Lepcha. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-REJANG:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_REJANG</code></span></p></td>
-<td>    Rejang. Since 2.16.3
+<td>Rejang. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SUNDANESE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SUNDANESE</code></span></p></td>
-<td> Sundanese. Since 2.16.3
+<td>Sundanese. Since 2.16.3
 </td>
 </tr>
 <tr>
@@ -1922,122 +2276,157 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CHAM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CHAM</code></span></p></td>
-<td>      Cham. Since 2.16.3
+<td>Cham. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OL-CHIKI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OL_CHIKI</code></span></p></td>
-<td>  Ol Chiki. Since 2.16.3
+<td>Ol Chiki. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-VAI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_VAI</code></span></p></td>
-<td>       Vai. Since 2.16.3
+<td>Vai. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-CARIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CARIAN</code></span></p></td>
-<td>    Carian. Since 2.16.3
+<td>Carian. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LYCIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LYCIAN</code></span></p></td>
-<td>    Lycian. Since 2.16.3
+<td>Lycian. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LYDIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LYDIAN</code></span></p></td>
-<td>    Lydian. Since 2.16.3
+<td>Lydian. Since 2.16.3
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-AVESTAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_AVESTAN</code></span></p></td>
-<td>               Avestan. Since 2.26
+<td>Avestan. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BAMUM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BAMUM</code></span></p></td>
-<td>                 Bamum. Since 2.26
+<td>Bamum. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-EGYPTIAN-HIEROGLYPHS:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS</code></span></p></td>
-<td>  Egyptian Hieroglpyhs. Since 2.26
+<td>                              Egyptian Hieroglpyhs. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-IMPERIAL-ARAMAIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC</code></span></p></td>
-<td>      Imperial Aramaic. Since 2.26
+<td>                              Imperial Aramaic. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-INSCRIPTIONAL-PAHLAVI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI</code></span></p></td>
-<td> Inscriptional Pahlavi. Since 2.26
+<td>                              Inscriptional Pahlavi. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-INSCRIPTIONAL-PARTHIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN</code></span></p></td>
-<td>Inscriptional Parthian. Since 2.26
+<td>                              Inscriptional Parthian. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-JAVANESE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_JAVANESE</code></span></p></td>
-<td>              Javanese. Since 2.26
+<td>Javanese. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-KAITHI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_KAITHI</code></span></p></td>
-<td>                Kaithi. Since 2.26
+<td>Kaithi. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-LISU:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_LISU</code></span></p></td>
-<td>                  Lisu. Since 2.26
+<td>Lisu. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-MEETEI-MAYEK:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MEETEI_MAYEK</code></span></p></td>
-<td>          Meetei Mayek. Since 2.26
+<td>                              Meetei Mayek. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OLD-SOUTH-ARABIAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN</code></span></p></td>
-<td>     Old South Arabian. Since 2.26
+<td>                              Old South Arabian. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-OLD-TURKIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_OLD_TURKIC</code></span></p></td>
-<td>            Old Turkic. Since 2.28
+<td>Old Turkic. Since 2.28
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-SAMARITAN:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SAMARITAN</code></span></p></td>
-<td>             Samaritan. Since 2.26
+<td>Samaritan. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAI-THAM:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAI_THAM</code></span></p></td>
-<td>              Tai Tham. Since 2.26
+<td>Tai Tham. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-TAI-VIET:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAI_VIET</code></span></p></td>
-<td>              Tai Viet. Since 2.26
+<td>Tai Viet. Since 2.26
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BATAK:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BATAK</code></span></p></td>
-<td>                 Batak. Since 2.28
+<td>Batak. Since 2.28
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-BRAHMI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_BRAHMI</code></span></p></td>
-<td>                Brahmi. Since 2.28
+<td>Brahmi. Since 2.28
 </td>
 </tr>
 <tr>
 <td><p><a name="G-UNICODE-SCRIPT-MANDAIC:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MANDAIC</code></span></p></td>
-<td>               Mandaic. Since 2.28
+<td>Mandaic. Since 2.28
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-CHAKMA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_CHAKMA</code></span></p></td>
+<td>Chakma. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-MEROITIC-CURSIVE:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MEROITIC_CURSIVE</code></span></p></td>
+<td>Meroitic Cursive. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-MEROITIC-HIEROGLYPHS:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS</code></span></p></td>
+<td>Meroitic Hieroglyphs. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-MIAO:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_MIAO</code></span></p></td>
+<td>Miao. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-SHARADA:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SHARADA</code></span></p></td>
+<td>Sharada. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-SORA-SOMPENG:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_SORA_SOMPENG</code></span></p></td>
+<td>Sora Sompeng. Since: 2.32
+</td>
+</tr>
+<tr>
+<td><p><a name="G-UNICODE-SCRIPT-TAKRI:CAPS"></a><span class="term"><code class="literal">G_UNICODE_SCRIPT_TAKRI</code></span></p></td>
+<td>Takri. Since: 2.32
 </td>
 </tr>
 </tbody>
@@ -2049,7 +2438,7 @@ See <a class="ulink" href="http://www.unicode.org/reports/tr24/" target="_top">U
 <pre class="programlisting"><a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="returnvalue">GUnicodeScript</span></a>      g_unichar_get_script                (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#gunichar" title="gunichar"><span class="type">gunichar</span></a> ch</code></em>);</pre>
 <p>
 Looks up the <a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="type">GUnicodeScript</span></a> for a particular character (as defined
-by Unicode Standard Annex <span class="type">24</span>). No check is made for <em class="parameter"><code>ch</code></em> being a
+by Unicode Standard Annex #24). No check is made for <em class="parameter"><code>ch</code></em> being a
 valid Unicode character; if you pass in invalid character, the
 result is undefined.
 </p>
@@ -2057,8 +2446,11 @@ result is undefined.
 This function is equivalent to <a href="/usr/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html#pango-script-for-unichar"><code class="function">pango_script_for_unichar()</code></a> and the
 two are interchangeable.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ch</code></em> :</span></p></td>
@@ -2074,6 +2466,76 @@ two are interchangeable.
 </div>
 <hr>
 <div class="refsect2">
+<a name="g-unicode-script-from-iso15924"></a><h3>g_unicode_script_from_iso15924 ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="returnvalue">GUnicodeScript</span></a>      g_unicode_script_from_iso15924      (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#guint32" title="guint32"><span class="type">guint32</span></a> iso15924</code></em>);</pre>
+<p>
+Looks up the Unicode script for <em class="parameter"><code>iso15924</code></em>.  ISO 15924 assigns four-letter
+codes to scripts.  For example, the code for Arabic is 'Arab'.
+This function accepts four letter codes encoded as a <em class="parameter"><code>guint32</code></em> in a
+big-endian fashion.  That is, the code expected for Arabic is
+0x41726162 (0x41 is ASCII code for 'A', 0x72 is ASCII code for 'r', etc).
+</p>
+<p>
+See <a class="ulink" href="http://unicode.org/iso15924/codelists.html" target="_top">Codes for the
+representation of names of scripts</a> for details.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>iso15924</code></em> :</span></p></td>
+<td>a Unicode script</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the Unicode script for <em class="parameter"><code>iso15924</code></em>, or
+of <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-SCRIPT-INVALID-CODE:CAPS"><code class="literal">G_UNICODE_SCRIPT_INVALID_CODE</code></a> if <em class="parameter"><code>iso15924</code></em> is zero and
+<a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-SCRIPT-UNKNOWN:CAPS"><code class="literal">G_UNICODE_SCRIPT_UNKNOWN</code></a> if <em class="parameter"><code>iso15924</code></em> is unknown.</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="g-unicode-script-to-iso15924"></a><h3>g_unicode_script_to_iso15924 ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#guint32" title="guint32"><span class="returnvalue">guint32</span></a>             g_unicode_script_to_iso15924        (<em class="parameter"><code><a class="link" href="glib-Unicode-Manipulation.html#GUnicodeScript" title="enum GUnicodeScript"><span class="type">GUnicodeScript</span></a> script</code></em>);</pre>
+<p>
+Looks up the ISO 15924 code for <em class="parameter"><code>script</code></em>.  ISO 15924 assigns four-letter
+codes to scripts.  For example, the code for Arabic is 'Arab'.  The
+four letter codes are encoded as a <em class="parameter"><code>guint32</code></em> by this function in a
+big-endian fashion.  That is, the code returned for Arabic is
+0x41726162 (0x41 is ASCII code for 'A', 0x72 is ASCII code for 'r', etc).
+</p>
+<p>
+See <a class="ulink" href="http://unicode.org/iso15924/codelists.html" target="_top">Codes for the
+representation of names of scripts</a> for details.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>script</code></em> :</span></p></td>
+<td>a Unicode script</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the ISO 15924 code for <em class="parameter"><code>script</code></em>, encoded as an integer,
+of zero if <em class="parameter"><code>script</code></em> is <a class="link" href="glib-Unicode-Manipulation.html#G-UNICODE-SCRIPT-INVALID-CODE:CAPS"><code class="literal">G_UNICODE_SCRIPT_INVALID_CODE</code></a> or
+ISO 15924 code 'Zzzz' (script code for UNKNOWN) if <em class="parameter"><code>script</code></em> is not understood.</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="g-utf8-next-char"></a><h3>g_utf8_next_char()</h3>
 <pre class="programlisting">#define             g_utf8_next_char(p)</pre>
 <p>
@@ -2084,11 +2546,14 @@ character. The macro returns the start of the next UTF-8 character.
 Before using this macro, use <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title="g_utf8_validate ()"><code class="function">g_utf8_validate()</code></a> to validate strings
 that may contain invalid UTF-8.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
-<td>Pointer to the start of a valid UTF-8 character.</td>
+<td>Pointer to the start of a valid UTF-8 character</td>
 </tr></tbody>
 </table></div>
 </div>
@@ -2103,8 +2568,11 @@ undefined. If you are not sure that the bytes are complete
 valid Unicode characters, you should use <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-get-char-validated" title="g_utf8_get_char_validated ()"><code class="function">g_utf8_get_char_validated()</code></a>
 instead.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2128,8 +2596,11 @@ This function checks for incomplete characters, for invalid characters
 such as characters that are out of the range of Unicode, and for
 overlong encodings of valid characters.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2182,8 +2653,11 @@ text rendering and therefore has to be as fast as possible.
 </div>
 <p>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2214,8 +2688,11 @@ character offset.
 Since 2.10, this function allows <em class="parameter"><code>pos</code></em> to be before <em class="parameter"><code>str</code></em>, and returns
 a negative offset in this case.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2246,8 +2723,11 @@ is made to see if the character found is actually valid other than
 it starts with an appropriate byte. If <em class="parameter"><code>p</code></em> might be the first
 character of the string, you must use <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-find-prev-char" title="g_utf8_find_prev_char ()"><code class="function">g_utf8_find_prev_char()</code></a> instead.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2273,8 +2753,11 @@ Finds the start of the next UTF-8 character in the string after <em class="param
 is made to see if the character found is actually valid other than
 it starts with an appropriate byte.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2308,8 +2791,11 @@ UTF-8 characters are present in <em class="parameter"><code>str</code></em> befo
 is made to see if the character found is actually valid other than
 it starts with an appropriate byte.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2334,10 +2820,14 @@ it starts with an appropriate byte.
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> max</code></em>);</pre>
 <p>
 Computes the length of the string in characters, not including
-the terminating nul character.
+the terminating nul character. If the <em class="parameter"><code>max</code></em>'th byte falls in the
+middle of a character, the last (partial) character is not counted.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2348,7 +2838,8 @@ the terminating nul character.
 <td>the maximum number of bytes to examine. If <em class="parameter"><code>max</code></em>
 is less than 0, then the string is assumed to be
 nul-terminated. If <em class="parameter"><code>max</code></em> is 0, <em class="parameter"><code>p</code></em> will not be examined and
-may be <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.</td>
+may be <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. If <em class="parameter"><code>max</code></em> is greater than 0, up to <em class="parameter"><code>max</code></em>
+bytes are examined</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -2370,8 +2861,11 @@ bytes. The <em class="parameter"><code>src</code></em> string must be valid UTF-
 (Use <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title="g_utf8_validate ()"><code class="function">g_utf8_validate()</code></a> on all text before trying to use UTF-8
 utility functions with it.)
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
@@ -2404,8 +2898,11 @@ Finds the leftmost occurrence of the given Unicode character
 in a UTF-8 encoded string, while limiting the search to <em class="parameter"><code>len</code></em> bytes.
 If <em class="parameter"><code>len</code></em> is -1, allow unbounded search.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2441,8 +2938,11 @@ Find the rightmost occurrence of the given Unicode character
 in a UTF-8 encoded string, while limiting the search to <em class="parameter"><code>len</code></em> bytes.
 If <em class="parameter"><code>len</code></em> is -1, allow unbounded search.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>p</code></em> :</span></p></td>
@@ -2489,8 +2989,11 @@ Note that unlike <a class="link" href="glib-String-Utility-Functions.html#g-strr
 newly-allocated memory, which should be freed with <a class="link" href="glib-Memory-Allocation.html#g-free" title="g_free ()"><code class="function">g_free()</code></a> when
 no longer needed.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2511,6 +3014,46 @@ then the string is nul-terminated.</td>
 </div>
 <hr>
 <div class="refsect2">
+<a name="g-utf8-substring"></a><h3>g_utf8_substring ()</h3>
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_utf8_substring                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#glong" title="glong"><span class="type">glong</span></a> start_pos</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#glong" title="glong"><span class="type">glong</span></a> end_pos</code></em>);</pre>
+<p>
+Copies a substring out of a UTF-8 encoded string.
+The substring will contain <em class="parameter"><code>end_pos</code></em> - <em class="parameter"><code>start_pos</code></em>
+characters.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
+<td>a UTF-8 encoded string</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>start_pos</code></em> :</span></p></td>
+<td>a character offset within <em class="parameter"><code>str</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>end_pos</code></em> :</span></p></td>
+<td>another character offset within <em class="parameter"><code>str</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a newly allocated copy of the requested
+substring. Free with <a class="link" href="glib-Memory-Allocation.html#g-free" title="g_free ()"><code class="function">g_free()</code></a> when no longer needed.</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.30</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="g-utf8-validate"></a><h3>g_utf8_validate ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            g_utf8_validate                     (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> max_len</code></em>,
@@ -2526,7 +3069,7 @@ being validated otherwise).
 </p>
 <p>
 Note that <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title="g_utf8_validate ()"><code class="function">g_utf8_validate()</code></a> returns <a class="link" href="glib-Standard-Macros.html#FALSE:CAPS" title="FALSE"><code class="literal">FALSE</code></a> if <em class="parameter"><code>max_len</code></em> is
-positive and NUL is met before <em class="parameter"><code>max_len</code></em> bytes have been read.
+positive and any of the <em class="parameter"><code>max_len</code></em> bytes are NUL.
 </p>
 <p>
 Returns <a class="link" href="glib-Standard-Macros.html#TRUE:CAPS" title="TRUE"><code class="literal">TRUE</code></a> if all of <em class="parameter"><code>str</code></em> was valid. Many GLib and GTK+
@@ -2534,12 +3077,16 @@ routines <span class="emphasis"><em>require</em></span> valid UTF-8 as input;
 so data read from a file or the network should be checked
 with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title="g_utf8_validate ()"><code class="function">g_utf8_validate()</code></a> before doing anything else with it.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
-<td>a pointer to character data</td>
+<td>a pointer to character data. <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=max_len][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint8]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>max_len</code></em> :</span></p></td>
@@ -2547,7 +3094,8 @@ with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-validate" title
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>end</code></em> :</span></p></td>
-<td>return location for end of valid data</td>
+<td>return location for end of valid data. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -2569,8 +3117,11 @@ on the current locale, and may result in the number of
 characters in the string increasing. (For instance, the
 German ess-zet will be changed to SS.)
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2599,8 +3150,11 @@ to lowercase. The exact manner that this is done depends
 on the current locale, and may result in the number of
 characters in the string changing.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2637,8 +3191,11 @@ right would require a more sophisticated collation function that
 takes case sensitivity into account. GLib does not currently
 provide such a function.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2691,8 +3248,11 @@ useful if you intend to convert the string to
 a legacy encoding or pass it to a system with
 less capable Unicode handling.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2731,58 +3291,62 @@ valid UTF-8.</td>
 </pre>
 <p>
 Defines how a Unicode string is transformed in a canonical
-form, standardizing such issues as whether a character with an accent is
-represented as a base character and combining accent or as a single precomposed
-character. Unicode strings should generally be normalized before comparing them.
+form, standardizing such issues as whether a character with
+an accent is represented as a base character and combining
+accent or as a single precomposed character. Unicode strings
+should generally be normalized before comparing them.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="G-NORMALIZE-DEFAULT:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_DEFAULT</code></span></p></td>
 <td>standardize differences that do not affect the
-  text content, such as the above-mentioned accent representation.
+    text content, such as the above-mentioned accent representation
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-NFD:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_NFD</code></span></p></td>
-<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a>.
+<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a>
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-DEFAULT-COMPOSE:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_DEFAULT_COMPOSE</code></span></p></td>
-<td>like <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a>, but with composed
-  forms rather than a maximally decomposed form.
+<td>like <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a>, but with
+    composed forms rather than a maximally decomposed form
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-NFC:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_NFC</code></span></p></td>
-<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT-COMPOSE:CAPS"><code class="literal">G_NORMALIZE_DEFAULT_COMPOSE</code></a>.
+<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT-COMPOSE:CAPS"><code class="literal">G_NORMALIZE_DEFAULT_COMPOSE</code></a>
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-ALL:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_ALL</code></span></p></td>
-<td>beyond <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a> also standardize the
-  "compatibility" characters in Unicode, such as SUPERSCRIPT THREE to the
-  standard forms (in this case DIGIT THREE). Formatting information may be
-  lost but for most text operations such characters should be considered the
-  same.
+<td>beyond <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-DEFAULT:CAPS"><code class="literal">G_NORMALIZE_DEFAULT</code></a> also standardize the
+    "compatibility" characters in Unicode, such as SUPERSCRIPT THREE
+    to the standard forms (in this case DIGIT THREE). Formatting
+    information may be lost but for most text operations such
+    characters should be considered the same
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-NFKD:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_NFKD</code></span></p></td>
-<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-ALL:CAPS"><code class="literal">G_NORMALIZE_ALL</code></a>.
+<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-ALL:CAPS"><code class="literal">G_NORMALIZE_ALL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-ALL-COMPOSE:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_ALL_COMPOSE</code></span></p></td>
 <td>like <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-ALL:CAPS"><code class="literal">G_NORMALIZE_ALL</code></a>, but with composed
-  forms rather than a maximally decomposed form.
+    forms rather than a maximally decomposed form
 </td>
 </tr>
 <tr>
 <td><p><a name="G-NORMALIZE-NFKC:CAPS"></a><span class="term"><code class="literal">G_NORMALIZE_NFKC</code></span></p></td>
-<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-ALL-COMPOSE:CAPS"><code class="literal">G_NORMALIZE_ALL_COMPOSE</code></a>.
+<td>another name for <a class="link" href="glib-Unicode-Manipulation.html#G-NORMALIZE-ALL-COMPOSE:CAPS"><code class="literal">G_NORMALIZE_ALL_COMPOSE</code></a>
 </td>
 </tr>
 </tbody>
@@ -2801,8 +3365,11 @@ faster to obtain collation keys with <a class="link" href="glib-Unicode-Manipula
 compare the keys with <code class="function">strcmp()</code> when sorting instead of sorting
 the original strings.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str1</code></em> :</span></p></td>
@@ -2839,8 +3406,11 @@ original keys with <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-c
 Note that this function depends on the
 <a class="link" href="glib-running.html#setlocale" title="Locale">current locale</a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2879,8 +3449,11 @@ is sorted as "file1" "file5" "file10".
 Note that this function depends on the
 <a class="link" href="glib-running.html#setlocale" title="Locale">current locale</a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2911,8 +3484,11 @@ be freed with <a class="link" href="glib-Memory-Allocation.html#g-free" title="g
 Convert a string from UTF-8 to UTF-16. A 0 character will be
 added to the result after the converted text.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2929,17 +3505,19 @@ If <em class="parameter"><code>len</code></em> &lt; 0, then the string is nul-te
 If <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>, then <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-PARTIAL-INPUT:CAPS"><code class="literal">G_CONVERT_ERROR_PARTIAL_INPUT</code></a> will be
 returned in case <em class="parameter"><code>str</code></em> contains a trailing partial
 character. If an error occurs then the index of the
-invalid input is stored here.</td>
+invalid input is stored here. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of <span class="type">gunichar2</span> written,
 or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
-The value stored here does not include the trailing 0.</td>
+The value stored here does not include the trailing 0. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -2963,11 +3541,14 @@ error occurs, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="struct GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Convert a string from UTF-8 to a 32-bit fixed width
-representation as UCS-4. A trailing 0 will be added to the
+representation as UCS-4. A trailing 0 character will be added to the
 string after the converted text.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -2984,17 +3565,19 @@ then the string is nul-terminated.</td>
 If <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>, then <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-PARTIAL-INPUT:CAPS"><code class="literal">G_CONVERT_ERROR_PARTIAL_INPUT</code></a> will be
 returned in case <em class="parameter"><code>str</code></em> contains a trailing partial
 character. If an error occurs then the index of the
-invalid input is stored here.</td>
+invalid input is stored here. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of characters written or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 The value here stored does not include the trailing 0
-character.</td>
+character. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -3018,10 +3601,14 @@ error occurs, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="
 Convert a string from UTF-8 to a 32-bit fixed width
 representation as UCS-4, assuming valid UTF-8 input.
 This function is roughly twice as fast as <a class="link" href="glib-Unicode-Manipulation.html#g-utf8-to-ucs4" title="g_utf8_to_ucs4 ()"><code class="function">g_utf8_to_ucs4()</code></a>
-but does no error checking on the input.
+but does no error checking on the input. A trailing 0 character
+will be added to the string after the converted text.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -3035,7 +3622,8 @@ then the string is nul-terminated.</td>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store the number of characters in the
-result, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.</td>
+result, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -3057,8 +3645,11 @@ This value must be freed with <a class="link" href="glib-Memory-Allocation.html#
 Convert a string from UTF-16 to UCS-4. The result will be
 nul-terminated.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -3075,17 +3666,19 @@ If <em class="parameter"><code>len</code></em> &lt; 0, then the string is nul-te
 If <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>, then <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-PARTIAL-INPUT:CAPS"><code class="literal">G_CONVERT_ERROR_PARTIAL_INPUT</code></a> will be
 returned in case <em class="parameter"><code>str</code></em> contains a trailing partial
 character. If an error occurs then the index of the
-invalid input is stored here.</td>
+invalid input is stored here. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of characters written, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 The value stored here does not include the trailing
-0 character.</td>
+0 character. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -3124,8 +3717,11 @@ validation done by this function is to ensure that the input can
 be correctly interpreted as UTF-16, i.e. it doesn't contain
 things unpaired surrogates.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -3142,17 +3738,19 @@ If <em class="parameter"><code>len</code></em> &lt; 0, then the string is nul-te
 If <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>, then <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-PARTIAL-INPUT:CAPS"><code class="literal">G_CONVERT_ERROR_PARTIAL_INPUT</code></a> will be
 returned in case <em class="parameter"><code>str</code></em> contains a trailing partial
 character. If an error occurs then the index of the
-invalid input is stored here.</td>
+invalid input is stored here. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of bytes written, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 The value stored here does not include the trailing
-0 byte.</td>
+0 byte. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -3178,8 +3776,11 @@ error occurs, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="
 Convert a string from UCS-4 to UTF-16. A 0 character will be
 added to the result after the converted text.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -3194,17 +3795,19 @@ If <em class="parameter"><code>len</code></em> &lt; 0, then the string is nul-te
 <td><p><span class="term"><em class="parameter"><code>items_read</code></em> :</span></p></td>
 <td>location to store number of bytes read, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 If an error occurs then the index of the invalid input
-is stored here.</td>
+is stored here. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of <span class="type">gunichar2</span>
 written, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. The value stored here does not
-include the trailing 0.</td>
+include the trailing 0. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -3230,8 +3833,11 @@ error occurs, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="
 Convert a string from a 32-bit fixed width representation as UCS-4.
 to UTF-8. The result will be terminated with a 0 byte.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
@@ -3244,17 +3850,19 @@ If <em class="parameter"><code>len</code></em> &lt; 0, then the string is nul-te
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_read</code></em> :</span></p></td>
-<td>location to store number of characters read, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.</td>
+<td>location to store number of characters read, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>items_written</code></em> :</span></p></td>
 <td>location to store number of bytes written or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
 The value here stored does not include the trailing 0
-byte.</td>
+byte. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
+<td>location to store the error occurring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
 errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> other than
 <a class="link" href="glib-Character-Set-Conversion.html#G-CONVERT-ERROR-NO-CONVERSION:CAPS"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></a> may occur.</td>
 </tr>
@@ -3278,8 +3886,11 @@ character.</td>
 <p>
 Converts a single character to UTF-8.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
@@ -3301,27 +3912,15 @@ and nothing will be written to <em class="parameter"><code>outbuf</code></em>.</
 </div>
 <div class="refsect1">
 <a name="glib-Unicode-Manipulation.see-also"></a><h2>See Also</h2>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><a class="link" href="glib-Character-Set-Conversion.html#g-locale-to-utf8" title="g_locale_to_utf8 ()"><code class="function">g_locale_to_utf8()</code></a>, <a class="link" href="glib-Character-Set-Conversion.html#g-locale-from-utf8" title="g_locale_from_utf8 ()"><code class="function">g_locale_from_utf8()</code></a></span></p></td>
-<td><p>
-Convenience functions for converting between UTF-8 and the locale encoding.
-</p></td>
-</tr></tbody>
-</table></div>
-<p>
-</p>
+g_locale_to_utf8(), <a class="link" href="glib-Character-Set-Conversion.html#g-locale-from-utf8" title="g_locale_from_utf8 ()"><code class="function">g_locale_from_utf8()</code></a>
 </div>
 <div class="footnotes">
-<br><hr width="100" align="left">
-<div class="footnote"><em class="firstterm"><sup>[<a name="ftn.utf16_surrogate_pairs" href="#utf16_surrogate_pairs" class="firstterm">3</a>] </sup>surrogate pairs</em></div>
+<br><hr style="width:100; align:left;">
+<div id="ftn.utf16_surrogate_pairs" class="footnote"><em class="firstterm"><a href="#utf16_surrogate_pairs" class="firstterm"><sup>[4] </sup></a>surrogate pairs</em></div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.17</div>
+          Generated by GTK-Doc V1.18</div>
 </body>
 </html>