Use PANGO_OT_DEFAULT_LANGUAGE and PANGO_OT_ALL_GLYPHS instead of hardcoded

2007-05-10  Behdad Esfahbod  <behdad@gnome.org>

        * modules/arabic/arabic-fc.c (maybe_add_gsub_feature),
        (maybe_add_gpos_feature), (get_ruleset):
        * modules/basic/basic-fc.c (get_ruleset):
        * modules/hebrew/hebrew-fc.c (maybe_add_gsub_feature),
        (maybe_add_gpos_feature), (get_ruleset):
        * modules/indic/indic-fc.c (maybe_add_GSUB_feature),
        (maybe_add_GPOS_feature):
        * modules/khmer/khmer-fc.c (maybe_add_GSUB_feature),
        (maybe_add_GPOS_feature):
        * modules/syriac/syriac-fc.c (maybe_add_gsub_feature),
        (maybe_add_gpos_feature), (get_ruleset):
        * modules/thai/thai-ot.c (maybe_add_gsub_feature),
        (maybe_add_gpos_feature), (thai_ot_get_ruleset),
        (lao_ot_get_ruleset):
        * modules/tibetan/tibetan-fc.c (maybe_add_GSUB_feature),
        (maybe_add_GPOS_feature):
        Use PANGO_OT_DEFAULT_LANGUAGE and PANGO_OT_ALL_GLYPHS instead
        of hardcoded 0xFFFF.


svn path=/trunk/; revision=2282

9 files changed, 72 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f34f7ae..d76be462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2007-05-10  Behdad Esfahbod  <behdad@gnome.org>
 
+	* modules/arabic/arabic-fc.c (maybe_add_gsub_feature),
+	(maybe_add_gpos_feature), (get_ruleset):
+	* modules/basic/basic-fc.c (get_ruleset):
+	* modules/hebrew/hebrew-fc.c (maybe_add_gsub_feature),
+	(maybe_add_gpos_feature), (get_ruleset):
+	* modules/indic/indic-fc.c (maybe_add_GSUB_feature),
+	(maybe_add_GPOS_feature):
+	* modules/khmer/khmer-fc.c (maybe_add_GSUB_feature),
+	(maybe_add_GPOS_feature):
+	* modules/syriac/syriac-fc.c (maybe_add_gsub_feature),
+	(maybe_add_gpos_feature), (get_ruleset):
+	* modules/thai/thai-ot.c (maybe_add_gsub_feature),
+	(maybe_add_gpos_feature), (thai_ot_get_ruleset),
+	(lao_ot_get_ruleset):
+	* modules/tibetan/tibetan-fc.c (maybe_add_GSUB_feature),
+	(maybe_add_GPOS_feature):
+	Use PANGO_OT_DEFAULT_LANGUAGE and PANGO_OT_ALL_GLYPHS instead
+	of hardcoded 0xFFFF.
+
+2007-05-10  Behdad Esfahbod  <behdad@gnome.org>
+
 	* ChangeLog.pre-1-16: Split ChangeLog.
 
 2007-05-10  Behdad Esfahbod  <behdad@gnome.org>
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index 27670959..2306bfe5 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -58,9 +58,8 @@ maybe_add_gsub_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				  property_bit);
 }
@@ -74,9 +73,8 @@ maybe_add_gpos_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				  property_bit);
 }
@@ -111,30 +109,30 @@ get_ruleset (FT_Face face)
 				     arab_tag, &script_index))
 	{
 	  /* Language based forms: */
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','c','m','p'), 0xFFFF);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','c','m','p'), PANGO_OT_ALL_GLYPHS);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('i','s','o','l'), isolated);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('f','i','n','a'), final);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','e','d','i'), medial);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('i','n','i','t'), initial);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('r','l','i','g'), 0xFFFF);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','a','l','t'), 0xFFFF);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('r','l','i','g'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','a','l','t'), PANGO_OT_ALL_GLYPHS);
 
 	  /* Typographical forms: */
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('l','i','g','a'), 0xFFFF);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('l','i','g','a'), PANGO_OT_ALL_GLYPHS);
 	  /* this one should be turned-on/off-able.  lets turn off for now. */
-	  /* maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('d','l','i','g'), 0xFFFF); */
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','s','w','h'), 0xFFFF);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','s','e','t'), 0xFFFF);
+	  /* maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('d','l','i','g'), PANGO_OT_ALL_GLYPHS); */
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','s','w','h'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','s','e','t'), PANGO_OT_ALL_GLYPHS);
 	}
 
       if (pango_ot_info_find_script (info, PANGO_OT_TABLE_GPOS,
 				     arab_tag, &script_index))
 	{
 	  /* Positioning features: */
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','u','r','s'), 0xFFFF);
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('k','e','r','n'), 0xFFFF);
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','a','r','k'), 0xFFFF);
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','k','m','k'), 0xFFFF);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','u','r','s'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('k','e','r','n'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','a','r','k'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','k','m','k'), PANGO_OT_ALL_GLYPHS);
 	}
 
       g_object_set_qdata_full (G_OBJECT (info), ruleset_quark, ruleset,
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index a4592253..300dd1f8 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -273,10 +273,9 @@ get_ruleset (FT_Face face)
 						     gpos_features[j][2], gpos_features[j][3]);
 	       guint feature_index;
 
-	       /* 0xffff means default language */
-	       if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS, feature_tag, script_index, 0xffff,&feature_index))
+	       if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS, feature_tag, script_index, PANGO_OT_DEFAULT_LANGUAGE ,&feature_index))
 	       {
-		 pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index, 0xffff);
+		 pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index, PANGO_OT_ALL_GLYPHS);
 	       }
 	     }
 
@@ -287,11 +286,10 @@ get_ruleset (FT_Face face)
 						      gsub_features[j][2], gsub_features[j][3]);
 		guint feature_index;
 
-		/* 0xffff means default language */
 		if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB, feature_tag,
-						script_index, 0xffff, &feature_index))
+						script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
 		  {
-		    pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index, 0xffff);
+		    pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index, PANGO_OT_ALL_GLYPHS);
 		  }
 	      }
       }
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index 098b2850..28739e91 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -153,9 +153,8 @@ maybe_add_gsub_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				  property_bit);
 }
@@ -169,9 +168,8 @@ maybe_add_gpos_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				  property_bit);
 }
@@ -203,9 +201,9 @@ get_ruleset (FT_Face face)
 
 	  /* Again, tags from the SBL font. */
 	  maybe_add_gpos_feature (ruleset, info, script_index,
-				  FT_MAKE_TAG ('k','e','r','n'), 0xFFFF);
+				  FT_MAKE_TAG ('k','e','r','n'), PANGO_OT_ALL_GLYPHS);
 	  maybe_add_gpos_feature (ruleset, info, script_index,
-				  FT_MAKE_TAG ('m','a','r','k'), 0xFFFF);
+				  FT_MAKE_TAG ('m','a','r','k'), PANGO_OT_ALL_GLYPHS);
 	}
       else
 	/* Return NULL to trigger use of heuristics if there is no
@@ -218,10 +216,10 @@ get_ruleset (FT_Face face)
 	{
 	  /* Add the features that we want */
 	  maybe_add_gsub_feature (ruleset, info, script_index,
-				  FT_MAKE_TAG ('c','c','m','p'), 0xFFFF);
+				  FT_MAKE_TAG ('c','c','m','p'), PANGO_OT_ALL_GLYPHS);
 
 	  maybe_add_gsub_feature (ruleset, info, script_index,
-				  FT_MAKE_TAG ('r','l','i','g'), 0xFFFF);
+				  FT_MAKE_TAG ('r','l','i','g'), PANGO_OT_ALL_GLYPHS);
 	}
 
       g_object_set_qdata_full (G_OBJECT (info), ruleset_quark, ruleset,
diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index 5d81c6c4..42a31bc9 100644
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -140,14 +140,9 @@ maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  feature_tag, script_index, 0xffff, &feature_index))
+				  feature_tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     {
-      /*
-      printf("Added GSUB feature '%c%c%c%c' = %8.8X\n", feature_tag>>24, feature_tag>>16&0xFF, feature_tag>>8&0xFF, feature_tag&0xFF, property_bit);
-      */
-
       pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				    property_bit);
     }
@@ -163,12 +158,8 @@ maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
   guint feature_index;
 
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  feature_tag,script_index, 0xffff, &feature_index))
+				  feature_tag,script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     {
-      /*
-      printf("Added GPOS feature '%c%c%c%c' = %8.8X\n", feature_tag>>24, feature_tag>>16&0xFF, feature_tag>>8&0xFF, feature_tag&0xFF, property_bit);
-      */
-
       pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				    property_bit);
     }
diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c
index 563a0cf8..07127be1 100644
--- a/modules/khmer/khmer-fc.c
+++ b/modules/khmer/khmer-fc.c
@@ -424,9 +424,8 @@ maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				  property_bit);
 }
@@ -441,9 +440,8 @@ maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				  property_bit);
 }
diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c
index 985f0040..3065ceba 100644
--- a/modules/syriac/syriac-fc.c
+++ b/modules/syriac/syriac-fc.c
@@ -60,9 +60,8 @@ maybe_add_gsub_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				  property_bit);
 }
@@ -76,9 +75,8 @@ maybe_add_gpos_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				  property_bit);
 }
@@ -106,12 +104,10 @@ get_ruleset (FT_Face face)
 
       ruleset = pango_ot_ruleset_new (info);
 
-#define ALL_GLYPHS ~(gulong)0
-
       if (pango_ot_info_find_script (info, PANGO_OT_TABLE_GSUB,
 				     syrc_tag, &script_index))
 	{
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','c','m','p'), ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','c','m','p'), PANGO_OT_ALL_GLYPHS);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('i','s','o','l'), isolated);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('f','i','n','a'), final);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('f','i','n','2'), final2);
@@ -119,18 +115,18 @@ get_ruleset (FT_Face face)
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','e','d','i'), medial);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','e','d','2'), medial2);
 	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('i','n','i','t'), initial);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('r','l','i','g'), ALL_GLYPHS);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','a','l','t'), ALL_GLYPHS);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('l','i','g','a'), ALL_GLYPHS);
-	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('d','l','i','g'), ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('r','l','i','g'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('c','a','l','t'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('l','i','g','a'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gsub_feature (ruleset, info, script_index, FT_MAKE_TAG ('d','l','i','g'), PANGO_OT_ALL_GLYPHS);
 	}
 
       if (pango_ot_info_find_script (info, PANGO_OT_TABLE_GPOS,
 				     syrc_tag, &script_index))
 	{
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('k','e','r','n'), ALL_GLYPHS);
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','a','r','k'), ALL_GLYPHS);
-	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','k','m','k'), ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('k','e','r','n'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','a','r','k'), PANGO_OT_ALL_GLYPHS);
+	  maybe_add_gpos_feature (ruleset, info, script_index, FT_MAKE_TAG ('m','k','m','k'), PANGO_OT_ALL_GLYPHS);
 	}
 
       g_object_set_qdata_full (G_OBJECT (info), ruleset_quark, ruleset,
diff --git a/modules/thai/thai-ot.c b/modules/thai/thai-ot.c
index e17cefd5..d947d1f7 100644
--- a/modules/thai/thai-ot.c
+++ b/modules/thai/thai-ot.c
@@ -34,9 +34,8 @@ maybe_add_gsub_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  feature_tag, script_index, 0xffff, &feature_index))
+				  feature_tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     {
       pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				    property_bit);
@@ -55,7 +54,7 @@ maybe_add_gpos_feature (PangoOTRuleset *ruleset,
   guint feature_index;
 
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  feature_tag, script_index, 0xffff, &feature_index))
+				  feature_tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     {
       pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				    property_bit);
@@ -101,10 +100,10 @@ thai_ot_get_ruleset (PangoFont *font)
 	    {
 	      n += maybe_add_gsub_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('c','c','m','p'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gsub_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('l','i','g','a'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	    }
 
 	  if (pango_ot_info_find_script (info, PANGO_OT_TABLE_GPOS,
@@ -112,13 +111,13 @@ thai_ot_get_ruleset (PangoFont *font)
 	    {
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('k','e','r','n'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('m','a','r','k'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('m','k','m','k'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	    }
 
 	  if (n > 0)
@@ -174,10 +173,10 @@ lao_ot_get_ruleset (PangoFont *font)
 	    {
 	      n += maybe_add_gsub_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('c','c','m','p'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gsub_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('l','i','g','a'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	    }
 
 	  if (pango_ot_info_find_script (info, PANGO_OT_TABLE_GPOS,
@@ -185,13 +184,13 @@ lao_ot_get_ruleset (PangoFont *font)
 	    {
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('k','e','r','n'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('m','a','r','k'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	      n += maybe_add_gpos_feature (ruleset, info, script_index,
 					   FT_MAKE_TAG ('m','k','m','k'),
-					   0xFFFF);
+					   PANGO_OT_ALL_GLYPHS);
 	    }
 
 	  if (n > 0)
diff --git a/modules/tibetan/tibetan-fc.c b/modules/tibetan/tibetan-fc.c
index dfb68820..5dffc0b5 100644
--- a/modules/tibetan/tibetan-fc.c
+++ b/modules/tibetan/tibetan-fc.c
@@ -391,9 +391,8 @@ maybe_add_GSUB_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GSUB,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GSUB, feature_index,
 				  property_bit);
 }
@@ -408,9 +407,8 @@ maybe_add_GPOS_feature (PangoOTRuleset *ruleset,
 {
   guint feature_index;
 
-  /* 0xffff == default language system */
   if (pango_ot_info_find_feature (info, PANGO_OT_TABLE_GPOS,
-				  tag, script_index, 0xffff, &feature_index))
+				  tag, script_index, PANGO_OT_DEFAULT_LANGUAGE, &feature_index))
     pango_ot_ruleset_add_feature (ruleset, PANGO_OT_TABLE_GPOS, feature_index,
 				  property_bit);
 }