From 33b37afeab6180e4fdc3c97f7f6cc713686ac6a9 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Thu, 20 Jan 2011 11:59:46 +0000 Subject: Ensure there are zero global symbols without css_ or css__ in front of them. This helps prevent confusion if someone else wants a function called parse_background or similar svn path=/trunk/libcss/; revision=11416 --- src/select/properties/azimuth.c | 12 +++--- src/select/properties/background_attachment.c | 10 ++--- src/select/properties/background_color.c | 10 ++--- src/select/properties/background_image.c | 10 ++--- src/select/properties/background_position.c | 14 +++---- src/select/properties/background_repeat.c | 10 ++--- src/select/properties/border_bottom_color.c | 10 ++--- src/select/properties/border_bottom_style.c | 10 ++--- src/select/properties/border_bottom_width.c | 10 ++--- src/select/properties/border_collapse.c | 10 ++--- src/select/properties/border_left_color.c | 10 ++--- src/select/properties/border_left_style.c | 10 ++--- src/select/properties/border_left_width.c | 10 ++--- src/select/properties/border_right_color.c | 10 ++--- src/select/properties/border_right_style.c | 10 ++--- src/select/properties/border_right_width.c | 10 ++--- src/select/properties/border_spacing.c | 14 +++---- src/select/properties/border_top_color.c | 10 ++--- src/select/properties/border_top_style.c | 10 ++--- src/select/properties/border_top_width.c | 10 ++--- src/select/properties/bottom.c | 10 ++--- src/select/properties/caption_side.c | 10 ++--- src/select/properties/clear.c | 10 ++--- src/select/properties/clip.c | 18 ++++----- src/select/properties/color.c | 12 +++--- src/select/properties/content.c | 10 ++--- src/select/properties/counter_increment.c | 10 ++--- src/select/properties/counter_reset.c | 10 ++--- src/select/properties/cue_after.c | 10 ++--- src/select/properties/cue_before.c | 10 ++--- src/select/properties/cursor.c | 10 ++--- src/select/properties/direction.c | 10 ++--- src/select/properties/display.c | 10 ++--- src/select/properties/elevation.c | 12 +++--- src/select/properties/empty_cells.c | 10 ++--- src/select/properties/float.c | 10 ++--- src/select/properties/font_family.c | 12 +++--- src/select/properties/font_size.c | 12 +++--- src/select/properties/font_style.c | 10 ++--- src/select/properties/font_variant.c | 10 ++--- src/select/properties/font_weight.c | 10 ++--- src/select/properties/height.c | 10 ++--- src/select/properties/helpers.c | 56 +++++++++++++-------------- src/select/properties/helpers.h | 24 ++++++------ src/select/properties/left.c | 10 ++--- src/select/properties/letter_spacing.c | 10 ++--- src/select/properties/line_height.c | 12 +++--- src/select/properties/list_style_image.c | 10 ++--- src/select/properties/list_style_position.c | 10 ++--- src/select/properties/list_style_type.c | 10 ++--- src/select/properties/margin_bottom.c | 10 ++--- src/select/properties/margin_left.c | 10 ++--- src/select/properties/margin_right.c | 10 ++--- src/select/properties/margin_top.c | 10 ++--- src/select/properties/max_height.c | 10 ++--- src/select/properties/max_width.c | 10 ++--- src/select/properties/min_height.c | 10 ++--- src/select/properties/min_width.c | 10 ++--- src/select/properties/orphans.c | 10 ++--- src/select/properties/outline_color.c | 10 ++--- src/select/properties/outline_style.c | 10 ++--- src/select/properties/outline_width.c | 10 ++--- src/select/properties/overflow.c | 10 ++--- src/select/properties/padding_bottom.c | 10 ++--- src/select/properties/padding_left.c | 10 ++--- src/select/properties/padding_right.c | 10 ++--- src/select/properties/padding_top.c | 10 ++--- src/select/properties/page_break_after.c | 10 ++--- src/select/properties/page_break_before.c | 10 ++--- src/select/properties/page_break_inside.c | 10 ++--- src/select/properties/pause_after.c | 10 ++--- src/select/properties/pause_before.c | 10 ++--- src/select/properties/pitch.c | 12 +++--- src/select/properties/pitch_range.c | 10 ++--- src/select/properties/play_during.c | 10 ++--- src/select/properties/position.c | 10 ++--- src/select/properties/properties.h | 8 ++-- src/select/properties/quotes.c | 12 +++--- src/select/properties/richness.c | 10 ++--- src/select/properties/right.c | 10 ++--- src/select/properties/speach_rate.c | 10 ++--- src/select/properties/speak.c | 10 ++--- src/select/properties/speak_header.c | 10 ++--- src/select/properties/speak_numeral.c | 10 ++--- src/select/properties/speak_punctuation.c | 10 ++--- src/select/properties/stress.c | 10 ++--- src/select/properties/table_layout.c | 10 ++--- src/select/properties/text_align.c | 10 ++--- src/select/properties/text_decoration.c | 10 ++--- src/select/properties/text_indent.c | 10 ++--- src/select/properties/text_transform.c | 10 ++--- src/select/properties/top.c | 10 ++--- src/select/properties/unicode_bidi.c | 10 ++--- src/select/properties/vertical_align.c | 12 +++--- src/select/properties/visibility.c | 10 ++--- src/select/properties/voice_family.c | 10 ++--- src/select/properties/volume.c | 12 +++--- src/select/properties/white_space.c | 10 ++--- src/select/properties/width.c | 10 ++--- src/select/properties/windows.c | 10 ++--- src/select/properties/word_spacing.c | 10 ++--- src/select/properties/z_index.c | 10 ++--- 102 files changed, 557 insertions(+), 557 deletions(-) (limited to 'src/select/properties') diff --git a/src/select/properties/azimuth.c b/src/select/properties/azimuth.c index 2d1c0ed..cb5fc61 100644 --- a/src/select/properties/azimuth.c +++ b/src/select/properties/azimuth.c @@ -12,7 +12,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_azimuth(uint32_t opv, css_style *style, +css_error css__cascade_azimuth(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -47,9 +47,9 @@ css_error cascade_azimuth(uint32_t opv, css_style *style, /** \todo azimuth behind */ } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo set computed azimuth */ } @@ -57,7 +57,7 @@ css_error cascade_azimuth(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_azimuth_from_hint(const css_hint *hint, +css_error css__set_azimuth_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -66,14 +66,14 @@ css_error set_azimuth_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_azimuth(css_select_state *state) +css_error css__initial_azimuth(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_azimuth(const css_computed_style *parent, +css_error css__compose_azimuth(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/background_attachment.c b/src/select/properties/background_attachment.c index d2b56f8..89fd181 100644 --- a/src/select/properties/background_attachment.c +++ b/src/select/properties/background_attachment.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_background_attachment(uint32_t opv, css_style *style, +css_error css__cascade_background_attachment(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_BACKGROUND_ATTACHMENT_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_background_attachment(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_background_attachment(state->computed, value); } @@ -40,19 +40,19 @@ css_error cascade_background_attachment(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_background_attachment_from_hint(const css_hint *hint, +css_error css__set_background_attachment_from_hint(const css_hint *hint, css_computed_style *style) { return set_background_attachment(style, hint->status); } -css_error initial_background_attachment(css_select_state *state) +css_error css__initial_background_attachment(css_select_state *state) { return set_background_attachment(state->computed, CSS_BACKGROUND_ATTACHMENT_SCROLL); } -css_error compose_background_attachment(const css_computed_style *parent, +css_error css__compose_background_attachment(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/background_color.c b/src/select/properties/background_color.c index ca4c015..e71fc7d 100644 --- a/src/select/properties/background_color.c +++ b/src/select/properties/background_color.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_background_color(uint32_t opv, css_style *style, +css_error css__cascade_background_color(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_bg_border_color(opv, style, state, set_background_color); + return css__cascade_bg_border_color(opv, style, state, set_background_color); } -css_error set_background_color_from_hint(const css_hint *hint, +css_error css__set_background_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_background_color(style, hint->status, hint->data.color); } -css_error initial_background_color(css_select_state *state) +css_error css__initial_background_color(css_select_state *state) { return set_background_color(state->computed, CSS_BACKGROUND_COLOR_TRANSPARENT, 0); } -css_error compose_background_color(const css_computed_style *parent, +css_error css__compose_background_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/background_image.c b/src/select/properties/background_image.c index 6a63ce9..e371a15 100644 --- a/src/select/properties/background_image.c +++ b/src/select/properties/background_image.c @@ -14,13 +14,13 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_background_image(uint32_t opv, css_style *style, +css_error css__cascade_background_image(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_uri_none(opv, style, state, set_background_image); + return css__cascade_uri_none(opv, style, state, set_background_image); } -css_error set_background_image_from_hint(const css_hint *hint, +css_error css__set_background_image_from_hint(const css_hint *hint, css_computed_style *style) { css_error error; @@ -33,13 +33,13 @@ css_error set_background_image_from_hint(const css_hint *hint, return error; } -css_error initial_background_image(css_select_state *state) +css_error css__initial_background_image(css_select_state *state) { return set_background_image(state->computed, CSS_BACKGROUND_IMAGE_NONE, NULL); } -css_error compose_background_image(const css_computed_style *parent, +css_error css__compose_background_image(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/background_position.c b/src/select/properties/background_position.c index 9eda573..e7b5d6f 100644 --- a/src/select/properties/background_position.c +++ b/src/select/properties/background_position.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_background_position(uint32_t opv, css_style *style, +css_error css__cascade_background_position(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_BACKGROUND_POSITION_INHERIT; @@ -69,10 +69,10 @@ css_error cascade_background_position(uint32_t opv, css_style *style, } } - hunit = to_css_unit(hunit); - vunit = to_css_unit(vunit); + hunit = css__to_css_unit(hunit); + vunit = css__to_css_unit(vunit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_background_position(state->computed, value, hlength, hunit, vlength, vunit); @@ -81,7 +81,7 @@ css_error cascade_background_position(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_background_position_from_hint(const css_hint *hint, +css_error css__set_background_position_from_hint(const css_hint *hint, css_computed_style *style) { return set_background_position(style, hint->status, @@ -89,14 +89,14 @@ css_error set_background_position_from_hint(const css_hint *hint, hint->data.position.v.value, hint->data.position.v.unit); } -css_error initial_background_position(css_select_state *state) +css_error css__initial_background_position(css_select_state *state) { return set_background_position(state->computed, CSS_BACKGROUND_POSITION_SET, 0, CSS_UNIT_PCT, 0, CSS_UNIT_PCT); } -css_error compose_background_position(const css_computed_style *parent, +css_error css__compose_background_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/background_repeat.c b/src/select/properties/background_repeat.c index 95ff660..e31275f 100644 --- a/src/select/properties/background_repeat.c +++ b/src/select/properties/background_repeat.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_background_repeat(uint32_t opv, css_style *style, +css_error css__cascade_background_repeat(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_BACKGROUND_REPEAT_INHERIT; @@ -38,7 +38,7 @@ css_error cascade_background_repeat(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_background_repeat(state->computed, value); } @@ -46,19 +46,19 @@ css_error cascade_background_repeat(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_background_repeat_from_hint(const css_hint *hint, +css_error css__set_background_repeat_from_hint(const css_hint *hint, css_computed_style *style) { return set_background_repeat(style, hint->status); } -css_error initial_background_repeat(css_select_state *state) +css_error css__initial_background_repeat(css_select_state *state) { return set_background_repeat(state->computed, CSS_BACKGROUND_REPEAT_REPEAT); } -css_error compose_background_repeat(const css_computed_style *parent, +css_error css__compose_background_repeat(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_bottom_color.c b/src/select/properties/border_bottom_color.c index c5b7633..0df95cc 100644 --- a/src/select/properties/border_bottom_color.c +++ b/src/select/properties/border_bottom_color.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_bottom_color(uint32_t opv, css_style *style, +css_error css__cascade_border_bottom_color(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_bg_border_color(opv, style, state, + return css__cascade_bg_border_color(opv, style, state, set_border_bottom_color); } -css_error set_border_bottom_color_from_hint(const css_hint *hint, +css_error css__set_border_bottom_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_bottom_color(style, hint->status, hint->data.color); } -css_error initial_border_bottom_color(css_select_state *state) +css_error css__initial_border_bottom_color(css_select_state *state) { return set_border_bottom_color(state->computed, CSS_BORDER_COLOR_INITIAL, 0); } -css_error compose_border_bottom_color(const css_computed_style *parent, +css_error css__compose_border_bottom_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_bottom_style.c b/src/select/properties/border_bottom_style.c index 2f022c3..2a6cd6a 100644 --- a/src/select/properties/border_bottom_style.c +++ b/src/select/properties/border_bottom_style.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_bottom_style(uint32_t opv, css_style *style, +css_error css__cascade_border_bottom_style(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_style(opv, style, state, set_border_bottom_style); + return css__cascade_border_style(opv, style, state, set_border_bottom_style); } -css_error set_border_bottom_style_from_hint(const css_hint *hint, +css_error css__set_border_bottom_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_bottom_style(style, hint->status); } -css_error initial_border_bottom_style(css_select_state *state) +css_error css__initial_border_bottom_style(css_select_state *state) { return set_border_bottom_style(state->computed, CSS_BORDER_STYLE_NONE); } -css_error compose_border_bottom_style(const css_computed_style *parent, +css_error css__compose_border_bottom_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_bottom_width.c b/src/select/properties/border_bottom_width.c index 27f5b05..fdf0824 100644 --- a/src/select/properties/border_bottom_width.c +++ b/src/select/properties/border_bottom_width.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_bottom_width(uint32_t opv, css_style *style, +css_error css__cascade_border_bottom_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_width(opv, style, state, set_border_bottom_width); + return css__cascade_border_width(opv, style, state, set_border_bottom_width); } -css_error set_border_bottom_width_from_hint(const css_hint *hint, +css_error css__set_border_bottom_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_bottom_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_bottom_width(css_select_state *state) +css_error css__initial_border_bottom_width(css_select_state *state) { return set_border_bottom_width(state->computed, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_border_bottom_width(const css_computed_style *parent, +css_error css__compose_border_bottom_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_collapse.c b/src/select/properties/border_collapse.c index 7b69847..5da1a00 100644 --- a/src/select/properties/border_collapse.c +++ b/src/select/properties/border_collapse.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_collapse(uint32_t opv, css_style *style, +css_error css__cascade_border_collapse(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_BORDER_COLLAPSE_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_border_collapse(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_border_collapse(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_border_collapse(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_border_collapse_from_hint(const css_hint *hint, +css_error css__set_border_collapse_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_collapse(style, hint->status); } -css_error initial_border_collapse(css_select_state *state) +css_error css__initial_border_collapse(css_select_state *state) { return set_border_collapse(state->computed, CSS_BORDER_COLLAPSE_SEPARATE); } -css_error compose_border_collapse(const css_computed_style *parent, +css_error css__compose_border_collapse(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_left_color.c b/src/select/properties/border_left_color.c index 7c2e670..ea631ee 100644 --- a/src/select/properties/border_left_color.c +++ b/src/select/properties/border_left_color.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_left_color(uint32_t opv, css_style *style, +css_error css__cascade_border_left_color(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_bg_border_color(opv, style, state, + return css__cascade_bg_border_color(opv, style, state, set_border_left_color); } -css_error set_border_left_color_from_hint(const css_hint *hint, +css_error css__set_border_left_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_left_color(style, hint->status, hint->data.color); } -css_error initial_border_left_color(css_select_state *state) +css_error css__initial_border_left_color(css_select_state *state) { return set_border_left_color(state->computed, CSS_BORDER_COLOR_INITIAL, 0); } -css_error compose_border_left_color(const css_computed_style *parent, +css_error css__compose_border_left_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_left_style.c b/src/select/properties/border_left_style.c index 74ee138..89708f7 100644 --- a/src/select/properties/border_left_style.c +++ b/src/select/properties/border_left_style.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_left_style(uint32_t opv, css_style *style, +css_error css__cascade_border_left_style(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_style(opv, style, state, set_border_left_style); + return css__cascade_border_style(opv, style, state, set_border_left_style); } -css_error set_border_left_style_from_hint(const css_hint *hint, +css_error css__set_border_left_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_left_style(style, hint->status); } -css_error initial_border_left_style(css_select_state *state) +css_error css__initial_border_left_style(css_select_state *state) { return set_border_left_style(state->computed, CSS_BORDER_STYLE_NONE); } -css_error compose_border_left_style(const css_computed_style *parent, +css_error css__compose_border_left_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_left_width.c b/src/select/properties/border_left_width.c index 610d956..a4633da 100644 --- a/src/select/properties/border_left_width.c +++ b/src/select/properties/border_left_width.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_left_width(uint32_t opv, css_style *style, +css_error css__cascade_border_left_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_width(opv, style, state, set_border_left_width); + return css__cascade_border_width(opv, style, state, set_border_left_width); } -css_error set_border_left_width_from_hint(const css_hint *hint, +css_error css__set_border_left_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_left_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_left_width(css_select_state *state) +css_error css__initial_border_left_width(css_select_state *state) { return set_border_left_width(state->computed, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_border_left_width(const css_computed_style *parent, +css_error css__compose_border_left_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_right_color.c b/src/select/properties/border_right_color.c index 41fe441..5f9b6ca 100644 --- a/src/select/properties/border_right_color.c +++ b/src/select/properties/border_right_color.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_right_color(uint32_t opv, css_style *style, +css_error css__cascade_border_right_color(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_bg_border_color(opv, style, state, + return css__cascade_bg_border_color(opv, style, state, set_border_right_color); } -css_error set_border_right_color_from_hint(const css_hint *hint, +css_error css__set_border_right_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_right_color(style, hint->status, hint->data.color); } -css_error initial_border_right_color(css_select_state *state) +css_error css__initial_border_right_color(css_select_state *state) { return set_border_right_color(state->computed, CSS_BORDER_COLOR_INITIAL, 0); } -css_error compose_border_right_color(const css_computed_style *parent, +css_error css__compose_border_right_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_right_style.c b/src/select/properties/border_right_style.c index 2462b03..3f5934b 100644 --- a/src/select/properties/border_right_style.c +++ b/src/select/properties/border_right_style.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_right_style(uint32_t opv, css_style *style, +css_error css__cascade_border_right_style(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_style(opv, style, state, set_border_right_style); + return css__cascade_border_style(opv, style, state, set_border_right_style); } -css_error set_border_right_style_from_hint(const css_hint *hint, +css_error css__set_border_right_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_right_style(style, hint->status); } -css_error initial_border_right_style(css_select_state *state) +css_error css__initial_border_right_style(css_select_state *state) { return set_border_right_style(state->computed, CSS_BORDER_STYLE_NONE); } -css_error compose_border_right_style(const css_computed_style *parent, +css_error css__compose_border_right_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_right_width.c b/src/select/properties/border_right_width.c index 477e74f..269fefe 100644 --- a/src/select/properties/border_right_width.c +++ b/src/select/properties/border_right_width.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_right_width(uint32_t opv, css_style *style, +css_error css__cascade_border_right_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_width(opv, style, state, set_border_right_width); + return css__cascade_border_width(opv, style, state, set_border_right_width); } -css_error set_border_right_width_from_hint(const css_hint *hint, +css_error css__set_border_right_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_right_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_right_width(css_select_state *state) +css_error css__initial_border_right_width(css_select_state *state) { return set_border_right_width(state->computed, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_border_right_width(const css_computed_style *parent, +css_error css__compose_border_right_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_spacing.c b/src/select/properties/border_spacing.c index 745c423..1b32747 100644 --- a/src/select/properties/border_spacing.c +++ b/src/select/properties/border_spacing.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_spacing(uint32_t opv, css_style *style, +css_error css__cascade_border_spacing(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_BORDER_SPACING_INHERIT; @@ -36,10 +36,10 @@ css_error cascade_border_spacing(uint32_t opv, css_style *style, advance_bytecode(style, sizeof(vunit)); } - hunit = to_css_unit(hunit); - vunit = to_css_unit(vunit); + hunit = css__to_css_unit(hunit); + vunit = css__to_css_unit(vunit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_border_spacing(state->computed, value, hlength, hunit, vlength, vunit); @@ -48,7 +48,7 @@ css_error cascade_border_spacing(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_border_spacing_from_hint(const css_hint *hint, +css_error css__set_border_spacing_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_spacing(style, hint->status, @@ -56,13 +56,13 @@ css_error set_border_spacing_from_hint(const css_hint *hint, hint->data.position.v.value, hint->data.position.v.unit); } -css_error initial_border_spacing(css_select_state *state) +css_error css__initial_border_spacing(css_select_state *state) { return set_border_spacing(state->computed, CSS_BORDER_SPACING_SET, 0, CSS_UNIT_PX, 0, CSS_UNIT_PX); } -css_error compose_border_spacing(const css_computed_style *parent, +css_error css__compose_border_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_top_color.c b/src/select/properties/border_top_color.c index 6d3b7f3..328ce67 100644 --- a/src/select/properties/border_top_color.c +++ b/src/select/properties/border_top_color.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_top_color(uint32_t opv, css_style *style, +css_error css__cascade_border_top_color(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_bg_border_color(opv, style, state, set_border_top_color); + return css__cascade_bg_border_color(opv, style, state, set_border_top_color); } -css_error set_border_top_color_from_hint(const css_hint *hint, +css_error css__set_border_top_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_top_color(style, hint->status, hint->data.color); } -css_error initial_border_top_color(css_select_state *state) +css_error css__initial_border_top_color(css_select_state *state) { return set_border_top_color(state->computed, CSS_BORDER_COLOR_INITIAL, 0); } -css_error compose_border_top_color(const css_computed_style *parent, +css_error css__compose_border_top_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_top_style.c b/src/select/properties/border_top_style.c index 6109cf3..9841202 100644 --- a/src/select/properties/border_top_style.c +++ b/src/select/properties/border_top_style.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_top_style(uint32_t opv, css_style *style, +css_error css__cascade_border_top_style(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_style(opv, style, state, set_border_top_style); + return css__cascade_border_style(opv, style, state, set_border_top_style); } -css_error set_border_top_style_from_hint(const css_hint *hint, +css_error css__set_border_top_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_top_style(style, hint->status); } -css_error initial_border_top_style(css_select_state *state) +css_error css__initial_border_top_style(css_select_state *state) { return set_border_top_style(state->computed, CSS_BORDER_STYLE_NONE); } -css_error compose_border_top_style(const css_computed_style *parent, +css_error css__compose_border_top_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/border_top_width.c b/src/select/properties/border_top_width.c index 5884ab4..237d594 100644 --- a/src/select/properties/border_top_width.c +++ b/src/select/properties/border_top_width.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_border_top_width(uint32_t opv, css_style *style, +css_error css__cascade_border_top_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_width(opv, style, state, set_border_top_width); + return css__cascade_border_width(opv, style, state, set_border_top_width); } -css_error set_border_top_width_from_hint(const css_hint *hint, +css_error css__set_border_top_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_border_top_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_top_width(css_select_state *state) +css_error css__initial_border_top_width(css_select_state *state) { return set_border_top_width(state->computed, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_border_top_width(const css_computed_style *parent, +css_error css__compose_border_top_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/bottom.c b/src/select/properties/bottom.c index 286d546..7c9b509 100644 --- a/src/select/properties/bottom.c +++ b/src/select/properties/bottom.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_bottom(uint32_t opv, css_style *style, +css_error css__cascade_bottom(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_bottom); + return css__cascade_length_auto(opv, style, state, set_bottom); } -css_error set_bottom_from_hint(const css_hint *hint, +css_error css__set_bottom_from_hint(const css_hint *hint, css_computed_style *style) { return set_bottom(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_bottom(css_select_state *state) +css_error css__initial_bottom(css_select_state *state) { return set_bottom(state->computed, CSS_BOTTOM_AUTO, 0, CSS_UNIT_PX); } -css_error compose_bottom(const css_computed_style *parent, +css_error css__compose_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/caption_side.c b/src/select/properties/caption_side.c index cafbe2e..c097348 100644 --- a/src/select/properties/caption_side.c +++ b/src/select/properties/caption_side.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_caption_side(uint32_t opv, css_style *style, +css_error css__cascade_caption_side(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_CAPTION_SIDE_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_caption_side(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_caption_side(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_caption_side(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_caption_side_from_hint(const css_hint *hint, +css_error css__set_caption_side_from_hint(const css_hint *hint, css_computed_style *style) { return set_caption_side(style, hint->status); } -css_error initial_caption_side(css_select_state *state) +css_error css__initial_caption_side(css_select_state *state) { return set_caption_side(state->computed, CSS_CAPTION_SIDE_TOP); } -css_error compose_caption_side(const css_computed_style *parent, +css_error css__compose_caption_side(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/clear.c b/src/select/properties/clear.c index 27da0bd..55ca087 100644 --- a/src/select/properties/clear.c +++ b/src/select/properties/clear.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_clear(uint32_t opv, css_style *style, +css_error css__cascade_clear(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_CLEAR_INHERIT; @@ -38,7 +38,7 @@ css_error cascade_clear(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_clear(state->computed, value); } @@ -46,18 +46,18 @@ css_error cascade_clear(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_clear_from_hint(const css_hint *hint, +css_error css__set_clear_from_hint(const css_hint *hint, css_computed_style *style) { return set_clear(style, hint->status); } -css_error initial_clear(css_select_state *state) +css_error css__initial_clear(css_select_state *state) { return set_clear(state->computed, CSS_CLEAR_NONE); } -css_error compose_clear(const css_computed_style *parent, +css_error css__compose_clear(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/clip.c b/src/select/properties/clip.c index 6daa204..523b722 100644 --- a/src/select/properties/clip.c +++ b/src/select/properties/clip.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_clip(uint32_t opv, css_style *style, +css_error css__cascade_clip(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_CLIP_INHERIT; @@ -64,12 +64,12 @@ css_error cascade_clip(uint32_t opv, css_style *style, } } - rect.tunit = to_css_unit(rect.tunit); - rect.runit = to_css_unit(rect.runit); - rect.bunit = to_css_unit(rect.bunit); - rect.lunit = to_css_unit(rect.lunit); + rect.tunit = css__to_css_unit(rect.tunit); + rect.runit = css__to_css_unit(rect.runit); + rect.bunit = css__to_css_unit(rect.bunit); + rect.lunit = css__to_css_unit(rect.lunit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_clip(state->computed, value, &rect); } @@ -77,13 +77,13 @@ css_error cascade_clip(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_clip_from_hint(const css_hint *hint, +css_error css__set_clip_from_hint(const css_hint *hint, css_computed_style *style) { return set_clip(style, hint->status, hint->data.clip); } -css_error initial_clip(css_select_state *state) +css_error css__initial_clip(css_select_state *state) { css_computed_clip_rect rect = { 0, 0, 0, 0, CSS_UNIT_PX, CSS_UNIT_PX, CSS_UNIT_PX, CSS_UNIT_PX, @@ -92,7 +92,7 @@ css_error initial_clip(css_select_state *state) return set_clip(state->computed, CSS_CLIP_AUTO, &rect); } -css_error compose_clip(const css_computed_style *parent, +css_error css__compose_clip(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/color.c b/src/select/properties/color.c index c246349..3cd1e3d 100644 --- a/src/select/properties/color.c +++ b/src/select/properties/color.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_color(uint32_t opv, css_style *style, +css_error css__cascade_color(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_COLOR_INHERIT; @@ -26,7 +26,7 @@ css_error cascade_color(uint32_t opv, css_style *style, advance_bytecode(style, sizeof(color)); } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_color(state->computed, value, color); } @@ -34,13 +34,13 @@ css_error cascade_color(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_color_from_hint(const css_hint *hint, +css_error css__set_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_color(style, hint->status, hint->data.color); } -css_error initial_color(css_select_state *state) +css_error css__initial_color(css_select_state *state) { css_hint hint; css_error error; @@ -50,10 +50,10 @@ css_error initial_color(css_select_state *state) if (error != CSS_OK) return error; - return set_color_from_hint(&hint, state->computed); + return css__set_color_from_hint(&hint, state->computed); } -css_error compose_color(const css_computed_style *parent, +css_error css__compose_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/content.c b/src/select/properties/content.c index f6e8452..5e38d49 100644 --- a/src/select/properties/content.c +++ b/src/select/properties/content.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_content(uint32_t opv, css_style *style, +css_error css__cascade_content(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_CONTENT_INHERIT; @@ -140,7 +140,7 @@ css_error cascade_content(uint32_t opv, css_style *style, content[n_contents].type = CSS_COMPUTED_CONTENT_NONE; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { css_error error; @@ -156,7 +156,7 @@ css_error cascade_content(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_content_from_hint(const css_hint *hint, +css_error css__set_content_from_hint(const css_hint *hint, css_computed_style *style) { css_computed_content_item *item; @@ -195,12 +195,12 @@ css_error set_content_from_hint(const css_hint *hint, return error; } -css_error initial_content(css_select_state *state) +css_error css__initial_content(css_select_state *state) { return set_content(state->computed, CSS_CONTENT_NORMAL, NULL); } -css_error compose_content(const css_computed_style *parent, +css_error css__compose_content(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/counter_increment.c b/src/select/properties/counter_increment.c index a0a0ae5..26419a2 100644 --- a/src/select/properties/counter_increment.c +++ b/src/select/properties/counter_increment.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_counter_increment(uint32_t opv, css_style *style, +css_error css__cascade_counter_increment(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_counter_increment_reset(opv, style, state, + return css__cascade_counter_increment_reset(opv, style, state, set_counter_increment); } -css_error set_counter_increment_from_hint(const css_hint *hint, +css_error css__set_counter_increment_from_hint(const css_hint *hint, css_computed_style *style) { css_computed_counter *item; @@ -42,13 +42,13 @@ css_error set_counter_increment_from_hint(const css_hint *hint, return error; } -css_error initial_counter_increment(css_select_state *state) +css_error css__initial_counter_increment(css_select_state *state) { return set_counter_increment(state->computed, CSS_COUNTER_INCREMENT_NONE, NULL); } -css_error compose_counter_increment(const css_computed_style *parent, +css_error css__compose_counter_increment(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/counter_reset.c b/src/select/properties/counter_reset.c index 60b3939..362c86d 100644 --- a/src/select/properties/counter_reset.c +++ b/src/select/properties/counter_reset.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_counter_reset(uint32_t opv, css_style *style, +css_error css__cascade_counter_reset(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_counter_increment_reset(opv, style, state, + return css__cascade_counter_increment_reset(opv, style, state, set_counter_reset); } -css_error set_counter_reset_from_hint(const css_hint *hint, +css_error css__set_counter_reset_from_hint(const css_hint *hint, css_computed_style *style) { css_computed_counter *item; @@ -42,12 +42,12 @@ css_error set_counter_reset_from_hint(const css_hint *hint, return error; } -css_error initial_counter_reset(css_select_state *state) +css_error css__initial_counter_reset(css_select_state *state) { return set_counter_reset(state->computed, CSS_COUNTER_RESET_NONE, NULL); } -css_error compose_counter_reset(const css_computed_style *parent, +css_error css__compose_counter_reset(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/cue_after.c b/src/select/properties/cue_after.c index 1bdea51..86dd4a7 100644 --- a/src/select/properties/cue_after.c +++ b/src/select/properties/cue_after.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_cue_after(uint32_t opv, css_style *style, +css_error css__cascade_cue_after(uint32_t opv, css_style *style, css_select_state *state) { /** \todo cue-after */ - return cascade_uri_none(opv, style, state, NULL); + return css__cascade_uri_none(opv, style, state, NULL); } -css_error set_cue_after_from_hint(const css_hint *hint, +css_error css__set_cue_after_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_cue_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_cue_after(css_select_state *state) +css_error css__initial_cue_after(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_cue_after(const css_computed_style *parent, +css_error css__compose_cue_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/cue_before.c b/src/select/properties/cue_before.c index 72f31dd..cf89475 100644 --- a/src/select/properties/cue_before.c +++ b/src/select/properties/cue_before.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_cue_before(uint32_t opv, css_style *style, +css_error css__cascade_cue_before(uint32_t opv, css_style *style, css_select_state *state) { /** \todo cue-before */ - return cascade_uri_none(opv, style, state, NULL); + return css__cascade_uri_none(opv, style, state, NULL); } -css_error set_cue_before_from_hint(const css_hint *hint, +css_error css__set_cue_before_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_cue_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_cue_before(css_select_state *state) +css_error css__initial_cue_before(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_cue_before(const css_computed_style *parent, +css_error css__compose_cue_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/cursor.c b/src/select/properties/cursor.c index 42d1900..42c3753 100644 --- a/src/select/properties/cursor.c +++ b/src/select/properties/cursor.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_cursor(uint32_t opv, css_style *style, +css_error css__cascade_cursor(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_CURSOR_INHERIT; @@ -124,7 +124,7 @@ css_error cascade_cursor(uint32_t opv, css_style *style, uris[n_uris] = NULL; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { css_error error; @@ -141,7 +141,7 @@ css_error cascade_cursor(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_cursor_from_hint(const css_hint *hint, +css_error css__set_cursor_from_hint(const css_hint *hint, css_computed_style *style) { lwc_string **item; @@ -160,12 +160,12 @@ css_error set_cursor_from_hint(const css_hint *hint, return error; } -css_error initial_cursor(css_select_state *state) +css_error css__initial_cursor(css_select_state *state) { return set_cursor(state->computed, CSS_CURSOR_AUTO, NULL); } -css_error compose_cursor(const css_computed_style *parent, +css_error css__compose_cursor(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/direction.c b/src/select/properties/direction.c index 6878f02..1e68123 100644 --- a/src/select/properties/direction.c +++ b/src/select/properties/direction.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_direction(uint32_t opv, css_style *style, +css_error css__cascade_direction(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_DIRECTION_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_direction(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_direction(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_direction(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_direction_from_hint(const css_hint *hint, +css_error css__set_direction_from_hint(const css_hint *hint, css_computed_style *style) { return set_direction(style, hint->status); } -css_error initial_direction(css_select_state *state) +css_error css__initial_direction(css_select_state *state) { return set_direction(state->computed, CSS_DIRECTION_LTR); } -css_error compose_direction(const css_computed_style *parent, +css_error css__compose_direction(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/display.c b/src/select/properties/display.c index 9c05f52..02f5e1e 100644 --- a/src/select/properties/display.c +++ b/src/select/properties/display.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_display(uint32_t opv, css_style *style, +css_error css__cascade_display(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_DISPLAY_INHERIT; @@ -74,7 +74,7 @@ css_error cascade_display(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_display(state->computed, value); } @@ -82,18 +82,18 @@ css_error cascade_display(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_display_from_hint(const css_hint *hint, +css_error css__set_display_from_hint(const css_hint *hint, css_computed_style *style) { return set_display(style, hint->status); } -css_error initial_display(css_select_state *state) +css_error css__initial_display(css_select_state *state) { return set_display(state->computed, CSS_DISPLAY_INLINE); } -css_error compose_display(const css_computed_style *parent, +css_error css__compose_display(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/elevation.c b/src/select/properties/elevation.c index 144d150..12b8e22 100644 --- a/src/select/properties/elevation.c +++ b/src/select/properties/elevation.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_elevation(uint32_t opv, css_style *style, +css_error css__cascade_elevation(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -42,9 +42,9 @@ css_error cascade_elevation(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo set computed elevation */ } @@ -52,7 +52,7 @@ css_error cascade_elevation(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_elevation_from_hint(const css_hint *hint, +css_error css__set_elevation_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -61,14 +61,14 @@ css_error set_elevation_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_elevation(css_select_state *state) +css_error css__initial_elevation(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_elevation(const css_computed_style *parent, +css_error css__compose_elevation(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/empty_cells.c b/src/select/properties/empty_cells.c index ae7d331..5e749c2 100644 --- a/src/select/properties/empty_cells.c +++ b/src/select/properties/empty_cells.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_empty_cells(uint32_t opv, css_style *style, +css_error css__cascade_empty_cells(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_EMPTY_CELLS_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_empty_cells(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_empty_cells(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_empty_cells(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_empty_cells_from_hint(const css_hint *hint, +css_error css__set_empty_cells_from_hint(const css_hint *hint, css_computed_style *style) { return set_empty_cells(style, hint->status); } -css_error initial_empty_cells(css_select_state *state) +css_error css__initial_empty_cells(css_select_state *state) { return set_empty_cells(state->computed, CSS_EMPTY_CELLS_SHOW); } -css_error compose_empty_cells(const css_computed_style *parent, +css_error css__compose_empty_cells(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/float.c b/src/select/properties/float.c index ff35f82..82df983 100644 --- a/src/select/properties/float.c +++ b/src/select/properties/float.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_float(uint32_t opv, css_style *style, +css_error css__cascade_float(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FLOAT_INHERIT; @@ -35,7 +35,7 @@ css_error cascade_float(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_float(state->computed, value); } @@ -43,18 +43,18 @@ css_error cascade_float(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_float_from_hint(const css_hint *hint, +css_error css__set_float_from_hint(const css_hint *hint, css_computed_style *style) { return set_float(style, hint->status); } -css_error initial_float(css_select_state *state) +css_error css__initial_float(css_select_state *state) { return set_float(state->computed, CSS_FLOAT_NONE); } -css_error compose_float(const css_computed_style *parent, +css_error css__compose_float(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/font_family.c b/src/select/properties/font_family.c index c8b3789..f712cdb 100644 --- a/src/select/properties/font_family.c +++ b/src/select/properties/font_family.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_font_family(uint32_t opv, css_style *style, +css_error css__cascade_font_family(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FONT_FAMILY_INHERIT; @@ -101,7 +101,7 @@ css_error cascade_font_family(uint32_t opv, css_style *style, fonts[n_fonts] = NULL; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { css_error error; @@ -118,7 +118,7 @@ css_error cascade_font_family(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_font_family_from_hint(const css_hint *hint, +css_error css__set_font_family_from_hint(const css_hint *hint, css_computed_style *style) { lwc_string **item; @@ -137,7 +137,7 @@ css_error set_font_family_from_hint(const css_hint *hint, return error; } -css_error initial_font_family(css_select_state *state) +css_error css__initial_font_family(css_select_state *state) { css_hint hint; css_error error; @@ -147,10 +147,10 @@ css_error initial_font_family(css_select_state *state) if (error != CSS_OK) return error; - return set_font_family_from_hint(&hint, state->computed); + return css__set_font_family_from_hint(&hint, state->computed); } -css_error compose_font_family(const css_computed_style *parent, +css_error css__compose_font_family(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/font_size.c b/src/select/properties/font_size.c index 3fbe9ea..65fbb94 100644 --- a/src/select/properties/font_size.c +++ b/src/select/properties/font_size.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_font_size(uint32_t opv, css_style *style, +css_error css__cascade_font_size(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FONT_SIZE_INHERIT; @@ -62,9 +62,9 @@ css_error cascade_font_size(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_font_size(state->computed, value, size, unit); } @@ -72,20 +72,20 @@ css_error cascade_font_size(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_font_size_from_hint(const css_hint *hint, +css_error css__set_font_size_from_hint(const css_hint *hint, css_computed_style *style) { return set_font_size(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_font_size(css_select_state *state) +css_error css__initial_font_size(css_select_state *state) { return set_font_size(state->computed, CSS_FONT_SIZE_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_font_size(const css_computed_style *parent, +css_error css__compose_font_size(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/font_style.c b/src/select/properties/font_style.c index 23aa119..68846d6 100644 --- a/src/select/properties/font_style.c +++ b/src/select/properties/font_style.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_font_style(uint32_t opv, css_style *style, +css_error css__cascade_font_style(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FONT_STYLE_INHERIT; @@ -35,7 +35,7 @@ css_error cascade_font_style(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_font_style(state->computed, value); } @@ -43,18 +43,18 @@ css_error cascade_font_style(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_font_style_from_hint(const css_hint *hint, +css_error css__set_font_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_font_style(style, hint->status); } -css_error initial_font_style(css_select_state *state) +css_error css__initial_font_style(css_select_state *state) { return set_font_style(state->computed, CSS_FONT_STYLE_NORMAL); } -css_error compose_font_style(const css_computed_style *parent, +css_error css__compose_font_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/font_variant.c b/src/select/properties/font_variant.c index a5c9967..b6bb2e9 100644 --- a/src/select/properties/font_variant.c +++ b/src/select/properties/font_variant.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_font_variant(uint32_t opv, css_style *style, +css_error css__cascade_font_variant(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FONT_VARIANT_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_font_variant(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_font_variant(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_font_variant(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_font_variant_from_hint(const css_hint *hint, +css_error css__set_font_variant_from_hint(const css_hint *hint, css_computed_style *style) { return set_font_variant(style, hint->status); } -css_error initial_font_variant(css_select_state *state) +css_error css__initial_font_variant(css_select_state *state) { return set_font_variant(state->computed, CSS_FONT_VARIANT_NORMAL); } -css_error compose_font_variant(const css_computed_style *parent, +css_error css__compose_font_variant(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/font_weight.c b/src/select/properties/font_weight.c index fa814f4..bd67f89 100644 --- a/src/select/properties/font_weight.c +++ b/src/select/properties/font_weight.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_font_weight(uint32_t opv, css_style *style, +css_error css__cascade_font_weight(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_FONT_WEIGHT_INHERIT; @@ -65,7 +65,7 @@ css_error cascade_font_weight(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_font_weight(state->computed, value); } @@ -73,18 +73,18 @@ css_error cascade_font_weight(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_font_weight_from_hint(const css_hint *hint, +css_error css__set_font_weight_from_hint(const css_hint *hint, css_computed_style *style) { return set_font_weight(style, hint->status); } -css_error initial_font_weight(css_select_state *state) +css_error css__initial_font_weight(css_select_state *state) { return set_font_weight(state->computed, CSS_FONT_WEIGHT_NORMAL); } -css_error compose_font_weight(const css_computed_style *parent, +css_error css__compose_font_weight(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/height.c b/src/select/properties/height.c index 38b35c1..7aeec3f 100644 --- a/src/select/properties/height.c +++ b/src/select/properties/height.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_height(uint32_t opv, css_style *style, +css_error css__cascade_height(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_height); + return css__cascade_length_auto(opv, style, state, set_height); } -css_error set_height_from_hint(const css_hint *hint, +css_error css__set_height_from_hint(const css_hint *hint, css_computed_style *style) { return set_height(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_height(css_select_state *state) +css_error css__initial_height(css_select_state *state) { return set_height(state->computed, CSS_HEIGHT_AUTO, 0, CSS_UNIT_PX); } -css_error compose_height(const css_computed_style *parent, +css_error css__compose_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/helpers.c b/src/select/properties/helpers.c index 3310502..7bb60ef 100644 --- a/src/select/properties/helpers.c +++ b/src/select/properties/helpers.c @@ -18,7 +18,7 @@ /* Useful helpers */ -css_unit to_css_unit(uint32_t u) +css_unit css__to_css_unit(uint32_t u) { switch (u) { case UNIT_PX: return CSS_UNIT_PX; @@ -45,7 +45,7 @@ css_unit to_css_unit(uint32_t u) /****************************************************************************** * Utilities below here * ******************************************************************************/ -css_error cascade_bg_border_color(uint32_t opv, css_style *style, +css_error css__cascade_bg_border_color(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_color)) { @@ -70,7 +70,7 @@ css_error cascade_bg_border_color(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, color); } @@ -78,7 +78,7 @@ css_error cascade_bg_border_color(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_uri_none(uint32_t opv, css_style *style, +css_error css__cascade_uri_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, lwc_string *)) @@ -100,7 +100,7 @@ css_error cascade_uri_none(uint32_t opv, css_style *style, } /** \todo lose fun != NULL once all properties have set routines */ - if (fun != NULL && outranks_existing(getOpcode(opv), + if (fun != NULL && css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, uri); } @@ -108,7 +108,7 @@ css_error cascade_uri_none(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_border_style(uint32_t opv, css_style *style, +css_error css__cascade_border_style(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)) { @@ -151,7 +151,7 @@ css_error cascade_border_style(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value); } @@ -159,7 +159,7 @@ css_error cascade_border_style(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_border_width(uint32_t opv, css_style *style, +css_error css__cascade_border_width(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)) @@ -189,9 +189,9 @@ css_error cascade_border_width(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length, unit); } @@ -199,7 +199,7 @@ css_error cascade_border_width(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_length_auto(uint32_t opv, css_style *style, +css_error css__cascade_length_auto(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)) @@ -223,9 +223,9 @@ css_error cascade_length_auto(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length, unit); } @@ -233,7 +233,7 @@ css_error cascade_length_auto(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_length_normal(uint32_t opv, css_style *style, +css_error css__cascade_length_normal(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)) @@ -257,9 +257,9 @@ css_error cascade_length_normal(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length, unit); } @@ -267,7 +267,7 @@ css_error cascade_length_normal(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_length_none(uint32_t opv, css_style *style, +css_error css__cascade_length_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)) @@ -291,9 +291,9 @@ css_error cascade_length_none(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length, unit); } @@ -301,7 +301,7 @@ css_error cascade_length_none(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_length(uint32_t opv, css_style *style, +css_error css__cascade_length(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)) @@ -318,10 +318,10 @@ css_error cascade_length(uint32_t opv, css_style *style, advance_bytecode(style, sizeof(unit)); } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); /** \todo lose fun != NULL once all properties have set routines */ - if (fun != NULL && outranks_existing(getOpcode(opv), + if (fun != NULL && css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length, unit); } @@ -329,7 +329,7 @@ css_error cascade_length(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_number(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)) { @@ -345,7 +345,7 @@ css_error cascade_number(uint32_t opv, css_style *style, } /** \todo lose fun != NULL once all properties have set routines */ - if (fun != NULL && outranks_existing(getOpcode(opv), + if (fun != NULL && css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value, length); } @@ -353,7 +353,7 @@ css_error cascade_number(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_page_break_after_before(uint32_t opv, css_style *style, +css_error css__cascade_page_break_after_before(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)) { @@ -374,7 +374,7 @@ css_error cascade_page_break_after_before(uint32_t opv, css_style *style, } /** \todo lose fun != NULL */ - if (fun != NULL && outranks_existing(getOpcode(opv), + if (fun != NULL && css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return fun(state->computed, value); } @@ -382,7 +382,7 @@ css_error cascade_page_break_after_before(uint32_t opv, css_style *style, return CSS_OK; } -css_error cascade_counter_increment_reset(uint32_t opv, css_style *style, +css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_computed_counter *)) @@ -456,7 +456,7 @@ css_error cascade_counter_increment_reset(uint32_t opv, css_style *style, counters[n_counters].value = 0; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { css_error error; diff --git a/src/select/properties/helpers.h b/src/select/properties/helpers.h index a2da115..9e3e327 100644 --- a/src/select/properties/helpers.h +++ b/src/select/properties/helpers.h @@ -13,45 +13,45 @@ uint32_t generic_destroy_uri(void *bytecode); uint32_t generic_destroy_length(void *bytecode); uint32_t generic_destroy_number(void *bytecode); -css_unit to_css_unit(uint32_t u); +css_unit css__to_css_unit(uint32_t u); -css_error cascade_bg_border_color(uint32_t opv, css_style *style, +css_error css__cascade_bg_border_color(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_color)); -css_error cascade_uri_none(uint32_t opv, css_style *style, +css_error css__cascade_uri_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, lwc_string *)); -css_error cascade_border_style(uint32_t opv, css_style *style, +css_error css__cascade_border_style(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)); -css_error cascade_border_width(uint32_t opv, css_style *style, +css_error css__cascade_border_width(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)); -css_error cascade_length_auto(uint32_t opv, css_style *style, +css_error css__cascade_length_auto(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)); -css_error cascade_length_normal(uint32_t opv, css_style *style, +css_error css__cascade_length_normal(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)); -css_error cascade_length_none(uint32_t opv, css_style *style, +css_error css__cascade_length_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)); -css_error cascade_length(uint32_t opv, css_style *style, +css_error css__cascade_length(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_fixed, css_unit)); -css_error cascade_number(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 cascade_page_break_after_before(uint32_t opv, css_style *style, +css_error css__cascade_page_break_after_before(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)); -css_error cascade_counter_increment_reset(uint32_t opv, css_style *style, +css_error css__cascade_counter_increment_reset(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, css_computed_counter *)); diff --git a/src/select/properties/left.c b/src/select/properties/left.c index 4814b66..faf76bb 100644 --- a/src/select/properties/left.c +++ b/src/select/properties/left.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_left(uint32_t opv, css_style *style, +css_error css__cascade_left(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_left); + return css__cascade_length_auto(opv, style, state, set_left); } -css_error set_left_from_hint(const css_hint *hint, +css_error css__set_left_from_hint(const css_hint *hint, css_computed_style *style) { return set_left(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_left(css_select_state *state) +css_error css__initial_left(css_select_state *state) { return set_left(state->computed, CSS_LEFT_AUTO, 0, CSS_UNIT_PX); } -css_error compose_left(const css_computed_style *parent, +css_error css__compose_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/letter_spacing.c b/src/select/properties/letter_spacing.c index ea30359..322efef 100644 --- a/src/select/properties/letter_spacing.c +++ b/src/select/properties/letter_spacing.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_letter_spacing(uint32_t opv, css_style *style, +css_error css__cascade_letter_spacing(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_normal(opv, style, state, set_letter_spacing); + return css__cascade_length_normal(opv, style, state, set_letter_spacing); } -css_error set_letter_spacing_from_hint(const css_hint *hint, +css_error css__set_letter_spacing_from_hint(const css_hint *hint, css_computed_style *style) { return set_letter_spacing(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_letter_spacing(css_select_state *state) +css_error css__initial_letter_spacing(css_select_state *state) { return set_letter_spacing(state->computed, CSS_LETTER_SPACING_NORMAL, 0, CSS_UNIT_PX); } -css_error compose_letter_spacing(const css_computed_style *parent, +css_error css__compose_letter_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/line_height.c b/src/select/properties/line_height.c index b52747d..24b9e80 100644 --- a/src/select/properties/line_height.c +++ b/src/select/properties/line_height.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_line_height(uint32_t opv, css_style *style, +css_error css__cascade_line_height(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_LINE_HEIGHT_INHERIT; @@ -41,9 +41,9 @@ css_error cascade_line_height(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_line_height(state->computed, value, val, unit); } @@ -51,20 +51,20 @@ css_error cascade_line_height(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_line_height_from_hint(const css_hint *hint, +css_error css__set_line_height_from_hint(const css_hint *hint, css_computed_style *style) { return set_line_height(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_line_height(css_select_state *state) +css_error css__initial_line_height(css_select_state *state) { return set_line_height(state->computed, CSS_LINE_HEIGHT_NORMAL, 0, CSS_UNIT_PX); } -css_error compose_line_height(const css_computed_style *parent, +css_error css__compose_line_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/list_style_image.c b/src/select/properties/list_style_image.c index bf2b213..edc92fb 100644 --- a/src/select/properties/list_style_image.c +++ b/src/select/properties/list_style_image.c @@ -14,13 +14,13 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_list_style_image(uint32_t opv, css_style *style, +css_error css__cascade_list_style_image(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_uri_none(opv, style, state, set_list_style_image); + return css__cascade_uri_none(opv, style, state, set_list_style_image); } -css_error set_list_style_image_from_hint(const css_hint *hint, +css_error css__set_list_style_image_from_hint(const css_hint *hint, css_computed_style *style) { css_error error; @@ -33,13 +33,13 @@ css_error set_list_style_image_from_hint(const css_hint *hint, return error; } -css_error initial_list_style_image(css_select_state *state) +css_error css__initial_list_style_image(css_select_state *state) { return set_list_style_image(state->computed, CSS_LIST_STYLE_IMAGE_NONE, NULL); } -css_error compose_list_style_image(const css_computed_style *parent, +css_error css__compose_list_style_image(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/list_style_position.c b/src/select/properties/list_style_position.c index b21abb5..acdbedb 100644 --- a/src/select/properties/list_style_position.c +++ b/src/select/properties/list_style_position.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_list_style_position(uint32_t opv, css_style *style, +css_error css__cascade_list_style_position(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_LIST_STYLE_POSITION_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_list_style_position(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_list_style_position(state->computed, value); } @@ -40,19 +40,19 @@ css_error cascade_list_style_position(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_list_style_position_from_hint(const css_hint *hint, +css_error css__set_list_style_position_from_hint(const css_hint *hint, css_computed_style *style) { return set_list_style_position(style, hint->status); } -css_error initial_list_style_position(css_select_state *state) +css_error css__initial_list_style_position(css_select_state *state) { return set_list_style_position(state->computed, CSS_LIST_STYLE_POSITION_OUTSIDE); } -css_error compose_list_style_position(const css_computed_style *parent, +css_error css__compose_list_style_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/list_style_type.c b/src/select/properties/list_style_type.c index 2536f9c..470bfb0 100644 --- a/src/select/properties/list_style_type.c +++ b/src/select/properties/list_style_type.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_list_style_type(uint32_t opv, css_style *style, +css_error css__cascade_list_style_type(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_LIST_STYLE_TYPE_INHERIT; @@ -71,7 +71,7 @@ css_error cascade_list_style_type(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_list_style_type(state->computed, value); } @@ -79,18 +79,18 @@ css_error cascade_list_style_type(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_list_style_type_from_hint(const css_hint *hint, +css_error css__set_list_style_type_from_hint(const css_hint *hint, css_computed_style *style) { return set_list_style_type(style, hint->status); } -css_error initial_list_style_type(css_select_state *state) +css_error css__initial_list_style_type(css_select_state *state) { return set_list_style_type(state->computed, CSS_LIST_STYLE_TYPE_DISC); } -css_error compose_list_style_type(const css_computed_style *parent, +css_error css__compose_list_style_type(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/margin_bottom.c b/src/select/properties/margin_bottom.c index a80ae2d..c34004e 100644 --- a/src/select/properties/margin_bottom.c +++ b/src/select/properties/margin_bottom.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_margin_bottom(uint32_t opv, css_style *style, +css_error css__cascade_margin_bottom(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_margin_bottom); + return css__cascade_length_auto(opv, style, state, set_margin_bottom); } -css_error set_margin_bottom_from_hint(const css_hint *hint, +css_error css__set_margin_bottom_from_hint(const css_hint *hint, css_computed_style *style) { return set_margin_bottom(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_bottom(css_select_state *state) +css_error css__initial_margin_bottom(css_select_state *state) { return set_margin_bottom(state->computed, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } -css_error compose_margin_bottom(const css_computed_style *parent, +css_error css__compose_margin_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/margin_left.c b/src/select/properties/margin_left.c index 1740169..ac22c3d 100644 --- a/src/select/properties/margin_left.c +++ b/src/select/properties/margin_left.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_margin_left(uint32_t opv, css_style *style, +css_error css__cascade_margin_left(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_margin_left); + return css__cascade_length_auto(opv, style, state, set_margin_left); } -css_error set_margin_left_from_hint(const css_hint *hint, +css_error css__set_margin_left_from_hint(const css_hint *hint, css_computed_style *style) { return set_margin_left(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_left(css_select_state *state) +css_error css__initial_margin_left(css_select_state *state) { return set_margin_left(state->computed, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } -css_error compose_margin_left(const css_computed_style *parent, +css_error css__compose_margin_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/margin_right.c b/src/select/properties/margin_right.c index 908652e..a10df13 100644 --- a/src/select/properties/margin_right.c +++ b/src/select/properties/margin_right.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_margin_right(uint32_t opv, css_style *style, +css_error css__cascade_margin_right(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_margin_right); + return css__cascade_length_auto(opv, style, state, set_margin_right); } -css_error set_margin_right_from_hint(const css_hint *hint, +css_error css__set_margin_right_from_hint(const css_hint *hint, css_computed_style *style) { return set_margin_right(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_right(css_select_state *state) +css_error css__initial_margin_right(css_select_state *state) { return set_margin_right(state->computed, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } -css_error compose_margin_right(const css_computed_style *parent, +css_error css__compose_margin_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/margin_top.c b/src/select/properties/margin_top.c index ec13e11..f66c8ee 100644 --- a/src/select/properties/margin_top.c +++ b/src/select/properties/margin_top.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_margin_top(uint32_t opv, css_style *style, +css_error css__cascade_margin_top(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_margin_top); + return css__cascade_length_auto(opv, style, state, set_margin_top); } -css_error set_margin_top_from_hint(const css_hint *hint, +css_error css__set_margin_top_from_hint(const css_hint *hint, css_computed_style *style) { return set_margin_top(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_top(css_select_state *state) +css_error css__initial_margin_top(css_select_state *state) { return set_margin_top(state->computed, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } -css_error compose_margin_top(const css_computed_style *parent, +css_error css__compose_margin_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/max_height.c b/src/select/properties/max_height.c index f527aa6..51fae8c 100644 --- a/src/select/properties/max_height.c +++ b/src/select/properties/max_height.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_max_height(uint32_t opv, css_style *style, +css_error css__cascade_max_height(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_none(opv, style, state, set_max_height); + return css__cascade_length_none(opv, style, state, set_max_height); } -css_error set_max_height_from_hint(const css_hint *hint, +css_error css__set_max_height_from_hint(const css_hint *hint, css_computed_style *style) { return set_max_height(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_max_height(css_select_state *state) +css_error css__initial_max_height(css_select_state *state) { return set_max_height(state->computed, CSS_MAX_HEIGHT_NONE, 0, CSS_UNIT_PX); } -css_error compose_max_height(const css_computed_style *parent, +css_error css__compose_max_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/max_width.c b/src/select/properties/max_width.c index 916288c..f9ccc03 100644 --- a/src/select/properties/max_width.c +++ b/src/select/properties/max_width.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_max_width(uint32_t opv, css_style *style, +css_error css__cascade_max_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_none(opv, style, state, set_max_width);; + return css__cascade_length_none(opv, style, state, set_max_width);; } -css_error set_max_width_from_hint(const css_hint *hint, +css_error css__set_max_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_max_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_max_width(css_select_state *state) +css_error css__initial_max_width(css_select_state *state) { return set_max_width(state->computed, CSS_MAX_WIDTH_NONE, 0, CSS_UNIT_PX); } -css_error compose_max_width(const css_computed_style *parent, +css_error css__compose_max_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/min_height.c b/src/select/properties/min_height.c index 087cc50..a3ab6b9 100644 --- a/src/select/properties/min_height.c +++ b/src/select/properties/min_height.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_min_height(uint32_t opv, css_style *style, +css_error css__cascade_min_height(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_min_height); + return css__cascade_length(opv, style, state, set_min_height); } -css_error set_min_height_from_hint(const css_hint *hint, +css_error css__set_min_height_from_hint(const css_hint *hint, css_computed_style *style) { return set_min_height(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_min_height(css_select_state *state) +css_error css__initial_min_height(css_select_state *state) { return set_min_height(state->computed, CSS_MIN_HEIGHT_SET, 0, CSS_UNIT_PX); } -css_error compose_min_height(const css_computed_style *parent, +css_error css__compose_min_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/min_width.c b/src/select/properties/min_width.c index 9cdcdea..4139eda 100644 --- a/src/select/properties/min_width.c +++ b/src/select/properties/min_width.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_min_width(uint32_t opv, css_style *style, +css_error css__cascade_min_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_min_width); + return css__cascade_length(opv, style, state, set_min_width); } -css_error set_min_width_from_hint(const css_hint *hint, +css_error css__set_min_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_min_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_min_width(css_select_state *state) +css_error css__initial_min_width(css_select_state *state) { return set_min_width(state->computed, CSS_MIN_WIDTH_SET, 0, CSS_UNIT_PX); } -css_error compose_min_width(const css_computed_style *parent, +css_error css__compose_min_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/orphans.c b/src/select/properties/orphans.c index e723266..5129c5d 100644 --- a/src/select/properties/orphans.c +++ b/src/select/properties/orphans.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_orphans(uint32_t opv, css_style *style, +css_error css__cascade_orphans(uint32_t opv, css_style *style, css_select_state *state) { /** \todo orphans */ - return cascade_number(opv, style, state, NULL); + return css__cascade_number(opv, style, state, NULL); } -css_error set_orphans_from_hint(const css_hint *hint, +css_error css__set_orphans_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_orphans_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_orphans(css_select_state *state) +css_error css__initial_orphans(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_orphans(const css_computed_style *parent, +css_error css__compose_orphans(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/outline_color.c b/src/select/properties/outline_color.c index 925376e..dced1d8 100644 --- a/src/select/properties/outline_color.c +++ b/src/select/properties/outline_color.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_outline_color(uint32_t opv, css_style *style, +css_error css__cascade_outline_color(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_OUTLINE_COLOR_INHERIT; @@ -33,7 +33,7 @@ css_error cascade_outline_color(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_outline_color(state->computed, value, color); } @@ -41,18 +41,18 @@ css_error cascade_outline_color(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_outline_color_from_hint(const css_hint *hint, +css_error css__set_outline_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_outline_color(style, hint->status, hint->data.color); } -css_error initial_outline_color(css_select_state *state) +css_error css__initial_outline_color(css_select_state *state) { return set_outline_color(state->computed, CSS_OUTLINE_COLOR_INVERT, 0); } -css_error compose_outline_color(const css_computed_style *parent, +css_error css__compose_outline_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/outline_style.c b/src/select/properties/outline_style.c index 1bce2b8..7b64381 100644 --- a/src/select/properties/outline_style.c +++ b/src/select/properties/outline_style.c @@ -14,24 +14,24 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_outline_style(uint32_t opv, css_style *style, +css_error css__cascade_outline_style(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_style(opv, style, state, set_outline_style); + return css__cascade_border_style(opv, style, state, set_outline_style); } -css_error set_outline_style_from_hint(const css_hint *hint, +css_error css__set_outline_style_from_hint(const css_hint *hint, css_computed_style *style) { return set_outline_style(style, hint->status); } -css_error initial_outline_style(css_select_state *state) +css_error css__initial_outline_style(css_select_state *state) { return set_outline_style(state->computed, CSS_OUTLINE_STYLE_NONE); } -css_error compose_outline_style(const css_computed_style *parent, +css_error css__compose_outline_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/outline_width.c b/src/select/properties/outline_width.c index acf8729..5380179 100644 --- a/src/select/properties/outline_width.c +++ b/src/select/properties/outline_width.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_outline_width(uint32_t opv, css_style *style, +css_error css__cascade_outline_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_border_width(opv, style, state, set_outline_width); + return css__cascade_border_width(opv, style, state, set_outline_width); } -css_error set_outline_width_from_hint(const css_hint *hint, +css_error css__set_outline_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_outline_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_outline_width(css_select_state *state) +css_error css__initial_outline_width(css_select_state *state) { return set_outline_width(state->computed, CSS_OUTLINE_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } -css_error compose_outline_width(const css_computed_style *parent, +css_error css__compose_outline_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/overflow.c b/src/select/properties/overflow.c index bf10d58..7d7d0a9 100644 --- a/src/select/properties/overflow.c +++ b/src/select/properties/overflow.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_overflow(uint32_t opv, css_style *style, +css_error css__cascade_overflow(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_OVERFLOW_INHERIT; @@ -38,7 +38,7 @@ css_error cascade_overflow(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_overflow(state->computed, value); } @@ -46,18 +46,18 @@ css_error cascade_overflow(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_overflow_from_hint(const css_hint *hint, +css_error css__set_overflow_from_hint(const css_hint *hint, css_computed_style *style) { return set_overflow(style, hint->status); } -css_error initial_overflow(css_select_state *state) +css_error css__initial_overflow(css_select_state *state) { return set_overflow(state->computed, CSS_OVERFLOW_VISIBLE); } -css_error compose_overflow(const css_computed_style *parent, +css_error css__compose_overflow(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/padding_bottom.c b/src/select/properties/padding_bottom.c index e529ecd..806f0f5 100644 --- a/src/select/properties/padding_bottom.c +++ b/src/select/properties/padding_bottom.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_padding_bottom(uint32_t opv, css_style *style, +css_error css__cascade_padding_bottom(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_padding_bottom); + return css__cascade_length(opv, style, state, set_padding_bottom); } -css_error set_padding_bottom_from_hint(const css_hint *hint, +css_error css__set_padding_bottom_from_hint(const css_hint *hint, css_computed_style *style) { return set_padding_bottom(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_bottom(css_select_state *state) +css_error css__initial_padding_bottom(css_select_state *state) { return set_padding_bottom(state->computed, CSS_PADDING_SET, 0, CSS_UNIT_PX); } -css_error compose_padding_bottom(const css_computed_style *parent, +css_error css__compose_padding_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/padding_left.c b/src/select/properties/padding_left.c index 07acd03..8873652 100644 --- a/src/select/properties/padding_left.c +++ b/src/select/properties/padding_left.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_padding_left(uint32_t opv, css_style *style, +css_error css__cascade_padding_left(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_padding_left); + return css__cascade_length(opv, style, state, set_padding_left); } -css_error set_padding_left_from_hint(const css_hint *hint, +css_error css__set_padding_left_from_hint(const css_hint *hint, css_computed_style *style) { return set_padding_left(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_left(css_select_state *state) +css_error css__initial_padding_left(css_select_state *state) { return set_padding_left(state->computed, CSS_PADDING_SET, 0, CSS_UNIT_PX); } -css_error compose_padding_left(const css_computed_style *parent, +css_error css__compose_padding_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/padding_right.c b/src/select/properties/padding_right.c index bf3cfba..a79d8f4 100644 --- a/src/select/properties/padding_right.c +++ b/src/select/properties/padding_right.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_padding_right(uint32_t opv, css_style *style, +css_error css__cascade_padding_right(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_padding_right); + return css__cascade_length(opv, style, state, set_padding_right); } -css_error set_padding_right_from_hint(const css_hint *hint, +css_error css__set_padding_right_from_hint(const css_hint *hint, css_computed_style *style) { return set_padding_right(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_right(css_select_state *state) +css_error css__initial_padding_right(css_select_state *state) { return set_padding_right(state->computed, CSS_PADDING_SET, 0, CSS_UNIT_PX); } -css_error compose_padding_right(const css_computed_style *parent, +css_error css__compose_padding_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/padding_top.c b/src/select/properties/padding_top.c index bb7197d..20fbe1e 100644 --- a/src/select/properties/padding_top.c +++ b/src/select/properties/padding_top.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_padding_top(uint32_t opv, css_style *style, +css_error css__cascade_padding_top(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_padding_top); + return css__cascade_length(opv, style, state, set_padding_top); } -css_error set_padding_top_from_hint(const css_hint *hint, +css_error css__set_padding_top_from_hint(const css_hint *hint, css_computed_style *style) { return set_padding_top(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_top(css_select_state *state) +css_error css__initial_padding_top(css_select_state *state) { return set_padding_top(state->computed, CSS_PADDING_SET, 0, CSS_UNIT_PX); } -css_error compose_padding_top(const css_computed_style *parent, +css_error css__compose_padding_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/page_break_after.c b/src/select/properties/page_break_after.c index d0422e7..c2c3051 100644 --- a/src/select/properties/page_break_after.c +++ b/src/select/properties/page_break_after.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_page_break_after(uint32_t opv, css_style *style, +css_error css__cascade_page_break_after(uint32_t opv, css_style *style, css_select_state *state) { /** \todo page-break-after */ - return cascade_page_break_after_before(opv, style, state, NULL); + return css__cascade_page_break_after_before(opv, style, state, NULL); } -css_error set_page_break_after_from_hint(const css_hint *hint, +css_error css__set_page_break_after_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_page_break_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_after(css_select_state *state) +css_error css__initial_page_break_after(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_page_break_after(const css_computed_style *parent, +css_error css__compose_page_break_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/page_break_before.c b/src/select/properties/page_break_before.c index 7be98e0..a0799fd 100644 --- a/src/select/properties/page_break_before.c +++ b/src/select/properties/page_break_before.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_page_break_before(uint32_t opv, css_style *style, +css_error css__cascade_page_break_before(uint32_t opv, css_style *style, css_select_state *state) { /** \todo page-break-before */ - return cascade_page_break_after_before(opv, style, state, NULL); + return css__cascade_page_break_after_before(opv, style, state, NULL); } -css_error set_page_break_before_from_hint(const css_hint *hint, +css_error css__set_page_break_before_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_page_break_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_before(css_select_state *state) +css_error css__initial_page_break_before(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_page_break_before(const css_computed_style *parent, +css_error css__compose_page_break_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/page_break_inside.c b/src/select/properties/page_break_inside.c index cb960a9..b3d5114 100644 --- a/src/select/properties/page_break_inside.c +++ b/src/select/properties/page_break_inside.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_page_break_inside(uint32_t opv, css_style *style, +css_error css__cascade_page_break_inside(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -31,7 +31,7 @@ css_error cascade_page_break_inside(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo page-break-inside */ } @@ -39,7 +39,7 @@ css_error cascade_page_break_inside(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_page_break_inside_from_hint(const css_hint *hint, +css_error css__set_page_break_inside_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -48,14 +48,14 @@ css_error set_page_break_inside_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_inside(css_select_state *state) +css_error css__initial_page_break_inside(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_page_break_inside(const css_computed_style *parent, +css_error css__compose_page_break_inside(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/pause_after.c b/src/select/properties/pause_after.c index d4a9b55..a33ee66 100644 --- a/src/select/properties/pause_after.c +++ b/src/select/properties/pause_after.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_pause_after(uint32_t opv, css_style *style, +css_error css__cascade_pause_after(uint32_t opv, css_style *style, css_select_state *state) { /** \todo pause-after */ - return cascade_length(opv, style, state, NULL); + return css__cascade_length(opv, style, state, NULL); } -css_error set_pause_after_from_hint(const css_hint *hint, +css_error css__set_pause_after_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_pause_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pause_after(css_select_state *state) +css_error css__initial_pause_after(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_pause_after(const css_computed_style *parent, +css_error css__compose_pause_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/pause_before.c b/src/select/properties/pause_before.c index 1621bbc..b33e94a 100644 --- a/src/select/properties/pause_before.c +++ b/src/select/properties/pause_before.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_pause_before(uint32_t opv, css_style *style, +css_error css__cascade_pause_before(uint32_t opv, css_style *style, css_select_state *state) { /** \todo pause-before */ - return cascade_length(opv, style, state, NULL); + return css__cascade_length(opv, style, state, NULL); } -css_error set_pause_before_from_hint(const css_hint *hint, +css_error css__set_pause_before_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_pause_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pause_before(css_select_state *state) +css_error css__initial_pause_before(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_pause_before(const css_computed_style *parent, +css_error css__compose_pause_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/pitch.c b/src/select/properties/pitch.c index 4301b25..a8c65d1 100644 --- a/src/select/properties/pitch.c +++ b/src/select/properties/pitch.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_pitch(uint32_t opv, css_style *style, +css_error css__cascade_pitch(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -41,9 +41,9 @@ css_error cascade_pitch(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo pitch */ } @@ -51,7 +51,7 @@ css_error cascade_pitch(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_pitch_from_hint(const css_hint *hint, +css_error css__set_pitch_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -60,14 +60,14 @@ css_error set_pitch_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pitch(css_select_state *state) +css_error css__initial_pitch(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_pitch(const css_computed_style *parent, +css_error css__compose_pitch(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/pitch_range.c b/src/select/properties/pitch_range.c index 25b928f..9a2ea24 100644 --- a/src/select/properties/pitch_range.c +++ b/src/select/properties/pitch_range.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_pitch_range(uint32_t opv, css_style *style, +css_error css__cascade_pitch_range(uint32_t opv, css_style *style, css_select_state *state) { /** \todo pitch-range */ - return cascade_number(opv, style, state, NULL); + return css__cascade_number(opv, style, state, NULL); } -css_error set_pitch_range_from_hint(const css_hint *hint, +css_error css__set_pitch_range_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_pitch_range_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pitch_range(css_select_state *state) +css_error css__initial_pitch_range(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_pitch_range(const css_computed_style *parent, +css_error css__compose_pitch_range(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/play_during.c b/src/select/properties/play_during.c index 9e482dd..ab01b6a 100644 --- a/src/select/properties/play_during.c +++ b/src/select/properties/play_during.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_play_during(uint32_t opv, css_style *style, +css_error css__cascade_play_during(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -37,7 +37,7 @@ css_error cascade_play_during(uint32_t opv, css_style *style, /** \todo mix & repeat */ } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo play-during */ } @@ -45,7 +45,7 @@ css_error cascade_play_during(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_play_during_from_hint(const css_hint *hint, +css_error css__set_play_during_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -54,14 +54,14 @@ css_error set_play_during_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_play_during(css_select_state *state) +css_error css__initial_play_during(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_play_during(const css_computed_style *parent, +css_error css__compose_play_during(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/position.c b/src/select/properties/position.c index 03161ee..7f566da 100644 --- a/src/select/properties/position.c +++ b/src/select/properties/position.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_position(uint32_t opv, css_style *style, +css_error css__cascade_position(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_POSITION_INHERIT; @@ -38,7 +38,7 @@ css_error cascade_position(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_position(state->computed, value); } @@ -46,18 +46,18 @@ css_error cascade_position(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_position_from_hint(const css_hint *hint, +css_error css__set_position_from_hint(const css_hint *hint, css_computed_style *style) { return set_position(style, hint->status); } -css_error initial_position(css_select_state *state) +css_error css__initial_position(css_select_state *state) { return set_position(state->computed, CSS_POSITION_STATIC); } -css_error compose_position(const css_computed_style *parent, +css_error css__compose_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/properties.h b/src/select/properties/properties.h index 0d9cd72..5312ce9 100644 --- a/src/select/properties/properties.h +++ b/src/select/properties/properties.h @@ -15,10 +15,10 @@ #include "select/select.h" #define PROPERTY_FUNCS(pname) \ - css_error cascade_##pname (uint32_t opv, css_style *style, css_select_state *state); \ - css_error set_##pname##_from_hint(const css_hint *hint, css_computed_style *style); \ - css_error initial_##pname (css_select_state *state); \ - css_error compose_##pname (const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); \ + css_error css__cascade_##pname (uint32_t opv, css_style *style, css_select_state *state); \ + css_error css__set_##pname##_from_hint(const css_hint *hint, css_computed_style *style); \ + css_error css__initial_##pname (css_select_state *state); \ + css_error css__compose_##pname (const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); \ uint32_t destroy_##pname (void *bytecode) PROPERTY_FUNCS(azimuth); diff --git a/src/select/properties/quotes.c b/src/select/properties/quotes.c index 91ba76e..5db2184 100644 --- a/src/select/properties/quotes.c +++ b/src/select/properties/quotes.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_quotes(uint32_t opv, css_style *style, +css_error css__cascade_quotes(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_QUOTES_INHERIT; @@ -74,7 +74,7 @@ css_error cascade_quotes(uint32_t opv, css_style *style, quotes[n_quotes] = NULL; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { css_error error; @@ -91,7 +91,7 @@ css_error cascade_quotes(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_quotes_from_hint(const css_hint *hint, +css_error css__set_quotes_from_hint(const css_hint *hint, css_computed_style *style) { lwc_string **item; @@ -110,7 +110,7 @@ css_error set_quotes_from_hint(const css_hint *hint, return error; } -css_error initial_quotes(css_select_state *state) +css_error css__initial_quotes(css_select_state *state) { css_hint hint; css_error error; @@ -120,10 +120,10 @@ css_error initial_quotes(css_select_state *state) if (error != CSS_OK) return error; - return set_quotes_from_hint(&hint, state->computed); + return css__set_quotes_from_hint(&hint, state->computed); } -css_error compose_quotes(const css_computed_style *parent, +css_error css__compose_quotes(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/richness.c b/src/select/properties/richness.c index 29971e9..d05ed7b 100644 --- a/src/select/properties/richness.c +++ b/src/select/properties/richness.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_richness(uint32_t opv, css_style *style, +css_error css__cascade_richness(uint32_t opv, css_style *style, css_select_state *state) { /** \todo richness */ - return cascade_number(opv, style, state, NULL); + return css__cascade_number(opv, style, state, NULL); } -css_error set_richness_from_hint(const css_hint *hint, +css_error css__set_richness_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_richness_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_richness(css_select_state *state) +css_error css__initial_richness(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_richness(const css_computed_style *parent, +css_error css__compose_richness(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/right.c b/src/select/properties/right.c index 190db4d..b87e63e 100644 --- a/src/select/properties/right.c +++ b/src/select/properties/right.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_right(uint32_t opv, css_style *style, +css_error css__cascade_right(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_right); + return css__cascade_length_auto(opv, style, state, set_right); } -css_error set_right_from_hint(const css_hint *hint, +css_error css__set_right_from_hint(const css_hint *hint, css_computed_style *style) { return set_right(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_right(css_select_state *state) +css_error css__initial_right(css_select_state *state) { return set_right(state->computed, CSS_RIGHT_AUTO, 0, CSS_UNIT_PX); } -css_error compose_right(const css_computed_style *parent, +css_error css__compose_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/speach_rate.c b/src/select/properties/speach_rate.c index e55d884..290ce48 100644 --- a/src/select/properties/speach_rate.c +++ b/src/select/properties/speach_rate.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_speech_rate(uint32_t opv, css_style *style, +css_error css__cascade_speech_rate(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -40,7 +40,7 @@ css_error cascade_speech_rate(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo speech-rate */ } @@ -48,7 +48,7 @@ css_error cascade_speech_rate(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_speech_rate_from_hint(const css_hint *hint, +css_error css__set_speech_rate_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -57,14 +57,14 @@ css_error set_speech_rate_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speech_rate(css_select_state *state) +css_error css__initial_speech_rate(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_speech_rate(const css_computed_style *parent, +css_error css__compose_speech_rate(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/speak.c b/src/select/properties/speak.c index 2f260ca..2b7d18f 100644 --- a/src/select/properties/speak.c +++ b/src/select/properties/speak.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_speak(uint32_t opv, css_style *style, +css_error css__cascade_speak(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -32,7 +32,7 @@ css_error cascade_speak(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo speak */ } @@ -40,7 +40,7 @@ css_error cascade_speak(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_speak_from_hint(const css_hint *hint, +css_error css__set_speak_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -49,14 +49,14 @@ css_error set_speak_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak(css_select_state *state) +css_error css__initial_speak(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_speak(const css_computed_style *parent, +css_error css__compose_speak(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/speak_header.c b/src/select/properties/speak_header.c index 5ed68d4..50dbb41 100644 --- a/src/select/properties/speak_header.c +++ b/src/select/properties/speak_header.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_speak_header(uint32_t opv, css_style *style, +css_error css__cascade_speak_header(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -31,7 +31,7 @@ css_error cascade_speak_header(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo speak-header */ } @@ -39,7 +39,7 @@ css_error cascade_speak_header(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_speak_header_from_hint(const css_hint *hint, +css_error css__set_speak_header_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -48,14 +48,14 @@ css_error set_speak_header_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_header(css_select_state *state) +css_error css__initial_speak_header(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_speak_header(const css_computed_style *parent, +css_error css__compose_speak_header(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/speak_numeral.c b/src/select/properties/speak_numeral.c index ec09410..d2ff01d 100644 --- a/src/select/properties/speak_numeral.c +++ b/src/select/properties/speak_numeral.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_speak_numeral(uint32_t opv, css_style *style, +css_error css__cascade_speak_numeral(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -31,7 +31,7 @@ css_error cascade_speak_numeral(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo speak-numeral */ } @@ -39,7 +39,7 @@ css_error cascade_speak_numeral(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_speak_numeral_from_hint(const css_hint *hint, +css_error css__set_speak_numeral_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -48,14 +48,14 @@ css_error set_speak_numeral_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_numeral(css_select_state *state) +css_error css__initial_speak_numeral(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_speak_numeral(const css_computed_style *parent, +css_error css__compose_speak_numeral(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/speak_punctuation.c b/src/select/properties/speak_punctuation.c index fec4a30..928f425 100644 --- a/src/select/properties/speak_punctuation.c +++ b/src/select/properties/speak_punctuation.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_speak_punctuation( +css_error css__cascade_speak_punctuation( uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -31,7 +31,7 @@ css_error cascade_speak_punctuation( } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo speak-punctuation */ } @@ -39,7 +39,7 @@ css_error cascade_speak_punctuation( return CSS_OK; } -css_error set_speak_punctuation_from_hint(const css_hint *hint, +css_error css__set_speak_punctuation_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -48,14 +48,14 @@ css_error set_speak_punctuation_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_punctuation(css_select_state *state) +css_error css__initial_speak_punctuation(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_speak_punctuation(const css_computed_style *parent, +css_error css__compose_speak_punctuation(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/stress.c b/src/select/properties/stress.c index f2e0a2b..81cf0e4 100644 --- a/src/select/properties/stress.c +++ b/src/select/properties/stress.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_stress(uint32_t opv, css_style *style, +css_error css__cascade_stress(uint32_t opv, css_style *style, css_select_state *state) { /** \todo stress */ - return cascade_number(opv, style, state, NULL); + return css__cascade_number(opv, style, state, NULL); } -css_error set_stress_from_hint(const css_hint *hint, +css_error css__set_stress_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_stress_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_stress(css_select_state *state) +css_error css__initial_stress(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_stress(const css_computed_style *parent, +css_error css__compose_stress(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/table_layout.c b/src/select/properties/table_layout.c index 1af8154..c28cdae 100644 --- a/src/select/properties/table_layout.c +++ b/src/select/properties/table_layout.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_table_layout(uint32_t opv, css_style *style, +css_error css__cascade_table_layout(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_TABLE_LAYOUT_INHERIT; @@ -32,7 +32,7 @@ css_error cascade_table_layout(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_table_layout(state->computed, value); } @@ -40,18 +40,18 @@ css_error cascade_table_layout(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_table_layout_from_hint(const css_hint *hint, +css_error css__set_table_layout_from_hint(const css_hint *hint, css_computed_style *style) { return set_table_layout(style, hint->status); } -css_error initial_table_layout(css_select_state *state) +css_error css__initial_table_layout(css_select_state *state) { return set_table_layout(state->computed, CSS_TABLE_LAYOUT_AUTO); } -css_error compose_table_layout(const css_computed_style *parent, +css_error css__compose_table_layout(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/text_align.c b/src/select/properties/text_align.c index 780667e..611fcd3 100644 --- a/src/select/properties/text_align.c +++ b/src/select/properties/text_align.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_text_align(uint32_t opv, css_style *style, +css_error css__cascade_text_align(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_TEXT_ALIGN_INHERIT; @@ -47,7 +47,7 @@ css_error cascade_text_align(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_text_align(state->computed, value); } @@ -55,18 +55,18 @@ css_error cascade_text_align(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_text_align_from_hint(const css_hint *hint, +css_error css__set_text_align_from_hint(const css_hint *hint, css_computed_style *style) { return set_text_align(style, hint->status); } -css_error initial_text_align(css_select_state *state) +css_error css__initial_text_align(css_select_state *state) { return set_text_align(state->computed, CSS_TEXT_ALIGN_DEFAULT); } -css_error compose_text_align(const css_computed_style *parent, +css_error css__compose_text_align(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/text_decoration.c b/src/select/properties/text_decoration.c index e8f976e..7f5a172 100644 --- a/src/select/properties/text_decoration.c +++ b/src/select/properties/text_decoration.c @@ -16,7 +16,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_text_decoration(uint32_t opv, css_style *style, +css_error css__cascade_text_decoration(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_TEXT_DECORATION_INHERIT; @@ -40,7 +40,7 @@ css_error cascade_text_decoration(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_text_decoration(state->computed, value); } @@ -48,18 +48,18 @@ css_error cascade_text_decoration(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_text_decoration_from_hint(const css_hint *hint, +css_error css__set_text_decoration_from_hint(const css_hint *hint, css_computed_style *style) { return set_text_decoration(style, hint->status); } -css_error initial_text_decoration(css_select_state *state) +css_error css__initial_text_decoration(css_select_state *state) { return set_text_decoration(state->computed, CSS_TEXT_DECORATION_NONE); } -css_error compose_text_decoration(const css_computed_style *parent, +css_error css__compose_text_decoration(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/text_indent.c b/src/select/properties/text_indent.c index d81b651..867292e 100644 --- a/src/select/properties/text_indent.c +++ b/src/select/properties/text_indent.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_text_indent(uint32_t opv, css_style *style, +css_error css__cascade_text_indent(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length(opv, style, state, set_text_indent); + return css__cascade_length(opv, style, state, set_text_indent); } -css_error set_text_indent_from_hint(const css_hint *hint, +css_error css__set_text_indent_from_hint(const css_hint *hint, css_computed_style *style) { return set_text_indent(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_text_indent(css_select_state *state) +css_error css__initial_text_indent(css_select_state *state) { return set_text_indent(state->computed, CSS_TEXT_INDENT_SET, 0, CSS_UNIT_PX); } -css_error compose_text_indent(const css_computed_style *parent, +css_error css__compose_text_indent(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/text_transform.c b/src/select/properties/text_transform.c index db4cd9f..43117e9 100644 --- a/src/select/properties/text_transform.c +++ b/src/select/properties/text_transform.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_text_transform(uint32_t opv, css_style *style, +css_error css__cascade_text_transform(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_TEXT_TRANSFORM_INHERIT; @@ -38,7 +38,7 @@ css_error cascade_text_transform(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_text_transform(state->computed, value); } @@ -46,18 +46,18 @@ css_error cascade_text_transform(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_text_transform_from_hint(const css_hint *hint, +css_error css__set_text_transform_from_hint(const css_hint *hint, css_computed_style *style) { return set_text_transform(style, hint->status); } -css_error initial_text_transform(css_select_state *state) +css_error css__initial_text_transform(css_select_state *state) { return set_text_transform(state->computed, CSS_TEXT_TRANSFORM_NONE); } -css_error compose_text_transform(const css_computed_style *parent, +css_error css__compose_text_transform(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/top.c b/src/select/properties/top.c index 9620d3f..8fd1935 100644 --- a/src/select/properties/top.c +++ b/src/select/properties/top.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_top(uint32_t opv, css_style *style, +css_error css__cascade_top(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_top); + return css__cascade_length_auto(opv, style, state, set_top); } -css_error set_top_from_hint(const css_hint *hint, +css_error css__set_top_from_hint(const css_hint *hint, css_computed_style *style) { return set_top(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_top(css_select_state *state) +css_error css__initial_top(css_select_state *state) { return set_top(state->computed, CSS_TOP_AUTO, 0, CSS_UNIT_PX); } -css_error compose_top(const css_computed_style *parent, +css_error css__compose_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/unicode_bidi.c b/src/select/properties/unicode_bidi.c index 38a4a97..d798ff2 100644 --- a/src/select/properties/unicode_bidi.c +++ b/src/select/properties/unicode_bidi.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_unicode_bidi(uint32_t opv, css_style *style, +css_error css__cascade_unicode_bidi(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_UNICODE_BIDI_INHERIT; @@ -35,7 +35,7 @@ css_error cascade_unicode_bidi(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_unicode_bidi(state->computed, value); } @@ -43,18 +43,18 @@ css_error cascade_unicode_bidi(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_unicode_bidi_from_hint(const css_hint *hint, +css_error css__set_unicode_bidi_from_hint(const css_hint *hint, css_computed_style *style) { return set_unicode_bidi(style, hint->status); } -css_error initial_unicode_bidi(css_select_state *state) +css_error css__initial_unicode_bidi(css_select_state *state) { return set_unicode_bidi(state->computed, CSS_UNICODE_BIDI_NORMAL); } -css_error compose_unicode_bidi(const css_computed_style *parent, +css_error css__compose_unicode_bidi(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/vertical_align.c b/src/select/properties/vertical_align.c index fb3b988..dba2343 100644 --- a/src/select/properties/vertical_align.c +++ b/src/select/properties/vertical_align.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_vertical_align(uint32_t opv, css_style *style, +css_error css__cascade_vertical_align(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_VERTICAL_ALIGN_INHERIT; @@ -58,9 +58,9 @@ css_error cascade_vertical_align(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_vertical_align(state->computed, value, length, unit); } @@ -68,20 +68,20 @@ css_error cascade_vertical_align(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_vertical_align_from_hint(const css_hint *hint, +css_error css__set_vertical_align_from_hint(const css_hint *hint, css_computed_style *style) { return set_vertical_align(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_vertical_align(css_select_state *state) +css_error css__initial_vertical_align(css_select_state *state) { return set_vertical_align(state->computed, CSS_VERTICAL_ALIGN_BASELINE, 0, CSS_UNIT_PX); } -css_error compose_vertical_align(const css_computed_style *parent, +css_error css__compose_vertical_align(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/visibility.c b/src/select/properties/visibility.c index 2616c04..dd1c1e3 100644 --- a/src/select/properties/visibility.c +++ b/src/select/properties/visibility.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_visibility(uint32_t opv, css_style *style, +css_error css__cascade_visibility(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_VISIBILITY_INHERIT; @@ -35,7 +35,7 @@ css_error cascade_visibility(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_visibility(state->computed, value); } @@ -43,18 +43,18 @@ css_error cascade_visibility(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_visibility_from_hint(const css_hint *hint, +css_error css__set_visibility_from_hint(const css_hint *hint, css_computed_style *style) { return set_visibility(style, hint->status); } -css_error initial_visibility(css_select_state *state) +css_error css__initial_visibility(css_select_state *state) { return set_visibility(state->computed, CSS_VISIBILITY_VISIBLE); } -css_error compose_visibility(const css_computed_style *parent, +css_error css__compose_visibility(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/voice_family.c b/src/select/properties/voice_family.c index 395a778..dfff826 100644 --- a/src/select/properties/voice_family.c +++ b/src/select/properties/voice_family.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_voice_family(uint32_t opv, css_style *style, +css_error css__cascade_voice_family(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -93,7 +93,7 @@ css_error cascade_voice_family(uint32_t opv, css_style *style, voices[n_voices] = NULL; } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo voice-family */ if (n_voices > 0) @@ -106,7 +106,7 @@ css_error cascade_voice_family(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_voice_family_from_hint(const css_hint *hint, +css_error css__set_voice_family_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -115,14 +115,14 @@ css_error set_voice_family_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_voice_family(css_select_state *state) +css_error css__initial_voice_family(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_voice_family(const css_computed_style *parent, +css_error css__compose_voice_family(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/volume.c b/src/select/properties/volume.c index aaa7d18..16f6560 100644 --- a/src/select/properties/volume.c +++ b/src/select/properties/volume.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_volume(uint32_t opv, css_style *style, +css_error css__cascade_volume(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = 0; @@ -48,9 +48,9 @@ css_error cascade_volume(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { /** \todo volume */ } @@ -58,7 +58,7 @@ css_error cascade_volume(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_volume_from_hint(const css_hint *hint, +css_error css__set_volume_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -67,14 +67,14 @@ css_error set_volume_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_volume(css_select_state *state) +css_error css__initial_volume(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_volume(const css_computed_style *parent, +css_error css__compose_volume(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/white_space.c b/src/select/properties/white_space.c index 4657c6d..d537768 100644 --- a/src/select/properties/white_space.c +++ b/src/select/properties/white_space.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_white_space(uint32_t opv, css_style *style, +css_error css__cascade_white_space(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_WHITE_SPACE_INHERIT; @@ -41,7 +41,7 @@ css_error cascade_white_space(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_white_space(state->computed, value); } @@ -49,18 +49,18 @@ css_error cascade_white_space(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_white_space_from_hint(const css_hint *hint, +css_error css__set_white_space_from_hint(const css_hint *hint, css_computed_style *style) { return set_white_space(style, hint->status); } -css_error initial_white_space(css_select_state *state) +css_error css__initial_white_space(css_select_state *state) { return set_white_space(state->computed, CSS_WHITE_SPACE_NORMAL); } -css_error compose_white_space(const css_computed_style *parent, +css_error css__compose_white_space(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/width.c b/src/select/properties/width.c index 8b05084..4b43a8c 100644 --- a/src/select/properties/width.c +++ b/src/select/properties/width.c @@ -14,25 +14,25 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_width(uint32_t opv, css_style *style, +css_error css__cascade_width(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_auto(opv, style, state, set_width); + return css__cascade_length_auto(opv, style, state, set_width); } -css_error set_width_from_hint(const css_hint *hint, +css_error css__set_width_from_hint(const css_hint *hint, css_computed_style *style) { return set_width(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_width(css_select_state *state) +css_error css__initial_width(css_select_state *state) { return set_width(state->computed, CSS_WIDTH_AUTO, 0, CSS_UNIT_PX); } -css_error compose_width(const css_computed_style *parent, +css_error css__compose_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/windows.c b/src/select/properties/windows.c index f9a153f..80b1eee 100644 --- a/src/select/properties/windows.c +++ b/src/select/properties/windows.c @@ -14,14 +14,14 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_widows(uint32_t opv, css_style *style, +css_error css__cascade_widows(uint32_t opv, css_style *style, css_select_state *state) { /** \todo widows */ - return cascade_number(opv, style, state, NULL); + return css__cascade_number(opv, style, state, NULL); } -css_error set_widows_from_hint(const css_hint *hint, +css_error css__set_widows_from_hint(const css_hint *hint, css_computed_style *style) { UNUSED(hint); @@ -30,14 +30,14 @@ css_error set_widows_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_widows(css_select_state *state) +css_error css__initial_widows(css_select_state *state) { UNUSED(state); return CSS_OK; } -css_error compose_widows(const css_computed_style *parent, +css_error css__compose_widows(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/word_spacing.c b/src/select/properties/word_spacing.c index e764198..dd4e1d7 100644 --- a/src/select/properties/word_spacing.c +++ b/src/select/properties/word_spacing.c @@ -14,26 +14,26 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_word_spacing(uint32_t opv, css_style *style, +css_error css__cascade_word_spacing(uint32_t opv, css_style *style, css_select_state *state) { - return cascade_length_normal(opv, style, state, set_word_spacing); + return css__cascade_length_normal(opv, style, state, set_word_spacing); } -css_error set_word_spacing_from_hint(const css_hint *hint, +css_error css__set_word_spacing_from_hint(const css_hint *hint, css_computed_style *style) { return set_word_spacing(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_word_spacing(css_select_state *state) +css_error css__initial_word_spacing(css_select_state *state) { return set_word_spacing(state->computed, CSS_WORD_SPACING_NORMAL, 0, CSS_UNIT_PX); } -css_error compose_word_spacing(const css_computed_style *parent, +css_error css__compose_word_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { diff --git a/src/select/properties/z_index.c b/src/select/properties/z_index.c index 189fe26..3ad15e7 100644 --- a/src/select/properties/z_index.c +++ b/src/select/properties/z_index.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_z_index(uint32_t opv, css_style *style, +css_error css__cascade_z_index(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_Z_INDEX_INHERIT; @@ -34,7 +34,7 @@ css_error cascade_z_index(uint32_t opv, css_style *style, } } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_z_index(state->computed, value, index); } @@ -42,18 +42,18 @@ css_error cascade_z_index(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_z_index_from_hint(const css_hint *hint, +css_error css__set_z_index_from_hint(const css_hint *hint, css_computed_style *style) { return set_z_index(style, hint->status, hint->data.integer); } -css_error initial_z_index(css_select_state *state) +css_error css__initial_z_index(css_select_state *state) { return set_z_index(state->computed, CSS_Z_INDEX_AUTO, 0); } -css_error compose_z_index(const css_computed_style *parent, +css_error css__compose_z_index(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { -- cgit v1.2.3