white-space

svn path=/trunk/libcss/; revision=5801

2 files changed, 44 insertions, 4 deletions

diff --git a/src/parse/css21.c b/src/parse/css21.c
index bf3eb9a..8f4fe0d 100644
--- a/src/parse/css21.c
+++ b/src/parse/css21.c
@@ -67,6 +67,7 @@ enum {
 	SLOW, FAST, X_FAST, FASTER, SLOWER, CENTER, JUSTIFY, CAPITALIZE,
 	UPPERCASE, LOWERCASE, EMBED, BIDI_OVERRIDE, BASELINE, SUB, SUPER,
 	TEXT_TOP, MIDDLE, TEXT_BOTTOM, SILENT, X_SOFT, SOFT, LOUD, X_LOUD,
+	PRE, NOWRAP, PRE_WRAP, PRE_LINE,
 
 	LAST_KNOWN
 };
@@ -302,6 +303,10 @@ static struct {
 	{ "soft", SLEN("soft") },
 	{ "loud", SLEN("loud") },
 	{ "x-loud", SLEN("x-loud") },
+	{ "pre", SLEN("pre") },
+	{ "nowrap", SLEN("nowrap") },
+	{ "pre-wrap", SLEN("pre-wrap") },
+	{ "pre-line", SLEN("pre-line") },
 };
 
 typedef struct context_entry {
diff --git a/src/parse/css21props.c b/src/parse/css21props.c
index 59c34e3..569cce9 100644
--- a/src/parse/css21props.c
+++ b/src/parse/css21props.c
@@ -4129,10 +4129,45 @@ css_error parse_white_space(css_css21 *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style **result)
 {
-	UNUSED(c);
-	UNUSED(vector);
-	UNUSED(ctx);
-	UNUSED(result);
+	css_error error;
+	const css_token *ident;
+	uint8_t flags = 0;
+	uint16_t value = 0;
+	uint32_t opv;
+
+	/* IDENT (normal, pre, nowrap, pre-wrap, pre-line, inherit) */
+	ident = parserutils_vector_iterate(vector, ctx);
+	if (ident == NULL || ident->type != CSS_TOKEN_IDENT)
+		return CSS_INVALID;
+
+	error = parse_important(c, vector, ctx, &flags);
+	if (error != CSS_OK)
+		return error;
+
+	if (ident->lower.ptr == c->strings[INHERIT]) {
+		flags |= FLAG_INHERIT;
+	} else if (ident->lower.ptr == c->strings[NORMAL]) {
+		value = WHITE_SPACE_NORMAL;
+	} else if (ident->lower.ptr == c->strings[PRE]) {
+		value = WHITE_SPACE_PRE;
+	} else if (ident->lower.ptr == c->strings[NOWRAP]) {
+		value = WHITE_SPACE_NOWRAP;
+	} else if (ident->lower.ptr == c->strings[PRE_WRAP]) {
+		value = WHITE_SPACE_PRE_WRAP;
+	} else if (ident->lower.ptr == c->strings[PRE_LINE]) {
+		value = WHITE_SPACE_PRE_LINE;
+	} else
+		return CSS_INVALID;
+
+	opv = buildOPV(OP_WHITE_SPACE, flags, value);
+
+	/* Allocate result */
+	error = css_stylesheet_style_create(c->sheet, sizeof(opv), result);
+	if (error != CSS_OK)
+		return error;
+
+	/* Copy the bytecode to it */
+	memcpy((*result)->bytecode, &opv, sizeof(opv));
 
 	return CSS_OK;
 }