text-align

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

2 files changed, 40 insertions, 5 deletions

diff --git a/src/parse/css21.c b/src/parse/css21.c
index 7f0bc4c..7c5fd3f 100644
--- a/src/parse/css21.c
+++ b/src/parse/css21.c
@@ -64,7 +64,7 @@ enum {
 	LOWER_LATIN, UPPER_LATIN, ARMENIAN, GEORGIAN, LOWER_ALPHA, UPPER_ALPHA,
 	INVERT, VISIBLE, ALWAYS, AVOID, X_LOW, LOW, HIGH, X_HIGH, STATIC,
 	RELATIVE, ABSOLUTE, ONCE, DIGITS, CONTINUOUS, CODE, SPELL_OUT, X_SLOW,
-	SLOW, FAST, X_FAST, FASTER, SLOWER,
+	SLOW, FAST, X_FAST, FASTER, SLOWER, CENTER, JUSTIFY,
 
 	LAST_KNOWN
 };
@@ -282,6 +282,8 @@ static struct {
 	{ "x-fast", SLEN("x-fast") },
 	{ "faster", SLEN("faster") },
 	{ "slower", SLEN("slower") },
+	{ "center", SLEN("center") },
+	{ "justify", SLEN("justify") },
 };
 
 typedef struct context_entry {
diff --git a/src/parse/css21props.c b/src/parse/css21props.c
index 097f36c..e58cad5 100644
--- a/src/parse/css21props.c
+++ b/src/parse/css21props.c
@@ -3611,10 +3611,43 @@ css_error parse_text_align(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 (left, right, center, justify, 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[LEFT]) {
+		value = TEXT_ALIGN_LEFT;
+	} else if (ident->lower.ptr == c->strings[RIGHT]) {
+		value = TEXT_ALIGN_RIGHT;
+	} else if (ident->lower.ptr == c->strings[CENTER]) {
+		value = TEXT_ALIGN_CENTER;
+	} else if (ident->lower.ptr == c->strings[JUSTIFY]) {
+		value = TEXT_ALIGN_JUSTIFY;
+	} else
+		return CSS_INVALID;
+
+	opv = buildOPV(OP_TEXT_ALIGN, 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;
 }