make charset ordering of chinese character sets differently for chinese

	* modules/basic/tables-big.i: make charset ordering of
	chinese character sets differently for chinese locales -
	e.g., GB18030 is used first in zh-cn locales.
	(#89937 James Su, Brian Yuan.)

7 files changed, 46 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c291713d..c5f2ec7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index c291713d..c5f2ec7c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index c291713d..c5f2ec7c 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index c291713d..c5f2ec7c 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index c291713d..c5f2ec7c 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index c291713d..c5f2ec7c 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Fri Sep 27 13:10:25 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* modules/basic/tables-big.i: make charset ordering of
+	chinese character sets differently for chinese locales -
+	e.g., GB18030 is used first in zh-cn locales.
+	(#89937 James Su, Brian Yuan.)
+
 2002-09-25  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/Makefile.am: INCLUDED_WIN32_MODULES was missing from a
diff --git a/modules/basic/tables-big.i b/modules/basic/tables-big.i
index f8cee9d0..7cca755a 100644
--- a/modules/basic/tables-big.i
+++ b/modules/basic/tables-big.i
@@ -65,12 +65,12 @@ static Charset charsets[] = {
 };
 
 static CharsetOrdering charset_orderings[] = {
-	{ "ja", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 16, 17, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} },
-	{ "ko", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} },
-	{ "zh-cn", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 22, 23, 28, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} },
-	{ "zh", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 22, 23, 28, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} },
+	{ "ja", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 16, 17, 20, 21, 24, 25, 26, 27, 28, 22, 23, 29} },
+	{ "ko", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 15, 16, 18, 19, 20, 21, 24, 25, 26, 27, 28, 22, 23, 29} },
+	{ "zh-cn", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 28, 22, 23, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} },
 	{ "zh-tw", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 21, 25, 26, 27, 24, 22, 23, 16, 17, 15, 18, 19, 28, 29} },
 	{ "zh-hk", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 24, 20, 21, 25, 26, 27, 22, 23, 16, 17, 15, 18, 19, 28, 29} },
+	{ "zh", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 28, 22, 23, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} },
 	{ NULL, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 29, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28} }
 };
 static const guint32 char_mask_map[] = {