reverted the patch for bug #123602 since I only applied it accidentally. I

2003-11-20  Sven Neumann  <sven@gimp.org>

	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
	since I only applied it accidentally. I still believe the patch
	should go in though.

	* pango/pangoft2.c: really applied the fix for #101856 as
	described below.

7 files changed, 75 insertions, 70 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e5e42f0..bad6ccd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
+	since I only applied it accidentally. I still believe the patch
+	should go in though.
+
+	* pango/pangoft2.c: really applied the fix for #101856 as
+	described below.
+
 2003-11-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* pango/pango-utils.c:
@@ -24,10 +33,10 @@
 
 2003-11-18  Sven Neumann  <sven@gimp.org>
 
-	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
-	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
-	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
-	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	* pango/pangoft2.c: removed the set_unicode_charmap() call.  Made
+	pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char() use
+	FcCharSetHasChar().  This allows to use PangoFT2 with all font
 	encodings supported by fontconfig and fixes bug #101856.
 
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 5e5e42f0..bad6ccd4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+2003-11-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
+	since I only applied it accidentally. I still believe the patch
+	should go in though.
+
+	* pango/pangoft2.c: really applied the fix for #101856 as
+	described below.
+
 2003-11-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* pango/pango-utils.c:
@@ -24,10 +33,10 @@
 
 2003-11-18  Sven Neumann  <sven@gimp.org>
 
-	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
-	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
-	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
-	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	* pango/pangoft2.c: removed the set_unicode_charmap() call.  Made
+	pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char() use
+	FcCharSetHasChar().  This allows to use PangoFT2 with all font
 	encodings supported by fontconfig and fixes bug #101856.
 
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 5e5e42f0..bad6ccd4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+2003-11-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
+	since I only applied it accidentally. I still believe the patch
+	should go in though.
+
+	* pango/pangoft2.c: really applied the fix for #101856 as
+	described below.
+
 2003-11-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* pango/pango-utils.c:
@@ -24,10 +33,10 @@
 
 2003-11-18  Sven Neumann  <sven@gimp.org>
 
-	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
-	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
-	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
-	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	* pango/pangoft2.c: removed the set_unicode_charmap() call.  Made
+	pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char() use
+	FcCharSetHasChar().  This allows to use PangoFT2 with all font
 	encodings supported by fontconfig and fixes bug #101856.
 
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 5e5e42f0..bad6ccd4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+2003-11-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
+	since I only applied it accidentally. I still believe the patch
+	should go in though.
+
+	* pango/pangoft2.c: really applied the fix for #101856 as
+	described below.
+
 2003-11-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* pango/pango-utils.c:
@@ -24,10 +33,10 @@
 
 2003-11-18  Sven Neumann  <sven@gimp.org>
 
-	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
-	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
-	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
-	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	* pango/pangoft2.c: removed the set_unicode_charmap() call.  Made
+	pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char() use
+	FcCharSetHasChar().  This allows to use PangoFT2 with all font
 	encodings supported by fontconfig and fixes bug #101856.
 
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 5e5e42f0..bad6ccd4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+2003-11-20  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
+	since I only applied it accidentally. I still believe the patch
+	should go in though.
+
+	* pango/pangoft2.c: really applied the fix for #101856 as
+	described below.
+
 2003-11-20  Noah Levitt  <nlevitt@columbia.edu>
 
 	* pango/pango-utils.c:
@@ -24,10 +33,10 @@
 
 2003-11-18  Sven Neumann  <sven@gimp.org>
 
-	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
-	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
-	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
-	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	* pango/pangoft2.c: removed the set_unicode_charmap() call.  Made
+	pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char() use
+	FcCharSetHasChar().  This allows to use PangoFT2 with all font
 	encodings supported by fontconfig and fixes bug #101856.
 
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 3460eee8..7efe0287 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -68,7 +68,6 @@ struct _PangoFT2FontMapClass
 };
 
 static void          pango_ft2_font_map_class_init          (PangoFT2FontMapClass *class);
-static void          pango_ft2_font_map_init                (PangoFT2FontMap      *fontmap);
 static void          pango_ft2_font_map_finalize            (GObject              *object);
 static void          pango_ft2_font_map_default_substitute  (PangoFcFontMap       *fcfontmap,
 							     FcPattern            *pattern);
@@ -96,9 +95,9 @@ pango_ft2_font_map_get_type (void)
         NULL,           /* class_data */
         sizeof (PangoFT2FontMap),
         0,              /* n_preallocs */
-        (GInstanceInitFunc) pango_ft2_font_map_init,
+        (GInstanceInitFunc) NULL,
       };
-
+      
       object_type = g_type_register_static (PANGO_TYPE_FC_FONT_MAP,
                                             "PangoFT2FontMap",
                                             &object_info, 0);
@@ -121,14 +120,6 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class)
 }
 
 static void
-pango_ft2_font_map_init (PangoFT2FontMap *fontmap)
-{
-  fontmap->library = NULL;
-  fontmap->dpi_x   = 72.0;
-  fontmap->dpi_y   = 72.0;
-}
-
-static void
 pango_ft2_font_map_finalize (GObject *object)
 {
   PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (object);
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index e1a7306f..cc1b4c54 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -110,21 +110,6 @@ _pango_ft2_font_new (PangoFT2FontMap *ft2fontmap,
   return ft2font;
 }
 
-static gboolean
-set_unicode_charmap (FT_Face face)
-{
-  int charmap;
-
-  for (charmap = 0; charmap < face->num_charmaps; charmap++)
-    if (face->charmaps[charmap]->encoding == ft_encoding_unicode)
-      {
-	FT_Error error = FT_Set_Charmap(face, face->charmaps[charmap]);
-	return error == FT_Err_Ok;
-      }
-
-  return FALSE;
-}
-
 static void
 load_fallback_face (PangoFT2Font *ft2font,
 		    const char   *original_file)
@@ -169,12 +154,6 @@ load_fallback_face (PangoFT2Font *ft2font,
       g_free (name);
     }
 
-  if (!set_unicode_charmap (ft2font->face))
-    {
-      g_warning ("Unable to load unicode charmap from file %s, exiting\n", filename2);
-      exit (1);
-    }
-  
   FcPatternDestroy (sans);
   FcPatternDestroy (matched);
 }
@@ -248,17 +227,6 @@ pango_ft2_font_get_face (PangoFont *font)
 	}
 
       g_assert (ft2font->face);
-      
-      if (!set_unicode_charmap (ft2font->face))
-	{
-	  g_warning ("Unable to load unicode charmap from font file %s",
-                     filename);
-	  
-	  FT_Done_Face (ft2font->face);
-	  ft2font->face = NULL;
-	  
-	  load_fallback_face (ft2font, filename);
-	}
 
       error = FT_Set_Char_Size (ft2font->face,
 				PANGO_PIXELS_26_6 (ft2font->size),
@@ -652,14 +620,15 @@ static gboolean
 pango_ft2_font_real_has_char (PangoFcFont *font,
 			      gunichar     wc)
 {
-  FT_Face face;
-  FT_UInt index;
+  FcCharSet *charset;
 
-  face = pango_ft2_font_get_face ((PangoFont *)font);
-  index = FT_Get_Char_Index (face, wc);
-  return (index && index <= face->num_glyphs);
+  if (FcPatternGetCharSet (font->font_pattern,
+                           FC_CHARSET, 0, &charset) != FcResultMatch)
+    return FALSE;
+
+  return FcCharSetHasChar (charset, wc);
 }
-				   
+
 static guint
 pango_ft2_font_real_get_glyph (PangoFcFont *font,
 			       gunichar     wc)
@@ -668,7 +637,7 @@ pango_ft2_font_real_get_glyph (PangoFcFont *font,
   FT_UInt index;
 
   face = pango_ft2_font_get_face ((PangoFont *)font);
-  index = FT_Get_Char_Index (face, wc);
+  index = FcFreeTypeCharIndex (face, wc);
   if (index && index <= face->num_glyphs)
     return index;