X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fguniprop.c;h=98dff2157170ab7ad5503788e5b594ea7c390eab;hb=49a5d0f6f2aed99cd78f25655f137f4448e47d92;hp=639057434dd7fe916ff0ed9d4a6dc79f10337943;hpb=73ca8b47540d005d5227c03aac143d6780da654c;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 6390574..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"
@@ -88,7 +86,7 @@
#define ISMARK(Type) IS ((Type), \
OR (G_UNICODE_NON_SPACING_MARK, \
- OR (G_UNICODE_COMBINING_MARK, \
+ OR (G_UNICODE_SPACING_MARK, \
OR (G_UNICODE_ENCLOSING_MARK, 0))))
#define ISZEROWIDTHTYPE(Type) IS ((Type), \
@@ -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)
{
@@ -447,27 +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)
{
- /* sorted list of intervals of East_Asian_Width = W and F characters
- * from Unicode 5.1.0. produced by mungling output of:
- * grep ';[FW]\>' EastAsianWidth.txt */
- static const struct Interval wide[] = {
- {0x1100, 0x1159}, {0x115F, 0x115F}, {0x2329, 0x232A}, {0x2E80, 0x2E99},
- {0x2E9B, 0x2EF3}, {0x2F00, 0x2FD5}, {0x2FF0, 0x2FFB}, {0x3000, 0x303E},
- {0x3041, 0x3096}, {0x3099, 0x30FF}, {0x3105, 0x312D}, {0x3131, 0x318E},
- {0x3190, 0x31B7}, {0x31C0, 0x31E3}, {0x31F0, 0x321E}, {0x3220, 0x3243},
- {0x3250, 0x32FE}, {0x3300, 0x4DB5}, {0x4E00, 0x9FC3}, {0xA000, 0xA48C},
- {0xA490, 0xA4C6}, {0xAC00, 0xD7A3}, {0xF900, 0xFA2D}, {0xFA30, 0xFA6A},
- {0xFA70, 0xFAD9}, {0xFE10, 0xFE19}, {0xFE30, 0xFE52}, {0xFE54, 0xFE66},
- {0xFE68, 0xFE6B}, {0xFF01, 0xFF60}, {0xFFE0, 0xFFE6}, {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;
@@ -482,71 +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)
{
- /* sorted list of intervals of East_Asian_Width = A and F characters
- * from Unicode 5.1.0. produced by mungling output of:
- * grep ';[A]\>' EastAsianWidth.txt */
- 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},
- {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}, {0x273D, 0x273D},
- {0x2776, 0x277F}, {0xE000, 0xF8FF}, {0xFE00, 0xFE0F}, {0xFFFD, 0xFFFD},
- {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;
@@ -560,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.
**/
@@ -588,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;
@@ -600,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.
**/
@@ -641,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.
**/
@@ -669,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
@@ -687,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
@@ -708,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)
@@ -738,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])
@@ -840,15 +781,14 @@ real_toupper (const gchar *str,
* which could simplify this considerably.
*/
gsize decomp_len, i;
- gunichar *decomp;
+ gunichar decomp[G_UNICHAR_MAX_DECOMPOSITION_LENGTH];
- decomp = g_unicode_canonical_decomposition (c, &decomp_len);
+ 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 */)
len += g_unichar_to_utf8 (g_unichar_toupper (decomp[i]), out_buffer ? out_buffer + len : NULL);
}
- g_free (decomp);
len += output_marks (&p, out_buffer ? out_buffer + len : NULL, TRUE);
@@ -859,7 +799,7 @@ real_toupper (const gchar *str,
last_was_i = FALSE;
}
}
-
+
if (locale_type == LOCALE_TURKIC && c == 'i')
{
/* i => LATIN CAPITAL LETTER I WITH DOT ABOVE */
@@ -934,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 *
@@ -1122,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 *
@@ -1165,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 *
@@ -1220,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
**/
@@ -1283,14 +1223,14 @@ g_unichar_get_script_bsearch (gunichar ch)
* @ch: a Unicode character
*
* Looks up the #GUnicodeScript for a particular character (as defined
- * by Unicode Standard Annex #24). No check is made for @ch being a
+ * by Unicode Standard Annex \#24). No check is made for @ch being a
* valid Unicode character; if you pass in invalid character, the
* result is undefined.
*
* 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
*/
@@ -1302,3 +1242,222 @@ g_unichar_get_script (gunichar ch)
else
return g_unichar_get_script_bsearch (ch);
}
+
+
+/* http://unicode.org/iso15924/ */
+static const guint32 iso15924_tags[] =
+{
+#define PACK(a,b,c,d) ((guint32)((((guint8)(a))<<24)|(((guint8)(b))<<16)|(((guint8)(c))<<8)|((guint8)(d))))
+
+ PACK ('Z','y','y','y'), /* G_UNICODE_SCRIPT_COMMON */
+ PACK ('Z','i','n','h'), /* G_UNICODE_SCRIPT_INHERITED */
+ PACK ('A','r','a','b'), /* G_UNICODE_SCRIPT_ARABIC */
+ PACK ('A','r','m','n'), /* G_UNICODE_SCRIPT_ARMENIAN */
+ PACK ('B','e','n','g'), /* G_UNICODE_SCRIPT_BENGALI */
+ PACK ('B','o','p','o'), /* G_UNICODE_SCRIPT_BOPOMOFO */
+ PACK ('C','h','e','r'), /* G_UNICODE_SCRIPT_CHEROKEE */
+ PACK ('C','o','p','t'), /* G_UNICODE_SCRIPT_COPTIC */
+ PACK ('C','y','r','l'), /* G_UNICODE_SCRIPT_CYRILLIC */
+ PACK ('D','s','r','t'), /* G_UNICODE_SCRIPT_DESERET */
+ PACK ('D','e','v','a'), /* G_UNICODE_SCRIPT_DEVANAGARI */
+ PACK ('E','t','h','i'), /* G_UNICODE_SCRIPT_ETHIOPIC */
+ PACK ('G','e','o','r'), /* G_UNICODE_SCRIPT_GEORGIAN */
+ PACK ('G','o','t','h'), /* G_UNICODE_SCRIPT_GOTHIC */
+ PACK ('G','r','e','k'), /* G_UNICODE_SCRIPT_GREEK */
+ PACK ('G','u','j','r'), /* G_UNICODE_SCRIPT_GUJARATI */
+ PACK ('G','u','r','u'), /* G_UNICODE_SCRIPT_GURMUKHI */
+ PACK ('H','a','n','i'), /* G_UNICODE_SCRIPT_HAN */
+ PACK ('H','a','n','g'), /* G_UNICODE_SCRIPT_HANGUL */
+ PACK ('H','e','b','r'), /* G_UNICODE_SCRIPT_HEBREW */
+ PACK ('H','i','r','a'), /* G_UNICODE_SCRIPT_HIRAGANA */
+ PACK ('K','n','d','a'), /* G_UNICODE_SCRIPT_KANNADA */
+ PACK ('K','a','n','a'), /* G_UNICODE_SCRIPT_KATAKANA */
+ PACK ('K','h','m','r'), /* G_UNICODE_SCRIPT_KHMER */
+ PACK ('L','a','o','o'), /* G_UNICODE_SCRIPT_LAO */
+ PACK ('L','a','t','n'), /* G_UNICODE_SCRIPT_LATIN */
+ PACK ('M','l','y','m'), /* G_UNICODE_SCRIPT_MALAYALAM */
+ PACK ('M','o','n','g'), /* G_UNICODE_SCRIPT_MONGOLIAN */
+ PACK ('M','y','m','r'), /* G_UNICODE_SCRIPT_MYANMAR */
+ PACK ('O','g','a','m'), /* G_UNICODE_SCRIPT_OGHAM */
+ PACK ('I','t','a','l'), /* G_UNICODE_SCRIPT_OLD_ITALIC */
+ PACK ('O','r','y','a'), /* G_UNICODE_SCRIPT_ORIYA */
+ PACK ('R','u','n','r'), /* G_UNICODE_SCRIPT_RUNIC */
+ PACK ('S','i','n','h'), /* G_UNICODE_SCRIPT_SINHALA */
+ PACK ('S','y','r','c'), /* G_UNICODE_SCRIPT_SYRIAC */
+ PACK ('T','a','m','l'), /* G_UNICODE_SCRIPT_TAMIL */
+ PACK ('T','e','l','u'), /* G_UNICODE_SCRIPT_TELUGU */
+ PACK ('T','h','a','a'), /* G_UNICODE_SCRIPT_THAANA */
+ PACK ('T','h','a','i'), /* G_UNICODE_SCRIPT_THAI */
+ PACK ('T','i','b','t'), /* G_UNICODE_SCRIPT_TIBETAN */
+ PACK ('C','a','n','s'), /* G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL */
+ PACK ('Y','i','i','i'), /* G_UNICODE_SCRIPT_YI */
+ PACK ('T','g','l','g'), /* G_UNICODE_SCRIPT_TAGALOG */
+ PACK ('H','a','n','o'), /* G_UNICODE_SCRIPT_HANUNOO */
+ PACK ('B','u','h','d'), /* G_UNICODE_SCRIPT_BUHID */
+ PACK ('T','a','g','b'), /* G_UNICODE_SCRIPT_TAGBANWA */
+
+ /* Unicode-4.0 additions */
+ PACK ('B','r','a','i'), /* G_UNICODE_SCRIPT_BRAILLE */
+ PACK ('C','p','r','t'), /* G_UNICODE_SCRIPT_CYPRIOT */
+ PACK ('L','i','m','b'), /* G_UNICODE_SCRIPT_LIMBU */
+ PACK ('O','s','m','a'), /* G_UNICODE_SCRIPT_OSMANYA */
+ PACK ('S','h','a','w'), /* G_UNICODE_SCRIPT_SHAVIAN */
+ PACK ('L','i','n','b'), /* G_UNICODE_SCRIPT_LINEAR_B */
+ PACK ('T','a','l','e'), /* G_UNICODE_SCRIPT_TAI_LE */
+ PACK ('U','g','a','r'), /* G_UNICODE_SCRIPT_UGARITIC */
+
+ /* Unicode-4.1 additions */
+ PACK ('T','a','l','u'), /* G_UNICODE_SCRIPT_NEW_TAI_LUE */
+ PACK ('B','u','g','i'), /* G_UNICODE_SCRIPT_BUGINESE */
+ PACK ('G','l','a','g'), /* G_UNICODE_SCRIPT_GLAGOLITIC */
+ PACK ('T','f','n','g'), /* G_UNICODE_SCRIPT_TIFINAGH */
+ PACK ('S','y','l','o'), /* G_UNICODE_SCRIPT_SYLOTI_NAGRI */
+ PACK ('X','p','e','o'), /* G_UNICODE_SCRIPT_OLD_PERSIAN */
+ PACK ('K','h','a','r'), /* G_UNICODE_SCRIPT_KHAROSHTHI */
+
+ /* Unicode-5.0 additions */
+ PACK ('Z','z','z','z'), /* G_UNICODE_SCRIPT_UNKNOWN */
+ PACK ('B','a','l','i'), /* G_UNICODE_SCRIPT_BALINESE */
+ PACK ('X','s','u','x'), /* G_UNICODE_SCRIPT_CUNEIFORM */
+ PACK ('P','h','n','x'), /* G_UNICODE_SCRIPT_PHOENICIAN */
+ PACK ('P','h','a','g'), /* G_UNICODE_SCRIPT_PHAGS_PA */
+ PACK ('N','k','o','o'), /* G_UNICODE_SCRIPT_NKO */
+
+ /* Unicode-5.1 additions */
+ PACK ('K','a','l','i'), /* G_UNICODE_SCRIPT_KAYAH_LI */
+ PACK ('L','e','p','c'), /* G_UNICODE_SCRIPT_LEPCHA */
+ PACK ('R','j','n','g'), /* G_UNICODE_SCRIPT_REJANG */
+ PACK ('S','u','n','d'), /* G_UNICODE_SCRIPT_SUNDANESE */
+ PACK ('S','a','u','r'), /* G_UNICODE_SCRIPT_SAURASHTRA */
+ PACK ('C','h','a','m'), /* G_UNICODE_SCRIPT_CHAM */
+ PACK ('O','l','c','k'), /* G_UNICODE_SCRIPT_OL_CHIKI */
+ PACK ('V','a','i','i'), /* G_UNICODE_SCRIPT_VAI */
+ PACK ('C','a','r','i'), /* G_UNICODE_SCRIPT_CARIAN */
+ PACK ('L','y','c','i'), /* G_UNICODE_SCRIPT_LYCIAN */
+ PACK ('L','y','d','i'), /* G_UNICODE_SCRIPT_LYDIAN */
+
+ /* Unicode-5.2 additions */
+ PACK ('A','v','s','t'), /* G_UNICODE_SCRIPT_AVESTAN */
+ PACK ('B','a','m','u'), /* G_UNICODE_SCRIPT_BAMUM */
+ PACK ('E','g','y','p'), /* G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS */
+ PACK ('A','r','m','i'), /* G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC */
+ PACK ('P','h','l','i'), /* G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI */
+ PACK ('P','r','t','i'), /* G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN */
+ PACK ('J','a','v','a'), /* G_UNICODE_SCRIPT_JAVANESE */
+ PACK ('K','t','h','i'), /* G_UNICODE_SCRIPT_KAITHI */
+ PACK ('L','i','s','u'), /* G_UNICODE_SCRIPT_LISU */
+ PACK ('M','t','e','i'), /* G_UNICODE_SCRIPT_MEETEI_MAYEK */
+ PACK ('S','a','r','b'), /* G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN */
+ PACK ('O','r','k','h'), /* G_UNICODE_SCRIPT_OLD_TURKIC */
+ PACK ('S','a','m','r'), /* G_UNICODE_SCRIPT_SAMARITAN */
+ PACK ('L','a','n','a'), /* G_UNICODE_SCRIPT_TAI_THAM */
+ PACK ('T','a','v','t'), /* G_UNICODE_SCRIPT_TAI_VIET */
+
+ /* Unicode-6.0 additions */
+ PACK ('B','a','t','k'), /* G_UNICODE_SCRIPT_BATAK */
+ 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
+};
+
+/**
+ * g_unicode_script_to_iso15924:
+ * @script: a Unicode script
+ *
+ * Looks up the ISO 15924 code for @script. ISO 15924 assigns four-letter
+ * codes to scripts. For example, the code for Arabic is 'Arab'. The
+ * four letter codes are encoded as a @guint32 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).
+ *
+ * See
+ * [Codes for the representation of names of scripts](http://unicode.org/iso15924/codelists.html)
+ * for details.
+ *
+ * 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.
+ *
+ * Since: 2.30
+ */
+guint32
+g_unicode_script_to_iso15924 (GUnicodeScript script)
+{
+ if (G_UNLIKELY (script == G_UNICODE_SCRIPT_INVALID_CODE))
+ return 0;
+
+ if (G_UNLIKELY (script < 0 || script >= (int) G_N_ELEMENTS (iso15924_tags)))
+ return 0x5A7A7A7A;
+
+ return iso15924_tags[script];
+}
+
+/**
+ * g_unicode_script_from_iso15924:
+ * @iso15924: a Unicode script
+ *
+ * Looks up the Unicode script for @iso15924. 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 @guint32 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).
+ *
+ * See
+ * [Codes for the representation of names of scripts](http://unicode.org/iso15924/codelists.html)
+ * for details.
+ *
+ * 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.
+ *
+ * Since: 2.30
+ */
+GUnicodeScript
+g_unicode_script_from_iso15924 (guint32 iso15924)
+{
+ unsigned int i;
+
+ if (!iso15924)
+ return G_UNICODE_SCRIPT_INVALID_CODE;
+
+ for (i = 0; i < G_N_ELEMENTS (iso15924_tags); i++)
+ if (iso15924_tags[i] == iso15924)
+ return (GUnicodeScript) i;
+
+ return G_UNICODE_SCRIPT_UNKNOWN;
+}