summaryrefslogtreecommitdiff
path: root/modules/basic
diff options
context:
space:
mode:
Diffstat (limited to 'modules/basic')
-rw-r--r--modules/basic/basic-ft2.c33
-rw-r--r--modules/basic/basic-win32.c35
-rw-r--r--modules/basic/basic-x.c39
-rw-r--r--modules/basic/basic.c39
4 files changed, 5 insertions, 141 deletions
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index 973e8a43..b252eed0 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -98,12 +98,6 @@ static PangoEngineRange basic_ranges[] = {
static PangoEngineInfo script_engines[] = {
{
- "BasicScriptEngineLangFT2",
- PANGO_ENGINE_TYPE_LANG,
- PANGO_RENDER_TYPE_NONE,
- basic_ranges, G_N_ELEMENTS(basic_ranges)
- },
- {
"BasicScriptEngineFT2",
PANGO_ENGINE_TYPE_SHAPE,
PANGO_RENDER_TYPE_FT2,
@@ -114,33 +108,6 @@ static PangoEngineInfo script_engines[] = {
static gint n_script_engines = G_N_ELEMENTS (script_engines);
/*
- * Language script engine
- */
-
-static void
-basic_engine_break (const char *text,
- gint len,
- PangoAnalysis *analysis,
- PangoLogAttr *attrs)
-{
-}
-
-static PangoEngine *
-basic_engine_lang_new (void)
-{
- PangoEngineLang *result;
-
- result = g_new (PangoEngineLang, 1);
-
- result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
- result->engine.length = sizeof (result);
- result->script_break = basic_engine_break;
-
- return (PangoEngine *)result;
-}
-
-/*
* FT2 system script engine portion
*/
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 81b0b746..b4599e61 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -41,12 +41,6 @@ static PangoEngineRange basic_ranges[] = {
static PangoEngineInfo script_engines[] = {
{
- "BasicScriptEngineLangWin32",
- PANGO_ENGINE_TYPE_LANG,
- PANGO_RENDER_TYPE_NONE,
- basic_ranges, G_N_ELEMENTS(basic_ranges)
- },
- {
"BasicScriptEngineWin32",
PANGO_ENGINE_TYPE_SHAPE,
PANGO_RENDER_TYPE_WIN32,
@@ -57,33 +51,6 @@ static PangoEngineInfo script_engines[] = {
static gint n_script_engines = G_N_ELEMENTS (script_engines);
/*
- * Language script engine
- */
-
-static void
-basic_engine_break (const char *text,
- gint len,
- PangoAnalysis *analysis,
- PangoLogAttr *attrs)
-{
-}
-
-static PangoEngine *
-basic_engine_lang_new (void)
-{
- PangoEngineLang *result;
-
- result = g_new (PangoEngineLang, 1);
-
- result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
- result->engine.length = sizeof (result);
- result->script_break = basic_engine_break;
-
- return (PangoEngine *)result;
-}
-
-/*
* Win32 system script engine portion
*/
@@ -307,7 +274,7 @@ basic_engine_win32_new (void)
result = g_new (PangoEngineShape, 1);
result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
+ result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
result->engine.length = sizeof (result);
result->script_shape = basic_engine_shape;
result->get_coverage = basic_engine_get_coverage;
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index b49c8480..ab54aa9b 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -79,12 +79,6 @@ static PangoGlyph conv_ucs4 (CharCache *cache,
static PangoEngineInfo script_engines[] = {
{
- "BasicScriptEngineLang",
- PANGO_ENGINE_TYPE_LANG,
- PANGO_RENDER_TYPE_NONE,
- basic_ranges, G_N_ELEMENTS(basic_ranges)
- },
- {
"BasicScriptEngineX",
PANGO_ENGINE_TYPE_SHAPE,
PANGO_RENDER_TYPE_X,
@@ -95,33 +89,6 @@ static PangoEngineInfo script_engines[] = {
static gint n_script_engines = G_N_ELEMENTS (script_engines);
/*
- * Language script engine
- */
-
-static void
-basic_engine_break (const char *text,
- gint len,
- PangoAnalysis *analysis,
- PangoLogAttr *attrs)
-{
-}
-
-static PangoEngine *
-basic_engine_lang_new ()
-{
- PangoEngineLang *result;
-
- result = g_new (PangoEngineLang, 1);
-
- result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
- result->engine.length = sizeof (result);
- result->script_break = basic_engine_break;
-
- return (PangoEngine *)result;
-}
-
-/*
* X window system script engine portion
*/
@@ -481,7 +448,7 @@ basic_engine_x_new ()
result = g_new (PangoEngineShape, 1);
result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
+ result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
result->engine.length = sizeof (result);
result->script_shape = basic_engine_shape;
result->get_coverage = basic_engine_get_coverage;
@@ -508,9 +475,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
PangoEngine *
MODULE_ENTRY(script_engine_load) (const char *id)
{
- if (!strcmp (id, "BasicScriptEngineLang"))
- return basic_engine_lang_new ();
- else if (!strcmp (id, "BasicScriptEngineX"))
+ if (!strcmp (id, "BasicScriptEngineX"))
return basic_engine_x_new ();
else
return NULL;
diff --git a/modules/basic/basic.c b/modules/basic/basic.c
index b49c8480..ab54aa9b 100644
--- a/modules/basic/basic.c
+++ b/modules/basic/basic.c
@@ -79,12 +79,6 @@ static PangoGlyph conv_ucs4 (CharCache *cache,
static PangoEngineInfo script_engines[] = {
{
- "BasicScriptEngineLang",
- PANGO_ENGINE_TYPE_LANG,
- PANGO_RENDER_TYPE_NONE,
- basic_ranges, G_N_ELEMENTS(basic_ranges)
- },
- {
"BasicScriptEngineX",
PANGO_ENGINE_TYPE_SHAPE,
PANGO_RENDER_TYPE_X,
@@ -95,33 +89,6 @@ static PangoEngineInfo script_engines[] = {
static gint n_script_engines = G_N_ELEMENTS (script_engines);
/*
- * Language script engine
- */
-
-static void
-basic_engine_break (const char *text,
- gint len,
- PangoAnalysis *analysis,
- PangoLogAttr *attrs)
-{
-}
-
-static PangoEngine *
-basic_engine_lang_new ()
-{
- PangoEngineLang *result;
-
- result = g_new (PangoEngineLang, 1);
-
- result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
- result->engine.length = sizeof (result);
- result->script_break = basic_engine_break;
-
- return (PangoEngine *)result;
-}
-
-/*
* X window system script engine portion
*/
@@ -481,7 +448,7 @@ basic_engine_x_new ()
result = g_new (PangoEngineShape, 1);
result->engine.id = "BasicScriptEngine";
- result->engine.type = PANGO_ENGINE_TYPE_LANG;
+ result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
result->engine.length = sizeof (result);
result->script_shape = basic_engine_shape;
result->get_coverage = basic_engine_get_coverage;
@@ -508,9 +475,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, gint *n_engines)
PangoEngine *
MODULE_ENTRY(script_engine_load) (const char *id)
{
- if (!strcmp (id, "BasicScriptEngineLang"))
- return basic_engine_lang_new ();
- else if (!strcmp (id, "BasicScriptEngineX"))
+ if (!strcmp (id, "BasicScriptEngineX"))
return basic_engine_x_new ();
else
return NULL;
View Lorry Controller Status