Change Punjabi script ('punj') to Gurmukhi ('guru')

4 files changed, 27 insertions, 25 deletions

diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index 369c9444..390b2871 100644
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -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 *ruleset,
     }
 }
 
-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;
 
diff --git a/modules/indic/indic-ot-class-tables.c b/modules/indic/indic-ot-class-tables.c
index 644b40ee..cc18a9be 100644
--- a/modules/indic/indic-ot-class-tables.c
+++ b/modules/indic/indic-ot-class-tables.c
@@ -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 mlymSplitTable[] = {{0x0D46, 0x0D3E}, {0x0D47, 0x
  */
 #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 = {0x0900, 0x0970, 2, DEVA_SCRIPT_FLAGS, deva
 
 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};
 
diff --git a/modules/indic/indic-ot.h b/modules/indic/indic-ot.h
index 57e2bbac..a28885ca 100644
--- a/modules/indic/indic-ot.h
+++ b/modules/indic/indic-ot.h
@@ -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 IndicOTClassTable;
 
 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;
diff --git a/modules/indic/indic-xft.c b/modules/indic/indic-xft.c
index 369c9444..390b2871 100644
--- a/modules/indic/indic-xft.c
+++ b/modules/indic/indic-xft.c
@@ -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 *ruleset,
     }
 }
 
-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;