Index: pango/pango-script.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-script.h,v
retrieving revision 1.4
diff -u -r1.4 pango-script.h
--- pango/pango-script.h	25 Jul 2006 02:08:46 -0000	1.4
+++ pango/pango-script.h	9 Oct 2006 03:19:16 -0000
@@ -114,7 +114,9 @@
       PANGO_SCRIPT_NKO                 /* Nkoo */
 } PangoScript;
 
+#ifndef PANGO_DISABLE_DEPRECATED
 PangoScript pango_script_for_unichar         (gunichar             ch);
+#endif
 
 PangoScriptIter *pango_script_iter_new       (const char          *text,
 					      int                  length);
Index: pango/pango-script.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-script.c,v
retrieving revision 1.22
diff -u -r1.22 pango-script.c
--- pango/pango-script.c	25 Jul 2006 08:11:11 -0000	1.22
+++ pango/pango-script.c	9 Oct 2006 03:19:31 -0000
@@ -59,7 +59,6 @@
 #include <string.h>
 
 #include "pango-script.h"
-#include "pango-script-table.h"
 
 #define PAREN_STACK_DEPTH 128
 
@@ -84,33 +83,6 @@
   int paren_sp;
 };
 
-#define PANGO_SCRIPT_TABLE_MIDPOINT (G_N_ELEMENTS (pango_script_table) / 2)
-
-static inline PangoScript
-pango_script_for_unichar_bsearch (gunichar ch)
-{
-  int lower = 0;
-  int upper = G_N_ELEMENTS (pango_script_table) - 1;
-  static int saved_mid = PANGO_SCRIPT_TABLE_MIDPOINT;
-  int mid = saved_mid;
-
-
-  do 
-    {
-      if (ch < pango_script_table[mid].start)
-	upper = mid - 1;
-      else if (ch >= pango_script_table[mid].start + pango_script_table[mid].chars)
-	lower = mid + 1;
-      else
-	return pango_script_table[saved_mid = mid].script;
-
-      mid = (lower + upper) / 2;
-    }
-  while (lower <= upper);
-
-  return PANGO_SCRIPT_UNKNOWN;
-}
-
 /**
  * pango_script_for_unichar:
  * @ch: a Unicode character
@@ -123,14 +95,13 @@
  * Return value: the #PangoScript for the character.
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.16: Use g_unichar_get_script() instead. 
  **/
 PangoScript
 pango_script_for_unichar (gunichar ch)
 {
-  if (ch < PANGO_EASY_SCRIPTS_RANGE)
-    return pango_script_easy_table[ch];
-  else 
-    return pango_script_for_unichar_bsearch (ch); 
+  return (PangoScript) g_unichar_get_script (ch);
 }
 
 /**********************************************************************/
Index: pango/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/Makefile.am,v
retrieving revision 1.143
diff -u -r1.143 Makefile.am
--- pango/Makefile.am	7 Jul 2006 05:01:06 -0000	1.143
+++ pango/Makefile.am	9 Oct 2006 03:19:53 -0000
@@ -81,7 +81,6 @@
 	pango-renderer.c			\
 	pango-script.c				\
 	pango-script-lang-table.h		\
-	pango-script-table.h			\
 	pango-tabs.c				\
 	pango-utils.c				\
 	pango-matrix.c				\
