diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-01-28 20:25:01 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-01-28 20:25:01 +0000 |
commit | 32ed7d0984f0dd872b4aaac0ac12c18471f291a0 (patch) | |
tree | 39181671076458c8f379507e0585d376ebc7363f /src/parse | |
parent | 6800a4d203fa62366720cc18993a74af92c0359c (diff) | |
download | libcss-32ed7d0984f0dd872b4aaac0ac12c18471f291a0.tar.gz libcss-32ed7d0984f0dd872b4aaac0ac12c18471f291a0.tar.bz2 |
Add support for parsing CSS3 Multi-column layout properties:
+ break-after
+ break-before
+ break-inside
+ column-count
+ column-fill
+ column-gap
+ column-rule-color
+ column-rule-style
+ column_rule-width
+ column_span
+ column_width
TODO: Shorthand properties (columns, column-rule)
TODO: Selection
svn path=/trunk/libcss/; revision=13412
Diffstat (limited to 'src/parse')
-rw-r--r-- | src/parse/important.c | 15 | ||||
-rw-r--r-- | src/parse/properties/properties.c | 11 | ||||
-rw-r--r-- | src/parse/properties/properties.gen | 24 | ||||
-rw-r--r-- | src/parse/properties/properties.h | 33 | ||||
-rw-r--r-- | src/parse/propstrings.c | 15 | ||||
-rw-r--r-- | src/parse/propstrings.h | 39 |
6 files changed, 119 insertions, 18 deletions
diff --git a/src/parse/important.c b/src/parse/important.c index 8587afd..8ed51d9 100644 --- a/src/parse/important.c +++ b/src/parse/important.c @@ -99,8 +99,11 @@ void css__make_style_important(css_style *style) case CSS_PROP_BORDER_BOTTOM_COLOR: case CSS_PROP_BORDER_LEFT_COLOR: case CSS_PROP_BACKGROUND_COLOR: + case CSS_PROP_COLUMN_RULE_COLOR: assert(BACKGROUND_COLOR_SET == BORDER_COLOR_SET); + assert(BACKGROUND_COLOR_SET == + COLUMN_RULE_COLOR_SET); if (value == BACKGROUND_COLOR_SET) offset++; /* colour */ @@ -137,7 +140,10 @@ void css__make_style_important(css_style *style) case CSS_PROP_BORDER_BOTTOM_WIDTH: case CSS_PROP_BORDER_LEFT_WIDTH: case CSS_PROP_OUTLINE_WIDTH: + case CSS_PROP_COLUMN_RULE_WIDTH: assert(BORDER_WIDTH_SET == OUTLINE_WIDTH_SET); + assert(BORDER_WIDTH_SET == + COLUMN_RULE_WIDTH_SET); if (value == BORDER_WIDTH_SET) offset += 2; /* length + units */ @@ -153,12 +159,16 @@ void css__make_style_important(css_style *style) case CSS_PROP_TOP: case CSS_PROP_HEIGHT: case CSS_PROP_WIDTH: + case CSS_PROP_COLUMN_WIDTH: + case CSS_PROP_COLUMN_GAP: assert(BOTTOM_SET == LEFT_SET); assert(BOTTOM_SET == RIGHT_SET); assert(BOTTOM_SET == TOP_SET); assert(BOTTOM_SET == HEIGHT_SET); assert(BOTTOM_SET == MARGIN_SET); assert(BOTTOM_SET == WIDTH_SET); + assert(BOTTOM_SET == COLUMN_WIDTH_SET); + assert(BOTTOM_SET == COLUMN_GAP_SET); if (value == BOTTOM_SET) offset += 2; /* length + units */ @@ -186,6 +196,11 @@ void css__make_style_important(css_style *style) offset++; /* colour */ break; + case CSS_PROP_COLUMN_COUNT: + if (value == COLUMN_COUNT_SET) + offset++; /* colour */ + break; + case CSS_PROP_CONTENT: while (value != CONTENT_NORMAL && value != CONTENT_NONE) { diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c index bc2f225..9918366 100644 --- a/src/parse/properties/properties.c +++ b/src/parse/properties/properties.c @@ -42,10 +42,21 @@ const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] = css__parse_border_top_width, css__parse_border_width, css__parse_bottom, + css__parse_break_after, + css__parse_break_before, + css__parse_break_inside, css__parse_caption_side, css__parse_clear, css__parse_clip, css__parse_color, + css__parse_column_count, + css__parse_column_fill, + css__parse_column_gap, + css__parse_column_rule_color, + css__parse_column_rule_style, + css__parse_column_rule_width, + css__parse_column_span, + css__parse_column_width, css__parse_content, css__parse_counter_increment, css__parse_counter_reset, diff --git a/src/parse/properties/properties.gen b/src/parse/properties/properties.gen index 016d7a0..5a4ebe0 100644 --- a/src/parse/properties/properties.gen +++ b/src/parse/properties/properties.gen @@ -188,3 +188,27 @@ width:CSS_PROP_WIDTH IDENT:( INHERIT: AUTO:0,WIDTH_AUTO IDENT:) LENGTH_UNIT:( UN word_spacing:CSS_PROP_WORD_SPACING IDENT:( INHERIT: NORMAL:0,WORD_SPACING_NORMAL IDENT:) LENGTH_UNIT:( UNIT_PX:WORD_SPACING_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ||unit&UNIT_PCT LENGTH_UNIT:) z_index:CSS_PROP_Z_INDEX IDENT:( INHERIT: AUTO:0,Z_INDEX_AUTO IDENT:) NUMBER:( true:Z_INDEX_SET NUMBER:) + + +break_after:CSS_PROP_BREAK_AFTER IDENT:( INHERIT: AUTO:0,BREAK_AFTER_AUTO ALWAYS:0,BREAK_AFTER_ALWAYS AVOID:0,BREAK_AFTER_AVOID LEFT:0,BREAK_AFTER_LEFT RIGHT:0,BREAK_AFTER_RIGHT PAGE:0,BREAK_AFTER_PAGE COLUMN:0,BREAK_AFTER_COLUMN AVOID_PAGE:0,BREAK_AFTER_AVOID_PAGE AVOID_COLUMN:0,BREAK_AFTER_AVOID_COLUMN IDENT:) + +break_before:CSS_PROP_BREAK_BEFORE IDENT:( INHERIT: AUTO:0,BREAK_BEFORE_AUTO ALWAYS:0,BREAK_BEFORE_ALWAYS AVOID:0,BREAK_BEFORE_AVOID LEFT:0,BREAK_BEFORE_LEFT RIGHT:0,BREAK_BEFORE_RIGHT PAGE:0,BREAK_BEFORE_PAGE COLUMN:0,BREAK_BEFORE_COLUMN AVOID_PAGE:0,BREAK_BEFORE_AVOID_PAGE AVOID_COLUMN:0,BREAK_BEFORE_AVOID_COLUMN IDENT:) + +break_inside:CSS_PROP_BREAK_INSIDE IDENT:( INHERIT: AUTO:0,BREAK_INSIDE_AUTO AVOID:0,BREAK_INSIDE_AVOID AVOID_PAGE:0,BREAK_INSIDE_AVOID_PAGE AVOID_COLUMN:0,BREAK_INSIDE_AVOID_COLUMN IDENT:) + +column_count:CSS_PROP_COLUMN_COUNT IDENT:( INHERIT: AUTO:0,COLUMN_COUNT_AUTO IDENT:) NUMBER:( true:COLUMN_COUNT_SET RANGE:num<0 NUMBER:) + +column_fill:CSS_PROP_COLUMN_FILL IDENT:( INHERIT: BALANCE:0,COLUMN_FILL_BALANCE AUTO:0,COLUMN_FILL_AUTO IDENT:) + +column_gap:CSS_PROP_COLUMN_GAP IDENT:( INHERIT: NORMAL:0,COLUMN_GAP_NORMAL IDENT:) LENGTH_UNIT:( UNIT_PX:COLUMN_GAP_SET RANGE:<0 DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ||unit&UNIT_PCT LENGTH_UNIT:) + +column_rule_color:CSS_PROP_COLUMN_RULE_COLOR IDENT:( INHERIT: IDENT:) COLOR:COLUMN_RULE_COLOR_SET + +column_rule_style:CSS_PROP_COLUMN_RULE_STYLE IDENT:( INHERIT: NONE:0,BORDER_STYLE_NONE HIDDEN:0,BORDER_STYLE_HIDDEN DOTTED:0,BORDER_STYLE_DOTTED DASHED:0,BORDER_STYLE_DASHED SOLID:0,BORDER_STYLE_SOLID LIBCSS_DOUBLE:0,BORDER_STYLE_DOUBLE GROOVE:0,BORDER_STYLE_GROOVE RIDGE:0,BORDER_STYLE_RIDGE INSET:0,BORDER_STYLE_INSET OUTSET:0,BORDER_STYLE_OUTSET IDENT:) + +column_rule_width:CSS_PROP_COLUMN_RULE_WIDTH WRAP:css__parse_border_side_width + +column_span:CSS_PROP_COLUMN_SPAN IDENT:( INHERIT: NONE:0,COLUMN_SPAN_NONE ALL:0,COLUMN_SPAN_ALL IDENT:) + +column_width:CSS_PROP_COLUMN_WIDTH IDENT:( INHERIT: AUTO:0,COLUMN_WIDTH_AUTO IDENT:) LENGTH_UNIT:( UNIT_PX:COLUMN_WIDTH_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ||unit&UNIT_PCT LENGTH_UNIT:) + diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h index 6992f18..b3d2eb4 100644 --- a/src/parse/properties/properties.h +++ b/src/parse/properties/properties.h @@ -112,6 +112,15 @@ css_error css__parse_border_width(css_language *c, css_error css__parse_bottom(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); +css_error css__parse_break_after(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_break_before(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_break_inside(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); css_error css__parse_caption_side(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); @@ -124,6 +133,30 @@ 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_column_count(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_column_fill(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_column_gap(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); +css_error css__parse_column_rule_style(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_column_rule_width(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_column_span(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); +css_error css__parse_column_width(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); css_error css__parse_content(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 dea8816..9ea4707 100644 --- a/src/parse/propstrings.c +++ b/src/parse/propstrings.c @@ -105,10 +105,21 @@ const stringmap_entry stringmap[LAST_KNOWN] = { { "border-top-width", SLEN("border-top-width") }, { "border-width", SLEN("border-width") }, { "bottom", SLEN("bottom") }, + { "break-after", SLEN("break-after") }, + { "break-before", SLEN("break-before") }, + { "break-inside", SLEN("break-inside") }, { "caption-side", SLEN("caption-side") }, { "clear", SLEN("clear") }, { "clip", SLEN("clip") }, { "color", SLEN("color") }, + { "column-count", SLEN("column-count") }, + { "column-fill", SLEN("column-fill") }, + { "column-gap", SLEN("column-gap") }, + { "column-rule-color", SLEN("column-rule-color") }, + { "column-rule-style", SLEN("column-rule-style") }, + { "column-rule-width", SLEN("column-rule_width") }, + { "column-span", SLEN("column-span") }, + { "column-width", SLEN("column-width") }, { "content", SLEN("content") }, { "counter-increment", SLEN("counter-increment") }, { "counter-reset", SLEN("counter-reset") }, @@ -382,6 +393,10 @@ const stringmap_entry stringmap[LAST_KNOWN] = { { "opentype", SLEN("opentype") }, { "embedded-opentype", SLEN("embedded-opentype") }, { "svg", SLEN("svg") }, + { "column", SLEN("column") }, + { "avoid-page", SLEN("avoid_page") }, + { "avoid-column", SLEN("avoid-column") }, + { "balance", SLEN("balance") }, { "aliceblue", SLEN("aliceblue") }, { "antiquewhite", SLEN("antiquewhite") }, diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h index 16affcd..ffa69ee 100644 --- a/src/parse/propstrings.h +++ b/src/parse/propstrings.h @@ -42,23 +42,25 @@ enum { BORDER_LEFT_WIDTH, BORDER_RIGHT, BORDER_RIGHT_COLOR, BORDER_RIGHT_STYLE, BORDER_RIGHT_WIDTH, BORDER_SPACING, BORDER_STYLE, BORDER_TOP, BORDER_TOP_COLOR, BORDER_TOP_STYLE, - BORDER_TOP_WIDTH, BORDER_WIDTH, BOTTOM, CAPTION_SIDE, CLEAR, - CLIP, COLOR, 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, MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, - MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH, OPACITY, ORPHANS, - OUTLINE, OUTLINE_COLOR, OUTLINE_STYLE, OUTLINE_WIDTH, OVERFLOW, - PADDING, PADDING_BOTTOM, PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, - PAGE_BREAK_AFTER, PAGE_BREAK_BEFORE, PAGE_BREAK_INSIDE, - PAUSE, PAUSE_AFTER, PAUSE_BEFORE, PITCH_RANGE, PITCH, PLAY_DURING, - POSITION, QUOTES, RICHNESS, RIGHT, SPEAK_HEADER, SPEAK_NUMERAL, - SPEAK_PUNCTUATION, SPEAK, SPEECH_RATE, STRESS, TABLE_LAYOUT, - TEXT_ALIGN, TEXT_DECORATION, TEXT_INDENT, TEXT_TRANSFORM, TOP, - UNICODE_BIDI, VERTICAL_ALIGN, VISIBILITY, VOICE_FAMILY, VOLUME, - WHITE_SPACE, WIDOWS, WIDTH, WORD_SPACING, Z_INDEX, + 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, + 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, + MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, MAX_HEIGHT, MAX_WIDTH, + MIN_HEIGHT, MIN_WIDTH, OPACITY, ORPHANS, OUTLINE, OUTLINE_COLOR, + OUTLINE_STYLE, OUTLINE_WIDTH, OVERFLOW, PADDING, PADDING_BOTTOM, + PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PAGE_BREAK_AFTER, + PAGE_BREAK_BEFORE, PAGE_BREAK_INSIDE, PAUSE, PAUSE_AFTER, PAUSE_BEFORE, + PITCH_RANGE, PITCH, PLAY_DURING, POSITION, QUOTES, RICHNESS, RIGHT, + SPEAK_HEADER, SPEAK_NUMERAL, SPEAK_PUNCTUATION, SPEAK, SPEECH_RATE, + STRESS, TABLE_LAYOUT, TEXT_ALIGN, TEXT_DECORATION, TEXT_INDENT, + TEXT_TRANSFORM, TOP, UNICODE_BIDI, VERTICAL_ALIGN, VISIBILITY, + VOICE_FAMILY, VOLUME, WHITE_SPACE, WIDOWS, WIDTH, WORD_SPACING, Z_INDEX, LAST_PROP = Z_INDEX, @@ -89,7 +91,8 @@ enum { FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, LINE_THROUGH, BLINK, RGB, RGBA, HSL, HSLA, LIBCSS_LEFT, LIBCSS_CENTER, LIBCSS_RIGHT, CURRENTCOLOR, ODD, EVEN, SRC, LOCAL, INITIAL, - FORMAT, WOFF, TRUETYPE, OPENTYPE, EMBEDDED_OPENTYPE, SVG, + FORMAT, WOFF, TRUETYPE, OPENTYPE, EMBEDDED_OPENTYPE, SVG, COLUMN, + AVOID_PAGE, AVOID_COLUMN, BALANCE, /* Named colours */ FIRST_COLOUR, |