From fb574834c18893413fa0549f0c12699ad6354724 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 10 Feb 2012 16:59:41 +0100 Subject: [PATCH] unicode: Add new scripts from Unicode 6.1.0 --- glib/gunicode.h | 22 +++++++++++++++++++--- glib/guniprop.c | 9 +++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/glib/gunicode.h b/glib/gunicode.h index 10d35329a..f7b221304 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -361,6 +361,13 @@ typedef enum * @G_UNICODE_SCRIPT_BATAK: Batak. Since 2.28 * @G_UNICODE_SCRIPT_BRAHMI: Brahmi. Since 2.28 * @G_UNICODE_SCRIPT_MANDAIC: Mandaic. Since 2.28 + * @G_UNICODE_SCRIPT_CHAKMA: Chakma. Since: 2.32 + * @G_UNICODE_SCRIPT_MEROITIC_CURSIVE: Meroitic Cursive. Since: 2.32 + * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS, Meroitic Hieroglyphs. Since: 2.32 + * @G_UNICODE_SCRIPT_MIAO: Miao. Since: 2.32 + * @G_UNICODE_SCRIPT_SHARADA: Sharada. Since: 2.32 + * @G_UNICODE_SCRIPT_SORA_SOMPENG: Sora Sompeng. Since: 2.32 + * @G_UNICODE_SCRIPT_TAKRI Takri. Since: 2.32 * * The #GUnicodeScript enumeration identifies different writing * systems. The values correspond to the names as defined in the @@ -377,13 +384,13 @@ 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 */ @@ -483,7 +490,16 @@ typedef enum /* 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; guint32 g_unicode_script_to_iso15924 (GUnicodeScript script); diff --git a/glib/guniprop.c b/glib/guniprop.c index ec2424194..420d58ac9 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -1432,6 +1432,15 @@ 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 */ + #undef PACK }; -- 2.11.0