Adapt to new g_utf8_to_ucs4() prototype.

Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>

        * modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
        to new g_utf8_to_ucs4() prototype.

        * modules/basic/basic-ft2.c: Include pango-engine.h

        * pango/pangoft2.h: Don't include pango.h, which would
        pull in pango-enums.h and thus break module building,
        just include neeeded pango-layout.h

11 files changed, 80 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index bd2b35cc..3d8150ce 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
+	to new g_utf8_to_ucs4() prototype.
+
+	* modules/basic/basic-ft2.c: Include pango-engine.h
+
+	* pango/pangoft2.h: Don't include pango.h, which would
+	pull in pango-enums.h and thus break module building, 
+	just include neeeded pango-layout.h
+
 Fri Jan  5 16:12:37 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/{arabic-xft,arabic}.c pango/{pango-context.c,pangoft.c,pangox.c}:
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 49b322e5..e535f153 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -118,16 +118,6 @@ FreeType Fonts and Rendering
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_ft2_has_glyph ##### -->
-<para>
-
-</para>
-
-@font: 
-@glyph: 
-@Returns: 
-
-
 <!-- ##### FUNCTION pango_ft2_get_unknown_glyph ##### -->
 <para>
 
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 1a427055..4ab5d6bf 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -216,8 +216,7 @@ arabic_engine_shape (PangoFont        *font,
     p = text;
     if (analysis->level % 2 == 0)
         {
-            wc      = g_utf8_to_ucs4(text,length);
-            n_chars = g_utf8_strlen(text,length);
+            wc      = g_utf8_to_ucs4_fast (text,length,&n_chars);
             /* We were called on a LTR directional run (e.g. some numbers); 
                fallback as simple as possible */
             pango_glyph_string_set_size (glyphs, n_chars);
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index 72799e52..10a9bec2 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "pango-layout.h"
+#include "pango-engine.h"
 #include "pangoft2.h"
 #include "pango-utils.h"
 
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index 4cd98781..77c3667d 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -23,8 +23,7 @@
 #ifndef __PANGOFT2_H__
 #define __PANGOFT2_H__
 
-#include <glib.h>
-#include <pango/pango.h>
+#include <pango/pango-layout.h>
 
 #ifdef __cplusplus
 extern "C" {