October 2008 - netsurf-commits - listmaster.pepperfish.net

r5648 jmb - in /trunk/libcss: src/lex/lex.c test/data/lex/INDEX test/data/lex/regression.dat

by netsurf＠semichrome.net

Author: jmb Date: Mon Oct 27 00:57:18 2008 New Revision: 5648 URL: http://source.netsurf-browser.org?rev=5648&view=rev Log: Support signs on numbers, percentages, and dimensions Added: trunk/libcss/test/data/lex/regression.dat Modified: trunk/libcss/src/lex/lex.c trunk/libcss/test/data/lex/INDEX Modified: trunk/libcss/src/lex/lex.c URL: http://source.netsurf-browser.org/trunk/libcss/src/lex/lex.c?rev=5648&r1=... ============================================================================== --- trunk/libcss/src/lex/lex.c (original) +++ trunk/libcss/src/lex/lex.c Mon Oct 27 00:57:18 2008 @@ -130,7 +130,7 @@ css_token **token); static inline css_error AtKeyword(css_lexer *lexer, css_token **token); -static inline css_error CDCOrIdentOrFunction(css_lexer *lexer, +static inline css_error CDCOrIdentOrFunctionOrNPD(css_lexer *lexer, css_token **token); static inline css_error CDO(css_lexer *lexer, css_token **token); static inline css_error Comment(css_lexer *lexer, css_token **token); @@ -285,7 +285,7 @@ case sCDO: return CDO(lexer, token); case sCDC: - return CDCOrIdentOrFunction(lexer, token); + return CDCOrIdentOrFunctionOrNPD(lexer, token); case sS: return S(lexer, token); case sCOMMENT: @@ -541,7 +541,7 @@ return emitToken(lexer, CSS_TOKEN_ATKEYWORD, token); } -css_error CDCOrIdentOrFunction(css_lexer *lexer, css_token **token) +css_error CDCOrIdentOrFunctionOrNPD(css_lexer *lexer, css_token **token) { css_token *t = &lexer->token; uintptr_t cptr; @@ -553,10 +553,14 @@ /* CDC = "-->" * IDENT = [-]? nmstart nmchar* * FUNCTION = [-]? nmstart nmchar* '(' + * NUMBER = num = [-+]? ([0-9]+ | [0-9]* '.' [0-9]+) + * PERCENTAGE = num '%' + * DIMENSION = num ident * * The first dash has been consumed. Thus, we must consume the next * character in the stream. If it's a dash, then we're dealing with - * CDC. Otherwise, we're dealing with IDENT/FUNCTION. + * CDC. If it's a digit or dot, then we're dealing with NPD. + * Otherwise, we're dealing with IDENT/FUNCTION. */ switch (lexer->substate) { @@ -572,6 +576,16 @@ } c = *((uint8_t *) cptr); + + if (isDigit(c) || c == '.') { + /* NPD */ + APPEND(lexer, cptr, clen); + lexer->state = sNUMBER; + lexer->substate = 0; + /* Abuse "first" to store first non-sign character */ + lexer->context.first = c; + return NumberOrPercentageOrDimension(lexer, token); + } if (c != '-' && !startNMStart(c)) { /* Can only be CHAR */ @@ -975,11 +989,12 @@ enum { Initial = 0, Dot = 1, MoreDigits = 2, Suffix = 3, NMChars = 4, Escape = 5 }; - /* NUMBER = num = [0-9]+ | [0-9]* '.' [0-9]+ + /* NUMBER = num = [-+]? ([0-9]+ | [0-9]* '.' [0-9]+) * PERCENTAGE = num '%' * DIMENSION = num ident * - * The first digit, or '.' has been consumed. + * The sign, or sign and first digit or dot, + * or first digit, or '.' has been consumed. */ switch (lexer->substate) { @@ -998,7 +1013,8 @@ return CSS_NEEDDATA; if (cptr == PARSERUTILS_INPUTSTREAM_EOF) { - if (t->data.len == 1 && lexer->context.first == '.') + if (t->data.len == 1 && (lexer->context.first == '.' || + lexer->context.first == '+')) return emitToken(lexer, CSS_TOKEN_CHAR, token); else return emitToken(lexer, CSS_TOKEN_NUMBER, @@ -1042,7 +1058,8 @@ return CSS_NEEDDATA; if (cptr == PARSERUTILS_INPUTSTREAM_EOF) { - if (t->data.len == 1 && lexer->context.first == '.') + if (t->data.len == 1 && (lexer->context.first == '.' || + lexer->context.first == '+')) return emitToken(lexer, CSS_TOKEN_CHAR, token); else return emitToken(lexer, CSS_TOKEN_NUMBER, @@ -1051,8 +1068,9 @@ c = *((uint8_t *) cptr); - /* A solitary '.' is a CHAR, not numeric */ - if (t->data.len == 1 && lexer->context.first == '.') + /* A solitary '.' or '+' is a CHAR, not numeric */ + if (t->data.len == 1 && (lexer->context.first == '.' || + lexer->context.first == '+')) return emitToken(lexer, CSS_TOKEN_CHAR, token); if (c == '%') { @@ -1183,7 +1201,7 @@ return Hash(lexer, token); case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - case '.': + case '.': case '+': lexer->state = sNUMBER; lexer->substate = 0; lexer->context.first = c; @@ -1195,7 +1213,7 @@ case '-': lexer->state = sCDC; lexer->substate = 0; - return CDCOrIdentOrFunction(lexer, token); + return CDCOrIdentOrFunctionOrNPD(lexer, token); case ' ': case '\t': case '\r': case '\n': case '\f': lexer->state = sS; lexer->substate = 0; Modified: trunk/libcss/test/data/lex/INDEX URL: http://source.netsurf-browser.org/trunk/libcss/test/data/lex/INDEX?rev=56... ============================================================================== --- trunk/libcss/test/data/lex/INDEX (original) +++ trunk/libcss/test/data/lex/INDEX Mon Oct 27 00:57:18 2008 @@ -4,3 +4,4 @@ tests1.dat Basic tests tests2.dat More complicated tests +regression.dat Regression tests Added: trunk/libcss/test/data/lex/regression.dat URL: http://source.netsurf-browser.org/trunk/libcss/test/data/lex/regression.d... ============================================================================== --- trunk/libcss/test/data/lex/regression.dat (added) +++ trunk/libcss/test/data/lex/regression.dat Mon Oct 27 00:57:18 2008 @@ -1,0 +1,48 @@ +#data +-1 +#expected +NUMBER:-1 +S +EOF +#reset + +#data ++1 +#expected +NUMBER:+1 +S +EOF +#reset + +#data +-1.0 +#expected +NUMBER:-1.0 +S +EOF +#reset + +#data ++1.0 +#expected +NUMBER:+1.0 +S +EOF +#reset + +#data +-.5 +#expected +NUMBER:-.5 +S +EOF +#reset + +#data ++.5 +#expected +NUMBER:+.5 +S +EOF +#reset +

14 years, 11 months

1
0
0 / 0

r5647 jmb - /trunk/libcss/src/utils/utils.h

by netsurf＠semichrome.net

Author: jmb Date: Mon Oct 27 00:12:02 2008 New Revision: 5647 URL: http://source.netsurf-browser.org?rev=5647&view=rev Log: Really stop on first non-digit Modified: trunk/libcss/src/utils/utils.h Modified: trunk/libcss/src/utils/utils.h URL: http://source.netsurf-browser.org/trunk/libcss/src/utils/utils.h?rev=5647... ============================================================================== --- trunk/libcss/src/utils/utils.h (original) +++ trunk/libcss/src/utils/utils.h Mon Oct 27 00:12:02 2008 @@ -55,7 +55,7 @@ /* Now extract value, assuming base 10 */ while (len > 0) { /* Stop on first non-digit */ - if (ptr[0] <= '0' || '9' <= ptr[0]) + if (ptr[0] < '0' || '9' < ptr[0]) break; val *= 10;

14 years, 11 months

1
0
0 / 0

r5646 jmb - in /trunk/libcss/docs: Lexer Tokens

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 19:16:05 2008 New Revision: 5646 URL: http://source.netsurf-browser.org?rev=5646&view=rev Log: Update Lexer/Token documentation to handle CSS numbers correctly. This is delightful. I get to rework the lexer state machine. Grr. Modified: trunk/libcss/docs/Lexer trunk/libcss/docs/Tokens Modified: trunk/libcss/docs/Lexer URL: http://source.netsurf-browser.org/trunk/libcss/docs/Lexer?rev=5646&r1=564... ============================================================================== --- trunk/libcss/docs/Lexer (original) +++ trunk/libcss/docs/Lexer Sun Oct 26 19:16:05 2008 @@ -12,8 +12,8 @@ STRING '"' | "'" INVALID_STRING '"' | "'" HASH '#' -NUMBER [0-9] | '.' -PERCENTAGE [0-9] | '.' +NUMBER [0-9] | '.' | '-' | '+' +PERCENTAGE [0-9] | '.' | '-' | '+' DIMENSION [0-9] | '.' URI [Uu] UNICODE-RANGE [Uu] Modified: trunk/libcss/docs/Tokens URL: http://source.netsurf-browser.org/trunk/libcss/docs/Tokens?rev=5646&r1=56... ============================================================================== --- trunk/libcss/docs/Tokens (original) +++ trunk/libcss/docs/Tokens Sun Oct 26 19:16:05 2008 @@ -14,7 +14,7 @@ unicode ::= '\' [0-9a-fA-F]{1,6} wc? escape ::= unicode | '\' [^\n\r\f0-9a-fA-F] nmchar ::= [a-zA-Z0-9] | '-' | '_' | nonascii | escape -num ::= [0-9]+ | [0-9]* '.' [0-9]+ +num ::= [-+]? ([0-9]+ | [0-9]* '.' [0-9]+) string ::= '"' (stringchar | "'")* '"' | "'" (stringchar | '"')* "'" stringchar ::= urlchar | #x20 | #x29 | '\' nl urlchar ::= [#x9#x21#x23-#x26#x28#x2A-#x7E] | nonascii | escape

14 years, 11 months

1
0
0 / 0

r5645 jmb - in /trunk/libcss/src: parse/css21props.c utils/utils.h

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 18:58:06 2008 New Revision: 5645 URL: http://source.netsurf-browser.org?rev=5645&view=rev Log: Function to extract an integer from a css_string. Use this in font-weight parsing. TODO: NUMBER tokens may contain [-+]? ([0-9]+ | [0-9]* '.' [0-9]+). The lexer currently doesn't cater for the [-+]? part. This is a bug (inherited from the grammar in the spec), and must be fixed. TODO: integer_from_css_string probably wants to pass out the number of characters processed so that the client can determine if the input was valid for their context. Modified: trunk/libcss/src/parse/css21props.c trunk/libcss/src/utils/utils.h Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 18:58:06 2008 @@ -1683,7 +1683,7 @@ if (token->lower.ptr == c->strings[INHERIT]) { flags |= FLAG_INHERIT; } else if (token->type == CSS_TOKEN_NUMBER) { - int32_t num = 100; /** \todo strntol */ + int32_t num = integer_from_css_string(&token->lower); switch (num) { case 100: value = FONT_WEIGHT_100; break; case 200: value = FONT_WEIGHT_200; break; Modified: trunk/libcss/src/utils/utils.h URL: http://source.netsurf-browser.org/trunk/libcss/src/utils/utils.h?rev=5645... ============================================================================== --- trunk/libcss/src/utils/utils.h (original) +++ trunk/libcss/src/utils/utils.h Sun Oct 26 18:58:06 2008 @@ -2,11 +2,13 @@ * This file is part of LibCSS. * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php - * Copyright 2007 John-Mark Bell <jmb(a)netsurf-browser.org> + * Copyright 2007-8 John-Mark Bell <jmb(a)netsurf-browser.org> */ #ifndef css_utils_h_ #define css_utils_h_ + +#include <libcss/types.h> #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) @@ -25,4 +27,44 @@ #define UNUSED(x) ((x)=(x)) #endif +static inline int32_t integer_from_css_string(const css_string *string) +{ + size_t len; + const uint8_t *ptr; + int sign = 1; + int32_t val = 0; + + if (string == NULL || string->len == 0) + return 0; + + len = string->len; + ptr = string->ptr; + + /* Extract sign, if any */ + if (ptr[0] == '-') { + sign = -1; + len--; + ptr++; + } else if (ptr[0] == '+') { + len--; + ptr++; + } + + /** \todo check for overflow */ + + /* Now extract value, assuming base 10 */ + while (len > 0) { + /* Stop on first non-digit */ + if (ptr[0] <= '0' || '9' <= ptr[0]) + break; + + val *= 10; + val += ptr[0] - '0'; + ptr++; + len--; + } + + return val * sign; +} + #endif

14 years, 11 months

1
0
0 / 0

r5644 jmb - in /trunk/libcss/src/parse: css21.c css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 18:03:49 2008 New Revision: 5644 URL: http://source.netsurf-browser.org?rev=5644&view=rev Log: font-variant, font-weight Modified: trunk/libcss/src/parse/css21.c trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21.c?rev=5644... ============================================================================== --- trunk/libcss/src/parse/css21.c (original) +++ trunk/libcss/src/parse/css21.c Sun Oct 26 18:03:49 2008 @@ -58,7 +58,8 @@ TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, TABLE_CAPTION, BELOW, LEVEL, ABOVE, HIGHER, LOWER, SHOW, HIDE, XX_SMALL, X_SMALL, SMALL, LARGE, X_LARGE, XX_LARGE, - LARGER, SMALLER, NORMAL, ITALIC, OBLIQUE, + LARGER, SMALLER, NORMAL, ITALIC, OBLIQUE, SMALL_CAPS, BOLD, BOLDER, + LIGHTER, LAST_KNOWN }; @@ -234,6 +235,10 @@ { "normal", SLEN("normal") }, { "italic", SLEN("italic") }, { "oblique", SLEN("oblique") }, + { "small-caps", SLEN("small-caps") }, + { "bold", SLEN("bold") }, + { "bolder", SLEN("bolder") }, + { "lighter", SLEN("lighter") }, }; typedef struct context_entry { Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 18:03:49 2008 @@ -1622,10 +1622,39 @@ 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, small-caps, 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 = FONT_VARIANT_NORMAL; + } else if (ident->lower.ptr == c->strings[SMALL_CAPS]) { + value = FONT_VARIANT_SMALL_CAPS; + } else + return CSS_INVALID; + + opv = buildOPV(OP_FONT_VARIANT, flags, value); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, sizeof(opv)); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); return CSS_OK; } @@ -1634,10 +1663,59 @@ const parserutils_vector *vector, int *ctx, css_style **result) { - UNUSED(c); - UNUSED(vector); - UNUSED(ctx); - UNUSED(result); + css_error error; + const css_token *token; + uint8_t flags = 0; + uint16_t value = 0; + uint32_t opv; + + /* NUMBER (100, 200, 300, 400, 500, 600, 700, 800, 900) | + * IDENT (normal, bold, bolder, lighter, inherit) */ + token = parserutils_vector_iterate(vector, ctx); + if (token == NULL || (token->type != CSS_TOKEN_IDENT && + token->type != CSS_TOKEN_NUMBER)) + return CSS_INVALID; + + error = parse_important(c, vector, ctx, &flags); + if (error != CSS_OK) + return error; + + if (token->lower.ptr == c->strings[INHERIT]) { + flags |= FLAG_INHERIT; + } else if (token->type == CSS_TOKEN_NUMBER) { + int32_t num = 100; /** \todo strntol */ + switch (num) { + case 100: value = FONT_WEIGHT_100; break; + case 200: value = FONT_WEIGHT_200; break; + case 300: value = FONT_WEIGHT_300; break; + case 400: value = FONT_WEIGHT_400; break; + case 500: value = FONT_WEIGHT_500; break; + case 600: value = FONT_WEIGHT_600; break; + case 700: value = FONT_WEIGHT_700; break; + case 800: value = FONT_WEIGHT_800; break; + case 900: value = FONT_WEIGHT_900; break; + default: return CSS_INVALID; + } + } else if (token->lower.ptr == c->strings[NORMAL]) { + value = FONT_WEIGHT_NORMAL; + } else if (token->lower.ptr == c->strings[BOLD]) { + value = FONT_WEIGHT_BOLD; + } else if (token->lower.ptr == c->strings[BOLDER]) { + value = FONT_WEIGHT_BOLDER; + } else if (token->lower.ptr == c->strings[LIGHTER]) { + value = FONT_WEIGHT_LIGHTER; + } else + return CSS_INVALID; + + opv = buildOPV(OP_FONT_WEIGHT, flags, value); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, sizeof(opv)); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); return CSS_OK; }

14 years, 11 months

1
0
0 / 0

r5643 jmb - in /trunk/libcss/src/parse: css21.c css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 16:42:03 2008 New Revision: 5643 URL: http://source.netsurf-browser.org?rev=5643&view=rev Log: font-style Modified: trunk/libcss/src/parse/css21.c trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21.c?rev=5643... ============================================================================== --- trunk/libcss/src/parse/css21.c (original) +++ trunk/libcss/src/parse/css21.c Sun Oct 26 16:42:03 2008 @@ -58,7 +58,7 @@ TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, TABLE_CAPTION, BELOW, LEVEL, ABOVE, HIGHER, LOWER, SHOW, HIDE, XX_SMALL, X_SMALL, SMALL, LARGE, X_LARGE, XX_LARGE, - LARGER, SMALLER, + LARGER, SMALLER, NORMAL, ITALIC, OBLIQUE, LAST_KNOWN }; @@ -231,6 +231,9 @@ { "xx-large", SLEN("xx-large") }, { "larger", SLEN("larger") }, { "smaller", SLEN("smaller") }, + { "normal", SLEN("normal") }, + { "italic", SLEN("italic") }, + { "oblique", SLEN("oblique") }, }; typedef struct context_entry { Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 16:42:03 2008 @@ -1579,10 +1579,41 @@ 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, italic, oblique, 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 = FONT_STYLE_NORMAL; + } else if (ident->lower.ptr == c->strings[ITALIC]) { + value = FONT_STYLE_ITALIC; + } else if (ident->lower.ptr == c->strings[OBLIQUE]) { + value = FONT_STYLE_OBLIQUE; + } else + return CSS_INVALID; + + opv = buildOPV(OP_FONT_STYLE, flags, value); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, sizeof(opv)); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); return CSS_OK; }

14 years, 11 months

1
0
0 / 0

r5642 jmb - in /trunk/libcss/src/parse: css21.c css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 16:34:20 2008 New Revision: 5642 URL: http://source.netsurf-browser.org?rev=5642&view=rev Log: font-size Modified: trunk/libcss/src/parse/css21.c trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21.c?rev=5642... ============================================================================== --- trunk/libcss/src/parse/css21.c (original) +++ trunk/libcss/src/parse/css21.c Sun Oct 26 16:34:20 2008 @@ -57,7 +57,8 @@ INLINE_BLOCK, TABLE, INLINE_TABLE, TABLE_ROW_GROUP, TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, TABLE_CAPTION, BELOW, LEVEL, ABOVE, HIGHER, LOWER, - SHOW, HIDE, + SHOW, HIDE, XX_SMALL, X_SMALL, SMALL, LARGE, X_LARGE, XX_LARGE, + LARGER, SMALLER, LAST_KNOWN }; @@ -222,6 +223,14 @@ { "lower", SLEN("lower") }, { "show", SLEN("show") }, { "hide", SLEN("hide") }, + { "xx-small", SLEN("xx-small") }, + { "x-small", SLEN("x-small") }, + { "small", SLEN("small") }, + { "large", SLEN("large") }, + { "x-large", SLEN("x-large") }, + { "xx-large", SLEN("xx-large") }, + { "larger", SLEN("larger") }, + { "smaller", SLEN("smaller") }, }; typedef struct context_entry { Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 16:34:20 2008 @@ -1468,6 +1468,8 @@ const parserutils_vector *vector, int *ctx, css_style **result) { + /** \todo font-family */ + UNUSED(c); UNUSED(vector); UNUSED(ctx); @@ -1480,10 +1482,95 @@ const parserutils_vector *vector, int *ctx, css_style **result) { - UNUSED(c); - UNUSED(vector); - UNUSED(ctx); - UNUSED(result); + css_error error; + const css_token *token; + uint8_t flags = 0; + uint16_t value = 0; + uint32_t opv; + uint32_t length = 0; + uint32_t unit = 0; + uint32_t required_size; + + /* length | percentage | IDENT(xx-small, x-small, small, medium, + * large, x-large, xx-large, larger, smaller, inherit) */ + token = parserutils_vector_peek(vector, *ctx); + if (token == NULL) + return CSS_INVALID; + + if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[INHERIT]) { + parserutils_vector_iterate(vector, ctx); + flags = FLAG_INHERIT; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[XX_SMALL]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_XX_SMALL; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[X_SMALL]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_X_SMALL; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[SMALL]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_SMALL; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[MEDIUM]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_MEDIUM; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[LARGE]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_LARGE; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[X_LARGE]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_X_LARGE; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[XX_LARGE]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_XX_LARGE; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[LARGER]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_LARGER; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[SMALLER]) { + parserutils_vector_iterate(vector, ctx); + value = FONT_SIZE_SMALLER; + } else { + error = parse_unit_specifier(c, vector, ctx, &length, &unit); + if (error != CSS_OK) + return error; + + if (unit & UNIT_ANGLE || unit & UNIT_TIME || unit & UNIT_FREQ) + return CSS_INVALID; + + value = FONT_SIZE_DIMENSION; + } + + error = parse_important(c, vector, ctx, &flags); + if (error != CSS_OK) + return error; + + opv = buildOPV(OP_FONT_SIZE, flags, value); + + required_size = sizeof(opv); + if (value == FONT_SIZE_DIMENSION) + required_size += sizeof(length) + sizeof(unit); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, required_size); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); + if (value == FONT_SIZE_DIMENSION) { + memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv), + &length, sizeof(length)); + memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv) + + sizeof(length), &unit, sizeof(unit)); + } return CSS_OK; }

14 years, 11 months

1
0
0 / 0

r5641 jmb - /trunk/libcss/src/parse/css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 16:10:43 2008 New Revision: 5641 URL: http://source.netsurf-browser.org?rev=5641&view=rev Log: float Modified: trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 16:10:43 2008 @@ -1425,10 +1425,41 @@ 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, none, 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 = FLOAT_LEFT; + } else if (ident->lower.ptr == c->strings[RIGHT]) { + value = FLOAT_RIGHT; + } else if (ident->lower.ptr == c->strings[NONE]) { + value = FLOAT_NONE; + } else + return CSS_INVALID; + + opv = buildOPV(OP_FLOAT, flags, value); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, sizeof(opv)); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); return CSS_OK; }

14 years, 11 months

1
0
0 / 0

r5640 jmb - in /trunk/libcss/src/parse: css21.c css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 16:07:57 2008 New Revision: 5640 URL: http://source.netsurf-browser.org?rev=5640&view=rev Log: empty-cells Modified: trunk/libcss/src/parse/css21.c trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21.c?rev=5640... ============================================================================== --- trunk/libcss/src/parse/css21.c (original) +++ trunk/libcss/src/parse/css21.c Sun Oct 26 16:07:57 2008 @@ -57,6 +57,7 @@ INLINE_BLOCK, TABLE, INLINE_TABLE, TABLE_ROW_GROUP, TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, TABLE_CAPTION, BELOW, LEVEL, ABOVE, HIGHER, LOWER, + SHOW, HIDE, LAST_KNOWN }; @@ -219,6 +220,8 @@ { "above", SLEN("above") }, { "higher", SLEN("higher") }, { "lower", SLEN("lower") }, + { "show", SLEN("show") }, + { "hide", SLEN("hide") }, }; typedef struct context_entry { Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 16:07:57 2008 @@ -1384,10 +1384,39 @@ 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 (show, hide, 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[SHOW]) { + value = EMPTY_CELLS_SHOW; + } else if (ident->lower.ptr == c->strings[HIDE]) { + value = EMPTY_CELLS_HIDE; + } else + return CSS_INVALID; + + opv = buildOPV(OP_EMPTY_CELLS, flags, value); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, sizeof(opv)); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); return CSS_OK; }

14 years, 11 months

1
0
0 / 0

r5639 jmb - in /trunk/libcss/src/parse: css21.c css21props.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Oct 26 16:04:41 2008 New Revision: 5639 URL: http://source.netsurf-browser.org?rev=5639&view=rev Log: elevation Modified: trunk/libcss/src/parse/css21.c trunk/libcss/src/parse/css21props.c Modified: trunk/libcss/src/parse/css21.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21.c?rev=5639... ============================================================================== --- trunk/libcss/src/parse/css21.c (original) +++ trunk/libcss/src/parse/css21.c Sun Oct 26 16:04:41 2008 @@ -56,7 +56,7 @@ COLLAPSE, SEPARATE, AUTO, LTR, RTL, INLINE, BLOCK, LIST_ITEM, RUN_IN, INLINE_BLOCK, TABLE, INLINE_TABLE, TABLE_ROW_GROUP, TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, - TABLE_CELL, TABLE_CAPTION, + TABLE_CELL, TABLE_CAPTION, BELOW, LEVEL, ABOVE, HIGHER, LOWER, LAST_KNOWN }; @@ -214,6 +214,11 @@ { "table-column", SLEN("table-column") }, { "table-cell", SLEN("table-cell") }, { "table-caption", SLEN("table-caption") }, + { "below", SLEN("below") }, + { "level", SLEN("level") }, + { "above", SLEN("above") }, + { "higher", SLEN("higher") }, + { "lower", SLEN("lower") }, }; typedef struct context_entry { Modified: trunk/libcss/src/parse/css21props.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/css21props.c?rev... ============================================================================== --- trunk/libcss/src/parse/css21props.c (original) +++ trunk/libcss/src/parse/css21props.c Sun Oct 26 16:04:41 2008 @@ -1304,10 +1304,78 @@ const parserutils_vector *vector, int *ctx, css_style **result) { - UNUSED(c); - UNUSED(vector); - UNUSED(ctx); - UNUSED(result); + css_error error; + const css_token *token; + uint8_t flags = 0; + uint16_t value = 0; + uint32_t opv; + uint32_t length = 0; + uint32_t unit = 0; + uint32_t required_size; + + /* angle | IDENT(below, level, above, higher, lower, inherit) */ + token = parserutils_vector_peek(vector, *ctx); + if (token == NULL) + return CSS_INVALID; + + if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[INHERIT]) { + parserutils_vector_iterate(vector, ctx); + flags = FLAG_INHERIT; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[BELOW]) { + parserutils_vector_iterate(vector, ctx); + value = ELEVATION_BELOW; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[LEVEL]) { + parserutils_vector_iterate(vector, ctx); + value = ELEVATION_LEVEL; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[ABOVE]) { + parserutils_vector_iterate(vector, ctx); + value = ELEVATION_ABOVE; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[HIGHER]) { + parserutils_vector_iterate(vector, ctx); + value = ELEVATION_HIGHER; + } else if (token->type == CSS_TOKEN_IDENT && + token->lower.ptr == c->strings[LOWER]) { + parserutils_vector_iterate(vector, ctx); + value = ELEVATION_LOWER; + } else { + error = parse_unit_specifier(c, vector, ctx, &length, &unit); + if (error != CSS_OK) + return error; + + if ((unit & UNIT_ANGLE) == false) + return CSS_INVALID; + + value = ELEVATION_ANGLE; + } + + error = parse_important(c, vector, ctx, &flags); + if (error != CSS_OK) + return error; + + opv = buildOPV(OP_ELEVATION, flags, value); + + required_size = sizeof(opv); + if (value == ELEVATION_ANGLE) + required_size += sizeof(length) + sizeof(unit); + + /* Allocate result */ + *result = css_stylesheet_style_create(c->sheet, required_size); + if (*result == NULL) + return CSS_NOMEM; + + /* Copy the bytecode to it */ + memcpy((*result)->bytecode, &opv, sizeof(opv)); + if (value == ELEVATION_ANGLE) { + memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv), + &length, sizeof(length)); + memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv) + + sizeof(length), &unit, sizeof(unit)); + } return CSS_OK; }

14 years, 11 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2008