Add some extra ranges as "*" to match basic-x.c. (#101083, Jungshik Shin)

Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/basic/basic-xft.c: Add some extra ranges
        as "*" to match basic-x.c. (#101083, Jungshik Shin)
        Remove some extraneous "" ranges since we have
        { 0x0000, 0xffff, "" } anyways.

8 files changed, 50 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 14fdd7bc..fffecb2f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Mon Dec 16 18:10:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-xft.c: Add some extra ranges
+	as "*" to match basic-x.c. (#101083, Jungshik Shin)
+	Remove some extraneous "" ranges since we have
+	{ 0x0000, 0xffff, "" } anyways.
+
 Thu Dec 12 13:59:43 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Require autoconf-2.53.
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index c8c419a3..cdc0db36 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -32,15 +32,15 @@
 static PangoEngineRange basic_ranges[] = {
   /* Language characters */
   { 0x0380, 0x058f, "*" },
-  { 0x0591, 0x05f4, "" }, /* Hebrew */
-  { 0x060c, 0x06f9, "" }, /* Arabic */
-  { 0x0e01, 0x0e5b, "" },  /* Thai */
   { 0x10a0, 0x10ff, "*" }, /* Georgian */
   { 0x1200, 0x16ff, "*" }, /* Ethiopic,Cherokee,Canadian,Ogham,Runic */
   { 0x1e00, 0x1fff, "*" },
   { 0x2000, 0x302d, "*" },
   { 0x3030, 0x9fff, "*" },
-  { 0xf900, 0xfa0b, "kr" },
+  { 0xa000, 0xa4c6, "*" }, /* Yi */
+  { 0xe000, 0xf7ee, "*" }, /* HKSCS-1999 */
+  { 0xf900, 0xfa2d, "*" }, /* CJK Compatibility Ideographs */
+  { 0xfe30, 0xfe6b, "*" }, /* CJK Compatibility Forms and Small Form Variants */
   { 0xff00, 0xffe3, "*" },
   { 0x0000, 0xffff, "" },
 };
diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c
index c8c419a3..cdc0db36 100644
--- a/modules/basic/basic-xft.c
+++ b/modules/basic/basic-xft.c
@@ -32,15 +32,15 @@
 static PangoEngineRange basic_ranges[] = {
   /* Language characters */
   { 0x0380, 0x058f, "*" },
-  { 0x0591, 0x05f4, "" }, /* Hebrew */
-  { 0x060c, 0x06f9, "" }, /* Arabic */
-  { 0x0e01, 0x0e5b, "" },  /* Thai */
   { 0x10a0, 0x10ff, "*" }, /* Georgian */
   { 0x1200, 0x16ff, "*" }, /* Ethiopic,Cherokee,Canadian,Ogham,Runic */
   { 0x1e00, 0x1fff, "*" },
   { 0x2000, 0x302d, "*" },
   { 0x3030, 0x9fff, "*" },
-  { 0xf900, 0xfa0b, "kr" },
+  { 0xa000, 0xa4c6, "*" }, /* Yi */
+  { 0xe000, 0xf7ee, "*" }, /* HKSCS-1999 */
+  { 0xf900, 0xfa2d, "*" }, /* CJK Compatibility Ideographs */
+  { 0xfe30, 0xfe6b, "*" }, /* CJK Compatibility Forms and Small Form Variants */
   { 0xff00, 0xffe3, "*" },
   { 0x0000, 0xffff, "" },
 };