summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2007-01-10 18:14:16 +0000
committerDom Lachowicz <doml@src.gnome.org>2007-01-10 18:14:16 +0000
commitef258807ec53ed9639dd68e897de98dbe81f408c (patch)
tree303f65e1bab636a99b1d466d65ce0b311c01b5bb
parentc86451222851de8afe54f2d894a11d1deca5ea3d (diff)
downloadlibcroco-ef258807ec53ed9639dd68e897de98dbe81f408c.tar.gz
Handle FONT_WEIGHT_INHERIT.
2007-01-10 Bruno Haible <bruno@clisp.org> * cr-fonts.c (cr_font_weight_get_bolder): Handle FONT_WEIGHT_INHERIT. svn path=/trunk/; revision=311
-rw-r--r--ChangeLog1
-rw-r--r--src/cr-fonts.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a6294a..d4f67a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* cr-style.h (enum CRPositionType): Remove trailing comma. Needed for
compilation on AIX with xlc.
+ * cr-fonts.c (cr_font_weight_get_bolder): Handle FONT_WEIGHT_INHERIT.
2007-01-09 Benjamin Dauvergne <feanor@tol-eressea.org>
diff --git a/src/cr-fonts.c b/src/cr-fonts.c
index 35c57ad..94c4f2c 100644
--- a/src/cr-fonts.c
+++ b/src/cr-fonts.c
@@ -766,7 +766,10 @@ cr_font_variant_to_string (enum CRFontVariant a_code)
enum CRFontWeight
cr_font_weight_get_bolder (enum CRFontWeight a_weight)
{
- if (a_weight >= FONT_WEIGHT_900) {
+ if (a_weight == FONT_WEIGHT_INHERIT) {
+ cr_utils_trace_info ("can't return a bolder weight for FONT_WEIGHT_INHERIT") ;
+ return a_weight;
+ } else if (a_weight >= FONT_WEIGHT_900) {
return FONT_WEIGHT_900 ;
} else if (a_weight < FONT_WEIGHT_NORMAL) {
return FONT_WEIGHT_NORMAL ;