diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-25 22:30:25 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-25 22:30:25 +0000 |
commit | f498628383d82ecabceff445f748bfc62338a02c (patch) | |
tree | 045a54b31dc2a0cfe6ceb1bedc80e0f5326d5eb5 /src/parse | |
parent | e41fbd33783f4aa21e4144f6f8159c04e59edeee (diff) | |
download | libcss-f498628383d82ecabceff445f748bfc62338a02c.tar.gz libcss-f498628383d82ecabceff445f748bfc62338a02c.tar.bz2 |
speak
svn path=/trunk/libcss/; revision=5789
Diffstat (limited to 'src/parse')
-rw-r--r-- | src/parse/css21.c | 3 | ||||
-rw-r--r-- | src/parse/css21props.c | 39 |
2 files changed, 37 insertions, 5 deletions
diff --git a/src/parse/css21.c b/src/parse/css21.c index be819c4..3659180 100644 --- a/src/parse/css21.c +++ b/src/parse/css21.c @@ -63,7 +63,7 @@ enum { DECIMAL_LEADING_ZERO, LOWER_ROMAN, UPPER_ROMAN, LOWER_GREEK, 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, + RELATIVE, ABSOLUTE, ONCE, DIGITS, CONTINUOUS, CODE, SPELL_OUT, LAST_KNOWN }; @@ -274,6 +274,7 @@ static struct { { "digits", SLEN("digits") }, { "continuous", SLEN("continuous") }, { "code", SLEN("code") }, + { "spell-out", SLEN("spell-out") }, }; typedef struct context_entry { diff --git a/src/parse/css21props.c b/src/parse/css21props.c index b563d70..f62ba54 100644 --- a/src/parse/css21props.c +++ b/src/parse/css21props.c @@ -3391,10 +3391,41 @@ css_error parse_speak(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, none, spell-out, 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 = SPEAK_NORMAL; + } else if (ident->lower.ptr == c->strings[NONE]) { + value = SPEAK_NONE; + } else if (ident->lower.ptr == c->strings[SPELL_OUT]) { + value = SPEAK_SPELL_OUT; + } else + return CSS_INVALID; + + opv = buildOPV(OP_SPEAK, 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; } |