Oops, undo stuff that were committed accidentally.

6 files changed, 6 insertions, 48 deletions

diff --git a/configure.in b/configure.in
index e6610f6e..39132fec 100644
--- a/configure.in
+++ b/configure.in
@@ -394,7 +394,7 @@ fi
 #
 # Modules to build
 #
-arabic_modules="arabic-fc,arabic-lang"
+arabic_modules="arabic-fc"
 basic_modules="basic-fc,basic-win32,basic-x,basic-atsui"
 hangul_modules="hangul-fc"
 hebrew_modules="hebrew-fc"
@@ -472,7 +472,6 @@ done
 IFS="$pango_save_ifs"
 
 AM_CONDITIONAL(INCLUDE_ARABIC_FC,	echo $included_modules | egrep '(^|,)arabic-fc($|,)' 	> /dev/null)
-AM_CONDITIONAL(INCLUDE_ARABIC_LANG,	echo $included_modules | egrep '(^|,)arabic-lang($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_FC,	echo $included_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $included_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_X,		echo $included_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
@@ -486,7 +485,6 @@ AM_CONDITIONAL(INCLUDE_THAI_FC,		echo $included_modules | egrep '(^|,)thai-fc($|
 AM_CONDITIONAL(INCLUDE_TIBETAN_FC,	echo $included_modules | egrep '(^|,)tibetan-fc($|,)' 	> /dev/null)
 
 AM_CONDITIONAL(DYNAMIC_ARABIC_FC,	echo $dynamic_modules | egrep '(^|,)arabic-fc($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_ARABIC_LANG,	echo $dynamic_modules | egrep '(^|,)arabic-lang($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_FC,	echo $dynamic_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_WIN32,	echo $dynamic_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_X,		echo $dynamic_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 26b232eb..ca129b8d 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -21,21 +21,3 @@ pango_arabic_fc_la_LIBADD = $(pangoft2libs)
 pango_arabic_fc_la_SOURCES = $(fc_sources)
 libpango_arabic_fc_la_SOURCES = $(fc_sources)
 libpango_arabic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_fc
-
-
-if INCLUDE_ARABIC_LANG
-noinst_LTLIBRARIES += libpango-arabic-lang.la
-else
-if DYNAMIC_ARABIC_LANG
-module_LTLIBRARIES += pango-arabic-lang.la
-endif
-endif
-
-lang_sources = \
-	arabic-lang.c
-
-pango_arabic_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_arabic_lang_la_LIBADD = $(pangolibs)
-pango_arabic_lang_la_SOURCES = $(lang_sources)
-libpango_arabic_lang_la_SOURCES = $(lang_sources)
-libpango_arabic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_lang
diff --git a/pango/break.c b/pango/break.c
index fc9defb7..7a23ac19 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -1488,17 +1488,11 @@ pango_break (const gchar   *text,
   g_return_if_fail (analysis != NULL);
   g_return_if_fail (attrs != NULL);
   
-  g_message ("break");
-
   if (analysis->lang_engine &&
       PANGO_ENGINE_LANG_GET_CLASS (analysis->lang_engine)->script_break)
     PANGO_ENGINE_LANG_GET_CLASS (analysis->lang_engine)->script_break (analysis->lang_engine, text, length, analysis, attrs, attrs_len);
   else
     pango_default_break (text, length, analysis, attrs, attrs_len);
-
-  int i;
-  for (i = 0; i < attrs_len; i++)
-    g_message ("%d %d", attrs[i].is_cursor_position, attrs[i].backspace_deletes_character);
 }
 
 /**
@@ -1635,7 +1629,6 @@ pango_get_log_attrs (const char    *text,
   static guint engine_type_id = 0;
   static guint render_type_id = 0;
   PangoAnalysis analysis = { 0 };
-  PangoScriptIter *iter;
 
   analysis.level = level;
 
@@ -1654,18 +1647,8 @@ pango_get_log_attrs (const char    *text,
       render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_NONE);
     }
 
-  g_message ("logattrs %d >>>>>", length);
   lang_map = pango_find_map (language, engine_type_id, render_type_id);
 
-
-  iter = pango_script_iter_new (text, length);
-  do
-    {
-      
-    }
-  while (pango_script_iter_next (iter));
-  pango_script_iter_free (iter);
-
   range_start = text;
   script = pango_script_for_unichar (g_utf8_get_char (text));
   range_engine = (PangoEngineLang*) pango_map_get_engine (lang_map, script);
@@ -1683,14 +1666,14 @@ pango_get_log_attrs (const char    *text,
       g_assert (end - pos < length);
 
       script = pango_script_for_unichar (g_utf8_get_char (pos));
-      range_engine = (PangoEngineLang*) pango_map_get_engine (lang_map, script);
+      analysis.lang_engine =
+        (PangoEngineLang*) pango_map_get_engine (lang_map, script);
 
       if (range_engine != analysis.lang_engine)
         {
           /* Engine has changed; do the breaking for the current range,
            * then start a new range.
            */
-	  g_message ("log break %d %d", chars_broken, chars_in_range);
           pango_break (range_start,
                        pos - range_start,
                        &analysis,
@@ -1700,7 +1683,7 @@ pango_get_log_attrs (const char    *text,
           chars_broken += chars_in_range;
 
           range_start = pos;
-	  analysis.lang_engine = range_engine;
+          range_engine = analysis.lang_engine;
           chars_in_range = 1;
         }
       else
@@ -1716,11 +1699,9 @@ pango_get_log_attrs (const char    *text,
     g_assert (pos == end);
     g_assert (range_engine == analysis.lang_engine);
 
-    g_message ("log final break %d %d", chars_broken, chars_in_range);
     pango_break (range_start,
                  end - range_start,
                  &analysis,
                  log_attrs + chars_broken,
                  attrs_len - chars_broken);
-  g_message ("logattrs <<<<<");
 }
diff --git a/pango/modules.c b/pango/modules.c
index 3ec762cd..57b13443 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -260,7 +260,6 @@ pango_engine_pair_get_engine (PangoEnginePair *pair)
 	  g_type_module_unuse (G_TYPE_MODULE (pair->module));
 	}
 
-      /* TODO: warn once (per id or something) */
       if (!pair->engine)
 	g_printerr ("Failed to load Pango module for id: '%s'", pair->info.id);
     }
diff --git a/pango/pango-engine.h b/pango/pango-engine.h
index 44ae681a..2bd80c92 100644
--- a/pango/pango-engine.h
+++ b/pango/pango-engine.h
@@ -270,7 +270,7 @@ static GType prefix ## _type;						  \
 static void								  \
 prefix ## _register_type (GTypeModule *module)				  \
 {									  \
-  const GTypeInfo object_info =						  \
+  static const GTypeInfo object_info =					  \
     {									  \
       sizeof (name ## Class),						  \
       (GBaseInitFunc) NULL,						  \
diff --git a/pango/shape.c b/pango/shape.c
index fc165fbe..96abd21b 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -44,7 +44,7 @@ pango_shape (const gchar      *text,
              PangoGlyphString *glyphs)
 {
   int i;
-  int last_cluster;
+  int last_cluster = -1;
 
   if (G_LIKELY (PANGO_IS_ENGINE_SHAPE (analysis->shape_engine) && PANGO_IS_FONT (analysis->font)))
     {
@@ -109,8 +109,6 @@ pango_shape (const gchar      *text,
 				 text, length, analysis, glyphs);
     }
 
-  /* make sure last_cluster is invalid */
-  last_cluster = glyphs->log_clusters[0] - 1;
   for (i = 0; i < glyphs->num_glyphs; i++)
     {
      /* Set glyphs[i].attr.is_cluster_start based on log_clusters[]