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]

5 files changed, 15 insertions, 10 deletions

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;