X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=glib%2Fguniprop.c;h=98dff2157170ab7ad5503788e5b594ea7c390eab;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=2879a8096fed509c0ecec1cef5c2247bc9ea6696;hpb=1b033919845cef366842373da9f1cfb56f522d01;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 2879a80..98dff21 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -14,9 +14,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see .
*/
#include "config.h"
@@ -104,7 +102,7 @@
* Given some UTF-8 text, obtain a character value
* with g_utf8_get_char().
*
- * Return value: %TRUE if @c is an alphanumeric character
+ * Returns: %TRUE if @c is an alphanumeric character
**/
gboolean
g_unichar_isalnum (gunichar c)
@@ -120,7 +118,7 @@ g_unichar_isalnum (gunichar c)
* Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is an alphabetic character
+ * Returns: %TRUE if @c is an alphabetic character
**/
gboolean
g_unichar_isalpha (gunichar c)
@@ -137,7 +135,7 @@ g_unichar_isalpha (gunichar c)
* Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is a control character
+ * Returns: %TRUE if @c is a control character
**/
gboolean
g_unichar_iscntrl (gunichar c)
@@ -153,7 +151,7 @@ g_unichar_iscntrl (gunichar c)
* covers ASCII 0-9 and also digits in other languages/scripts. Given
* some UTF-8 text, obtain a character value with g_utf8_get_char().
*
- * Return value: %TRUE if @c is a digit
+ * Returns: %TRUE if @c is a digit
**/
gboolean
g_unichar_isdigit (gunichar c)
@@ -172,7 +170,7 @@ g_unichar_isdigit (gunichar c)
* spaces. Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is printable unless it's a space
+ * Returns: %TRUE if @c is printable unless it's a space
**/
gboolean
g_unichar_isgraph (gunichar c)
@@ -194,7 +192,7 @@ g_unichar_isgraph (gunichar c)
* Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is a lowercase letter
+ * Returns: %TRUE if @c is a lowercase letter
**/
gboolean
g_unichar_islower (gunichar c)
@@ -212,7 +210,7 @@ g_unichar_islower (gunichar c)
* Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is printable
+ * Returns: %TRUE if @c is printable
**/
gboolean
g_unichar_isprint (gunichar c)
@@ -233,7 +231,7 @@ g_unichar_isprint (gunichar c)
* Given some UTF-8 text, obtain a character value with
* g_utf8_get_char().
*
- * Return value: %TRUE if @c is a punctuation or symbol character
+ * Returns: %TRUE if @c is a punctuation or symbol character
**/
gboolean
g_unichar_ispunct (gunichar c)
@@ -265,7 +263,7 @@ g_unichar_ispunct (gunichar c)
* Pango or equivalent to get word breaking right, the algorithm
* is fairly complex.)
*
- * Return value: %TRUE if @c is a space character
+ * Returns: %TRUE if @c is a space character
**/
gboolean
g_unichar_isspace (gunichar c)
@@ -306,7 +304,7 @@ g_unichar_isspace (gunichar c)
* for writing most European languages as well as many non-Latin
* scripts.
*
- * Return value: %TRUE if @c is a mark character
+ * Returns: %TRUE if @c is a mark character
*
* Since: 2.14
**/
@@ -322,7 +320,7 @@ g_unichar_ismark (gunichar c)
*
* Determines if a character is uppercase.
*
- * Return value: %TRUE if @c is an uppercase character
+ * Returns: %TRUE if @c is an uppercase character
**/
gboolean
g_unichar_isupper (gunichar c)
@@ -341,7 +339,7 @@ g_unichar_isupper (gunichar c)
* first letter is capitalized. The titlecase form of the DZ
* digraph is U+01F2 LATIN CAPITAL LETTTER D WITH SMALL LETTER Z.
*
- * Return value: %TRUE if the character is titlecase
+ * Returns: %TRUE if the character is titlecase
**/
gboolean
g_unichar_istitle (gunichar c)
@@ -359,7 +357,7 @@ g_unichar_istitle (gunichar c)
*
* Determines if a character is a hexidecimal digit.
*
- * Return value: %TRUE if the character is a hexadecimal digit
+ * Returns: %TRUE if the character is a hexadecimal digit
**/
gboolean
g_unichar_isxdigit (gunichar c)
@@ -376,7 +374,7 @@ g_unichar_isxdigit (gunichar c)
* Determines if a given character is assigned in the Unicode
* standard.
*
- * Return value: %TRUE if the character has an assigned value
+ * Returns: %TRUE if the character has an assigned value
**/
gboolean
g_unichar_isdefined (gunichar c)
@@ -401,7 +399,7 @@ g_unichar_isdefined (gunichar c)
* when displayed on a grid display (terminals). However, note that not all
* terminals support zero-width rendering of zero-width marks.
*
- * Return value: %TRUE if the character has zero width
+ * Returns: %TRUE if the character has zero width
*
* Since: 2.14
**/
@@ -421,11 +419,6 @@ g_unichar_iszerowidth (gunichar c)
return FALSE;
}
-struct Interval
-{
- gunichar start, end;
-};
-
static int
interval_compare (const void *key, const void *elt)
{
@@ -440,20 +433,6 @@ interval_compare (const void *key, const void *elt)
return 0;
}
-
-/*
- * NOTE:
- *
- * The tables for g_unichar_iswide() and g_unichar_iswide_cjk() are
- * generated from the Unicode Character Database's file
- * extracted/DerivedEastAsianWidth.txt using the gen-iswide-table.py
- * in this way:
- *
- * ./gen-iswide-table.py < path/to/ucd/extracted/DerivedEastAsianWidth.txt | fmt
- *
- * Last update for Unicode 6.0.
- */
-
/**
* g_unichar_iswide:
* @c: a Unicode character
@@ -461,26 +440,15 @@ interval_compare (const void *key, const void *elt)
* Determines if a character is typically rendered in a double-width
* cell.
*
- * Return value: %TRUE if the character is wide
+ * Returns: %TRUE if the character is wide
**/
gboolean
g_unichar_iswide (gunichar c)
{
- /* See NOTE earlier for how to update this table. */
- static const struct Interval wide[] = {
- {0x1100, 0x115F}, {0x11A3, 0x11A7}, {0x11FA, 0x11FF}, {0x2329, 0x232A},
- {0x2E80, 0x2E99}, {0x2E9B, 0x2EF3}, {0x2F00, 0x2FD5}, {0x2FF0, 0x2FFB},
- {0x3000, 0x303E}, {0x3041, 0x3096}, {0x3099, 0x30FF}, {0x3105, 0x312D},
- {0x3131, 0x318E}, {0x3190, 0x31BA}, {0x31C0, 0x31E3}, {0x31F0, 0x321E},
- {0x3220, 0x3247}, {0x3250, 0x32FE}, {0x3300, 0x4DBF}, {0x4E00, 0xA48C},
- {0xA490, 0xA4C6}, {0xA960, 0xA97C}, {0xAC00, 0xD7A3}, {0xD7B0, 0xD7C6},
- {0xD7CB, 0xD7FB}, {0xF900, 0xFAFF}, {0xFE10, 0xFE19}, {0xFE30, 0xFE52},
- {0xFE54, 0xFE66}, {0xFE68, 0xFE6B}, {0xFF01, 0xFF60}, {0xFFE0, 0xFFE6},
- {0x1B000, 0x1B001}, {0x1F200, 0x1F202}, {0x1F210, 0x1F23A}, {0x1F240,
- 0x1F248}, {0x1F250, 0x1F251}, {0x20000, 0x2FFFD}, {0x30000, 0x3FFFD}
- };
-
- if (bsearch (GUINT_TO_POINTER (c), wide, G_N_ELEMENTS (wide), sizeof wide[0],
+ if (bsearch (GUINT_TO_POINTER (c),
+ g_unicode_width_table_wide,
+ G_N_ELEMENTS (g_unicode_width_table_wide),
+ sizeof g_unicode_width_table_wide[0],
interval_compare))
return TRUE;
@@ -495,73 +463,28 @@ g_unichar_iswide (gunichar c)
* Determines if a character is typically rendered in a double-width
* cell under legacy East Asian locales. If a character is wide according to
* g_unichar_iswide(), then it is also reported wide with this function, but
- * the converse is not necessarily true. See the
- * Unicode Standard
- * Annex #11 for details.
+ * the converse is not necessarily true. See the
+ * [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
+ * for details.
*
* If a character passes the g_unichar_iswide() test then it will also pass
* this test, but not the other way around. Note that some characters may
- * pas both this test and g_unichar_iszerowidth().
+ * pass both this test and g_unichar_iszerowidth().
*
- * Return value: %TRUE if the character is wide in legacy East Asian locales
+ * Returns: %TRUE if the character is wide in legacy East Asian locales
*
* Since: 2.12
*/
gboolean
g_unichar_iswide_cjk (gunichar c)
{
- /* See NOTE earlier for how to update this table. */
- static const struct Interval ambiguous[] = {
- {0x00A1, 0x00A1}, {0x00A4, 0x00A4}, {0x00A7, 0x00A8}, {0x00AA, 0x00AA},
- {0x00AD, 0x00AE}, {0x00B0, 0x00B4}, {0x00B6, 0x00BA}, {0x00BC, 0x00BF},
- {0x00C6, 0x00C6}, {0x00D0, 0x00D0}, {0x00D7, 0x00D8}, {0x00DE, 0x00E1},
- {0x00E6, 0x00E6}, {0x00E8, 0x00EA}, {0x00EC, 0x00ED}, {0x00F0, 0x00F0},
- {0x00F2, 0x00F3}, {0x00F7, 0x00FA}, {0x00FC, 0x00FC}, {0x00FE, 0x00FE},
- {0x0101, 0x0101}, {0x0111, 0x0111}, {0x0113, 0x0113}, {0x011B, 0x011B},
- {0x0126, 0x0127}, {0x012B, 0x012B}, {0x0131, 0x0133}, {0x0138, 0x0138},
- {0x013F, 0x0142}, {0x0144, 0x0144}, {0x0148, 0x014B}, {0x014D, 0x014D},
- {0x0152, 0x0153}, {0x0166, 0x0167}, {0x016B, 0x016B}, {0x01CE, 0x01CE},
- {0x01D0, 0x01D0}, {0x01D2, 0x01D2}, {0x01D4, 0x01D4}, {0x01D6, 0x01D6},
- {0x01D8, 0x01D8}, {0x01DA, 0x01DA}, {0x01DC, 0x01DC}, {0x0251, 0x0251},
- {0x0261, 0x0261}, {0x02C4, 0x02C4}, {0x02C7, 0x02C7}, {0x02C9, 0x02CB},
- {0x02CD, 0x02CD}, {0x02D0, 0x02D0}, {0x02D8, 0x02DB}, {0x02DD, 0x02DD},
- {0x02DF, 0x02DF}, {0x0300, 0x036F}, {0x0391, 0x03A1}, {0x03A3, 0x03A9},
- {0x03B1, 0x03C1}, {0x03C3, 0x03C9}, {0x0401, 0x0401}, {0x0410, 0x044F},
- {0x0451, 0x0451}, {0x2010, 0x2010}, {0x2013, 0x2016}, {0x2018, 0x2019},
- {0x201C, 0x201D}, {0x2020, 0x2022}, {0x2024, 0x2027}, {0x2030, 0x2030},
- {0x2032, 0x2033}, {0x2035, 0x2035}, {0x203B, 0x203B}, {0x203E, 0x203E},
- {0x2074, 0x2074}, {0x207F, 0x207F}, {0x2081, 0x2084}, {0x20AC, 0x20AC},
- {0x2103, 0x2103}, {0x2105, 0x2105}, {0x2109, 0x2109}, {0x2113, 0x2113},
- {0x2116, 0x2116}, {0x2121, 0x2122}, {0x2126, 0x2126}, {0x212B, 0x212B},
- {0x2153, 0x2154}, {0x215B, 0x215E}, {0x2160, 0x216B}, {0x2170, 0x2179},
- {0x2189, 0x2189}, {0x2190, 0x2199}, {0x21B8, 0x21B9}, {0x21D2, 0x21D2},
- {0x21D4, 0x21D4}, {0x21E7, 0x21E7}, {0x2200, 0x2200}, {0x2202, 0x2203},
- {0x2207, 0x2208}, {0x220B, 0x220B}, {0x220F, 0x220F}, {0x2211, 0x2211},
- {0x2215, 0x2215}, {0x221A, 0x221A}, {0x221D, 0x2220}, {0x2223, 0x2223},
- {0x2225, 0x2225}, {0x2227, 0x222C}, {0x222E, 0x222E}, {0x2234, 0x2237},
- {0x223C, 0x223D}, {0x2248, 0x2248}, {0x224C, 0x224C}, {0x2252, 0x2252},
- {0x2260, 0x2261}, {0x2264, 0x2267}, {0x226A, 0x226B}, {0x226E, 0x226F},
- {0x2282, 0x2283}, {0x2286, 0x2287}, {0x2295, 0x2295}, {0x2299, 0x2299},
- {0x22A5, 0x22A5}, {0x22BF, 0x22BF}, {0x2312, 0x2312}, {0x2460, 0x24E9},
- {0x24EB, 0x254B}, {0x2550, 0x2573}, {0x2580, 0x258F}, {0x2592, 0x2595},
- {0x25A0, 0x25A1}, {0x25A3, 0x25A9}, {0x25B2, 0x25B3}, {0x25B6, 0x25B7},
- {0x25BC, 0x25BD}, {0x25C0, 0x25C1}, {0x25C6, 0x25C8}, {0x25CB, 0x25CB},
- {0x25CE, 0x25D1}, {0x25E2, 0x25E5}, {0x25EF, 0x25EF}, {0x2605, 0x2606},
- {0x2609, 0x2609}, {0x260E, 0x260F}, {0x2614, 0x2615}, {0x261C, 0x261C},
- {0x261E, 0x261E}, {0x2640, 0x2640}, {0x2642, 0x2642}, {0x2660, 0x2661},
- {0x2663, 0x2665}, {0x2667, 0x266A}, {0x266C, 0x266D}, {0x266F, 0x266F},
- {0x269E, 0x269F}, {0x26BE, 0x26BF}, {0x26C4, 0x26CD}, {0x26CF, 0x26E1},
- {0x26E3, 0x26E3}, {0x26E8, 0x26FF}, {0x273D, 0x273D}, {0x2757, 0x2757},
- {0x2776, 0x277F}, {0x2B55, 0x2B59}, {0x3248, 0x324F}, {0xE000, 0xF8FF},
- {0xFE00, 0xFE0F}, {0xFFFD, 0xFFFD}, {0x1F100, 0x1F10A}, {0x1F110,
- 0x1F12D}, {0x1F130, 0x1F169}, {0x1F170, 0x1F19A}, {0xE0100, 0xE01EF},
- {0xF0000, 0xFFFFD}, {0x100000, 0x10FFFD}
- };
-
if (g_unichar_iswide (c))
return TRUE;
- if (bsearch (GUINT_TO_POINTER (c), ambiguous, G_N_ELEMENTS (ambiguous), sizeof ambiguous[0],
+ if (bsearch (GUINT_TO_POINTER (c),
+ g_unicode_width_table_ambiguous,
+ G_N_ELEMENTS (g_unicode_width_table_ambiguous),
+ sizeof g_unicode_width_table_ambiguous[0],
interval_compare))
return TRUE;
@@ -575,7 +498,7 @@ g_unichar_iswide_cjk (gunichar c)
*
* Converts a character to uppercase.
*
- * Return value: the result of converting @c to uppercase.
+ * Returns: the result of converting @c to uppercase.
* If @c is not an lowercase or titlecase character,
* or has no upper case equivalent @c is returned unchanged.
**/
@@ -603,7 +526,7 @@ g_unichar_toupper (gunichar c)
for (i = 0; i < G_N_ELEMENTS (title_table); ++i)
{
if (title_table[i][0] == c)
- return title_table[i][1];
+ return title_table[i][1] ? title_table[i][1] : c;
}
}
return c;
@@ -615,7 +538,7 @@ g_unichar_toupper (gunichar c)
*
* Converts a character to lower case.
*
- * Return value: the result of converting @c to lower case.
+ * Returns: the result of converting @c to lower case.
* If @c is not an upperlower or titlecase character,
* or has no lowercase equivalent @c is returned unchanged.
**/
@@ -656,7 +579,7 @@ g_unichar_tolower (gunichar c)
*
* Converts a character to the titlecase.
*
- * Return value: the result of converting @c to titlecase.
+ * Returns: the result of converting @c to titlecase.
* If @c is not an uppercase or lowercase character,
* @c is returned unchanged.
**/
@@ -684,7 +607,7 @@ g_unichar_totitle (gunichar c)
* Determines the numeric value of a character as a decimal
* digit.
*
- * Return value: If @c is a decimal digit (according to
+ * Returns: If @c is a decimal digit (according to
* g_unichar_isdigit()), its numeric value. Otherwise, -1.
**/
int
@@ -702,7 +625,7 @@ g_unichar_digit_value (gunichar c)
* Determines the numeric value of a character as a hexidecimal
* digit.
*
- * Return value: If @c is a hex digit (according to
+ * Returns: If @c is a hex digit (according to
* g_unichar_isxdigit()), its numeric value. Otherwise, -1.
**/
int
@@ -723,7 +646,7 @@ g_unichar_xdigit_value (gunichar c)
*
* Classifies a Unicode character by type.
*
- * Return value: the type of the character.
+ * Returns: the type of the character.
**/
GUnicodeType
g_unichar_type (gunichar c)
@@ -753,6 +676,9 @@ get_locale_type (void)
g_free (tem);
#else
const char *locale = setlocale (LC_CTYPE, NULL);
+
+ if (locale == NULL)
+ return LOCALE_NORMAL;
#endif
switch (locale[0])
@@ -855,9 +781,9 @@ real_toupper (const gchar *str,
* which could simplify this considerably.
*/
gsize decomp_len, i;
- gunichar decomp[18];
+ gunichar decomp[G_UNICHAR_MAX_DECOMPOSITION_LENGTH];
- decomp_len = g_unichar_fully_decompose (c, FALSE, decomp, 4);
+ decomp_len = g_unichar_fully_decompose (c, FALSE, decomp, G_N_ELEMENTS (decomp));
for (i=0; i < decomp_len; i++)
{
if (decomp[i] != 0x307 /* COMBINING DOT ABOVE */)
@@ -948,7 +874,7 @@ real_toupper (const gchar *str,
* characters in the string increasing. (For instance, the
* German ess-zet will be changed to SS.)
*
- * Return value: a newly allocated string, with all characters
+ * Returns: a newly allocated string, with all characters
* converted to uppercase.
**/
gchar *
@@ -1136,7 +1062,7 @@ real_tolower (const gchar *str,
* on the current locale, and may result in the number of
* characters in the string changing.
*
- * Return value: a newly allocated string, with all characters
+ * Returns: a newly allocated string, with all characters
* converted to lowercase.
**/
gchar *
@@ -1179,7 +1105,7 @@ g_utf8_strdown (const gchar *str,
* takes case sensitivity into account. GLib does not currently
* provide such a function.
*
- * Return value: a newly allocated string, that is a
+ * Returns: a newly allocated string, that is a
* case independent form of @str.
**/
gchar *
@@ -1234,17 +1160,17 @@ g_utf8_casefold (const gchar *str,
* @ch: a Unicode character
* @mirrored_ch: location to store the mirrored character
*
- * In Unicode, some characters are mirrored. This
- * means that their images are mirrored horizontally in text that is laid
- * out from right to left. For instance, "(" would become its mirror image,
- * ")", in right-to-left text.
+ * In Unicode, some characters are "mirrored". This means that their
+ * images are mirrored horizontally in text that is laid out from right
+ * to left. For instance, "(" would become its mirror image, ")", in
+ * right-to-left text.
*
* If @ch has the Unicode mirrored property and there is another unicode
* character that typically has a glyph that is the mirror image of @ch's
* glyph and @mirrored_ch is set, it puts that character in the address
* pointed to by @mirrored_ch. Otherwise the original character is put.
*
- * Return value: %TRUE if @ch has a mirrored character, %FALSE otherwise
+ * Returns: %TRUE if @ch has a mirrored character, %FALSE otherwise
*
* Since: 2.4
**/
@@ -1304,7 +1230,7 @@ g_unichar_get_script_bsearch (gunichar ch)
* This function is equivalent to pango_script_for_unichar() and the
* two are interchangeable.
*
- * Return value: the #GUnicodeScript for the character.
+ * Returns: the #GUnicodeScript for the character.
*
* Since: 2.14
*/
@@ -1432,6 +1358,40 @@ static const guint32 iso15924_tags[] =
PACK ('B','r','a','h'), /* G_UNICODE_SCRIPT_BRAHMI */
PACK ('M','a','n','d'), /* G_UNICODE_SCRIPT_MANDAIC */
+ /* Unicode-6.1 additions */
+ PACK ('C','a','k','m'), /* G_UNICODE_SCRIPT_CHAKMA */
+ PACK ('M','e','r','c'), /* G_UNICODE_SCRIPT_MEROITIC_CURSIVE */
+ PACK ('M','e','r','o'), /* G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS */
+ PACK ('P','l','r','d'), /* G_UNICODE_SCRIPT_MIAO */
+ PACK ('S','h','r','d'), /* G_UNICODE_SCRIPT_SHARADA */
+ PACK ('S','o','r','a'), /* G_UNICODE_SCRIPT_SORA_SOMPENG */
+ PACK ('T','a','k','r'), /* G_UNICODE_SCRIPT_TAKRI */
+
+ /* Unicode 7.0 additions */
+ PACK ('B','a','s','s'), /* G_UNICODE_SCRIPT_BASSA_VAH */
+ PACK ('A','g','h','b'), /* G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN */
+ PACK ('D','u','p','l'), /* G_UNICODE_SCRIPT_DUPLOYAN */
+ PACK ('E','l','b','a'), /* G_UNICODE_SCRIPT_ELBASAN */
+ PACK ('G','r','a','n'), /* G_UNICODE_SCRIPT_GRANTHA */
+ PACK ('K','h','o','j'), /* G_UNICODE_SCRIPT_KHOJKI*/
+ PACK ('S','i','n','d'), /* G_UNICODE_SCRIPT_KHUDAWADI */
+ PACK ('L','i','n','a'), /* G_UNICODE_SCRIPT_LINEAR_A */
+ PACK ('M','a','h','j'), /* G_UNICODE_SCRIPT_MAHAJANI */
+ PACK ('M','a','n','u'), /* G_UNICODE_SCRIPT_MANICHAEAN */
+ PACK ('M','e','n','d'), /* G_UNICODE_SCRIPT_MENDE_KIKAKUI */
+ PACK ('M','o','d','i'), /* G_UNICODE_SCRIPT_MODI */
+ PACK ('M','r','o','o'), /* G_UNICODE_SCRIPT_MRO */
+ PACK ('N','b','a','t'), /* G_UNICODE_SCRIPT_NABATAEAN */
+ PACK ('N','a','r','b'), /* G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN */
+ PACK ('P','e','r','m'), /* G_UNICODE_SCRIPT_OLD_PERMIC */
+ PACK ('H','m','n','g'), /* G_UNICODE_SCRIPT_PAHAWH_HMONG */
+ PACK ('P','a','l','m'), /* G_UNICODE_SCRIPT_PALMYRENE */
+ PACK ('P','a','u','c'), /* G_UNICODE_SCRIPT_PAU_CIN_HAU */
+ PACK ('P','h','l','p'), /* G_UNICODE_SCRIPT_PSALTER_PAHLAVI */
+ PACK ('S','i','d','d'), /* G_UNICODE_SCRIPT_SIDDHAM */
+ PACK ('T','i','r','h'), /* G_UNICODE_SCRIPT_TIRHUTA */
+ PACK ('W','a','r','a'), /* G_UNICODE_SCRIPT_WARANG_CITI */
+
#undef PACK
};
@@ -1445,10 +1405,11 @@ static const guint32 iso15924_tags[] =
* 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).
*
- * See Codes for the
- * representation of names of scripts for details.
+ * See
+ * [Codes for the representation of names of scripts](http://unicode.org/iso15924/codelists.html)
+ * for details.
*
- * Return value: the ISO 15924 code for @script, encoded as an integer,
+ * Returns: the ISO 15924 code for @script, encoded as an integer,
* of zero if @script is %G_UNICODE_SCRIPT_INVALID_CODE or
* ISO 15924 code 'Zzzz' (script code for UNKNOWN) if @script is not understood.
*
@@ -1476,10 +1437,11 @@ g_unicode_script_to_iso15924 (GUnicodeScript script)
* 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).
*
- * See Codes for the
- * representation of names of scripts for details.
+ * See
+ * [Codes for the representation of names of scripts](http://unicode.org/iso15924/codelists.html)
+ * for details.
*
- * Return value: the Unicode script for @iso15924, or
+ * Returns: the Unicode script for @iso15924, or
* of %G_UNICODE_SCRIPT_INVALID_CODE if @iso15924 is zero and
* %G_UNICODE_SCRIPT_UNKNOWN if @iso15924 is unknown.
*