From c506f17f0155956d90a506be3cc1b33f3618af64 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 31 Jul 2002 18:42:35 +0000 Subject: Make charset ordering more important than ordering in the font Wed Jul 31 14:41:07 2002 Owen Taylor * pango/pangox.c (pango_x_list_subfonts): Make charset ordering more important than ordering in the font specfication, and document the previously undocumented ordering. (#88562, Brian Yuan.) --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-2 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/pangox.c | 7 ++++--- 7 files changed, 46 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b92ffa7c..a742427a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b92ffa7c..a742427a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index b92ffa7c..a742427a 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b92ffa7c..a742427a 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b92ffa7c..a742427a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b92ffa7c..a742427a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Wed Jul 31 14:41:07 2002 Owen Taylor + + * pango/pangox.c (pango_x_list_subfonts): Make charset + ordering more important than ordering in the font + specfication, and document the previously undocumented + ordering. (#88562, Brian Yuan.) + Wed Jul 31 12:38:36 2002 Owen Taylor * pango/querymodules.c (string_needs_escape): Avoid diff --git a/pango/pangox.c b/pango/pangox.c index d64d13fe..72627e6c 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -1086,7 +1086,8 @@ pango_x_insert_subfont (PangoFont *font, const char *xlfd) * @subfont_charsets: location to store a pointer to an array of subfont IDs for each found subfont; * the result must be freed using g_free(). * - * Lists the subfonts of a given font. + * Lists the subfonts of a given font. The result is ordered first by charset, + * and then within each charset, by the order of fonts in the font specification. * * Return value: length of the arrays stored in @subfont_ids and * @subfont_charsets. @@ -1164,8 +1165,8 @@ pango_x_list_subfonts (PangoFont *font, n_subfonts = 0; - for (i=0; in_fonts; i++) - for (j=0; jn_fonts; i++) if (subfont_lists[j][i]) { (*subfont_ids)[n_subfonts] = subfont_lists[j][i]; -- cgit v1.2.1