modules/indic/indic-xft.c (maybe_add_GPOS_feature):

Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/indic/indic-xft.c (maybe_add_SUB_feature):
          modules/indic/indic-xft.c (maybe_add_GPOS_feature):
          modules/indic/indic-ot.c (getOutputIndex)
          modules/hebrew/hebrew-x.c (get_glyph_num)
          modules/basic/basic-x.c (find_char): Fix missing
         statics.

        * modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
        Namespace the "abstract functions" that thai-xft/thai-x.c
        export to thai-shaper.c.

        * modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}:
        Rename Assign_Arabic_Properties to Arabic_Assign_Properties.

21 files changed, 192 insertions, 95 deletions

diff --git a/ChangeLog b/ChangeLog
index 659de038..1e5f8aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 659de038..1e5f8aa3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 659de038..1e5f8aa3 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 659de038..1e5f8aa3 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 659de038..1e5f8aa3 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 659de038..1e5f8aa3 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,19 @@
+Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/indic/indic-xft.c (maybe_add_SUB_feature): 
+	  modules/indic/indic-xft.c (maybe_add_GPOS_feature): 
+	  modules/indic/indic-ot.c (getOutputIndex)
+	  modules/hebrew/hebrew-x.c (get_glyph_num)
+	  modules/basic/basic-x.c (find_char): Fix missing
+	 statics.
+
+	* modules/thai/{thai-shaper.[ch] thai-xft.c thai-x.c}:
+	Namespace the "abstract functions" that thai-xft/thai-x.c
+	export to thai-shaper.c.
+
+	* modules/arabic/arabic-{ot.[ch],ft2.c,xft.c}: 
+	Rename Assign_Arabic_Properties to Arabic_Assign_Properties.
+
 Tue Aug 20 15:06:50 2002  Owen Taylor  <otaylor@redhat.com>
  
  	* modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index b7958f2d..f4a63c0a 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -159,7 +159,7 @@ arabic_engine_shape (PangoFont        *font,
       wcs = g_utf8_to_ucs4_fast (text, length, NULL);
       properties = g_new0 (gulong, n_chars);
       
-      Assign_Arabic_Properties (wcs, properties, n_chars);
+      Arabic_Assign_Properties (wcs, properties, n_chars);
     }
   
   p = text;
diff --git a/modules/arabic/arabic-ft2.c b/modules/arabic/arabic-ft2.c
index 4ac27115..cb817e33 100644
--- a/modules/arabic/arabic-ft2.c
+++ b/modules/arabic/arabic-ft2.c
@@ -214,7 +214,7 @@ arabic_engine_shape (PangoFont        *font,
       wcs = g_utf8_to_ucs4_fast (text, length, NULL);
       properties = g_new0 (gulong, n_chars);
       
-      Assign_Arabic_Properties (wcs, properties, n_chars);
+      Arabic_Assign_Properties (wcs, properties, n_chars);
     }
   
   p = text;
diff --git a/modules/arabic/arabic-ot.c b/modules/arabic/arabic-ot.c
index ab2fffc4..d50bf749 100644
--- a/modules/arabic/arabic-ot.c
+++ b/modules/arabic/arabic-ot.c
@@ -283,7 +283,7 @@ static joining_class  Get_Joining_Class (gunichar*   string,
 }
 
 
-FT_Error  Assign_Arabic_Properties (gunichar    *string,
+FT_Error  Arabic_Assign_Properties (gunichar    *string,
 				    gulong      *properties,
 				    int          length)
 {
diff --git a/modules/arabic/arabic-ot.h b/modules/arabic/arabic-ot.h
index 63b79199..0be0ccf7 100644
--- a/modules/arabic/arabic-ot.h
+++ b/modules/arabic/arabic-ot.h
@@ -59,7 +59,7 @@ enum  joining_class_
 typedef enum joining_class_  joining_class;
 
 
-FT_Error  Assign_Arabic_Properties (gunichar   *string,
+FT_Error  Arabic_Assign_Properties (gunichar   *string,
 				    gulong     *properties,
 				    int         length);
 #if 0
diff --git a/modules/arabic/arabic-xft.c b/modules/arabic/arabic-xft.c
index b7958f2d..f4a63c0a 100644
--- a/modules/arabic/arabic-xft.c
+++ b/modules/arabic/arabic-xft.c
@@ -159,7 +159,7 @@ arabic_engine_shape (PangoFont        *font,
       wcs = g_utf8_to_ucs4_fast (text, length, NULL);
       properties = g_new0 (gulong, n_chars);
       
-      Assign_Arabic_Properties (wcs, properties, n_chars);
+      Arabic_Assign_Properties (wcs, properties, n_chars);
     }
   
   p = text;
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index c0a45b2f..47f4e0a2 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -199,7 +199,7 @@ char_cache_free (CharCache *cache)
   g_free (cache);
 }
 
-PangoGlyph 
+static PangoGlyph 
 find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input)
 {
   int mask_index;
diff --git a/modules/hebrew/hebrew-x.c b/modules/hebrew/hebrew-x.c
index 3a3eb338..dba246e0 100644
--- a/modules/hebrew/hebrew-x.c
+++ b/modules/hebrew/hebrew-x.c
@@ -258,9 +258,10 @@ add_cluster(HebrewFontInfo   *font_info,
     }
 }
 
-gint get_glyph_num(HebrewFontInfo *font_info,
-		   PangoFont *font,
-		   gunichar  uch)
+static gint
+get_glyph_num(HebrewFontInfo *font_info,
+	      PangoFont *font,
+	      gunichar  uch)
 {
   if (font_info->type == HEBREW_FONT_ISO8859_8)
     {
diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index b20dfd62..369c9444 100644
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -118,7 +118,7 @@ static PangoIndicInfo indic_info[] = {
   PANGO_INDIC_INFO(telu), PANGO_INDIC_INFO(knda), PANGO_INDIC_INFO(mlym)
 };
 
-void
+static void
 maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
 			PangoOTInfo    *info,
 			guint           script_index,
@@ -140,11 +140,11 @@ maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
     }
 }
 
-void maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
-			     PangoOTInfo    *info,
-			     guint           script_index,
-			     PangoOTTag      feature_tag,
-			     gulong          property_bit)
+static void maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
+				    PangoOTInfo    *info,
+				    guint           script_index,
+				    PangoOTTag      feature_tag,
+				    gulong          property_bit)
 {
   guint feature_index;
 
diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c
index faa47e4a..651cfc60 100644
--- a/modules/indic/indic-ot.c
+++ b/modules/indic/indic-ot.c
@@ -136,7 +136,7 @@ static void writeLengthMark(Output *output)
     }
 }
 
-glong getOutputIndex(Output *output)
+static glong getOutputIndex(Output *output)
 {
     return output->fOutIndex;
 }
diff --git a/modules/indic/indic-xft.c b/modules/indic/indic-xft.c
index b20dfd62..369c9444 100644
--- a/modules/indic/indic-xft.c
+++ b/modules/indic/indic-xft.c
@@ -118,7 +118,7 @@ static PangoIndicInfo indic_info[] = {
   PANGO_INDIC_INFO(telu), PANGO_INDIC_INFO(knda), PANGO_INDIC_INFO(mlym)
 };
 
-void
+static void
 maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
 			PangoOTInfo    *info,
 			guint           script_index,
@@ -140,11 +140,11 @@ maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
     }
 }
 
-void maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
-			     PangoOTInfo    *info,
-			     guint           script_index,
-			     PangoOTTag      feature_tag,
-			     gulong          property_bit)
+static void maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
+				    PangoOTInfo    *info,
+				    guint           script_index,
+				    PangoOTTag      feature_tag,
+				    gulong          property_bit)
 {
   guint feature_index;
 
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 74ad0725..a6ec0c15 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -130,7 +130,7 @@ contain_glyphs(PangoFont *font, const int glyph_map[128])
  * #PangoFont. This is computed once per font and cached for later retrieval.
  */
 ThaiFontInfo *
-get_font_info (PangoFont *font)
+thai_get_font_info (PangoFont *font)
 {
   ThaiFontInfo *font_info;
   GQuark info_id = g_quark_from_string ("thai-font-info");
@@ -162,7 +162,7 @@ get_font_info (PangoFont *font)
 }
 
 PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   int index;
   PangoGlyph result;
@@ -183,7 +183,7 @@ make_glyph (ThaiFontInfo *font_info, unsigned int c)
 }
 
 PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   return pango_xft_font_get_unknown_glyph (font_info->font, c);
 }
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index c5f8dfa4..9822c28b 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -339,17 +339,17 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
         if (is_char_type (cluster[0], BelowVowel|BelowDiac|AboveVowel|AboveDiac|Tone))
 	  {
 	    if (font_info->font_set == THAI_FONT_TIS)
-	      glyph_lists[0] = make_glyph (font_info, 0x20);
+	      glyph_lists[0] = thai_make_glyph (font_info, 0x20);
 	    else
-	      glyph_lists[0] = make_glyph (font_info, 0x7F);
+	      glyph_lists[0] = thai_make_glyph (font_info, 0x7F);
             glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    return 2;
           }
 	else
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
             return 1;
           }
         break;
@@ -359,36 +359,36 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
             is_char_type (cluster[1], SaraAm))
 	  {
             glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-            glyph_lists[1] = make_glyph (font_info, 0xED);
-            glyph_lists[2] = make_glyph (font_info, 0xD2);
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+            glyph_lists[1] = thai_make_glyph (font_info, 0xED);
+            glyph_lists[2] = thai_make_glyph (font_info, 0xD2);
             return 3;
           }
 	else if (is_char_type (cluster[0], UpTailCons) &&
           	 is_char_type (cluster[1], SaraAm))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-            glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+            glyph_lists[1] = thai_make_glyph (font_info,
 					shiftleft_tone_ad (0xED, shaping_table));
-            glyph_lists[2] = make_glyph (font_info, 0xD2);
+            glyph_lists[2] = thai_make_glyph (font_info, 0xD2);
             return 3;
           }
 	else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
           	 is_char_type (cluster[1], AboveVowel))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    return 2;
           }
 	else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
           	 is_char_type (cluster[1], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 		    	shiftdown_tone_ad (ucs2tis (cluster[1]), shaping_table));
 	    return 2;
 	  }
@@ -396,8 +396,8 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
           	 is_char_type (cluster[1], AboveVowel))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 		    	shiftleft_av (ucs2tis (cluster[1]), shaping_table));
 	    return 2;
           }
@@ -405,8 +405,8 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
           	 is_char_type (cluster[1], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 			shiftdownleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
 	    return 2;
 	  }
@@ -414,40 +414,40 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
           	 is_char_type (cluster[1], BelowVowel|BelowDiac))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    return 2;
           }
 	else if (is_char_type (cluster[0], BotTailCons) &&
 		 is_char_type (cluster[1], BelowVowel|BelowDiac))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info,
+		thai_make_glyph (font_info,
 			shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
 	    return 2;
 	  }
 	else if (is_char_type (cluster[0], SpltTailCons) &&
           	 is_char_type (cluster[1], BelowVowel|BelowDiac))
 	  {
-	    glyph_lists[0] = make_glyph (font_info,
+	    glyph_lists[0] = thai_make_glyph (font_info,
 		    		tailcutcons (ucs2tis (cluster[0]), shaping_table));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    return 2;
 	  }
 	else
 	  {
 	    if (font_info->font_set == THAI_FONT_TIS)
-	      glyph_lists[0] = make_glyph (font_info, 0x20);
+	      glyph_lists[0] = thai_make_glyph (font_info, 0x20);
 	    else
-	      glyph_lists[0] = make_glyph (font_info, 0x7F);
+	      glyph_lists[0] = thai_make_glyph (font_info, 0x7F);
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[2] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    return 3;
 	  }
         break;
@@ -458,11 +458,11 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
             is_char_type (cluster[2], SaraAm))
 	  {
             glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-            glyph_lists[1] = make_glyph (font_info, 0xED);
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+            glyph_lists[1] = thai_make_glyph (font_info, 0xED);
             glyph_lists[2] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
-            glyph_lists[3] = make_glyph (font_info, 0xD2);
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
+            glyph_lists[3] = thai_make_glyph (font_info, 0xD2);
             return 4;
           }
 	else if (is_char_type (cluster[0], UpTailCons) &&
@@ -470,12 +470,12 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[2], SaraAm))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 				shiftleft_tone_ad (0xED, shaping_table));
-	    glyph_lists[2] = make_glyph (font_info,
+	    glyph_lists[2] = thai_make_glyph (font_info,
 		    		shiftleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[3] = make_glyph (font_info, 0xD2);
+	    glyph_lists[3] = thai_make_glyph (font_info, 0xD2);
 	    return 4;
 	  }
 	else if (is_char_type (cluster[0], UpTailCons) &&
@@ -483,10 +483,10 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[2], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 				shiftleft_av (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[2] = make_glyph (font_info,
+	    glyph_lists[2] = thai_make_glyph (font_info,
 		    		shiftleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
 	    return 3;
 	  }
@@ -495,10 +495,10 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[2], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
-	    glyph_lists[2] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
+	    glyph_lists[2] = thai_make_glyph (font_info,
 			shiftdownleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
 	    return 3;
 	  }
@@ -507,11 +507,11 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[2], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    glyph_lists[2] =
-		make_glyph (font_info,
+		thai_make_glyph (font_info,
 			shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
 	    return 3;
 	  }
@@ -519,11 +519,11 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[1], BelowVowel) &&
 		 is_char_type (cluster[2], AboveDiac|Tone))
 	  {
-	    glyph_lists[0] = make_glyph (font_info,
+	    glyph_lists[0] = thai_make_glyph (font_info,
 		    		tailcutcons (ucs2tis (cluster[0]), shaping_table));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
-	    glyph_lists[2] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
+	    glyph_lists[2] = thai_make_glyph (font_info,
 		    		shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
 	    return 3;
 	  }
@@ -532,21 +532,21 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
 		 is_char_type (cluster[2], AboveDiac|Tone))
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
-	    glyph_lists[1] = make_glyph (font_info,
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
+	    glyph_lists[1] = thai_make_glyph (font_info,
 		    		shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[2] = make_glyph (font_info,
+	    glyph_lists[2] = thai_make_glyph (font_info,
 				shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
 	    return 3;
 	  }
 	else
 	  {
 	    glyph_lists[0] =
-		make_glyph (font_info, ucs2tis (cluster[0]));
+		thai_make_glyph (font_info, ucs2tis (cluster[0]));
 	    glyph_lists[1] =
-		make_glyph (font_info, ucs2tis (cluster[1]));
+		thai_make_glyph (font_info, ucs2tis (cluster[1]));
 	    glyph_lists[2] =
-		make_glyph (font_info, ucs2tis (cluster[2]));
+		thai_make_glyph (font_info, ucs2tis (cluster[2]));
 	    return 3;
 	  }
       break;
@@ -569,7 +569,7 @@ get_glyphs_list (ThaiFontInfo	*font_info,
     {
       case THAI_FONT_NONE:
         for (i=0; i < num_chrs; i++)
-	  glyph_lists[i] = make_unknown_glyph (font_info, glyph_lists[i]);
+	  glyph_lists[i] = thai_make_unknown_glyph (font_info, glyph_lists[i]);
         return num_chrs;
 
       case THAI_FONT_XTIS:
@@ -581,14 +581,14 @@ get_glyphs_list (ThaiFontInfo	*font_info,
 	    xtis_index +=8 * group1_map[cluster[1] - 0xe30];
         if (cluster[2])
 	    xtis_index += group2_map[cluster[2] - 0xe30];
-        glyph = make_glyph (font_info, xtis_index);
+        glyph = thai_make_glyph (font_info, xtis_index);
         if (pango_x_has_glyph (font_info->font, glyph)) {
             glyph_lists[0] = glyph;
             return 1;
         }
         for (i=0; i < num_chrs; i++)
 	  glyph_lists[i] =
-	      make_glyph (font_info,
+	      thai_make_glyph (font_info,
 			0x100 * (cluster[i] - 0xe00 + 0x20) + 0x30);
         return num_chrs;
       
@@ -612,7 +612,7 @@ get_glyphs_list (ThaiFontInfo	*font_info,
       
       case THAI_FONT_ISO10646:
         for (i=0; i < num_chrs; i++)
-          glyph_lists[i] = make_glyph (font_info, cluster[i]);
+          glyph_lists[i] = thai_make_glyph (font_info, cluster[i]);
         return num_chrs;
     }
 
@@ -706,7 +706,7 @@ thai_engine_shape (PangoFont        *font,
 
   pango_glyph_string_set_size (glyphs, 0);
 
-  font_info = get_font_info (font);
+  font_info = thai_get_font_info (font);
 
   p = text;
   while (p < text + length)
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index fa2f879e..c9f487fa 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -32,16 +32,16 @@ struct _ThaiFontInfo
 };
 
 /*
- * Abstract methods
+ * Abstract methods (implemented by each shaper module)
  */
 ThaiFontInfo *
-get_font_info (PangoFont *font);
+thai_get_font_info (PangoFont *font);
 
 PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned int c);
+thai_make_glyph (ThaiFontInfo *font_info, unsigned int c);
 
 PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c);
+thai_make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c);
 
 /*
  * Public functions
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index dbd15b64..5bfd0b09 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -55,7 +55,7 @@ static PangoEngineInfo script_engines[] = {
  * #PangoFont. This is computed once per font and cached for later retrieval.
  */
 ThaiFontInfo *
-get_font_info (PangoFont *font)
+thai_get_font_info (PangoFont *font)
 {
   static const char *charsets[] = {
     "tis620-2",
@@ -126,13 +126,13 @@ get_font_info (PangoFont *font)
 }
 
 PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   return PANGO_X_MAKE_GLYPH (font_info->subfont, c);
 }
 
 PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   return pango_x_get_unknown_glyph (font_info->font);
 }
@@ -143,7 +143,7 @@ thai_engine_get_coverage (PangoFont  *font,
 {
   PangoCoverage *result = pango_coverage_new ();
   
-  ThaiFontInfo *font_info = get_font_info (font);
+  ThaiFontInfo *font_info = thai_get_font_info (font);
   
   if (font_info->font_set != THAI_FONT_NONE)
     {
diff --git a/modules/thai/thai-xft.c b/modules/thai/thai-xft.c
index 74ad0725..a6ec0c15 100644
--- a/modules/thai/thai-xft.c
+++ b/modules/thai/thai-xft.c
@@ -130,7 +130,7 @@ contain_glyphs(PangoFont *font, const int glyph_map[128])
  * #PangoFont. This is computed once per font and cached for later retrieval.
  */
 ThaiFontInfo *
-get_font_info (PangoFont *font)
+thai_get_font_info (PangoFont *font)
 {
   ThaiFontInfo *font_info;
   GQuark info_id = g_quark_from_string ("thai-font-info");
@@ -162,7 +162,7 @@ get_font_info (PangoFont *font)
 }
 
 PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   int index;
   PangoGlyph result;
@@ -183,7 +183,7 @@ make_glyph (ThaiFontInfo *font_info, unsigned int c)
 }
 
 PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
+thai_make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
 {
   return pango_xft_font_get_unknown_glyph (font_info->font, c);
 }