updated externals including patch from J. Ali Harlow <ali@juiblex.co.uk>,

2004-02-28  Hans Breuer  <hans@breuer.org>

	* pango/pango.def : updated externals including
	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518

	* pango/pangowin32-fontmap.c : implement list_sizes() and
	is_monospace() members

7 files changed, 66 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index aad60993..93ac9ffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* pango/pango.def : updated externals including
+	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518
+
+	* pango/pangowin32-fontmap.c : implement list_sizes() and
+	is_monospace() members
+
 Fri Feb 27 14:26:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c (bengCharClasses):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index aad60993..93ac9ffc 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* pango/pango.def : updated externals including
+	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518
+
+	* pango/pangowin32-fontmap.c : implement list_sizes() and
+	is_monospace() members
+
 Fri Feb 27 14:26:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c (bengCharClasses):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index aad60993..93ac9ffc 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* pango/pango.def : updated externals including
+	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518
+
+	* pango/pangowin32-fontmap.c : implement list_sizes() and
+	is_monospace() members
+
 Fri Feb 27 14:26:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c (bengCharClasses):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index aad60993..93ac9ffc 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* pango/pango.def : updated externals including
+	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518
+
+	* pango/pangowin32-fontmap.c : implement list_sizes() and
+	is_monospace() members
+
 Fri Feb 27 14:26:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c (bengCharClasses):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index aad60993..93ac9ffc 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* pango/pango.def : updated externals including
+	patch from J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135518
+
+	* pango/pangowin32-fontmap.c : implement list_sizes() and
+	is_monospace() members
+
 Fri Feb 27 14:26:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot-class-tables.c (bengCharClasses):
diff --git a/pango/pango.def b/pango/pango.def
index 974e50f6..98dcea1e 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -105,14 +105,17 @@ EXPORTS
 	pango_font_face_describe
 	pango_font_face_get_face_name
 	pango_font_face_get_type
+	pango_font_face_list_sizes
 	pango_font_family_get_name
 	pango_font_family_get_type
+	pango_font_family_is_monospace
 	pango_font_family_list_faces
 	pango_font_find_shaper
 	pango_font_get_coverage
 	pango_font_get_glyph_extents
 	pango_font_get_metrics
 	pango_font_get_type
+	pango_font_map_get_shape_engine_type
 	pango_font_map_get_type
 	pango_font_map_list_families
 	pango_font_map_load_font
@@ -126,6 +129,7 @@ EXPORTS
 	pango_font_metrics_new
 	pango_font_metrics_ref
 	pango_font_metrics_unref
+	pango_fontset_foreach
 	pango_fontset_get_font
 	pango_fontset_get_metrics
 	pango_fontset_get_type
@@ -157,6 +161,7 @@ EXPORTS
 	pango_language_from_string
 	pango_language_get_sample_string
 	pango_language_get_type
+	pango_language_includes_script
 	pango_language_matches
 	pango_layout_context_changed
 	pango_layout_copy
@@ -226,6 +231,7 @@ EXPORTS
 	pango_log2vis_get_embedding_levels
 	pango_lookup_aliases
 	pango_map_get_engine
+	pango_map_get_engines
 	pango_module_register
 	pango_parse_markup
 	pango_parse_stretch
@@ -237,7 +243,13 @@ EXPORTS
 	pango_scan_int
 	pango_scan_string
 	pango_scan_word
+	pango_script_for_unichar
+	pango_script_get_sample_language
 	pango_script_get_type
+	pango_script_iter_free
+	pango_script_iter_get_range
+	pango_script_iter_new 
+	pango_script_iter_next
 	pango_shape
 	pango_skip_space
 	pango_split_file_list
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 4ecda7e5..9c446866 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -75,6 +75,8 @@ struct _PangoWin32Family
 
   char *family_name;
   GSList *font_entries;
+
+  gboolean is_monospace;
 };
 
 struct _PangoWin32SizeInfo
@@ -93,6 +95,10 @@ struct _PangoWin32SizeInfo
 GType             pango_win32_family_get_type        (void);
 GType             pango_win32_face_get_type          (void);
 
+static void       pango_win32_face_list_sizes        (PangoFontFace  *face,
+                                                      int           **sizes,
+                                                      int            *n_sizes);
+
 static void       pango_win32_font_map_init          (PangoWin32FontMap       *fontmap);
 static void       pango_win32_font_map_class_init    (PangoFontMapClass       *class);
 
@@ -327,9 +333,9 @@ pango_win32_family_get_name (PangoFontFamily  *family)
 static gboolean
 pango_win32_family_is_monospace (PangoFontFamily *family)
 {
-  /* FIXME: implement me */
-  g_warning ("is_monospace not implemented for win32 backend");
-  return FALSE;
+  PangoWin32Family *win32family = PANGO_WIN32_FAMILY (family);
+
+  return win32family->is_monospace;
 }
 
 static void
@@ -795,6 +801,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
     { 
     case FF_MODERN : /* monospace */
       PING(("monospace"));
+      font_family->is_monospace = TRUE; /* modify before reuse */
       font_family = pango_win32_get_font_family (win32fontmap, "monospace");
       font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
       win32fontmap->n_fonts++;
@@ -950,7 +957,10 @@ pango_win32_face_list_sizes (PangoFontFace  *face,
                              int           **sizes,
                              int            *n_sizes)
 {
-  g_warning ("font_face_list_sizes not implemented for win32 backend");
+  /*
+   * for scalable fonts it's simple, and currently we only have such
+   * see : pango_win32_enum_proc(), TRUETYPE_FONTTYPE
+   */
   *sizes = NULL;
   *n_sizes = 0;
 }