From bd8ef0f5e2ec383b528b825eba4724b90643cbef Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 3 Feb 2012 13:30:52 +0000 Subject: Add parsing of CSS3 Multi-column layout module shorthand properties. (columns & column-rule) svn path=/trunk/libcss/; revision=13416 --- src/parse/properties/Makefile | 3 +- src/parse/properties/column_rule.c | 177 +++++++++++++++++++++++++++++++++++++ src/parse/properties/columns.c | 141 +++++++++++++++++++++++++++++ src/parse/properties/properties.c | 2 + src/parse/properties/properties.h | 6 ++ src/parse/propstrings.c | 2 + src/parse/propstrings.h | 10 +-- 7 files changed, 335 insertions(+), 6 deletions(-) create mode 100644 src/parse/properties/column_rule.c create mode 100644 src/parse/properties/columns.c (limited to 'src') diff --git a/src/parse/properties/Makefile b/src/parse/properties/Makefile index 2cc192e..4aba48a 100644 --- a/src/parse/properties/Makefile +++ b/src/parse/properties/Makefile @@ -54,7 +54,8 @@ DIR_SOURCES := azimuth.c text_decoration.c background.c \ font_family.c list_style.c padding.c cursor.c \ list_style_type.c pause.c border.c border_width.c margin.c \ play_during.c clip.c properties.c border_color.c content.c \ - elevation.c font_weight.c quotes.c utils.c opacity.c + elevation.c font_weight.c quotes.c utils.c opacity.c columns.c \ + column_rule.c DIR_SOURCES := $(DIR_SOURCES) $(AUTOGEN_SOURCES) diff --git a/src/parse/properties/column_rule.c b/src/parse/properties/column_rule.c new file mode 100644 index 0000000..ba57565 --- /dev/null +++ b/src/parse/properties/column_rule.c @@ -0,0 +1,177 @@ +/* + * This file is part of LibCSS. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2012 Michael Drake + */ + +#include +#include + +#include "bytecode/bytecode.h" +#include "bytecode/opcodes.h" +#include "parse/properties/properties.h" +#include "parse/properties/utils.h" + +/** + * Parse column-rule shorthand + * + * \param c Parsing context + * \param vector Vector of tokens to process + * \param ctx Pointer to vector iteration context + * \param result Pointer to location to receive resulting style + * \return CSS_OK on success, + * CSS_NOMEM on memory exhaustion, + * CSS_INVALID if the input is not valid + * + * Post condition: \a *ctx is updated with the next token to process + * If the input is invalid, then \a *ctx remains unchanged. + */ +css_error css__parse_column_rule(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result) +{ + int orig_ctx = *ctx; + int prev_ctx; + const css_token *token; + css_error error; + bool color = true; + bool style = true; + bool width = true; + css_style *color_style; + css_style *style_style; + css_style *width_style; + + /* Firstly, handle inherit */ + token = parserutils_vector_peek(vector, *ctx); + if (token == NULL) + return CSS_INVALID; + + if (is_css_inherit(c, token)) { + error = css_stylesheet_style_inherit(result, + CSS_PROP_COLUMN_RULE_COLOR); + if (error != CSS_OK) + return error; + + error = css_stylesheet_style_inherit(result, + CSS_PROP_COLUMN_RULE_STYLE); + if (error != CSS_OK) + return error; + + error = css_stylesheet_style_inherit(result, + CSS_PROP_COLUMN_RULE_WIDTH); + + if (error == CSS_OK) + parserutils_vector_iterate(vector, ctx); + + return error; + } + + /* Allocate for styles */ + error = css__stylesheet_style_create(c->sheet, &color_style); + if (error != CSS_OK) + return error; + + error = css__stylesheet_style_create(c->sheet, &style_style); + if (error != CSS_OK) { + css__stylesheet_style_destroy(color_style); + return error; + } + + error = css__stylesheet_style_create(c->sheet, &width_style); + if (error != CSS_OK) { + css__stylesheet_style_destroy(color_style); + css__stylesheet_style_destroy(style_style); + return error; + } + + /* Attempt to parse the various longhand properties */ + do { + prev_ctx = *ctx; + error = CSS_OK; + + /* Ensure that we're not about to parse another inherit */ + token = parserutils_vector_peek(vector, *ctx); + if (token != NULL && is_css_inherit(c, token)) { + error = CSS_INVALID; + goto css__parse_column_rule_cleanup; + } + + if ((color) && + (error = css__parse_column_rule_color(c, vector, + ctx, color_style)) == CSS_OK) { + color = false; + } else if ((style) && + (error = css__parse_column_rule_style(c, vector, + ctx, style_style)) == CSS_OK) { + style = false; + } else if ((width) && + (error = css__parse_column_rule_width(c, vector, + ctx, width_style)) == CSS_OK) { + width = false; + } + + if (error == CSS_OK) { + consumeWhitespace(vector, ctx); + + token = parserutils_vector_peek(vector, *ctx); + } else { + /* Forcibly cause loop to exit */ + token = NULL; + } + } while (*ctx != prev_ctx && token != NULL); + + /* Set unset properties to initial values */ + if (color) { + error = css__stylesheet_style_appendOPV(color_style, + CSS_PROP_COLUMN_RULE_COLOR, 0, + COLUMN_RULE_COLOR_SET); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + + /** TODO: initial colour should be the UA-defined initial + * value of the "color" property, not "0" */ + error = css__stylesheet_style_append(color_style, 0x00000000); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + } + + if (style) { + error = css__stylesheet_style_appendOPV(style_style, + CSS_PROP_COLUMN_RULE_STYLE, 0, + COLUMN_RULE_STYLE_NONE); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + } + + if (width) { + error = css__stylesheet_style_appendOPV(width_style, + CSS_PROP_COLUMN_RULE_WIDTH, 0, + COLUMN_RULE_WIDTH_MEDIUM); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + } + + /* Merge styles into the result */ + error = css__stylesheet_merge_style(result, color_style); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + + error = css__stylesheet_merge_style(result, style_style); + if (error != CSS_OK) + goto css__parse_column_rule_cleanup; + + error = css__stylesheet_merge_style(result, width_style); + + +css__parse_column_rule_cleanup: + + css__stylesheet_style_destroy(width_style); + css__stylesheet_style_destroy(style_style); + css__stylesheet_style_destroy(color_style); + + if (error != CSS_OK) + *ctx = orig_ctx; + + return error; +} diff --git a/src/parse/properties/columns.c b/src/parse/properties/columns.c new file mode 100644 index 0000000..b245740 --- /dev/null +++ b/src/parse/properties/columns.c @@ -0,0 +1,141 @@ +/* + * This file is part of LibCSS. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2012 Michael Drake + */ + +#include +#include + +#include "bytecode/bytecode.h" +#include "bytecode/opcodes.h" +#include "parse/properties/properties.h" +#include "parse/properties/utils.h" + +/** + * Parse columns shorthand + * + * \param c Parsing context + * \param vector Vector of tokens to process + * \param ctx Pointer to vector iteration context + * \param result Pointer to location to receive resulting style + * \return CSS_OK on success, + * CSS_NOMEM on memory exhaustion, + * CSS_INVALID if the input is not valid + * + * Post condition: \a *ctx is updated with the next token to process + * If the input is invalid, then \a *ctx remains unchanged. + */ +css_error css__parse_columns(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result) +{ + int orig_ctx = *ctx; + int prev_ctx; + const css_token *token; + css_error error = CSS_OK; + bool width = true; + bool count = true; + css_style *width_style; + css_style *count_style; + + /* Firstly, handle inherit */ + token = parserutils_vector_peek(vector, *ctx); + if (token == NULL) + return CSS_INVALID; + + if (is_css_inherit(c, token)) { + error = css_stylesheet_style_inherit(result, + CSS_PROP_COLUMN_WIDTH); + if (error != CSS_OK) + return error; + + error = css_stylesheet_style_inherit(result, + CSS_PROP_COLUMN_COUNT); + if (error == CSS_OK) + parserutils_vector_iterate(vector, ctx); + + return error; + } + + /* Allocate for styles */ + error = css__stylesheet_style_create(c->sheet, &width_style); + if (error != CSS_OK) + return error; + + error = css__stylesheet_style_create(c->sheet, &count_style); + if (error != CSS_OK) { + css__stylesheet_style_destroy(width_style); + return error; + } + + /* Attempt to parse the various longhand properties */ + do { + prev_ctx = *ctx; + error = CSS_OK; + + if (is_css_inherit(c, token)) { + /* Can't have another inherit */ + error = CSS_INVALID; + goto css__parse_columns_cleanup; + } + + /* Try each property parser in turn, but only if we + * haven't already got a value for this property. + */ + if ((width) && + (error = css__parse_column_width(c, vector, ctx, + width_style)) == CSS_OK) { + width = false; + } else if ((count) && + (error = css__parse_column_count(c, vector, ctx, + count_style)) == CSS_OK) { + count = false; + } + + if (error == CSS_OK) { + consumeWhitespace(vector, ctx); + + token = parserutils_vector_peek(vector, *ctx); + } else { + /* Forcibly cause loop to exit */ + token = NULL; + } + } while (*ctx != prev_ctx && token != NULL); + + /* Set unset properties to initial values */ + if (width) { + error = css__stylesheet_style_appendOPV(width_style, + CSS_PROP_COLUMN_WIDTH, 0, + COLUMN_WIDTH_AUTO); + if (error != CSS_OK) + goto css__parse_columns_cleanup; + } + + if (count) { + error = css__stylesheet_style_appendOPV(count_style, + CSS_PROP_COLUMN_COUNT, 0, + COLUMN_COUNT_AUTO); + if (error != CSS_OK) + goto css__parse_columns_cleanup; + } + + /* Merge styles into the result */ + error = css__stylesheet_merge_style(result, width_style); + if (error != CSS_OK) + goto css__parse_columns_cleanup; + + error = css__stylesheet_merge_style(result, count_style); + + +css__parse_columns_cleanup: + css__stylesheet_style_destroy(width_style); + css__stylesheet_style_destroy(count_style); + + if (error != CSS_OK) + *ctx = orig_ctx; + + return error; +} + diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c index 9918366..e8ca3ce 100644 --- a/src/parse/properties/properties.c +++ b/src/parse/properties/properties.c @@ -49,9 +49,11 @@ const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] = css__parse_clear, css__parse_clip, css__parse_color, + css__parse_columns, css__parse_column_count, css__parse_column_fill, css__parse_column_gap, + css__parse_column_rule, css__parse_column_rule_color, css__parse_column_rule_style, css__parse_column_rule_width, diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h index b3d2eb4..7280d93 100644 --- a/src/parse/properties/properties.h +++ b/src/parse/properties/properties.h @@ -133,6 +133,9 @@ css_error css__parse_clip(css_language *c, css_error css__parse_color(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); +css_error css__parse_columns(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); css_error css__parse_column_count(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); @@ -142,6 +145,9 @@ css_error css__parse_column_fill(css_language *c, css_error css__parse_column_gap(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); +css_error css__parse_column_rule(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); css_error css__parse_column_rule_color(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); diff --git a/src/parse/propstrings.c b/src/parse/propstrings.c index 9ea4707..7a4abd5 100644 --- a/src/parse/propstrings.c +++ b/src/parse/propstrings.c @@ -112,9 +112,11 @@ const stringmap_entry stringmap[LAST_KNOWN] = { { "clear", SLEN("clear") }, { "clip", SLEN("clip") }, { "color", SLEN("color") }, + { "columns", SLEN("columns") }, { "column-count", SLEN("column-count") }, { "column-fill", SLEN("column-fill") }, { "column-gap", SLEN("column-gap") }, + { "column-rule", SLEN("column-rule") }, { "column-rule-color", SLEN("column-rule-color") }, { "column-rule-style", SLEN("column-rule-style") }, { "column-rule-width", SLEN("column-rule_width") }, diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h index ffa69ee..01108a8 100644 --- a/src/parse/propstrings.h +++ b/src/parse/propstrings.h @@ -43,11 +43,11 @@ enum { BORDER_RIGHT_STYLE, BORDER_RIGHT_WIDTH, BORDER_SPACING, BORDER_STYLE, BORDER_TOP, BORDER_TOP_COLOR, BORDER_TOP_STYLE, BORDER_TOP_WIDTH, BORDER_WIDTH, BOTTOM, BREAK_AFTER, BREAK_BEFORE, - BREAK_INSIDE, CAPTION_SIDE, CLEAR, CLIP, COLOR, COLUMN_COUNT, - COLUMN_FILL, COLUMN_GAP, COLUMN_RULE_COLOR, COLUMN_RULE_STYLE, - COLUMN_RULE_WIDTH, COLUMN_SPAN, COLUMN_WIDTH, CONTENT, - COUNTER_INCREMENT, COUNTER_RESET, CUE, CUE_AFTER, CUE_BEFORE, CURSOR, - DIRECTION, DISPLAY, ELEVATION, EMPTY_CELLS, LIBCSS_FLOAT, FONT, + BREAK_INSIDE, CAPTION_SIDE, CLEAR, CLIP, COLOR, COLUMNS, COLUMN_COUNT, + COLUMN_FILL, COLUMN_GAP, COLUMN_RULE, COLUMN_RULE_COLOR, + COLUMN_RULE_STYLE, COLUMN_RULE_WIDTH, COLUMN_SPAN, COLUMN_WIDTH, + CONTENT, COUNTER_INCREMENT, COUNTER_RESET, CUE, CUE_AFTER, CUE_BEFORE, + CURSOR, DIRECTION, DISPLAY, ELEVATION, EMPTY_CELLS, LIBCSS_FLOAT, FONT, FONT_FAMILY, FONT_SIZE, FONT_STYLE, FONT_VARIANT, FONT_WEIGHT, HEIGHT, LEFT, LETTER_SPACING, LINE_HEIGHT, LIST_STYLE, LIST_STYLE_IMAGE, LIST_STYLE_POSITION, LIST_STYLE_TYPE, MARGIN, MARGIN_BOTTOM, -- cgit v1.2.3