? external/gtk2/pango/config.h
? external/gtk2/pango/pango-zip.sh
? external/gtk2/pango/docs/version.xml
? external/gtk2/pango/docs/html/ix01.html
? external/gtk2/pango/pango/libpango-1.0-0.dll
? external/gtk2/pango/pango/libpango-1.0-0.exp
? external/gtk2/pango/pango/libpango-1.0-0.ilk
? external/gtk2/pango/pango/libpango-1.0-0.lib
? external/gtk2/pango/pango/libpango-1.0-0.pdb
? external/gtk2/pango/pango/libpangowin32-1.0-0.dll
? external/gtk2/pango/pango/libpangowin32-1.0-0.exp
? external/gtk2/pango/pango/libpangowin32-1.0-0.ilk
? external/gtk2/pango/pango/libpangowin32-1.0-0.lib
? external/gtk2/pango/pango/libpangowin32-1.0-0.pdb
? external/gtk2/pango/pango/module-defs-ft2.c
? external/gtk2/pango/pango/module-defs-win32.c
? external/gtk2/pango/pango/module-defs-x.c
? external/gtk2/pango/pango/module-defs-xft.c
? external/gtk2/pango/pango/module-defs.h
? external/gtk2/pango/pango/pango-1.0s.lib
? external/gtk2/pango/pango/pango-enum-types.c
? external/gtk2/pango/pango/pango-enum-types.h
? external/gtk2/pango/pango/pango.rc
? external/gtk2/pango/pango/pangoft2.rc
? external/gtk2/pango/pango/pangowin32-1.0s.lib
? external/gtk2/pango/pango/pangowin32.rc
? external/gtk2/pango/pango/querymodules.ilk
? external/gtk2/pango/pango/querymodules.pdb
? external/gtk2/pango/pango/testfonts.c
? external/gtk2/pango/pango/vc60.pdb
Index: external/gtk2/pango/pango/pango-fontmap.c
===================================================================
RCS file: /home/cvs/src/ide/external/gtk2/pango/pango/pango-fontmap.c,v
retrieving revision 1.1
diff -u -p -r1.1 pango-fontmap.c
--- external/gtk2/pango/pango/pango-fontmap.c	28 Mar 2003 23:15:29 -0000	1.1
+++ external/gtk2/pango/pango/pango-fontmap.c	2 Jul 2004 19:47:52 -0000
@@ -174,9 +174,9 @@ pango_font_map_real_load_fontset (PangoF
   int i;
   PangoFontsetSimple *fonts;
 
-  families = g_strsplit (pango_font_description_get_family (desc), ",", -1);
-
   fonts = pango_fontset_simple_new (language);
+
+  families = g_strsplit (pango_font_description_get_family (desc), ",", -1);
   
   for (i = 0; families[i]; i++)
     pango_font_map_fontset_add_fonts (fontmap,
Index: external/gtk2/pango/pango/pangowin32-fontmap.c
===================================================================
RCS file: /home/cvs/src/ide/external/gtk2/pango/pango/pangowin32-fontmap.c,v
retrieving revision 1.7
diff -u -p -r1.7 pangowin32-fontmap.c
--- external/gtk2/pango/pango/pangowin32-fontmap.c	1 Jul 2004 23:22:13 -0000	1.7
+++ external/gtk2/pango/pango/pangowin32-fontmap.c	2 Jul 2004 19:47:53 -0000
@@ -220,7 +220,10 @@ pango_win32_inner_enum_proc (LOGFONT    
 {
   PangoWin32FontMap* map = (PangoWin32FontMap*) lParam;
 
-  pango_win32_insert_font (map, lfp);
+  /* East asian fonts with rotated glyphs have @ prepended to their name;
+     ignore them for now. */
+  if (lfp->lfFaceName[0] != '@')
+	pango_win32_insert_font (map, lfp);
 
   return 1;
 }
