summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2006-01-29 12:23:22 +0000
committerJames Bursa <james@netsurf-browser.org>2006-01-29 12:23:22 +0000
commit2e7b32ea5a8e6ec72886466e1e6421f4e82d33d3 (patch)
tree5e1e1fcb4f7e1e3c781348e56be9b5613f43e608
parentb9de635dab672a829a298b95154cc42095b4411e (diff)
downloadnetsurf-2e7b32ea5a8e6ec72886466e1e6421f4e82d33d3.tar.gz
netsurf-2e7b32ea5a8e6ec72886466e1e6421f4e82d33d3.tar.bz2
[project @ 2006-01-29 12:23:22 by bursa]
New version of RUfl - better weight detection and up to 9 weights. svn path=/import/netsurf/; revision=2050
-rw-r--r--riscos/font.c31
1 files changed, 27 insertions, 4 deletions
diff --git a/riscos/font.c b/riscos/font.c
index 7eab7a03c..411bb134a 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -2,7 +2,7 @@
* This file is part of NetSurf, http://netsurf.sourceforge.net/
* Licensed under the GNU General Public License,
* http://www.opensource.org/licenses/gpl-license
- * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2006 James Bursa <bursa@users.sourceforge.net>
*/
/** \file
@@ -461,19 +461,42 @@ void nsfont_read_style(const struct css_style *style,
*font_style = rufl_SLANTED;
break;
default:
- *font_style = rufl_REGULAR;
+ *font_style = 0;
break;
}
switch (style->font_weight) {
- case CSS_FONT_WEIGHT_BOLD:
+ case CSS_FONT_WEIGHT_100:
+ *font_style |= rufl_WEIGHT_100;
+ break;
+ case CSS_FONT_WEIGHT_200:
+ *font_style |= rufl_WEIGHT_200;
+ break;
+ case CSS_FONT_WEIGHT_300:
+ *font_style |= rufl_WEIGHT_300;
+ break;
+ case CSS_FONT_WEIGHT_NORMAL:
+ case CSS_FONT_WEIGHT_400:
+ *font_style |= rufl_WEIGHT_400;
+ break;
+ case CSS_FONT_WEIGHT_500:
+ *font_style |= rufl_WEIGHT_500;
+ break;
case CSS_FONT_WEIGHT_600:
+ *font_style |= rufl_WEIGHT_600;
+ break;
+ case CSS_FONT_WEIGHT_BOLD:
case CSS_FONT_WEIGHT_700:
+ *font_style |= rufl_WEIGHT_700;
+ break;
case CSS_FONT_WEIGHT_800:
+ *font_style |= rufl_WEIGHT_800;
+ break;
case CSS_FONT_WEIGHT_900:
- *font_style += rufl_BOLD;
+ *font_style |= rufl_WEIGHT_900;
break;
default:
+ *font_style |= rufl_WEIGHT_400;
break;
}
}