diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2001-01-04 09:07:26 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-01-04 09:07:26 +0000 |
| commit | 6462b4e6f2389cc000801282da1e3cefefd83ca3 (patch) | |
| tree | ffe997f4f18c06e1b74317bd04c90d72ee6694ea /modules/arabic | |
| parent | baa65c923254e7e1b8b620f46adaff3447f4625f (diff) | |
| download | pango-6462b4e6f2389cc000801282da1e3cefefd83ca3.tar.gz | |
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]
Diffstat (limited to 'modules/arabic')
| -rw-r--r-- | modules/arabic/arabic-fc.c | 8 | ||||
| -rw-r--r-- | modules/arabic/arabic-x.c | 7 | ||||
| -rw-r--r-- | modules/arabic/arabic-xft.c | 8 |
3 files changed, 14 insertions, 9 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; |