Remove unused data for XTIS.

2004-10-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>

	* modules/thai/thai-shaper.c (groups, group1_map, group2_map):
	Remove unused data for XTIS.

	* modules/thai/thai-shaper.[ch] (enum ThaiFontSet, get_glyphs_list),
	modules/thai/thai-fc.c (thai_get_font_info, thai_make_glyph):
	Remove THAI_FONT_ISO10646 font set, as it's already covered by
	THAI_FONT_TIS.

6 files changed, 32 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 4675e04c..e38f2f61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* modules/thai/thai-shaper.c (groups, group1_map, group2_map):
+	Remove unused data for XTIS.
+
+	* modules/thai/thai-shaper.[ch] (enum ThaiFontSet, get_glyphs_list),
+	modules/thai/thai-fc.c (thai_get_font_info, thai_make_glyph):
+	Remove THAI_FONT_ISO10646 font set, as it's already covered by
+	THAI_FONT_TIS.
+
 Sat Oct  2 10:08:13 2004  Manish Singh  <yosh@gimp.org>
 
 	* modules/thai/thai-ot.c (thai_ot_get_ruleset): Use
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4675e04c..e38f2f61 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2004-10-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* modules/thai/thai-shaper.c (groups, group1_map, group2_map):
+	Remove unused data for XTIS.
+
+	* modules/thai/thai-shaper.[ch] (enum ThaiFontSet, get_glyphs_list),
+	modules/thai/thai-fc.c (thai_get_font_info, thai_make_glyph):
+	Remove THAI_FONT_ISO10646 font set, as it's already covered by
+	THAI_FONT_TIS.
+
 Sat Oct  2 10:08:13 2004  Manish Singh  <yosh@gimp.org>
 
 	* modules/thai/thai-ot.c (thai_ot_get_ruleset): Use
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4675e04c..e38f2f61 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2004-10-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* modules/thai/thai-shaper.c (groups, group1_map, group2_map):
+	Remove unused data for XTIS.
+
+	* modules/thai/thai-shaper.[ch] (enum ThaiFontSet, get_glyphs_list),
+	modules/thai/thai-fc.c (thai_get_font_info, thai_make_glyph):
+	Remove THAI_FONT_ISO10646 font set, as it's already covered by
+	THAI_FONT_TIS.
+
 Sat Oct  2 10:08:13 2004  Manish Singh  <yosh@gimp.org>
 
 	* modules/thai/thai-ot.c (thai_ot_get_ruleset): Use
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index f2760aa2..fd0808d4 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -160,10 +160,8 @@ thai_get_font_info (PangoFont *font)
         font_info->font_set = THAI_FONT_TIS_WIN;
       else if (contain_glyphs(font, tis620_1))
         font_info->font_set = THAI_FONT_TIS_MAC;
-      else if (contain_glyphs(font, tis620_0))
-        font_info->font_set = THAI_FONT_TIS;
       else
-        font_info->font_set = THAI_FONT_ISO10646;
+        font_info->font_set = THAI_FONT_TIS;
   
       g_object_set_qdata_full (G_OBJECT (font), info_id, font_info, (GDestroyNotify)g_free);
     }
@@ -179,7 +177,6 @@ thai_make_glyph (ThaiFontInfo *font_info, unsigned int c)
   PangoFcFont *fc_font = (PangoFcFont *)font_info->font;
 
   switch (font_info->font_set) {
-    case THAI_FONT_ISO10646:index = c; break;
     case THAI_FONT_TIS:     index = (c & 0x80) ? tis620_0[c & 0x7f] : c; break;
     case THAI_FONT_TIS_MAC: index = (c & 0x80) ? tis620_1[c & 0x7f] : c; break;
     case THAI_FONT_TIS_WIN: index = (c & 0x80) ? tis620_2[c & 0x7f] : c; break;
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index 3a0b4d88..f7d99f5d 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -83,41 +83,6 @@
 #define char_class(wc)		TAC_char_class[(unsigned int)(wc)]
 #define is_char_type(wc, mask)	(char_type_table[ucs2tis ((wc))] & (mask))
 
-/* All combining marks for Thai fall in the range U+0E30-U+0E50,
- * so we confine our data tables to that range, and use
- * default values for characters outside those ranges.
- */
-
-/* Map from code point to group used for rendering with XTIS fonts
- * (0 == base character)
- */
-static const char groups[32] = {
-  0, 1, 0, 0, 1, 1, 1, 1,
-  1, 1, 1, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 2,
-  2, 2, 2, 2, 2, 2, 1, 0
-};
-
-/* Map from code point to index within group 1
- * (0 == no combining mark from group 1)
- */   
-static const char group1_map[32] = {
-  0, 1, 0, 0, 2, 3, 4, 5,
-  6, 7, 8, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* Map from code point to index within group 2
- * (0 == no combining mark from group 2)
- */   
-static const char group2_map[32] = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 1,
-  2, 3, 4, 5, 6, 7, 1, 0
-};
-
 static const gint char_type_table[256] = {
   /*       0,   1,   2,   3,   4,   5,   6,   7,
            8,   9,   A,   B,   C,   D,   E,   F  */
@@ -577,11 +542,6 @@ get_glyphs_list (ThaiFontInfo	*font_info,
 	 */
         return get_adjusted_glyphs_list (font_info, cluster,
 		num_chrs, glyph_lists, &Win_shape_table);
-      
-      case THAI_FONT_ISO10646:
-        for (i=0; i < num_chrs; i++)
-          glyph_lists[i] = thai_make_glyph (font_info, cluster[i]);
-        return num_chrs;
     }
 
   return 0;			/* Quiet GCC */
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index 8055ce85..675d95ae 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -13,8 +13,7 @@ typedef enum {
   THAI_FONT_NONE,
   THAI_FONT_TIS,
   THAI_FONT_TIS_MAC,
-  THAI_FONT_TIS_WIN,
-  THAI_FONT_ISO10646
+  THAI_FONT_TIS_WIN
 } ThaiFontSet;
 
 typedef enum {