indic-ot: Punj -> Guru

[Eric Mader <mader jtcsv com>]

Hello,

In the process of chasing down other problems in the indic-ot code, I 
noticed that the code contains many references to the Punjabi script. These 
should be changed to references to the Gurmukhi script. In particular, this 
causes the wrong four-letter tag to be used to search for the script in 
OpenType fonts.

Here are the patches to fix this:

Index: indic-ot-class-tables.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-ot-class-tables.c,v
retrieving revision 1.1
diff -u -p -r1.1 indic-ot-class-tables.c
--- indic-ot-class-tables.c	7 May 2002 20:38:12 -0000	1.1
+++ indic-ot-class-tables.c	26 Aug 2002 23:27:11 -0000
@@ -94,7 +94,7 @@ static IndicOTCharClass bengCharClasses[
     _ct, _ct, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx                           /* 09F0 - 09FA */
 };

-static IndicOTCharClass punjCharClasses[] =
+static IndicOTCharClass guruCharClasses[] =
 {
     _xx, _xx, _ma, _xx, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _xx, 
_xx, _iv, /* 0A00 - 0A0F */
     _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, 
_ct, _ct, /* 0A10 - 0A1F */
@@ -207,7 +207,7 @@ static const IndicOTSplitMatra mlymSplit
  */
 #define DEVA_SCRIPT_FLAGS (SF_EYELASH_RA | SF_NO_POST_BASE_LIMIT)
 #define BENG_SCRIPT_FLAGS (SF_REPH_AFTER_BELOW | SF_NO_POST_BASE_LIMIT)
-#define PUNJ_SCRIPT_FLAGS (SF_NO_POST_BASE_LIMIT)
+#define GURU_SCRIPT_FLAGS (SF_NO_POST_BASE_LIMIT)
 #define GUJR_SCRIPT_FLAGS (SF_NO_POST_BASE_LIMIT)
 #define ORYA_SCRIPT_FLAGS (SF_REPH_AFTER_BELOW | SF_NO_POST_BASE_LIMIT)
 #define TAML_SCRIPT_FLAGS (SF_MPRE_FIXUP | SF_NO_POST_BASE_LIMIT)
@@ -222,7 +222,7 @@ IndicOTClassTable deva_class_table = {0x

 IndicOTClassTable beng_class_table = {0x0980, 0x09FA, 3, 
BENG_SCRIPT_FLAGS, bengCharClasses, bengSplitTable};

-IndicOTClassTable punj_class_table = {0x0A00, 0x0A74, 2, 
PUNJ_SCRIPT_FLAGS, punjCharClasses, NULL};
+IndicOTClassTable guru_class_table = {0x0A00, 0x0A74, 2, 
GURU_SCRIPT_FLAGS, guruCharClasses, NULL};

 IndicOTClassTable gujr_class_table = {0x0A80, 0x0AEF, 2, 
GUJR_SCRIPT_FLAGS, gujrCharClasses, NULL};

Index: indic-ot.h
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-ot.h,v
retrieving revision 1.1
diff -u -p -r1.1 indic-ot.h
--- indic-ot.h	7 May 2002 20:38:12 -0000	1.1
+++ indic-ot.h	26 Aug 2002 23:27:11 -0000
@@ -143,7 +143,7 @@ enum indic_glyph_property_

 #define SCRIPT_RANGE_beng 0x0980, 0x09FA

-#define SCRIPT_RANGE_punj 0x0A00, 0x0A74
+#define SCRIPT_RANGE_guru 0x0A00, 0x0A74

 #define SCRIPT_RANGE_gujr 0x0A80, 0x0AEF

@@ -209,7 +209,7 @@ typedef struct _IndicOTClassTable IndicO

 extern IndicOTClassTable deva_class_table;
 extern IndicOTClassTable beng_class_table;
-extern IndicOTClassTable punj_class_table;
+extern IndicOTClassTable guru_class_table;
 extern IndicOTClassTable gujr_class_table;
 extern IndicOTClassTable orya_class_table;
 extern IndicOTClassTable taml_class_table;
Index: indic-xft.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-xft.c,v
retrieving revision 1.3
diff -u -p -r1.3 indic-xft.c
--- indic-xft.c	20 Aug 2002 19:51:37 -0000	1.3
+++ indic-xft.c	26 Aug 2002 23:27:11 -0000
@@ -54,7 +54,7 @@ struct _PangoIndicInfo

 #define OT_TAG_deva FT_MAKE_TAG('d','e','v','a')
 #define OT_TAG_beng FT_MAKE_TAG('b','e','n','g')
-#define OT_TAG_punj FT_MAKE_TAG('p','u','n','j')
+#define OT_TAG_guru FT_MAKE_TAG('g','u','r','u')
 #define OT_TAG_gujr FT_MAKE_TAG('g','u','j','r')
 #define OT_TAG_orya FT_MAKE_TAG('o','r','y','a')
 #define OT_TAG_taml FT_MAKE_TAG('t','a','m','l')
@@ -70,8 +70,8 @@ static PangoEngineRange beng_ranges[] =
   INDIC_SCRIPT_RANGE(beng), /* Bengali */
 };

-static PangoEngineRange punj_ranges[] = {
-  INDIC_SCRIPT_RANGE(punj), /* Punjabi */
+static PangoEngineRange guru_ranges[] = {
+  INDIC_SCRIPT_RANGE(guru), /* Gurmukhi */
 };

 static PangoEngineRange gujr_ranges[] = {
@@ -99,7 +99,7 @@ static PangoEngineRange mlym_ranges[] =
 };

 static PangoEngineInfo script_engines[] = {
-  INDIC_ENGINE_INFO(deva), INDIC_ENGINE_INFO(beng), INDIC_ENGINE_INFO(punj),
+  INDIC_ENGINE_INFO(deva), INDIC_ENGINE_INFO(beng), INDIC_ENGINE_INFO(guru),
   INDIC_ENGINE_INFO(gujr), INDIC_ENGINE_INFO(orya), INDIC_ENGINE_INFO(taml),
   INDIC_ENGINE_INFO(telu), INDIC_ENGINE_INFO(knda), INDIC_ENGINE_INFO(mlym)
 };
@@ -113,7 +113,7 @@ static PangoEngineInfo script_engines[]
  * putting the pointers to the PangoEngineInfo in PangoIndicInfo...
  */
 static PangoIndicInfo indic_info[] = {
-  PANGO_INDIC_INFO(deva), PANGO_INDIC_INFO(beng), PANGO_INDIC_INFO(punj),
+  PANGO_INDIC_INFO(deva), PANGO_INDIC_INFO(beng), PANGO_INDIC_INFO(guru),
   PANGO_INDIC_INFO(gujr), PANGO_INDIC_INFO(orya), PANGO_INDIC_INFO(taml),
   PANGO_INDIC_INFO(telu), PANGO_INDIC_INFO(knda), PANGO_INDIC_INFO(mlym)
 };
@@ -140,11 +140,12 @@ maybe_add_GSUB_feature (PangoOTRuleset *
     }
 }

-static 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;

Regards,
Eric