diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-12-31 15:33:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-31 15:33:09 +0000 |
| commit | 3b7433839fab610f5f9444289ab5c4d67226e1a7 (patch) | |
| tree | 8026aba6c640bef383bbf7ab79065917a8c44603 | |
| parent | a947a4efe7913df1e1ca4e1e7b0264938fa89b20 (diff) | |
| download | pango-3b7433839fab610f5f9444289ab5c4d67226e1a7.tar.gz | |
Fix problem where MEDIUM was getting grouped with SEMIBOLD rather than
Fri Dec 31 10:20:55 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.c (pango_fc_convert_weight_to_pango):
Fix problem where MEDIUM was getting grouped with SEMIBOLD
rather than NORMAL.
(http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=143832)
Wed Dec 22 13:21:01 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-script.c pango/pango-types.h: Fix a couple
of documentation typos (#161647, Torsten Schoenfeld)
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 12 | ||||
| -rw-r--r-- | pango/pango-script.c | 2 | ||||
| -rw-r--r-- | pango/pango-types.h | 2 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 2 |
5 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,15 @@ +Fri Dec 31 10:20:55 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_pango): + Fix problem where MEDIUM was getting grouped with SEMIBOLD + rather than NORMAL. + (http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=143832) + +Wed Dec 22 13:21:01 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-script.c pango/pango-types.h: Fix a couple + of documentation typos (#161647, Torsten Schoenfeld) + Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index cd0cc712..e4b8708e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,15 @@ +Fri Dec 31 10:20:55 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_pango): + Fix problem where MEDIUM was getting grouped with SEMIBOLD + rather than NORMAL. + (http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=143832) + +Wed Dec 22 13:21:01 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-script.c pango/pango-types.h: Fix a couple + of documentation typos (#161647, Torsten Schoenfeld) + Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use diff --git a/pango/pango-script.c b/pango/pango-script.c index a1be94e0..d57358dc 100644 --- a/pango/pango-script.c +++ b/pango/pango-script.c @@ -172,7 +172,7 @@ pango_script_iter_free (PangoScriptIter *iter) * @script: location to store script for range, or %NULL * * Gets information about the range to which @iter currently points. - * The range is the is the set of locations p where *start <= p < *end. + * The range is the set of locations p where *start <= p < *end. * (That is, it doesn't include the character stored at *end) **/ void diff --git a/pango/pango-types.h b/pango/pango-types.h index 82143508..51eb456a 100644 --- a/pango/pango-types.h +++ b/pango/pango-types.h @@ -155,7 +155,7 @@ void pango_matrix_concat (PangoMatrix *matrix, * Unicode bidirectional algorithm; not every value in this * enumeration makes sense for every usage of #PangoDirection; * for example, the return value of pango_unichar_direction() - * and pango_find_base_direction() cannot be %PANGO_DIRECTION_WEAK_LTR + * and pango_find_base_dir() cannot be %PANGO_DIRECTION_WEAK_LTR * or %PANGO_DIRECTION_WEAK_RTL, since every character is either * neutral or has a strong direction; on the other hand * %PANGO_DIRECTION_NEUTRAL doesn't make sense to pass diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 8e17d76d..5ac4f285 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1288,7 +1288,7 @@ pango_fc_convert_weight_to_pango (int fc_weight) return PANGO_WEIGHT_ULTRALIGHT; else if (fc_weight < (FC_WEIGHT_LIGHT + FC_WEIGHT_REGULAR) / 2) return PANGO_WEIGHT_LIGHT; - else if (fc_weight < (FC_WEIGHT_REGULAR + FC_WEIGHT_MEDIUM) / 2) + else if (fc_weight < (FC_WEIGHT_REGULAR + FC_WEIGHT_DEMIBOLD) / 2) return PANGO_WEIGHT_NORMAL; /* We group the 500/MEDIUM weight with normal to reduce confusion * |