[glib] Don't use deprecated G_UNICODE_COMBINING_MARK

From: Behdad Esfahbod <behdad src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib] Don't use deprecated G_UNICODE_COMBINING_MARK
Date: Fri, 22 Jul 2011 14:53:14 +0000 (UTC)
commit 753948316915e834801347af08b773c24078a3bd
Author: Behdad Esfahbod <behdad behdad org>
Date:   Fri Jul 22 10:33:47 2011 -0400

    Don't use deprecated G_UNICODE_COMBINING_MARK

 glib/gen-unicode-tables.pl |    2 +-
 glib/gunichartables.h      |  388 ++++++++++++++++++++++----------------------
 glib/guniprop.c            |    2 +-
 3 files changed, 196 insertions(+), 196 deletions(-)
---
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index a8fe7bf..0e3b26b 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -79,7 +79,7 @@ $FOLDING_MAPPING = 2;
      'Ll' => "G_UNICODE_LOWERCASE_LETTER",
      'Lt' => "G_UNICODE_TITLECASE_LETTER",
      'Mn' => "G_UNICODE_NON_SPACING_MARK",
-     'Mc' => "G_UNICODE_COMBINING_MARK",
+     'Mc' => "G_UNICODE_SPACING_MARK",
      'Me' => "G_UNICODE_ENCLOSING_MARK",
      'Nd' => "G_UNICODE_DECIMAL_NUMBER",
      'Nl' => "G_UNICODE_LETTER_NUMBER",
diff --git a/glib/gunichartables.h b/glib/gunichartables.h
index a4bc776..dfa6b1a 100644
--- a/glib/gunichartables.h
+++ b/glib/gunichartables.h
@@ -1071,7 +1071,7 @@ static const char type_data[][256] = {
   },
   { /* page 9, index 9 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1090,17 +1090,17 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1122,7 +1122,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
@@ -1142,16 +1142,16 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1170,7 +1170,7 @@ static const char type_data[][256] = {
   },
   { /* page 10, index 10 */
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -1190,8 +1190,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -1216,7 +1216,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
@@ -1236,13 +1236,13 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -1265,7 +1265,7 @@ static const char type_data[][256] = {
   },
   { /* page 11, index 11 */
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
@@ -1285,16 +1285,16 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1331,16 +1331,16 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -1358,8 +1358,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 12, index 12 */
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
@@ -1380,8 +1380,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1405,7 +1405,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_NUMBER, 
     G_UNICODE_OTHER_NUMBER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1425,17 +1425,17 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1453,8 +1453,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
   },
   { /* page 13, index 13 */
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
@@ -1473,17 +1473,17 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1499,7 +1499,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1525,21 +1525,21 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -1670,8 +1670,8 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OPEN_PUNCTUATION, 
     G_UNICODE_CLOSE_PUNCTUATION, G_UNICODE_OPEN_PUNCTUATION, 
-    G_UNICODE_CLOSE_PUNCTUATION, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_CLOSE_PUNCTUATION, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1694,7 +1694,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
@@ -1766,16 +1766,16 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -1787,17 +1787,17 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -1806,19 +1806,19 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_DECIMAL_NUMBER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
-    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_DECIMAL_NUMBER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_UPPERCASE_LETTER, 
     G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -2279,16 +2279,16 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_FORMAT, 
-    G_UNICODE_FORMAT, G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_FORMAT, G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -2417,16 +2417,16 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, 
@@ -2469,18 +2469,18 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -2511,8 +2511,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2531,22 +2531,22 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -2604,7 +2604,7 @@ static const char type_data[][256] = {
   { /* page 27, index 25 */
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2620,15 +2620,15 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -2653,7 +2653,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2664,11 +2664,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -2690,13 +2690,13 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION, 
@@ -2716,15 +2716,15 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -2790,7 +2790,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -2798,7 +2798,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5305,9 +5305,9 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_NUMBER, 
@@ -5338,8 +5338,8 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
-    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -5356,14 +5356,14 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5426,7 +5426,7 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5443,7 +5443,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -5459,13 +5459,13 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -5510,9 +5510,9 @@ static const char type_data[][256] = {
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -5522,7 +5522,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -5540,7 +5540,7 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -5665,12 +5665,12 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_NON_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_PUNCTUATION, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
     G_UNICODE_DECIMAL_NUMBER, G_UNICODE_DECIMAL_NUMBER, 
@@ -7243,8 +7243,8 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED
   },
   { /* page 272, index 73 */
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7292,7 +7292,7 @@ static const char type_data[][256] = {
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -7307,11 +7307,11 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
     G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
-    G_UNICODE_OTHER_LETTER, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_OTHER_LETTER, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
     G_UNICODE_FORMAT, G_UNICODE_OTHER_PUNCTUATION, 
@@ -7916,13 +7916,13 @@ static const char type_data[][256] = {
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_NON_SPACING_MARK, 
+    G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
     G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
-    G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_FORMAT, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, 
+    G_UNICODE_SPACING_MARK, G_UNICODE_SPACING_MARK, G_UNICODE_FORMAT, 
     G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, 
     G_UNICODE_FORMAT, G_UNICODE_FORMAT, G_UNICODE_FORMAT, 
     G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 337710d..c22035c 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -88,7 +88,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),			\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]