diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-08-23 20:12:41 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-08-23 20:12:41 +0000 |
commit | 0b6d7198f4fc46961c57530e654691b5a66b36f0 (patch) | |
tree | 3e2a25ec514b4d9c34ea92dd79c4eafdc6008b76 /src/select/properties | |
parent | da47188a8369bb79884d37f3222c8bf8fabb7ea4 (diff) | |
download | libcss-0b6d7198f4fc46961c57530e654691b5a66b36f0.tar.gz libcss-0b6d7198f4fc46961c57530e654691b5a66b36f0.tar.bz2 |
Add support for selecting page-break-{before, after, inside}
Credit: James Montgomerie
svn path=/trunk/libcss/; revision=12645
Diffstat (limited to 'src/select/properties')
-rw-r--r-- | src/select/properties/helpers.c | 16 | ||||
-rw-r--r-- | src/select/properties/helpers.h | 4 | ||||
-rw-r--r-- | src/select/properties/page_break_after.c | 24 | ||||
-rw-r--r-- | src/select/properties/page_break_before.c | 27 | ||||
-rw-r--r-- | src/select/properties/page_break_inside.c | 41 |
5 files changed, 49 insertions, 63 deletions
diff --git a/src/select/properties/helpers.c b/src/select/properties/helpers.c index 3851b36..24e193d 100644 --- a/src/select/properties/helpers.c +++ b/src/select/properties/helpers.c @@ -356,22 +356,30 @@ css_error css__cascade_number(uint32_t opv, css_style *style, return CSS_OK; } -css_error css__cascade_page_break_after_before(uint32_t opv, css_style *style, - css_select_state *state, +css_error css__cascade_page_break_after_before_inside(uint32_t opv, + css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)) { - uint16_t value = 0; + uint16_t value = CSS_PAGE_BREAK_AFTER_INHERIT; UNUSED(style); if (isInherit(opv) == false) { switch (getValue(opv)) { case PAGE_BREAK_AFTER_AUTO: + value = CSS_PAGE_BREAK_AFTER_AUTO; + break; case PAGE_BREAK_AFTER_ALWAYS: + value = CSS_PAGE_BREAK_AFTER_ALWAYS; + break; case PAGE_BREAK_AFTER_AVOID: + value = CSS_PAGE_BREAK_AFTER_AVOID; + break; case PAGE_BREAK_AFTER_LEFT: + value = CSS_PAGE_BREAK_AFTER_LEFT; + break; case PAGE_BREAK_AFTER_RIGHT: - /** \todo convert to public values */ + value = CSS_PAGE_BREAK_AFTER_RIGHT; break; } } diff --git a/src/select/properties/helpers.h b/src/select/properties/helpers.h index 9e3e327..098fe1e 100644 --- a/src/select/properties/helpers.h +++ b/src/select/properties/helpers.h @@ -48,8 +48,8 @@ css_error css__cascade_length(uint32_t opv, css_style *style, css_error css__cascade_number(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed)); -css_error css__cascade_page_break_after_before(uint32_t opv, css_style *style, - css_select_state *state, +css_error css__cascade_page_break_after_before_inside(uint32_t opv, + css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)); css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style, css_select_state *state, diff --git a/src/select/properties/page_break_after.c b/src/select/properties/page_break_after.c index c2c3051..0fd44c4 100644 --- a/src/select/properties/page_break_after.c +++ b/src/select/properties/page_break_after.c @@ -17,34 +17,32 @@ css_error css__cascade_page_break_after(uint32_t opv, css_style *style, css_select_state *state) { - /** \todo page-break-after */ - return css__cascade_page_break_after_before(opv, style, state, NULL); + return css__cascade_page_break_after_before_inside(opv, style, state, + set_page_break_after); } css_error css__set_page_break_after_from_hint(const css_hint *hint, css_computed_style *style) { - UNUSED(hint); - UNUSED(style); - - return CSS_OK; + return set_page_break_after(style, hint->status); } css_error css__initial_page_break_after(css_select_state *state) { - UNUSED(state); - - return CSS_OK; + return set_page_break_after(state->computed, + CSS_PAGE_BREAK_AFTER_AUTO); } css_error css__compose_page_break_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - UNUSED(parent); - UNUSED(child); - UNUSED(result); + uint8_t type = get_page_break_after(child); + + if (type == CSS_PAGE_BREAK_AFTER_INHERIT) { + type = get_page_break_after(parent); + } - return CSS_OK; + return set_page_break_after(result, type); } diff --git a/src/select/properties/page_break_before.c b/src/select/properties/page_break_before.c index a0799fd..0acae48 100644 --- a/src/select/properties/page_break_before.c +++ b/src/select/properties/page_break_before.c @@ -17,34 +17,31 @@ css_error css__cascade_page_break_before(uint32_t opv, css_style *style, css_select_state *state) { - /** \todo page-break-before */ - return css__cascade_page_break_after_before(opv, style, state, NULL); + return css__cascade_page_break_after_before_inside(opv, style, state, + set_page_break_before); } css_error css__set_page_break_before_from_hint(const css_hint *hint, css_computed_style *style) { - UNUSED(hint); - UNUSED(style); - - return CSS_OK; + return set_page_break_before(style, hint->status); } css_error css__initial_page_break_before(css_select_state *state) { - UNUSED(state); - - return CSS_OK; + return set_page_break_before(state->computed, + CSS_PAGE_BREAK_BEFORE_AUTO); } css_error css__compose_page_break_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - UNUSED(parent); - UNUSED(child); - UNUSED(result); - - return CSS_OK; + uint8_t type = get_page_break_before(child); + + if (type == CSS_PAGE_BREAK_BEFORE_INHERIT) { + type = get_page_break_before(parent); + } + + return set_page_break_before(result, type); } - diff --git a/src/select/properties/page_break_inside.c b/src/select/properties/page_break_inside.c index 2e27298..20b8bf5 100644 --- a/src/select/properties/page_break_inside.c +++ b/src/select/properties/page_break_inside.c @@ -17,49 +17,32 @@ css_error css__cascade_page_break_inside(uint32_t opv, css_style *style, css_select_state *state) { - UNUSED(style); - - if (isInherit(opv) == false) { - switch (getValue(opv)) { - case PAGE_BREAK_INSIDE_AUTO: - case PAGE_BREAK_INSIDE_AVOID: - /** \todo convert to public values */ - break; - } - } - - if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, - isInherit(opv))) { - /** \todo page-break-inside */ - } - - return CSS_OK; + return css__cascade_page_break_after_before_inside(opv, style, state, + set_page_break_inside); } css_error css__set_page_break_inside_from_hint(const css_hint *hint, css_computed_style *style) { - UNUSED(hint); - UNUSED(style); - - return CSS_OK; + return set_page_break_inside(style, hint->status); } css_error css__initial_page_break_inside(css_select_state *state) { - UNUSED(state); - - return CSS_OK; + return set_page_break_inside(state->computed, + CSS_PAGE_BREAK_INSIDE_AUTO); } css_error css__compose_page_break_inside(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - UNUSED(parent); - UNUSED(child); - UNUSED(result); - - return CSS_OK; + uint8_t type = get_page_break_inside(child); + + if (type == CSS_PAGE_BREAK_INSIDE_INHERIT) { + type = get_page_break_inside(parent); + } + + return set_page_break_inside(result, type); } |