delete lang engine

2000-11-30  Havoc Pennington  <hp@pobox.com>

* modules/thai/thai.c: delete lang engine

* modules/tamil/tamil.c: delete lang engine
(tamil_engine_x_new): fix type tag for shape engine

* modules/indic/myanmar.c: delete lang engine
(pango_engine_x_new): fix type tag for shape engine

* modules/indic/gurmukhi.c: delete lang engine
(pango_indic_engine_x_new): fix type tag for shape engine

* modules/indic/gujarati.c: delete lang engine
(pango_indic_engine_x_new): fix type tag for shape engine

* modules/indic/devanagari.c: delete lang engine
(pango_indic_engine_x_new): fix type tag for shape engine

* modules/indic/pango-indic-script.h (SCRIPT_ENGINE_DEFINITION):
delete lang engine

* modules/indic/bengali.c: delete the lang engine
(pango_indic_engine_x_new): fix type tag for shape engine

* modules/hangul/hangul.c: delete the lang engine
(hangul_engine_x_new): fix type tag for shape engine

* modules/basic/basic.c: delete the lang engine
(basic_engine_x_new): fix type tag for shape engine

* modules/basic/basic-win32.c: delete the lang engine
(basic_engine_win32_new): this was a shape engine,
use correct type tag

* modules/basic/basic-ft2.c: delete the lang engine

* modules/arabic/arabic.c: Delete the lang engine
(arabic_engine_x_new): this is a shape
engine, not a lang engine, fix type tag

* pango/pango-layout.c (pango_layout_index_to_line_x): handle
the fact that paragraph delimiters aren't in the layout lines
(pango_layout_index_to_pos): update to handle paragraph
delimiters

* pango/break.c (pango_find_paragraph_boundary): New function
to find paragraph boundaries

* pango/pango-layout.c (get_items_log_attrs): don't separate calls
to pango_break() when directional level changes

* pango/pango-layout.h (struct _PangoLayoutLine): put start index
of the line into the struct

 * pango/pango-layout.c (pango_layout_get_cursor_pos): Fixups to
 reflect the fact that paragraph separators are removed from the
 input text.

 * pango/pango-layout.c (can_break_at): don't
 special-case start of line and whitespace-following-alphabetic
 here, because pango_break() already handles that properly

 * tests/testboundaries.c, tests/Makefile.am, tests/runtests.sh:
 Add directory for test programs, and a script to run them all

 * configure.in: Create Makefile in tests

 * pango/break.c (pango_break): Try for a real implementation of
 the Unicode text boundary algorithms
 (pango_get_log_attrs): Allow length to be -1

 * pango/pango-context.c (pango_itemize): use pango_item_new(),
 assert that items added to the list are sane.

 * pango/pango-layout.c (pango_layout_check_lines): Reimplement
 to honor the paragraph boundaries from pango_break()

 * pango/pango-layout.c (process_item): use pango_item_split() here

 * pango/pango-item.c (pango_item_split): New function to split an
 item into two items

1 files changed, 5 insertions, 65 deletions

diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 49435b5c..8115e606 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -29,12 +29,6 @@ static PangoEngineRange arabic_range[] = {
 
 static PangoEngineInfo script_engines[] = {
     {
-        "ArabicScriptEngineLang",
-        PANGO_ENGINE_TYPE_LANG,
-        PANGO_RENDER_TYPE_NONE,
-        arabic_range, G_N_ELEMENTS(arabic_range)
-    },
-    {
         "ArabicScriptEngineX",
         PANGO_ENGINE_TYPE_SHAPE,
         PANGO_RENDER_TYPE_X,
@@ -44,58 +38,6 @@ static PangoEngineInfo script_engines[] = {
 
 static gint n_script_engines = G_N_ELEMENTS (script_engines);
 
-
-
-
-/*
- * Language script engine
- */
-
-static void 
-arabic_engine_break (const char    *text,
-                     int            len,
-                     PangoAnalysis *analysis,
-                     PangoLogAttr  *attrs)
-{
-    /* Most of the code comes from tamil_engine_break
-     */
-
-    const char *cur = text;
-    gint        i  = 0;
-    gunichar    wc;
-
-    while (*cur && cur - text < len)
-        {
-            wc = g_utf8_get_char (cur);
-            if (wc == (gunichar)-1)
-                break;           /* FIXME: ERROR */
-
-            attrs[i].is_white = (wc == ' ' || wc == '\t' || wc == 'n') ? 1 : 0;
-            attrs[i].is_break = (i > 0 && attrs[i-1].is_white) || attrs[i].is_white;
-            attrs[i].is_char_stop = 1;
-            attrs[i].is_word_stop = (i == 0) || attrs[i-1].is_white;
-            /* actually, is_word_stop in not correct, but simple and good enough. */
-            
-            i++;
-            cur = g_utf8_next_char (cur);
-        }
-}
-
-static PangoEngine *
-arabic_engine_lang_new ()
-{
-    PangoEngineLang *result;
-  
-    result = g_new (PangoEngineLang, 1);
-
-    result->engine.id = "ArabicScriptEngine";
-    result->engine.type = PANGO_ENGINE_TYPE_LANG;
-    result->engine.length = sizeof (result);
-    result->script_break = arabic_engine_break;
-
-    return (PangoEngine *)result;
-}
-
 /*
  * X window system script engine portion
  */
@@ -377,7 +319,7 @@ arabic_engine_x_new ()
     result = g_new (PangoEngineShape, 1);
 
     result->engine.id = "ArabicScriptEngine";
-    result->engine.type = PANGO_ENGINE_TYPE_LANG;
+    result->engine.type = PANGO_ENGINE_TYPE_SHAPE;
     result->engine.length = sizeof (result);
     result->script_shape = arabic_engine_shape;
     result->get_coverage = arabic_engine_get_coverage;
@@ -408,12 +350,10 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, int *n_engines)
 PangoEngine *
 MODULE_ENTRY(script_engine_load) (const char *id)
 {
-    if (!strcmp (id, "ArabicScriptEngineLang"))
-        return arabic_engine_lang_new ();
-    else if (!strcmp (id, "ArabicScriptEngineX"))
-        return arabic_engine_x_new ();
-    else
-        return NULL;
+  if (!strcmp (id, "ArabicScriptEngineX"))
+    return arabic_engine_x_new ();
+  else
+    return NULL;
 }
 
 void