i2001-01-04 Alexander Larsson <alla@lysator.liu.se>

	* modules/arabic/arabic-x.c:
	* modules/arabic/arabic-xft.c:
	* modules/basic/basic-ft2.c:
	* modules/basic/basic-win32.c:
	* modules/basic/basic-x.c:
	* modules/hangul/hangul-x.c:
	* modules/indic/bengali-x.c:
	* modules/indic/devanagari-x.c:
	* modules/indic/gujarati-x.c:
	* modules/indic/gurmukhi-x.c:
	* modules/indic/myanmar-x.c:
	* modules/tamil/tamil-x.c:
	* modules/thai/thai-x.c:
	Change all modules to use a define to the script engine name. Also
	Fixes some errors in the names (they were different in the same module).

	* pango/.cvsignore:
	add module-defs*.[ch]

14 files changed, 59 insertions, 37 deletions

diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index b1dde7af..9413433d 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -28,6 +28,8 @@
 #include "pango-engine.h"
 #include "pango-utils.h"
 
+#define SCRIPT_ENGINE_NAME "ArabicScriptEngineXft"
+
 static PangoEngineRange arabic_ranges[] = {
   /* Language characters */
   { 0x060c, 0x06f9, "*" }, /* Arabic */
@@ -35,7 +37,7 @@ static PangoEngineRange arabic_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "ArabicScriptEngineXft",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_XFT,
     arabic_ranges, G_N_ELEMENTS(arabic_ranges)
@@ -311,7 +313,7 @@ arabic_engine_xft_new ()
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = PANGO_RENDER_TYPE_XFT;
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = arabic_engine_shape;
@@ -347,7 +349,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "ArabicScriptEngineXft"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return arabic_engine_xft_new ();
   else
     return NULL;
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 7828d546..1a427055 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #endif
 
+#define SCRIPT_ENGINE_NAME "ArabicScriptEngineX" 
 
 static PangoEngineRange arabic_range[] = {
     { 0x060B, 0x06D3, "*" }  /* 0x060B, 0x06D3 */
@@ -29,7 +30,7 @@ static PangoEngineRange arabic_range[] = {
 
 static PangoEngineInfo script_engines[] = {
     {
-        "ArabicScriptEngineX",
+        SCRIPT_ENGINE_NAME,
         PANGO_ENGINE_TYPE_SHAPE,
         PANGO_RENDER_TYPE_X,
         arabic_range, G_N_ELEMENTS(arabic_range)
@@ -318,7 +319,7 @@ arabic_engine_x_new ()
   
     result = g_new (PangoEngineShape, 1);
 
-    result->engine.id = "ArabicScriptEngine";
+    result->engine.id = SCRIPT_ENGINE_NAME;
     result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
     result->engine.length = sizeof (result);
     result->script_shape = arabic_engine_shape;
@@ -350,7 +351,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "ArabicScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return arabic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/arabic/arabic-xft.c b/modules/arabic/arabic-xft.c
index b1dde7af..9413433d 100644
--- a/modules/arabic/arabic-xft.c
+++ b/modules/arabic/arabic-xft.c
@@ -28,6 +28,8 @@
 #include "pango-engine.h"
 #include "pango-utils.h"
 
+#define SCRIPT_ENGINE_NAME "ArabicScriptEngineXft"
+
 static PangoEngineRange arabic_ranges[] = {
   /* Language characters */
   { 0x060c, 0x06f9, "*" }, /* Arabic */
@@ -35,7 +37,7 @@ static PangoEngineRange arabic_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "ArabicScriptEngineXft",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_XFT,
     arabic_ranges, G_N_ELEMENTS(arabic_ranges)
@@ -311,7 +313,7 @@ arabic_engine_xft_new ()
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = PANGO_RENDER_TYPE_XFT;
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = arabic_engine_shape;
@@ -347,7 +349,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "ArabicScriptEngineXft"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return arabic_engine_xft_new ();
   else
     return NULL;
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index 38d03800..72799e52 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -26,6 +26,8 @@
 #include "pangoft2.h"
 #include "pango-utils.h"
 
+#define SCRIPT_ENGINE_NAME "BasicScriptEngineFT2"
+
 static PangoEngineRange basic_ranges[] = {
   /* Basic Latin, Latin-1 Supplement, Latin Extended-A, Latin Extended-B,
    * IPA Extensions
@@ -99,7 +101,7 @@ static PangoEngineRange basic_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "BasicScriptEngineFT2",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_FT2,
     basic_ranges, G_N_ELEMENTS(basic_ranges)
@@ -302,7 +304,7 @@ basic_engine_ft2_new (void)
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "BasicScriptEngineFT2";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = basic_engine_shape;
@@ -331,7 +333,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines,
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "BasicScriptEngineFT2"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return basic_engine_ft2_new ();
   else
     return NULL;
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index cc596556..4581cc52 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -23,6 +23,8 @@
 #include "pangowin32.h"
 #include "pango-utils.h"
 
+#define SCRIPT_ENGINE_NAME "BasicScriptEngineWin32"
+
 static PangoEngineRange basic_ranges[] = {
   /* Language characters */
   { 0x0000, 0x02af, "*" },
@@ -40,7 +42,7 @@ static PangoEngineRange basic_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "BasicScriptEngineWin32",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_WIN32,
     basic_ranges, G_N_ELEMENTS(basic_ranges)
@@ -272,7 +274,7 @@ basic_engine_win32_new (void)
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "BasicScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = basic_engine_shape;
@@ -301,7 +303,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines,
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "BasicScriptEngineWin32"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return basic_engine_win32_new ();
   else
     return NULL;
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 205079c5..a37268b2 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -36,6 +36,8 @@ typedef PangoGlyph (*ConvFunc) (CharCache   *cache,
 
 #define MAX_CHARSETS 32
 
+#define SCRIPT_ENGINE_NAME "BasicScriptEngineX"
+
 struct _Charset
 {
   int   index;
@@ -96,7 +98,7 @@ static PangoEngineRange basic_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "BasicScriptEngineX",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_X,
     basic_ranges, G_N_ELEMENTS(basic_ranges)
@@ -464,7 +466,7 @@ basic_engine_x_new ()
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "BasicScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = basic_engine_shape;
@@ -492,7 +494,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "BasicScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return basic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c
index 54f3bbda..1c2ac477 100644
--- a/modules/hangul/hangul-x.c
+++ b/modules/hangul/hangul-x.c
@@ -25,6 +25,8 @@
 #include "pangox.h"
 #include "pango-engine.h"
 
+#define SCRIPT_ENGINE_NAME "HangulScriptEngineX"
+
 static PangoEngineRange hangul_ranges[] = {
 
   /* Hangul Jamo U+1100 -- U+11FF */
@@ -38,7 +40,7 @@ static PangoEngineRange hangul_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "HangulScriptEngineX",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_X,
     hangul_ranges, G_N_ELEMENTS(hangul_ranges)
@@ -716,7 +718,7 @@ hangul_engine_x_new ()
 
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "HangulScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = hangul_engine_shape;
@@ -747,7 +749,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "HangulScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return hangul_engine_x_new ();
   else
     return NULL;
diff --git a/modules/indic/bengali-x.c b/modules/indic/bengali-x.c
index 6d2f1f52..64843c4c 100644
--- a/modules/indic/bengali-x.c
+++ b/modules/indic/bengali-x.c
@@ -46,6 +46,7 @@
 #include "pango-engine.h"
 
 #define SCRIPT_STRING "Bengali"
+#define SCRIPT_ENGINE_NAME SCRIPT_STRING "ScriptEngineX"
 #define ISCII_BASED
 #define RANGE_START 0x980
 #define RANGE_SIZE 0x80
@@ -277,7 +278,7 @@ pango_indic_engine_x_new ()
 {
   PangoEngineShape *result;
   result = g_new (PangoEngineShape, 1);
-  result->engine.id = SCRIPT_STRING "ScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = pango_indic_engine_shape;
@@ -301,7 +302,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo ** engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, SCRIPT_STRING "ScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return pango_indic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c
index c09f6f41..d024e41f 100644
--- a/modules/indic/devanagari-x.c
+++ b/modules/indic/devanagari-x.c
@@ -46,6 +46,7 @@
 
 #define ISCII_BASED
 #define SCRIPT_STRING "Devanagari"
+#define SCRIPT_ENGINE_NAME SCRIPT_STRING "ScriptEngineX"
 
 #include "pango-indic.h"
 #include "pango-indic-script.h"
@@ -330,7 +331,7 @@ pango_indic_engine_x_new ()
 {
   PangoEngineShape *result;
   result = g_new (PangoEngineShape, 1);
-  result->engine.id = SCRIPT_STRING "ScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = pango_indic_engine_shape;
@@ -354,7 +355,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo ** engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, SCRIPT_STRING "ScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return pango_indic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/indic/gujarati-x.c b/modules/indic/gujarati-x.c
index 8307e5c4..ce1ffeac 100644
--- a/modules/indic/gujarati-x.c
+++ b/modules/indic/gujarati-x.c
@@ -33,6 +33,7 @@
 
 #define ISCII_BASED
 #define SCRIPT_STRING "Gujarati"
+#define SCRIPT_ENGINE_NAME SCRIPT_STRING "ScriptEngineX"
 
 #include "pango-indic.h"
 #include "pango-indic-script.h"
@@ -306,7 +307,7 @@ pango_indic_engine_x_new ()
 {
   PangoEngineShape *result;
   result = g_new (PangoEngineShape, 1);
-  result->engine.id = SCRIPT_STRING "ScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = pango_indic_engine_shape;
@@ -330,7 +331,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo ** engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, SCRIPT_STRING "ScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return pango_indic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/indic/gurmukhi-x.c b/modules/indic/gurmukhi-x.c
index 5a08f0f5..a8429ee3 100644
--- a/modules/indic/gurmukhi-x.c
+++ b/modules/indic/gurmukhi-x.c
@@ -37,6 +37,7 @@
 #define RANGE_START 0xa00
 #define RANGE_SIZE 0x80
 #define SCRIPT_STRING "Gurmukhi"
+#define SCRIPT_ENGINE_NAME SCRIPT_STRING "ScriptEngineX"
 #define ISCII_BASED
 
 #include "pango-indic-script.h"
@@ -220,7 +221,7 @@ pango_indic_engine_x_new ()
 {
   PangoEngineShape *result;
   result = g_new (PangoEngineShape, 1);
-  result->engine.id = SCRIPT_STRING "ScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = pango_indic_engine_shape;
@@ -244,7 +245,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo ** engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, SCRIPT_STRING "ScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return pango_indic_engine_x_new ();
   else
     return NULL;
diff --git a/modules/indic/myanmar-x.c b/modules/indic/myanmar-x.c
index 3e4e1d71..1eb9dfce 100644
--- a/modules/indic/myanmar-x.c
+++ b/modules/indic/myanmar-x.c
@@ -43,6 +43,7 @@
 #define RANGE_START 0x1000
 #define RANGE_SIZE 0x80
 #define SCRIPT_STRING "Myanmar"
+#define SCRIPT_ENGINE_NAME SCRIPT_STRING "ScriptEngineX"
 #define VIRAMA 0x1039
 
 #include "pango-indic-script.h"
@@ -200,7 +201,7 @@ pango_engine_x_new ()
 {
   PangoEngineShape *result;
   result = g_new (PangoEngineShape, 1);
-  result->engine.id = SCRIPT_STRING "ScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = pango_engine_shape;
@@ -224,7 +225,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo ** engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, SCRIPT_STRING "ScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return pango_engine_x_new ();
   else
     return NULL;
diff --git a/modules/tamil/tamil-x.c b/modules/tamil/tamil-x.c
index 3ff5f433..db9bef4d 100644
--- a/modules/tamil/tamil-x.c
+++ b/modules/tamil/tamil-x.c
@@ -12,13 +12,15 @@
 #include "pango-engine.h"
 #include <string.h>
 
+#define SCRIPT_ENGINE_NAME "TamilScriptEngineX"
+
 static PangoEngineRange tamil_range[] = {
   { 0x0b80, 0x0bff, "*" },
 };
 
 static PangoEngineInfo script_engines[] = {
   {
-    "TamilScriptEngineX",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_X,
     tamil_range, G_N_ELEMENTS(tamil_range)
@@ -173,7 +175,7 @@ tamil_engine_x_new ()
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "TamilScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = tamil_engine_shape;
@@ -202,7 +204,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "TamilScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return tamil_engine_x_new ();
   else
     return NULL;
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index c32e3386..f3299b69 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -86,6 +86,8 @@
 #define char_class(wc)		TAC_char_class[(unsigned int)(wc)]
 #define is_char_type(wc, mask)	(char_type_table[ucs2tis ((wc))] & (mask))
 
+#define SCRIPT_ENGINE_NAME "ThaiScriptEngineX"
+
 /* We handle the range U+0e01 to U+0e5b exactly
  */
 static PangoEngineRange thai_ranges[] = {
@@ -94,7 +96,7 @@ static PangoEngineRange thai_ranges[] = {
 
 static PangoEngineInfo script_engines[] = {
   {
-    "ThaiScriptEngineX",
+    SCRIPT_ENGINE_NAME,
     PANGO_ENGINE_TYPE_SHAPE,
     PANGO_RENDER_TYPE_X,
     thai_ranges, G_N_ELEMENTS(thai_ranges)
@@ -854,7 +856,7 @@ thai_engine_x_new ()
   
   result = g_new (PangoEngineShape, 1);
 
-  result->engine.id = "ThaiScriptEngine";
+  result->engine.id = SCRIPT_ENGINE_NAME;
   result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
   result->engine.length = sizeof (result);
   result->script_shape = thai_engine_shape;
@@ -890,7 +892,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-  if (!strcmp (id, "ThaiScriptEngineX"))
+  if (!strcmp (id, SCRIPT_ENGINE_NAME))
     return thai_engine_x_new ();
   else
     return NULL;