mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-26 22:09:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2002-08-11 23:02:25 by bursa]

Browse Source 
[monkeyson] Add font-weight and font-style.

svn path=/import/netsurf/; revision=29
This commit is contained in:
James Bursa 2002-08-11 23:02:49 +00:00
parent 72a56e8792
commit 1a1c493d74
3 changed files with 92 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
render/css.c
View File

@ -1,5 +1,5 @@
/**
* $Id: css.c,v 1.8 2002/06/28 20:14:04 bursa Exp $
* $Id: css.c,v 1.9 2002/08/11 23:02:25 bursa Exp $
*/
#include <string.h>
@ -56,6 +56,8 @@ const struct css_style css_base_style = {
CSS_DISPLAY_BLOCK,
CSS_FLOAT_NONE,
{ CSS_FONT_SIZE_LENGTH, { { 12, CSS_UNIT_PT } } },
CSS_FONT_WEIGHT_NORMAL,
CSS_FONT_STYLE_NORMAL,
{ CSS_HEIGHT_AUTO, { 1, CSS_UNIT_EM } },
{ CSS_LINE_HEIGHT_ABSOLUTE, { 1.2 } },
CSS_TEXT_ALIGN_LEFT,
@ -67,6 +69,8 @@ const struct css_style css_empty_style = {
CSS_DISPLAY_INHERIT,
CSS_FLOAT_INHERIT,
{ CSS_FONT_SIZE_INHERIT, { { 1, CSS_UNIT_EM } } },
CSS_FONT_WEIGHT_INHERIT,
CSS_FONT_STYLE_INHERIT,
{ CSS_HEIGHT_AUTO, { 1, CSS_UNIT_EM } },
{ CSS_LINE_HEIGHT_INHERIT, { 1.2 } },
CSS_TEXT_ALIGN_INHERIT,
@ -78,6 +82,8 @@ const struct css_style css_blank_style = {
CSS_DISPLAY_INLINE,
CSS_FLOAT_NONE,
{ CSS_FONT_SIZE_INHERIT, { { 1, CSS_UNIT_EM } } },
CSS_FONT_WEIGHT_INHERIT,
CSS_FONT_STYLE_INHERIT,
{ CSS_HEIGHT_AUTO, { 1, CSS_UNIT_EM } },
{ CSS_LINE_HEIGHT_INHERIT, { 1.2 } },
CSS_TEXT_ALIGN_INHERIT,
@ -113,6 +119,16 @@ static void parse_float(struct css_style * const style, const char * const value
style->float_ = css_float_parse(value);
}
static void parse_font_weight(struct css_style * const style, const char * const value)
{
style->font_weight = css_font_weight_parse(value);
}
static void parse_font_style(struct css_style * const style, const char * const value)
{
style->font_style = css_font_style_parse(value);
}
#define SIZE_FACTOR 1.2
static struct font_size {
@ -139,17 +155,18 @@ static void parse_font_size(struct css_style * const style, const char * const v
return;
}
}
if (strcmp(value, "larger") == 0)
style->font_size.size = CSS_FONT_SIZE_PERCENT,
if (strcmp(value, "larger") == 0) {
style->font_size.size = CSS_FONT_SIZE_PERCENT;
style->font_size.value.percent = SIZE_FACTOR * 100;
else if (strcmp(value, "smaller") == 0)
style->font_size.size = CSS_FONT_SIZE_PERCENT,
} else if (strcmp(value, "smaller") == 0) {
style->font_size.size = CSS_FONT_SIZE_PERCENT;
style->font_size.value.percent = 1 / SIZE_FACTOR * 100;
else if (strrchr(value, '%'))
style->font_size.size = CSS_FONT_SIZE_PERCENT,
} else if (strrchr(value, '%')) {
style->font_size.size = CSS_FONT_SIZE_PERCENT;
style->font_size.value.percent = atof(value);
else if (parse_length(&style->font_size.value.length, value) == 0)
} else if (parse_length(&style->font_size.value.length, value) == 0) {
style->font_size.size = CSS_FONT_SIZE_LENGTH;
}
}
static void parse_height(struct css_style * const style, const char * const value)
@ -162,14 +179,15 @@ static void parse_height(struct css_style * const style, const char * const valu
static void parse_line_height(struct css_style * const style, const char * const value)
{
if (strcmp(value, "normal") == 0)
style->line_height.size = CSS_LINE_HEIGHT_ABSOLUTE,
if (strcmp(value, "normal") == 0) {
style->line_height.size = CSS_LINE_HEIGHT_ABSOLUTE;
style->line_height.value.absolute = 1.0;
else if (strrchr(value, '%'))
style->line_height.size = CSS_LINE_HEIGHT_PERCENT,
} else if (strrchr(value, '%')) {
style->line_height.size = CSS_LINE_HEIGHT_PERCENT;
style->line_height.value.percent = atof(value);
else if (parse_length(&style->line_height.value.length, value) == 0)
} else if (parse_length(&style->line_height.value.length, value) == 0) {
style->line_height.size = CSS_LINE_HEIGHT_LENGTH;
}
}
static void parse_text_align(struct css_style * const style, const char * const value)
@ -181,10 +199,10 @@ static void parse_width(struct css_style * const style, const char * const value
{
if (strcmp(value, "auto") == 0)
style->width.width = CSS_WIDTH_AUTO;
else if (strrchr(value, '%'))
style->width.width = CSS_WIDTH_PERCENT,
else if (strrchr(value, '%')) {
style->width.width = CSS_WIDTH_PERCENT;
style->width.value.percent = atof(value);
else if (parse_length(&style->width.value.length, value) == 0)
} else if (parse_length(&style->width.value.length, value) == 0)
style->width.width = CSS_WIDTH_LENGTH;
}
@ -195,7 +213,9 @@ static struct property {
{ "clear", parse_clear },
{ "display", parse_display },
{ "float", parse_float },
{ "font-weight", parse_font_weight },
{ "font-size", parse_font_size },
{ "font-style", parse_font_style },
{ "height", parse_height },
{ "line-height", parse_line_height },
{ "text-align", parse_text_align },
@ -214,9 +234,14 @@ void css_parse_property_list(struct css_style * style, char * str)
char * value;
unsigned int i;
if ((end = strchr(str, ';')) != 0) *end = 0, end++;
if ((value = strchr(str, ':')) == 0) continue;
*value = 0; value++;
if ((end = strchr(str, ';')) != 0) {
*end = 0;
end++;
}
if ((value = strchr(str, ':')) == 0)
continue;
*value = 0;
value++;
prop = strip(str);
value = strip(value);
/*fprintf(stderr, "css_parse: '%s' => '%s'\n", prop, value);*/
@ -550,31 +575,55 @@ void css_dump_stylesheet(const struct css_stylesheet * stylesheet)
void css_cascade(struct css_style * const style, const struct css_style * const apply)
{
float f;
if (apply->clear != CSS_CLEAR_INHERIT) style->clear = apply->clear;
if (apply->display != CSS_DISPLAY_INHERIT) style->display = apply->display;
if (apply->float_ != CSS_FLOAT_INHERIT) style->float_ = apply->float_;
if (apply->height.height != CSS_HEIGHT_INHERIT) style->height = apply->height;
if (apply->text_align != CSS_TEXT_ALIGN_INHERIT) style->text_align = apply->text_align;
if (apply->width.width != CSS_WIDTH_INHERIT) style->width = apply->width;
if (apply->clear != CSS_CLEAR_INHERIT)
style->clear = apply->clear;
if (apply->display != CSS_DISPLAY_INHERIT)
style->display = apply->display;
if (apply->float_ != CSS_FLOAT_INHERIT)
style->float_ = apply->float_;
if (apply->height.height != CSS_HEIGHT_INHERIT)
style->height = apply->height;
if (apply->text_align != CSS_TEXT_ALIGN_INHERIT)
style->text_align = apply->text_align;
if (apply->width.width != CSS_WIDTH_INHERIT)
style->width = apply->width;
if (apply->font_weight != CSS_FONT_WEIGHT_INHERIT)
style->font_weight = apply->font_weight;
if (apply->font_style != CSS_FONT_STYLE_INHERIT)
style->font_style = apply->font_style;
/* font-size */
f = apply->font_size.value.percent / 100;
switch (apply->font_size.size) {
case CSS_FONT_SIZE_ABSOLUTE: style->font_size = apply->font_size; break;
case CSS_FONT_SIZE_ABSOLUTE:
style->font_size = apply->font_size;
break;
case CSS_FONT_SIZE_LENGTH:
switch (apply->font_size.value.length.unit) {
case CSS_UNIT_EM: f = apply->font_size.value.length.value; break;
case CSS_UNIT_EX: f = apply->font_size.value.length.value * 0.6 /*?*/; break;
default: style->font_size = apply->font_size;
case CSS_UNIT_EM:
f = apply->font_size.value.length.value;
break;
case CSS_UNIT_EX:
f = apply->font_size.value.length.value * 0.6 /*?*/;
break;
default:
style->font_size = apply->font_size;
}
if ((apply->font_size.value.length.unit != CSS_UNIT_EM) &&
(apply->font_size.value.length.unit != CSS_UNIT_EX)) break;
(apply->font_size.value.length.unit != CSS_UNIT_EX))
break;
/* drop through if EM or EX */
case CSS_FONT_SIZE_PERCENT:
switch (style->font_size.size) {
case CSS_FONT_SIZE_ABSOLUTE: style->font_size.value.absolute *= f; break;
case CSS_FONT_SIZE_LENGTH: style->font_size.value.length.value *= f; break;
default: die("attempting percentage of unknown font-size");
case CSS_FONT_SIZE_ABSOLUTE:
style->font_size.value.absolute *= f;
break;
case CSS_FONT_SIZE_LENGTH:
style->font_size.value.length.value *= f;
break;
default:
die("attempting percentage of unknown font-size");
}
break;
case CSS_FONT_SIZE_INHERIT:

9
render/css.h
View File

@ -1,7 +1,10 @@
/**
* $Id: css.h,v 1.6 2002/06/26 23:27:30 bursa Exp $
* $Id: css.h,v 1.7 2002/08/11 23:02:25 bursa Exp $
*/
#ifndef _NETSURF_RENDER_CSS_H_
#define _NETSURF_RENDER_CSS_H_
#include "css_enum.h"
/**
@ -33,6 +36,9 @@ struct css_style {
} value;
} font_size;
css_font_weight font_weight;
css_font_style font_style;
struct {
enum { CSS_HEIGHT_INHERIT,
CSS_HEIGHT_AUTO,
@ -91,3 +97,4 @@ void css_dump_stylesheet(const struct css_stylesheet * stylesheet);
void css_cascade(struct css_style * const style, const struct css_style * const apply);
void css_parse_property_list(struct css_style * style, char * str);
#endif

4
render/css_enums
View File

@ -7,9 +7,9 @@ css_border_style inherit none dashed dotted double groove inset outset ridge sol
css_clear inherit none both left right
css_display inherit inline block list-item run-in compact marker table inline-table table-row-group table-header-group table-footer-group table-row table-column-group table-column table-cell table-caption none
css_float inherit none left right
css_font_style normal italic oblique
css_font_style inherit normal italic oblique
css_font_variant normal smallcaps
css_font_weight normal bold bolder lighter 100 200 300 400 500 600 700 800 900
css_font_weight inherit normal bold bolder lighter 100 200 300 400 500 600 700 800 900
css_letter_spacing normal length
css_list_style_position outside inside
css_list_style_type disc circle square decimal lower_alpha lower_roman upper_alpha upper_roman none