summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/parse/important.c4
-rw-r--r--src/parse/important.h8
-rw-r--r--src/parse/language.c4
-rw-r--r--src/parse/language.h4
-rw-r--r--src/parse/parse.c2
-rw-r--r--src/parse/parse.h6
-rw-r--r--src/parse/properties/azimuth.c4
-rw-r--r--src/parse/properties/background.c34
-rw-r--r--src/parse/properties/background_position.c4
-rw-r--r--src/parse/properties/border.c10
-rw-r--r--src/parse/properties/border_color.c4
-rw-r--r--src/parse/properties/border_spacing.c6
-rw-r--r--src/parse/properties/border_style.c2
-rw-r--r--src/parse/properties/border_width.c4
-rw-r--r--src/parse/properties/clip.c4
-rw-r--r--src/parse/properties/content.c6
-rw-r--r--src/parse/properties/css_property_parser_gen.c10
-rw-r--r--src/parse/properties/cue.c10
-rw-r--r--src/parse/properties/cursor.c2
-rw-r--r--src/parse/properties/elevation.c4
-rw-r--r--src/parse/properties/font.c48
-rw-r--r--src/parse/properties/font_family.c4
-rw-r--r--src/parse/properties/font_weight.c4
-rw-r--r--src/parse/properties/list_style.c16
-rw-r--r--src/parse/properties/list_style_type.c4
-rw-r--r--src/parse/properties/margin.c4
-rw-r--r--src/parse/properties/outline.c16
-rw-r--r--src/parse/properties/padding.c4
-rw-r--r--src/parse/properties/pause.c10
-rw-r--r--src/parse/properties/play_during.c2
-rw-r--r--src/parse/properties/properties.c230
-rw-r--r--src/parse/properties/properties.gen58
-rw-r--r--src/parse/properties/properties.h234
-rw-r--r--src/parse/properties/quotes.c2
-rw-r--r--src/parse/properties/text_decoration.c2
-rw-r--r--src/parse/properties/utils.c52
-rw-r--r--src/parse/properties/utils.h32
-rw-r--r--src/parse/properties/voice_family.c4
-rw-r--r--src/parse/propstrings.h4
-rw-r--r--src/select/computed.c4
-rw-r--r--src/select/computed.h2
-rw-r--r--src/select/dispatch.c8
-rw-r--r--src/select/properties/azimuth.c12
-rw-r--r--src/select/properties/background_attachment.c10
-rw-r--r--src/select/properties/background_color.c10
-rw-r--r--src/select/properties/background_image.c10
-rw-r--r--src/select/properties/background_position.c14
-rw-r--r--src/select/properties/background_repeat.c10
-rw-r--r--src/select/properties/border_bottom_color.c10
-rw-r--r--src/select/properties/border_bottom_style.c10
-rw-r--r--src/select/properties/border_bottom_width.c10
-rw-r--r--src/select/properties/border_collapse.c10
-rw-r--r--src/select/properties/border_left_color.c10
-rw-r--r--src/select/properties/border_left_style.c10
-rw-r--r--src/select/properties/border_left_width.c10
-rw-r--r--src/select/properties/border_right_color.c10
-rw-r--r--src/select/properties/border_right_style.c10
-rw-r--r--src/select/properties/border_right_width.c10
-rw-r--r--src/select/properties/border_spacing.c14
-rw-r--r--src/select/properties/border_top_color.c10
-rw-r--r--src/select/properties/border_top_style.c10
-rw-r--r--src/select/properties/border_top_width.c10
-rw-r--r--src/select/properties/bottom.c10
-rw-r--r--src/select/properties/caption_side.c10
-rw-r--r--src/select/properties/clear.c10
-rw-r--r--src/select/properties/clip.c18
-rw-r--r--src/select/properties/color.c12
-rw-r--r--src/select/properties/content.c10
-rw-r--r--src/select/properties/counter_increment.c10
-rw-r--r--src/select/properties/counter_reset.c10
-rw-r--r--src/select/properties/cue_after.c10
-rw-r--r--src/select/properties/cue_before.c10
-rw-r--r--src/select/properties/cursor.c10
-rw-r--r--src/select/properties/direction.c10
-rw-r--r--src/select/properties/display.c10
-rw-r--r--src/select/properties/elevation.c12
-rw-r--r--src/select/properties/empty_cells.c10
-rw-r--r--src/select/properties/float.c10
-rw-r--r--src/select/properties/font_family.c12
-rw-r--r--src/select/properties/font_size.c12
-rw-r--r--src/select/properties/font_style.c10
-rw-r--r--src/select/properties/font_variant.c10
-rw-r--r--src/select/properties/font_weight.c10
-rw-r--r--src/select/properties/height.c10
-rw-r--r--src/select/properties/helpers.c56
-rw-r--r--src/select/properties/helpers.h24
-rw-r--r--src/select/properties/left.c10
-rw-r--r--src/select/properties/letter_spacing.c10
-rw-r--r--src/select/properties/line_height.c12
-rw-r--r--src/select/properties/list_style_image.c10
-rw-r--r--src/select/properties/list_style_position.c10
-rw-r--r--src/select/properties/list_style_type.c10
-rw-r--r--src/select/properties/margin_bottom.c10
-rw-r--r--src/select/properties/margin_left.c10
-rw-r--r--src/select/properties/margin_right.c10
-rw-r--r--src/select/properties/margin_top.c10
-rw-r--r--src/select/properties/max_height.c10
-rw-r--r--src/select/properties/max_width.c10
-rw-r--r--src/select/properties/min_height.c10
-rw-r--r--src/select/properties/min_width.c10
-rw-r--r--src/select/properties/orphans.c10
-rw-r--r--src/select/properties/outline_color.c10
-rw-r--r--src/select/properties/outline_style.c10
-rw-r--r--src/select/properties/outline_width.c10
-rw-r--r--src/select/properties/overflow.c10
-rw-r--r--src/select/properties/padding_bottom.c10
-rw-r--r--src/select/properties/padding_left.c10
-rw-r--r--src/select/properties/padding_right.c10
-rw-r--r--src/select/properties/padding_top.c10
-rw-r--r--src/select/properties/page_break_after.c10
-rw-r--r--src/select/properties/page_break_before.c10
-rw-r--r--src/select/properties/page_break_inside.c10
-rw-r--r--src/select/properties/pause_after.c10
-rw-r--r--src/select/properties/pause_before.c10
-rw-r--r--src/select/properties/pitch.c12
-rw-r--r--src/select/properties/pitch_range.c10
-rw-r--r--src/select/properties/play_during.c10
-rw-r--r--src/select/properties/position.c10
-rw-r--r--src/select/properties/properties.h8
-rw-r--r--src/select/properties/quotes.c12
-rw-r--r--src/select/properties/richness.c10
-rw-r--r--src/select/properties/right.c10
-rw-r--r--src/select/properties/speach_rate.c10
-rw-r--r--src/select/properties/speak.c10
-rw-r--r--src/select/properties/speak_header.c10
-rw-r--r--src/select/properties/speak_numeral.c10
-rw-r--r--src/select/properties/speak_punctuation.c10
-rw-r--r--src/select/properties/stress.c10
-rw-r--r--src/select/properties/table_layout.c10
-rw-r--r--src/select/properties/text_align.c10
-rw-r--r--src/select/properties/text_decoration.c10
-rw-r--r--src/select/properties/text_indent.c10
-rw-r--r--src/select/properties/text_transform.c10
-rw-r--r--src/select/properties/top.c10
-rw-r--r--src/select/properties/unicode_bidi.c10
-rw-r--r--src/select/properties/vertical_align.c12
-rw-r--r--src/select/properties/visibility.c10
-rw-r--r--src/select/properties/voice_family.c10
-rw-r--r--src/select/properties/volume.c12
-rw-r--r--src/select/properties/white_space.c10
-rw-r--r--src/select/properties/width.c10
-rw-r--r--src/select/properties/windows.c10
-rw-r--r--src/select/properties/word_spacing.c10
-rw-r--r--src/select/properties/z_index.c10
-rw-r--r--src/select/select.c6
-rw-r--r--src/select/select.h2
-rw-r--r--src/stylesheet.c2
-rw-r--r--src/utils/utils.c2
-rw-r--r--src/utils/utils.h2
-rw-r--r--test/csdetect.c4
-rw-r--r--test/lex-auto.c12
-rw-r--r--test/number.c6
-rw-r--r--test/parse-auto.c10
-rw-r--r--test/parse.c4
-rw-r--r--test/parse2-auto.c10
-rw-r--r--test/select-auto.c42
-rw-r--r--test/testutils.h18
157 files changed, 1055 insertions, 1055 deletions
diff --git a/src/parse/important.c b/src/parse/important.c
index 062074a..73d64ac 100644
--- a/src/parse/important.c
+++ b/src/parse/important.c
@@ -24,7 +24,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_important(css_language *c,
+css_error css__parse_important(css_language *c,
const parserutils_vector *vector, int *ctx,
uint8_t *result)
{
@@ -64,7 +64,7 @@ css_error parse_important(css_language *c,
*
* \param style The style to modify
*/
-void make_style_important(css_style *style)
+void css__make_style_important(css_style *style)
{
css_code_t *bytecode = style->bytecode;
uint32_t length = style->used;
diff --git a/src/parse/important.h b/src/parse/important.h
index 9faafef..ba5e118 100644
--- a/src/parse/important.h
+++ b/src/parse/important.h
@@ -5,16 +5,16 @@
* Copyright 2009 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_important_h_
-#define css_parse_important_h_
+#ifndef css_css__parse_important_h_
+#define css_css__parse_important_h_
#include "stylesheet.h"
#include "parse/language.h"
-css_error parse_important(css_language *c,
+css_error css__parse_important(css_language *c,
const parserutils_vector *vector, int *ctx,
uint8_t *result);
-void make_style_important(css_style *style);
+void css__make_style_important(css_style *style);
#endif
diff --git a/src/parse/language.c b/src/parse/language.c
index f8df2f1..ca21996 100644
--- a/src/parse/language.c
+++ b/src/parse/language.c
@@ -1288,7 +1288,7 @@ css_error parseProperty(css_language *c, const css_token *property,
}
/* Determine if this declaration is important or not */
- error = parse_important(c, vector, ctx, &flags);
+ error = css__parse_important(c, vector, ctx, &flags);
if (error != CSS_OK) {
css_stylesheet_style_destroy(style);
return error;
@@ -1305,7 +1305,7 @@ css_error parseProperty(css_language *c, const css_token *property,
/* If it's important, then mark the style appropriately */
if (flags != 0)
- make_style_important(style);
+ css__make_style_important(style);
/* Append style to rule */
error = css_stylesheet_rule_append_style(c->sheet, rule, style);
diff --git a/src/parse/language.h b/src/parse/language.h
index e94053d..73f6b2c 100644
--- a/src/parse/language.h
+++ b/src/parse/language.h
@@ -5,8 +5,8 @@
* Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_language_h_
-#define css_parse_language_h_
+#ifndef css_css__parse_language_h_
+#define css_css__parse_language_h_
#include <parserutils/utils/stack.h>
#include <parserutils/utils/vector.h>
diff --git a/src/parse/parse.c b/src/parse/parse.c
index e5b9c84..276b1d8 100644
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -293,7 +293,7 @@ css_error css_parser_setopt(css_parser *parser, css_parser_opttype type,
* \param len Length of chunk
* \return CSS_OK on success, appropriate error otherwise
*/
-css_error css_parser_parse_chunk(css_parser *parser, const uint8_t *data,
+css_error css_parser_css__parse_chunk(css_parser *parser, const uint8_t *data,
size_t len)
{
parserutils_error perror;
diff --git a/src/parse/parse.h b/src/parse/parse.h
index a2ffa35..7514887 100644
--- a/src/parse/parse.h
+++ b/src/parse/parse.h
@@ -5,8 +5,8 @@
* Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_parse_h_
-#define css_parse_parse_h_
+#ifndef css_css__parse_parse_h_
+#define css_css__parse_parse_h_
#include <libwapcaplet/libwapcaplet.h>
@@ -68,7 +68,7 @@ css_error css_parser_destroy(css_parser *parser);
css_error css_parser_setopt(css_parser *parser, css_parser_opttype type,
css_parser_optparams *params);
-css_error css_parser_parse_chunk(css_parser *parser, const uint8_t *data,
+css_error css_parser_css__parse_chunk(css_parser *parser, const uint8_t *data,
size_t len);
css_error css_parser_completed(css_parser *parser);
diff --git a/src/parse/properties/azimuth.c b/src/parse/properties/azimuth.c
index e6d28e6..ace29a2 100644
--- a/src/parse/properties/azimuth.c
+++ b/src/parse/properties/azimuth.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_azimuth(css_language *c,
+css_error css__parse_azimuth(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -184,7 +184,7 @@ css_error parse_azimuth(css_language *c,
value |= AZIMUTH_CENTER;
}
} else {
- error = parse_unit_specifier(c, vector, ctx, UNIT_DEG,
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_DEG,
&length, &unit);
if (error != CSS_OK) {
*ctx = orig_ctx;
diff --git a/src/parse/properties/background.c b/src/parse/properties/background.c
index f12fde7..137372e 100644
--- a/src/parse/properties/background.c
+++ b/src/parse/properties/background.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_background(css_language *c,
+css_error css__parse_background(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -118,30 +118,30 @@ css_error parse_background(css_language *c,
if (is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
/* Try each property parser in turn, but only if we
* haven't already got a value for this property.
*/
if ((attachment) &&
- (error = parse_background_attachment(c, vector, ctx,
+ (error = css__parse_background_attachment(c, vector, ctx,
attachment_style)) == CSS_OK) {
attachment = false;
} else if ((color) &&
- (error = parse_background_color(c, vector, ctx,
+ (error = css__parse_background_color(c, vector, ctx,
color_style)) == CSS_OK) {
color = false;
} else if ((image) &&
- (error = parse_background_image(c, vector, ctx,
+ (error = css__parse_background_image(c, vector, ctx,
image_style)) == CSS_OK) {
image = false;
} else if ((position) &&
- (error = parse_background_position(c, vector, ctx,
+ (error = css__parse_background_position(c, vector, ctx,
position_style)) == CSS_OK) {
position = false;
} else if ((repeat) &&
- (error = parse_background_repeat(c, vector, ctx,
+ (error = css__parse_background_repeat(c, vector, ctx,
repeat_style)) == CSS_OK) {
repeat = false;
}
@@ -161,7 +161,7 @@ css_error parse_background(css_language *c,
CSS_PROP_BACKGROUND_ATTACHMENT, 0,
BACKGROUND_ATTACHMENT_SCROLL);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
if (color) {
@@ -169,7 +169,7 @@ css_error parse_background(css_language *c,
CSS_PROP_BACKGROUND_COLOR, 0,
BACKGROUND_COLOR_TRANSPARENT);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
if (image) {
@@ -177,7 +177,7 @@ css_error parse_background(css_language *c,
CSS_PROP_BACKGROUND_IMAGE,
0, BACKGROUND_IMAGE_NONE);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
if (position) {
@@ -186,7 +186,7 @@ css_error parse_background(css_language *c,
0, BACKGROUND_POSITION_HORZ_LEFT |
BACKGROUND_POSITION_VERT_TOP);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
if (repeat) {
@@ -194,28 +194,28 @@ css_error parse_background(css_language *c,
CSS_PROP_BACKGROUND_REPEAT,
0, BACKGROUND_REPEAT_REPEAT);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
}
error = css_stylesheet_merge_style(result, attachment_style);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
error = css_stylesheet_merge_style(result, color_style);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
error = css_stylesheet_merge_style(result, image_style);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
error = css_stylesheet_merge_style(result, position_style);
if (error != CSS_OK)
- goto parse_background_cleanup;
+ goto css__parse_background_cleanup;
error = css_stylesheet_merge_style(result, repeat_style);
-parse_background_cleanup:
+css__parse_background_cleanup:
css_stylesheet_style_destroy(attachment_style);
css_stylesheet_style_destroy(color_style);
css_stylesheet_style_destroy(image_style);
diff --git a/src/parse/properties/background_position.c b/src/parse/properties/background_position.c
index e74072f..af38882 100644
--- a/src/parse/properties/background_position.c
+++ b/src/parse/properties/background_position.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_background_position(css_language *c,
+css_error css__parse_background_position(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -108,7 +108,7 @@ css_error parse_background_position(css_language *c,
} else if (token->type == CSS_TOKEN_DIMENSION ||
token->type == CSS_TOKEN_NUMBER ||
token->type == CSS_TOKEN_PERCENTAGE) {
- error = parse_unit_specifier(c, vector, ctx,
+ error = css__parse_unit_specifier(c, vector, ctx,
UNIT_PX, &length[i], &unit[i]);
if (error != CSS_OK) {
*ctx = orig_ctx;
diff --git a/src/parse/properties/border.c b/src/parse/properties/border.c
index e33aa40..98ad08b 100644
--- a/src/parse/properties/border.c
+++ b/src/parse/properties/border.c
@@ -27,35 +27,35 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border(css_language *c,
+css_error css__parse_border(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
int orig_ctx = *ctx;
css_error error;
- error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_TOP);
+ error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_TOP);
if (error != CSS_OK) {
*ctx = orig_ctx;
return error;
}
*ctx = orig_ctx;
- error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_RIGHT);
+ error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_RIGHT);
if (error != CSS_OK) {
*ctx = orig_ctx;
return error;
}
*ctx = orig_ctx;
- error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_BOTTOM);
+ error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_BOTTOM);
if (error != CSS_OK) {
*ctx = orig_ctx;
return error;
}
*ctx = orig_ctx;
- error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_LEFT);
+ error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_LEFT);
if (error != CSS_OK)
*ctx = orig_ctx;
diff --git a/src/parse/properties/border_color.c b/src/parse/properties/border_color.c
index aa337ad..87c1c5f 100644
--- a/src/parse/properties/border_color.c
+++ b/src/parse/properties/border_color.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_color(css_language *c,
+css_error css__parse_border_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -83,7 +83,7 @@ css_error parse_border_color(css_language *c,
error = CSS_OK;
} else {
side_val[side_count] = BORDER_COLOR_SET;
- error = parse_colour_specifier(c, vector, ctx, &side_color[side_count]);
+ error = css__parse_colour_specifier(c, vector, ctx, &side_color[side_count]);
}
if (error == CSS_OK) {
diff --git a/src/parse/properties/border_spacing.c b/src/parse/properties/border_spacing.c
index 3d8f994..0d6bc76 100644
--- a/src/parse/properties/border_spacing.c
+++ b/src/parse/properties/border_spacing.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_spacing(css_language *c,
+css_error css__parse_border_spacing(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -58,7 +58,7 @@ css_error parse_border_spacing(css_language *c,
} else {
int num_lengths = 0;
- error = parse_unit_specifier(c, vector, ctx, UNIT_PX,
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX,
&length[0], &unit[0]);
if (error != CSS_OK) {
*ctx = orig_ctx;
@@ -82,7 +82,7 @@ css_error parse_border_spacing(css_language *c,
* any remaining junk is thrown out.
* Ctx will be preserved on error, as usual
*/
- error = parse_unit_specifier(c, vector, ctx, UNIT_PX,
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX,
&length[1], &unit[1]);
if (error == CSS_OK) {
if (unit[1] & UNIT_ANGLE ||
diff --git a/src/parse/properties/border_style.c b/src/parse/properties/border_style.c
index 7ee6922..ae697df 100644
--- a/src/parse/properties/border_style.c
+++ b/src/parse/properties/border_style.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_style(css_language *c,
+css_error css__parse_border_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
diff --git a/src/parse/properties/border_width.c b/src/parse/properties/border_width.c
index de4845a..88abae5 100644
--- a/src/parse/properties/border_width.c
+++ b/src/parse/properties/border_width.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_width(css_language *c,
+css_error css__parse_border_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -90,7 +90,7 @@ css_error parse_border_width(css_language *c,
} else {
side_val[side_count] = BORDER_WIDTH_SET;
- error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
if (error == CSS_OK) {
if (side_unit[side_count] == UNIT_PCT ||
side_unit[side_count] & UNIT_ANGLE ||
diff --git a/src/parse/properties/clip.c b/src/parse/properties/clip.c
index 8b0cda6..0e06fd0 100644
--- a/src/parse/properties/clip.c
+++ b/src/parse/properties/clip.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_clip(css_language *c,
+css_error css__parse_clip(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -95,7 +95,7 @@ css_error parse_clip(css_language *c,
parserutils_vector_iterate(vector, ctx);
} else {
- error = parse_unit_specifier(c, vector, ctx,
+ error = css__parse_unit_specifier(c, vector, ctx,
UNIT_PX,
&length[num_lengths],
&unit[num_lengths]);
diff --git a/src/parse/properties/content.c b/src/parse/properties/content.c
index 9a3a425..8ea8e2f 100644
--- a/src/parse/properties/content.c
+++ b/src/parse/properties/content.c
@@ -28,7 +28,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_content(css_language *c,
+css_error css__parse_content(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -233,7 +233,7 @@ css_error parse_content(css_language *c,
return CSS_INVALID;
}
- error = parse_list_style_type_value(c, token, &v);
+ error = css__parse_list_style_type_value(c, token, &v);
if (error != CSS_OK) {
*ctx = orig_ctx;
return error;
@@ -339,7 +339,7 @@ css_error parse_content(css_language *c,
return CSS_INVALID;
}
- error = parse_list_style_type_value(c,
+ error = css__parse_list_style_type_value(c,
token, &v);
if (error != CSS_OK) {
*ctx = orig_ctx;
diff --git a/src/parse/properties/css_property_parser_gen.c b/src/parse/properties/css_property_parser_gen.c
index a348c6a..d53fe16 100644
--- a/src/parse/properties/css_property_parser_gen.c
+++ b/src/parse/properties/css_property_parser_gen.c
@@ -106,7 +106,7 @@ void output_header(FILE *outputf, const char *descriptor, struct keyval *parser_
" * Post condition: \\a *ctx is updated with the next token to process\n"
" * If the input is invalid, then \\a *ctx remains unchanged.\n"
" */\n"
- "css_error parse_%s(css_language *c,\n"
+ "css_error css__parse_%s(css_language *c,\n"
" const parserutils_vector *vector, int *ctx,\n"
" css_style *result%s)\n"
"{\n",
@@ -232,7 +232,7 @@ void output_number(FILE *outputf, struct keyval *parseid, struct keyval_list *kv
"if (token->type == CSS_TOKEN_NUMBER) {\n"
"\t\tcss_fixed num = 0;\n"
"\t\tsize_t consumed = 0;\n\n"
- "\t\tnum = number_from_lwc_string(token->idata, %s, &consumed);\n"
+ "\t\tnum = css__number_from_lwc_string(token->idata, %s, &consumed);\n"
"\t\t/* Invalid if there are trailing characters */\n"
"\t\tif (consumed != lwc_string_length(token->idata)) {\n"
"\t\t\t*ctx = orig_ctx;\n"
@@ -274,7 +274,7 @@ void output_color(FILE *outputf, struct keyval *parseid, struct keyval_list *kvl
"{\n"
"\t\tuint32_t color = 0;\n"
"\t\t*ctx = orig_ctx;\n\n"
- "\t\terror = parse_colour_specifier(c, vector, ctx, &color);\n"
+ "\t\terror = css__parse_colour_specifier(c, vector, ctx, &color);\n"
"\t\tif (error != CSS_OK) {\n"
"\t\t\t*ctx = orig_ctx;\n"
"\t\t\treturn error;\n"
@@ -302,7 +302,7 @@ void output_length_unit(FILE *outputf, struct keyval *parseid, struct keyval_lis
"\t\tcss_fixed length = 0;\n"
"\t\tuint32_t unit = 0;\n"
"\t\t*ctx = orig_ctx;\n\n"
- "\t\terror = parse_unit_specifier(c, vector, ctx, %s, &length, &unit);\n"
+ "\t\terror = css__parse_unit_specifier(c, vector, ctx, %s, &length, &unit);\n"
"\t\tif (error != CSS_OK) {\n"
"\t\t\t*ctx = orig_ctx;\n"
"\t\t\treturn error;\n"
@@ -383,7 +383,7 @@ void output_ident_list(FILE *outputf, struct keyval *parseid, struct keyval_list
"\t\t\ttoken = parserutils_vector_iterate(vector, ctx);\n"
"\t\t\tif ((token != NULL) && (token->type == CSS_TOKEN_NUMBER)) {\n"
"\t\t\t\tsize_t consumed = 0;\n\n"
- "\t\t\t\tnum = number_from_lwc_string(token->idata, true, &consumed);\n"
+ "\t\t\t\tnum = css__number_from_lwc_string(token->idata, true, &consumed);\n"
"\t\t\t\tif (consumed != lwc_string_length(token->idata)) {\n"
"\t\t\t\t\t*ctx = orig_ctx;\n"
"\t\t\t\t\treturn CSS_INVALID;\n"
diff --git a/src/parse/properties/cue.c b/src/parse/properties/cue.c
index 096c121..ea94adb 100644
--- a/src/parse/properties/cue.c
+++ b/src/parse/properties/cue.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_cue(css_language *c,
+css_error css__parse_cue(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -44,7 +44,7 @@ css_error parse_cue(css_language *c,
first_token = parserutils_vector_peek(vector, *ctx);
- error = parse_cue_before(c, vector, ctx, result);
+ error = css__parse_cue_before(c, vector, ctx, result);
if (error == CSS_OK) {
/* first token parsed */
@@ -54,14 +54,14 @@ css_error parse_cue(css_language *c,
if (token == NULL) {
/* no second token, re-parse the first */
*ctx = orig_ctx;
- error = parse_cue_after(c, vector, ctx, result);
+ error = css__parse_cue_after(c, vector, ctx, result);
} else {
/* second token - might be useful */
if (is_css_inherit(c, token)) {
/* another inherit which is bogus */
error = CSS_INVALID;
} else {
- error = parse_cue_after(c, vector, ctx, result);
+ error = css__parse_cue_after(c, vector, ctx, result);
if (error == CSS_OK) {
/* second token parsed */
if (is_css_inherit(c, first_token)) {
@@ -71,7 +71,7 @@ css_error parse_cue(css_language *c,
} else {
/* second token appears to be junk re-try with first */
*ctx = orig_ctx;
- error = parse_cue_after(c, vector, ctx, result);
+ error = css__parse_cue_after(c, vector, ctx, result);
}
}
}
diff --git a/src/parse/properties/cursor.c b/src/parse/properties/cursor.c
index e063a9b..ef94806 100644
--- a/src/parse/properties/cursor.c
+++ b/src/parse/properties/cursor.c
@@ -26,7 +26,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_cursor(css_language *c,
+css_error css__parse_cursor(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
diff --git a/src/parse/properties/elevation.c b/src/parse/properties/elevation.c
index d0c47d8..8c5e48e 100644
--- a/src/parse/properties/elevation.c
+++ b/src/parse/properties/elevation.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_elevation(css_language *c,
+css_error css__parse_elevation(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -84,7 +84,7 @@ css_error parse_elevation(css_language *c,
parserutils_vector_iterate(vector, ctx);
value = ELEVATION_LOWER;
} else {
- error = parse_unit_specifier(c, vector, ctx, UNIT_DEG,
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_DEG,
&length, &unit);
if (error != CSS_OK) {
*ctx = orig_ctx;
diff --git a/src/parse/properties/font.c b/src/parse/properties/font.c
index 93029a4..1417dda 100644
--- a/src/parse/properties/font.c
+++ b/src/parse/properties/font.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_font(css_language *c,
+css_error css__parse_font(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -138,19 +138,19 @@ css_error parse_font(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if ((token != NULL) && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
if ((style) &&
- (error = parse_font_style(c, vector,
+ (error = css__parse_font_style(c, vector,
ctx, style_style)) == CSS_OK) {
style = false;
} else if ((variant) &&
- (error = parse_font_variant(c, vector, ctx,
+ (error = css__parse_font_variant(c, vector, ctx,
variant_style)) == CSS_OK) {
variant = false;
} else if ((weight) &&
- (error = parse_font_weight(c, vector, ctx,
+ (error = css__parse_font_weight(c, vector, ctx,
weight_style)) == CSS_OK) {
weight = false;
}
@@ -171,13 +171,13 @@ css_error parse_font(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if ((token != NULL) && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
/* Now expect a font-size */
- error = parse_font_size(c, vector, ctx, size_style);
+ error = css__parse_font_size(c, vector, ctx, size_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
size = false;
consumeWhitespace(vector, ctx);
@@ -193,12 +193,12 @@ css_error parse_font(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if ((token != NULL) && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
- error = parse_line_height(c, vector, ctx, line_height_style);
+ error = css__parse_line_height(c, vector, ctx, line_height_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
line_height = false;
}
@@ -209,13 +209,13 @@ css_error parse_font(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if ((token != NULL) && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
/* Now expect a font-family */
- error = parse_font_family(c, vector, ctx, family_style);
+ error = css__parse_font_family(c, vector, ctx, family_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
family = false;
/* Must have size and family */
@@ -229,7 +229,7 @@ css_error parse_font(css_language *c,
CSS_PROP_FONT_STYLE, 0,
FONT_STYLE_NORMAL);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
if (variant) {
@@ -237,7 +237,7 @@ css_error parse_font(css_language *c,
CSS_PROP_FONT_VARIANT, 0,
FONT_VARIANT_NORMAL);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
if (weight) {
@@ -245,7 +245,7 @@ css_error parse_font(css_language *c,
CSS_PROP_FONT_WEIGHT,
0, FONT_WEIGHT_NORMAL);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
if (line_height) {
@@ -253,35 +253,35 @@ css_error parse_font(css_language *c,
CSS_PROP_LINE_HEIGHT,
0, LINE_HEIGHT_NORMAL);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
}
/* merge final output */
error = css_stylesheet_merge_style(result, style_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
error = css_stylesheet_merge_style(result, variant_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
error = css_stylesheet_merge_style(result, weight_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
error = css_stylesheet_merge_style(result, size_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
error = css_stylesheet_merge_style(result, line_height_style);
if (error != CSS_OK)
- goto parse_font_cleanup;
+ goto css__parse_font_cleanup;
error = css_stylesheet_merge_style(result, family_style);
-parse_font_cleanup:
+css__parse_font_cleanup:
css_stylesheet_style_destroy(style_style);
css_stylesheet_style_destroy(variant_style);
css_stylesheet_style_destroy(weight_style);
diff --git a/src/parse/properties/font_family.c b/src/parse/properties/font_family.c
index a2e9511..4d0a3b1 100644
--- a/src/parse/properties/font_family.c
+++ b/src/parse/properties/font_family.c
@@ -98,7 +98,7 @@ static css_code_t font_family_value(css_language *c, const css_token *token, boo
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_font_family(css_language *c,
+css_error css__parse_font_family(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -131,7 +131,7 @@ css_error parse_font_family(css_language *c,
} else {
*ctx = orig_ctx;
- error = comma_list_to_style(c, vector, ctx,
+ error = css__comma_list_to_style(c, vector, ctx,
font_family_reserved, font_family_value,
result);
if (error != CSS_OK) {
diff --git a/src/parse/properties/font_weight.c b/src/parse/properties/font_weight.c
index 03e6e51..9c4048b 100644
--- a/src/parse/properties/font_weight.c
+++ b/src/parse/properties/font_weight.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_font_weight(css_language *c,
+css_error css__parse_font_weight(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -53,7 +53,7 @@ css_error parse_font_weight(css_language *c,
flags |= FLAG_INHERIT;
} else if (token->type == CSS_TOKEN_NUMBER) {
size_t consumed = 0;
- css_fixed num = number_from_lwc_string(token->idata,
+ css_fixed num = css__number_from_lwc_string(token->idata,
true, &consumed);
/* Invalid if there are trailing characters */
if (consumed != lwc_string_length(token->idata)) {
diff --git a/src/parse/properties/list_style.c b/src/parse/properties/list_style.c
index b9406c1..7ac0831 100644
--- a/src/parse/properties/list_style.c
+++ b/src/parse/properties/list_style.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_list_style(css_language *c,
+css_error css__parse_list_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -91,19 +91,19 @@ css_error parse_list_style(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if (token != NULL && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_list_style_cleanup;
+ goto css__parse_list_style_cleanup;
}
if ((type) &&
- (error = parse_list_style_type(c, vector,
+ (error = css__parse_list_style_type(c, vector,
ctx, type_style)) == CSS_OK) {
type = false;
} else if ((position) &&
- (error = parse_list_style_position(c, vector,
+ (error = css__parse_list_style_position(c, vector,
ctx, position_style)) == CSS_OK) {
position = false;
} else if ((image) &&
- (error = parse_list_style_image(c, vector, ctx,
+ (error = css__parse_list_style_image(c, vector, ctx,
image_style)) == CSS_OK) {
image = false;
}
@@ -141,16 +141,16 @@ css_error parse_list_style(css_language *c,
error = css_stylesheet_merge_style(result, image_style);
if (error != CSS_OK)
- goto parse_list_style_cleanup;
+ goto css__parse_list_style_cleanup;
error = css_stylesheet_merge_style(result, position_style);
if (error != CSS_OK)
- goto parse_list_style_cleanup;
+ goto css__parse_list_style_cleanup;
error = css_stylesheet_merge_style(result, type_style);
-parse_list_style_cleanup:
+css__parse_list_style_cleanup:
css_stylesheet_style_destroy(type_style);
css_stylesheet_style_destroy(position_style);
diff --git a/src/parse/properties/list_style_type.c b/src/parse/properties/list_style_type.c
index 3afab3a..12fb465 100644
--- a/src/parse/properties/list_style_type.c
+++ b/src/parse/properties/list_style_type.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_list_style_type(css_language *c,
+css_error css__parse_list_style_type(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -54,7 +54,7 @@ css_error parse_list_style_type(css_language *c,
&match) == lwc_error_ok && match)) {
flags |= FLAG_INHERIT;
} else {
- error = parse_list_style_type_value(c, ident, &value);
+ error = css__parse_list_style_type_value(c, ident, &value);
if (error != CSS_OK) {
*ctx = orig_ctx;
return error;
diff --git a/src/parse/properties/margin.c b/src/parse/properties/margin.c
index b320e85..04b8795 100644
--- a/src/parse/properties/margin.c
+++ b/src/parse/properties/margin.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_margin(css_language *c,
+css_error css__parse_margin(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -82,7 +82,7 @@ css_error parse_margin(css_language *c,
} else {
side_val[side_count] = MARGIN_SET;
- error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
if (error == CSS_OK) {
if (side_unit[side_count] & UNIT_ANGLE||
side_unit[side_count] & UNIT_TIME||
diff --git a/src/parse/properties/outline.c b/src/parse/properties/outline.c
index 7af2cc3..7cd74cd 100644
--- a/src/parse/properties/outline.c
+++ b/src/parse/properties/outline.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_outline(css_language *c,
+css_error css__parse_outline(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -91,19 +91,19 @@ css_error parse_outline(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if (token != NULL && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_outline_cleanup;
+ goto css__parse_outline_cleanup;
}
if ((color) &&
- (error = parse_outline_color(c, vector, ctx,
+ (error = css__parse_outline_color(c, vector, ctx,
color_style)) == CSS_OK) {
color = false;
} else if ((style) &&
- (error = parse_outline_style(c, vector,
+ (error = css__parse_outline_style(c, vector,
ctx, style_style)) == CSS_OK) {
style = false;
} else if ((width) &&
- (error = parse_outline_width(c, vector,
+ (error = css__parse_outline_width(c, vector,
ctx, width_style)) == CSS_OK) {
width = false;
}
@@ -141,16 +141,16 @@ css_error parse_outline(css_language *c,
error = css_stylesheet_merge_style(result, color_style);
if (error != CSS_OK)
- goto parse_outline_cleanup;
+ goto css__parse_outline_cleanup;
error = css_stylesheet_merge_style(result, style_style);
if (error != CSS_OK)
- goto parse_outline_cleanup;
+ goto css__parse_outline_cleanup;
error = css_stylesheet_merge_style(result, width_style);
-parse_outline_cleanup:
+css__parse_outline_cleanup:
css_stylesheet_style_destroy(width_style);
css_stylesheet_style_destroy(style_style);
diff --git a/src/parse/properties/padding.c b/src/parse/properties/padding.c
index 263906d..5211e9d 100644
--- a/src/parse/properties/padding.c
+++ b/src/parse/properties/padding.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_padding(css_language *c,
+css_error css__parse_padding(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -73,7 +73,7 @@ css_error parse_padding(css_language *c,
return CSS_INVALID;
}
- error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+ error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
if (error == CSS_OK) {
if (side_unit[side_count] & UNIT_ANGLE ||
side_unit[side_count] & UNIT_TIME ||
diff --git a/src/parse/properties/pause.c b/src/parse/properties/pause.c
index c1612aa..fcb4644 100644
--- a/src/parse/properties/pause.c
+++ b/src/parse/properties/pause.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_pause(css_language *c,
+css_error css__parse_pause(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -44,7 +44,7 @@ css_error parse_pause(css_language *c,
first_token = parserutils_vector_peek(vector, *ctx);
- error = parse_pause_before(c, vector, ctx, result);
+ error = css__parse_pause_before(c, vector, ctx, result);
if (error == CSS_OK) {
/* first token parsed */
@@ -54,14 +54,14 @@ css_error parse_pause(css_language *c,
if (token == NULL) {
/* no second token, re-parse the first */
*ctx = orig_ctx;
- error = parse_pause_after(c, vector, ctx, result);
+ error = css__parse_pause_after(c, vector, ctx, result);
} else {
/* second token - might be useful */
if (is_css_inherit(c, token)) {
/* another bogus inherit */
error = CSS_INVALID;
} else {
- error = parse_pause_after(c, vector, ctx, result);
+ error = css__parse_pause_after(c, vector, ctx, result);
if (error == CSS_OK) {
/* second token parsed */
if (is_css_inherit(c, first_token)) {
@@ -71,7 +71,7 @@ css_error parse_pause(css_language *c,
} else {
/* second token appears to be junk re-try with first */
*ctx = orig_ctx;
- error = parse_pause_after(c, vector, ctx, result);
+ error = css__parse_pause_after(c, vector, ctx, result);
}
}
}
diff --git a/src/parse/properties/play_during.c b/src/parse/properties/play_during.c
index d2f6521..8d83a92 100644
--- a/src/parse/properties/play_during.c
+++ b/src/parse/properties/play_during.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_play_during(css_language *c,
+css_error css__parse_play_during(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c
index 79ad1a5..09ee255 100644
--- a/src/parse/properties/properties.c
+++ b/src/parse/properties/properties.c
@@ -12,120 +12,120 @@
*/
const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] =
{
- parse_azimuth,
- parse_background,
- parse_background_attachment,
- parse_background_color,
- parse_background_image,
- parse_background_position,
- parse_background_repeat,
- parse_border,
- parse_border_bottom,
- parse_border_bottom_color,
- parse_border_bottom_style,
- parse_border_bottom_width,
- parse_border_collapse,
- parse_border_color,
- parse_border_left,
- parse_border_left_color,
- parse_border_left_style,
- parse_border_left_width,
- parse_border_right,
- parse_border_right_color,
- parse_border_right_style,
- parse_border_right_width,
- parse_border_spacing,
- parse_border_style,
- parse_border_top,
- parse_border_top_color,
- parse_border_top_style,
- parse_border_top_width,
- parse_border_width,
- parse_bottom,
- parse_caption_side,
- parse_clear,
- parse_clip,
- parse_color,
- parse_content,
- parse_counter_increment,
- parse_counter_reset,
- parse_cue,
- parse_cue_after,
- parse_cue_before,
- parse_cursor,
- parse_direction,
- parse_display,
- parse_elevation,
- parse_empty_cells,
- parse_float,
- parse_font,
- parse_font_family,
- parse_font_size,
- parse_font_style,
- parse_font_variant,
- parse_font_weight,
- parse_height,
- parse_left,
- parse_letter_spacing,
- parse_line_height,
- parse_list_style,
- parse_list_style_image,
- parse_list_style_position,
- parse_list_style_type,
- parse_margin,
- parse_margin_bottom,
- parse_margin_left,
- parse_margin_right,
- parse_margin_top,
- parse_max_height,
- parse_max_width,
- parse_min_height,
- parse_min_width,
- parse_orphans,
- parse_outline,
- parse_outline_color,
- parse_outline_style,
- parse_outline_width,
- parse_overflow,
- parse_padding,
- parse_padding_bottom,
- parse_padding_left,
- parse_padding_right,
- parse_padding_top,
- parse_page_break_after,
- parse_page_break_before,
- parse_page_break_inside,
- parse_pause,
- parse_pause_after,
- parse_pause_before,
- parse_pitch_range,
- parse_pitch,
- parse_play_during,
- parse_position,
- parse_quotes,
- parse_richness,
- parse_right,
- parse_speak_header,
- parse_speak_numeral,
- parse_speak_punctuation,
- parse_speak,
- parse_speech_rate,
- parse_stress,
- parse_table_layout,
- parse_text_align,
- parse_text_decoration,
- parse_text_indent,
- parse_text_transform,
- parse_top,
- parse_unicode_bidi,
- parse_vertical_align,
- parse_visibility,
- parse_voice_family,
- parse_volume,
- parse_white_space,
- parse_widows,
- parse_width,
- parse_word_spacing,
- parse_z_index
+ css__parse_azimuth,
+ css__parse_background,
+ css__parse_background_attachment,
+ css__parse_background_color,
+ css__parse_background_image,
+ css__parse_background_position,
+ css__parse_background_repeat,
+ css__parse_border,
+ css__parse_border_bottom,
+ css__parse_border_bottom_color,
+ css__parse_border_bottom_style,
+ css__parse_border_bottom_width,
+ css__parse_border_collapse,
+ css__parse_border_color,
+ css__parse_border_left,
+ css__parse_border_left_color,
+ css__parse_border_left_style,
+ css__parse_border_left_width,
+ css__parse_border_right,
+ css__parse_border_right_color,
+ css__parse_border_right_style,
+ css__parse_border_right_width,
+ css__parse_border_spacing,
+ css__parse_border_style,
+ css__parse_border_top,
+ css__parse_border_top_color,
+ css__parse_border_top_style,
+ css__parse_border_top_width,
+ css__parse_border_width,
+ css__parse_bottom,
+ css__parse_caption_side,
+ css__parse_clear,
+ css__parse_clip,
+ css__parse_color,
+ css__parse_content,
+ css__parse_counter_increment,
+ css__parse_counter_reset,
+ css__parse_cue,
+ css__parse_cue_after,
+ css__parse_cue_before,
+ css__parse_cursor,
+ css__parse_direction,
+ css__parse_display,
+ css__parse_elevation,
+ css__parse_empty_cells,
+ css__parse_float,
+ css__parse_font,
+ css__parse_font_family,
+ css__parse_font_size,
+ css__parse_font_style,
+ css__parse_font_variant,
+ css__parse_font_weight,
+ css__parse_height,
+ css__parse_left,
+ css__parse_letter_spacing,
+ css__parse_line_height,
+ css__parse_list_style,
+ css__parse_list_style_image,
+ css__parse_list_style_position,
+ css__parse_list_style_type,
+ css__parse_margin,
+ css__parse_margin_bottom,
+ css__parse_margin_left,
+ css__parse_margin_right,
+ css__parse_margin_top,
+ css__parse_max_height,
+ css__parse_max_width,
+ css__parse_min_height,
+ css__parse_min_width,
+ css__parse_orphans,
+ css__parse_outline,
+ css__parse_outline_color,
+ css__parse_outline_style,
+ css__parse_outline_width,
+ css__parse_overflow,
+ css__parse_padding,
+ css__parse_padding_bottom,
+ css__parse_padding_left,
+ css__parse_padding_right,
+ css__parse_padding_top,
+ css__parse_page_break_after,
+ css__parse_page_break_before,
+ css__parse_page_break_inside,
+ css__parse_pause,
+ css__parse_pause_after,
+ css__parse_pause_before,
+ css__parse_pitch_range,
+ css__parse_pitch,
+ css__parse_play_during,
+ css__parse_position,
+ css__parse_quotes,
+ css__parse_richness,
+ css__parse_right,
+ css__parse_speak_header,
+ css__parse_speak_numeral,
+ css__parse_speak_punctuation,
+ css__parse_speak,
+ css__parse_speech_rate,
+ css__parse_stress,
+ css__parse_table_layout,
+ css__parse_text_align,
+ css__parse_text_decoration,
+ css__parse_text_indent,
+ css__parse_text_transform,
+ css__parse_top,
+ css__parse_unicode_bidi,
+ css__parse_vertical_align,
+ css__parse_visibility,
+ css__parse_voice_family,
+ css__parse_volume,
+ css__parse_white_space,
+ css__parse_widows,
+ css__parse_width,
+ css__parse_word_spacing,
+ css__parse_z_index
};
diff --git a/src/parse/properties/properties.gen b/src/parse/properties/properties.gen
index 7666a3a..b0e84b8 100644
--- a/src/parse/properties/properties.gen
+++ b/src/parse/properties/properties.gen
@@ -34,10 +34,10 @@ letter_spacing:CSS_PROP_LETTER_SPACING IDENT:( INHERIT: NORMAL:0,LETTER_SPACING_
line_height:CSS_PROP_LINE_HEIGHT IDENT:( INHERIT: NORMAL:0,LINE_HEIGHT_NORMAL IDENT:) NUMBER:( false:LINE_HEIGHT_NUMBER RANGE:num<0 NUMBER:) LENGTH_UNIT:( UNIT_PX:LINE_HEIGHT_DIMENSION DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
-border_top:BORDER_SIDE_TOP WRAP:parse_border_side
-border_bottom:BORDER_SIDE_BOTTOM WRAP:parse_border_side
-border_left:BORDER_SIDE_LEFT WRAP:parse_border_side
-border_right:BORDER_SIDE_RIGHT WRAP:parse_border_side
+border_top:BORDER_SIDE_TOP WRAP:css__parse_border_side
+border_bottom:BORDER_SIDE_BOTTOM WRAP:css__parse_border_side
+border_left:BORDER_SIDE_LEFT WRAP:css__parse_border_side
+border_right:BORDER_SIDE_RIGHT WRAP:css__parse_border_side
max_height:CSS_PROP_MAX_HEIGHT IDENT:( INHERIT: NONE:0,MAX_HEIGHT_NONE IDENT:) LENGTH_UNIT:( UNIT_PX:MAX_HEIGHT_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
@@ -52,53 +52,53 @@ color:CSS_PROP_COLOR IDENT:INHERIT COLOR:COLOR_SET
#generic for padding_{top, bottom, left, right}.c
padding_side:op GENERIC: IDENT:INHERIT LENGTH_UNIT:( UNIT_PX:PADDING_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
-padding_bottom:CSS_PROP_PADDING_BOTTOM WRAP:parse_padding_side
-padding_left:CSS_PROP_PADDING_LEFT WRAP:parse_padding_side
-padding_top:CSS_PROP_PADDING_TOP WRAP:parse_padding_side
-padding_right:CSS_PROP_PADDING_RIGHT WRAP:parse_padding_side
+padding_bottom:CSS_PROP_PADDING_BOTTOM WRAP:css__parse_padding_side
+padding_left:CSS_PROP_PADDING_LEFT WRAP:css__parse_padding_side
+padding_top:CSS_PROP_PADDING_TOP WRAP:css__parse_padding_side
+padding_right:CSS_PROP_PADDING_RIGHT WRAP:css__parse_padding_side
#generic for margin_{top, bottom, left, right}.c
margin_side:op GENERIC IDENT:( INHERIT: AUTO:0,MARGIN_AUTO IDENT:) LENGTH_UNIT:( UNIT_PX:MARGIN_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ LENGTH_UNIT:)
-margin_top:CSS_PROP_MARGIN_TOP WRAP:parse_margin_side
-margin_bottom:CSS_PROP_MARGIN_BOTTOM WRAP:parse_margin_side
-margin_left:CSS_PROP_MARGIN_LEFT WRAP:parse_margin_side
-margin_right:CSS_PROP_MARGIN_RIGHT WRAP:parse_margin_side
+margin_top:CSS_PROP_MARGIN_TOP WRAP:css__parse_margin_side
+margin_bottom:CSS_PROP_MARGIN_BOTTOM WRAP:css__parse_margin_side
+margin_left:CSS_PROP_MARGIN_LEFT WRAP:css__parse_margin_side
+margin_right:CSS_PROP_MARGIN_RIGHT WRAP:css__parse_margin_side
#generic for {top, bottom, left, right}.c
side:op GENERIC: IDENT:( INHERIT: AUTO:0,BOTTOM_AUTO IDENT:) LENGTH_UNIT:( UNIT_PX:BOTTOM_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ LENGTH_UNIT:)
-top:CSS_PROP_TOP WRAP:parse_side
-bottom:CSS_PROP_BOTTOM WRAP:parse_side
-left:CSS_PROP_LEFT WRAP:parse_side
-right:CSS_PROP_RIGHT WRAP:parse_side
+top:CSS_PROP_TOP WRAP:css__parse_side
+bottom:CSS_PROP_BOTTOM WRAP:css__parse_side
+left:CSS_PROP_LEFT WRAP:css__parse_side
+right:CSS_PROP_RIGHT WRAP:css__parse_side
#generic for border_{top, bottom, left, right}_width.c
border_side_width:op GENERIC: IDENT:( INHERIT: THIN:0,BORDER_WIDTH_THIN MEDIUM:0,BORDER_WIDTH_MEDIUM THICK:0,BORDER_WIDTH_THICK IDENT:) LENGTH_UNIT:( UNIT_PX:BORDER_WIDTH_SET DISALLOW:unit==UNIT_PCT||unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
-border_top_width:CSS_PROP_BORDER_TOP_WIDTH WRAP:parse_border_side_width
-border_bottom_width:CSS_PROP_BORDER_BOTTOM_WIDTH WRAP:parse_border_side_width
-border_left_width:CSS_PROP_BORDER_LEFT_WIDTH WRAP:parse_border_side_width
-border_right_width:CSS_PROP_BORDER_RIGHT_WIDTH WRAP:parse_border_side_width
+border_top_width:CSS_PROP_BORDER_TOP_WIDTH WRAP:css__parse_border_side_width
+border_bottom_width:CSS_PROP_BORDER_BOTTOM_WIDTH WRAP:css__parse_border_side_width
+border_left_width:CSS_PROP_BORDER_LEFT_WIDTH WRAP:css__parse_border_side_width
+border_right_width:CSS_PROP_BORDER_RIGHT_WIDTH WRAP:css__parse_border_side_width
#generic for border_{top, bottom, left, right}_style.c
border_side_style:op GENERIC: IDENT:( INHERIT: NONE:0,BORDER_STYLE_NONE HIDDEN:0,BORDER_STYLE_HIDDEN DOTTED:0,BORDER_STYLE_DOTTED DASHED:0,BORDER_STYLE_DASHED SOLID:0,BORDER_STYLE_SOLID LIBCSS_DOUBLE:0,BORDER_STYLE_DOUBLE GROOVE:0,BORDER_STYLE_GROOVE RIDGE:0,BORDER_STYLE_RIDGE INSET:0,BORDER_STYLE_INSET OUTSET:0,BORDER_STYLE_OUTSET IDENT:)
-border_top_style:CSS_PROP_BORDER_TOP_STYLE WRAP:parse_border_side_style
-border_bottom_style:CSS_PROP_BORDER_BOTTOM_STYLE WRAP:parse_border_side_style
-border_left_style:CSS_PROP_BORDER_LEFT_STYLE WRAP:parse_border_side_style
-border_right_style:CSS_PROP_BORDER_RIGHT_STYLE WRAP:parse_border_side_style
+border_top_style:CSS_PROP_BORDER_TOP_STYLE WRAP:css__parse_border_side_style
+border_bottom_style:CSS_PROP_BORDER_BOTTOM_STYLE WRAP:css__parse_border_side_style
+border_left_style:CSS_PROP_BORDER_LEFT_STYLE WRAP:css__parse_border_side_style
+border_right_style:CSS_PROP_BORDER_RIGHT_STYLE WRAP:css__parse_border_side_style
#generic for border_{top, bottom, left, right}_color.c
border_side_color:op GENERIC: IDENT:( INHERIT: TRANSPARENT:0,BORDER_COLOR_TRANSPARENT IDENT:) COLOR:BORDER_COLOR_SET
-border_top_color:CSS_PROP_BORDER_TOP_COLOR WRAP:parse_border_side_color
-border_bottom_color:CSS_PROP_BORDER_BOTTOM_COLOR WRAP:parse_border_side_color
-border_left_color:CSS_PROP_BORDER_LEFT_COLOR WRAP:parse_border_side_color
-border_right_color:CSS_PROP_BORDER_RIGHT_COLOR WRAP:parse_border_side_color
+border_top_color:CSS_PROP_BORDER_TOP_COLOR WRAP:css__parse_border_side_color
+border_bottom_color:CSS_PROP_BORDER_BOTTOM_COLOR WRAP:css__parse_border_side_color
+border_left_color:CSS_PROP_BORDER_LEFT_COLOR WRAP:css__parse_border_side_color
+border_right_color:CSS_PROP_BORDER_RIGHT_COLOR WRAP:css__parse_border_side_color
counter_increment:CSS_PROP_COUNTER_INCREMENT IDENT:( INHERIT: NONE:0,COUNTER_INCREMENT_NONE IDENT:) IDENT_LIST:( STRING_OPTNUM:COUNTER_INCREMENT_NAMED 1:COUNTER_INCREMENT_NONE IDENT_LIST:)
@@ -127,7 +127,7 @@ outline_color:CSS_PROP_OUTLINE_COLOR IDENT:( INHERIT: INVERT:0,OUTLINE_COLOR_INV
outline_style:CSS_PROP_OUTLINE_STYLE IDENT:( INHERIT: NONE:0,BORDER_STYLE_NONE DOTTED:0,BORDER_STYLE_DOTTED DASHED:0,BORDER_STYLE_DASHED SOLID:0,BORDER_STYLE_SOLID LIBCSS_DOUBLE:0,BORDER_STYLE_DOUBLE GROOVE:0,BORDER_STYLE_GROOVE RIDGE:0,BORDER_STYLE_RIDGE INSET:0,BORDER_STYLE_INSET OUTSET:0,BORDER_STYLE_OUTSET IDENT:)
-outline_width:CSS_PROP_OUTLINE_WIDTH WRAP:parse_border_side_width
+outline_width:CSS_PROP_OUTLINE_WIDTH WRAP:css__parse_border_side_width
overflow:CSS_PROP_OVERFLOW IDENT:( INHERIT: VISIBLE:0,OVERFLOW_VISIBLE HIDDEN:0,OVERFLOW_HIDDEN SCROLL:0,OVERFLOW_SCROLL AUTO:0,OVERFLOW_AUTO IDENT:)
diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h
index 6117387..5de344d 100644
--- a/src/parse/properties/properties.h
+++ b/src/parse/properties/properties.h
@@ -5,8 +5,8 @@
* Copyright 2009 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_properties_properties_h_
-#define css_parse_properties_properties_h_
+#ifndef css_css__parse_properties_properties_h_
+#define css_css__parse_properties_properties_h_
#include "stylesheet.h"
#include "lex/lex.h"
@@ -22,349 +22,349 @@ typedef css_error (*css_prop_handler)(css_language *c,
extern const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP];
-css_error parse_azimuth(css_language *c,
+css_error css__parse_azimuth(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background(css_language *c,
+css_error css__parse_background(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background_attachment(css_language *c,
+css_error css__parse_background_attachment(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background_color(css_language *c,
+css_error css__parse_background_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background_image(css_language *c,
+css_error css__parse_background_image(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background_position(css_language *c,
+css_error css__parse_background_position(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_background_repeat(css_language *c,
+css_error css__parse_background_repeat(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border(css_language *c,
+css_error css__parse_border(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_bottom(css_language *c,
+css_error css__parse_border_bottom(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_bottom_color(css_language *c,
+css_error css__parse_border_bottom_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_bottom_style(css_language *c,
+css_error css__parse_border_bottom_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_bottom_width(css_language *c,
+css_error css__parse_border_bottom_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_color(css_language *c,
+css_error css__parse_border_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_collapse(css_language *c,
+css_error css__parse_border_collapse(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_left(css_language *c,
+css_error css__parse_border_left(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_left_color(css_language *c,
+css_error css__parse_border_left_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_left_style(css_language *c,
+css_error css__parse_border_left_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_left_width(css_language *c,
+css_error css__parse_border_left_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_right(css_language *c,
+css_error css__parse_border_right(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_right_color(css_language *c,
+css_error css__parse_border_right_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_right_style(css_language *c,
+css_error css__parse_border_right_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_right_width(css_language *c,
+css_error css__parse_border_right_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_spacing(css_language *c,
+css_error css__parse_border_spacing(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_style(css_language *c,
+css_error css__parse_border_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_top(css_language *c,
+css_error css__parse_border_top(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_top_color(css_language *c,
+css_error css__parse_border_top_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_top_style(css_language *c,
+css_error css__parse_border_top_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_top_width(css_language *c,
+css_error css__parse_border_top_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_border_width(css_language *c,
+css_error css__parse_border_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_bottom(css_language *c,
+css_error css__parse_bottom(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_caption_side(css_language *c,
+css_error css__parse_caption_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_clear(css_language *c,
+css_error css__parse_clear(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_clip(css_language *c,
+css_error css__parse_clip(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_color(css_language *c,
+css_error css__parse_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_content(css_language *c,
+css_error css__parse_content(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_counter_increment(css_language *c,
+css_error css__parse_counter_increment(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_counter_reset(css_language *c,
+css_error css__parse_counter_reset(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_cue(css_language *c,
+css_error css__parse_cue(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_cue_after(css_language *c,
+css_error css__parse_cue_after(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_cue_before(css_language *c,
+css_error css__parse_cue_before(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_cursor(css_language *c,
+css_error css__parse_cursor(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_direction(css_language *c,
+css_error css__parse_direction(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_display(css_language *c,
+css_error css__parse_display(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_elevation(css_language *c,
+css_error css__parse_elevation(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_empty_cells(css_language *c,
+css_error css__parse_empty_cells(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_float(css_language *c,
+css_error css__parse_float(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font(css_language *c,
+css_error css__parse_font(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font_family(css_language *c,
+css_error css__parse_font_family(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font_size(css_language *c,
+css_error css__parse_font_size(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font_style(css_language *c,
+css_error css__parse_font_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font_variant(css_language *c,
+css_error css__parse_font_variant(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_font_weight(css_language *c,
+css_error css__parse_font_weight(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_height(css_language *c,
+css_error css__parse_height(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_left(css_language *c,
+css_error css__parse_left(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_letter_spacing(css_language *c,
+css_error css__parse_letter_spacing(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_line_height(css_language *c,
+css_error css__parse_line_height(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_list_style(css_language *c,
+css_error css__parse_list_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_list_style_image(css_language *c,
+css_error css__parse_list_style_image(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_list_style_position(css_language *c,
+css_error css__parse_list_style_position(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_list_style_type(css_language *c,
+css_error css__parse_list_style_type(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_margin(css_language *c,
+css_error css__parse_margin(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_margin_bottom(css_language *c,
+css_error css__parse_margin_bottom(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_margin_left(css_language *c,
+css_error css__parse_margin_left(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_margin_right(css_language *c,
+css_error css__parse_margin_right(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_margin_top(css_language *c,
+css_error css__parse_margin_top(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_max_height(css_language *c,
+css_error css__parse_max_height(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_max_width(css_language *c,
+css_error css__parse_max_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_min_height(css_language *c,
+css_error css__parse_min_height(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_min_width(css_language *c,
+css_error css__parse_min_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_orphans(css_language *c,
+css_error css__parse_orphans(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_outline(css_language *c,
+css_error css__parse_outline(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_outline_color(css_language *c,
+css_error css__parse_outline_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_outline_style(css_language *c,
+css_error css__parse_outline_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_outline_width(css_language *c,
+css_error css__parse_outline_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_overflow(css_language *c,
+css_error css__parse_overflow(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_padding(css_language *c,
+css_error css__parse_padding(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_padding_bottom(css_language *c,
+css_error css__parse_padding_bottom(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_padding_left(css_language *c,
+css_error css__parse_padding_left(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_padding_right(css_language *c,
+css_error css__parse_padding_right(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_padding_top(css_language *c,
+css_error css__parse_padding_top(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_page_break_after(css_language *c,
+css_error css__parse_page_break_after(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_page_break_before(css_language *c,
+css_error css__parse_page_break_before(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_page_break_inside(css_language *c,
+css_error css__parse_page_break_inside(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_pause(css_language *c,
+css_error css__parse_pause(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_pause_after(css_language *c,
+css_error css__parse_pause_after(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_pause_before(css_language *c,
+css_error css__parse_pause_before(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_pitch_range(css_language *c,
+css_error css__parse_pitch_range(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_pitch(css_language *c,
+css_error css__parse_pitch(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_play_during(css_language *c,
+css_error css__parse_play_during(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_position(css_language *c,
+css_error css__parse_position(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_quotes(css_language *c,
+css_error css__parse_quotes(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_richness(css_language *c,
+css_error css__parse_richness(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_right(css_language *c,
+css_error css__parse_right(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_speak_header(css_language *c,
+css_error css__parse_speak_header(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_speak_numeral(css_language *c,
+css_error css__parse_speak_numeral(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_speak_punctuation(css_language *c,
+css_error css__parse_speak_punctuation(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_speak(css_language *c,
+css_error css__parse_speak(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_speech_rate(css_language *c,
+css_error css__parse_speech_rate(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_stress(css_language *c,
+css_error css__parse_stress(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_table_layout(css_language *c,
+css_error css__parse_table_layout(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_text_align(css_language *c,
+css_error css__parse_text_align(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_text_decoration(css_language *c,
+css_error css__parse_text_decoration(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_text_indent(css_language *c,
+css_error css__parse_text_indent(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_text_transform(css_language *c,
+css_error css__parse_text_transform(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_top(css_language *c,
+css_error css__parse_top(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_unicode_bidi(css_language *c,
+css_error css__parse_unicode_bidi(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_vertical_align(css_language *c,
+css_error css__parse_vertical_align(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_visibility(css_language *c,
+css_error css__parse_visibility(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_voice_family(css_language *c,
+css_error css__parse_voice_family(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_volume(css_language *c,
+css_error css__parse_volume(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_white_space(css_language *c,
+css_error css__parse_white_space(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_widows(css_language *c,
+css_error css__parse_widows(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_width(css_language *c,
+css_error css__parse_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_word_spacing(css_language *c,
+css_error css__parse_word_spacing(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
-css_error parse_z_index(css_language *c,
+css_error css__parse_z_index(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result);
diff --git a/src/parse/properties/quotes.c b/src/parse/properties/quotes.c
index 423046a..6d235ab 100644
--- a/src/parse/properties/quotes.c
+++ b/src/parse/properties/quotes.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_quotes(css_language *c,
+css_error css__parse_quotes(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
diff --git a/src/parse/properties/text_decoration.c b/src/parse/properties/text_decoration.c
index c9a91d1..2d893f4 100644
--- a/src/parse/properties/text_decoration.c
+++ b/src/parse/properties/text_decoration.c
@@ -27,7 +27,7 @@
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_text_decoration(css_language *c,
+css_error css__parse_text_decoration(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
diff --git a/src/parse/properties/utils.c b/src/parse/properties/utils.c
index 34a5225..22fdd31 100644
--- a/src/parse/properties/utils.c
+++ b/src/parse/properties/utils.c
@@ -25,7 +25,7 @@
* \return CSS_OK on success,
* CSS_INVALID if the input is not valid
*/
-css_error parse_list_style_type_value(css_language *c, const css_token *ident,
+css_error css__parse_list_style_type_value(css_language *c, const css_token *ident,
uint16_t *value)
{
bool match;
@@ -118,7 +118,7 @@ css_error parse_list_style_type_value(css_language *c, const css_token *ident,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_side(css_language *c,
+css_error css__parse_border_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum border_side_e side)
{
@@ -181,22 +181,22 @@ css_error parse_border_side(css_language *c,
token = parserutils_vector_peek(vector, *ctx);
if (token != NULL && is_css_inherit(c, token)) {
error = CSS_INVALID;
- goto parse_border_side_cleanup;
+ goto css__parse_border_side_cleanup;
}
/* Try each property parser in turn, but only if we
* haven't already got a value for this property.
*/
if ((color) &&
- (error = parse_border_side_color(c, vector, ctx,
+ (error = css__parse_border_side_color(c, vector, ctx,
color_style, CSS_PROP_BORDER_TOP_COLOR + side)) == CSS_OK) {
color = false;
} else if ((style) &&
- (error = parse_border_side_style(c, vector, ctx,
+ (error = css__parse_border_side_style(c, vector, ctx,
style_style, CSS_PROP_BORDER_TOP_STYLE + side)) == CSS_OK) {
style = false;
} else if ((width) &&
- (error = parse_border_side_width(c, vector, ctx,
+ (error = css__parse_border_side_width(c, vector, ctx,
width_style, CSS_PROP_BORDER_TOP_WIDTH + side)) == CSS_OK) {
width = false;
}
@@ -216,7 +216,7 @@ css_error parse_border_side(css_language *c,
CSS_PROP_BORDER_TOP_STYLE + side, 0,
BORDER_STYLE_NONE);
if (error != CSS_OK)
- goto parse_border_side_cleanup;
+ goto css__parse_border_side_cleanup;
}
if (width) {
@@ -224,20 +224,20 @@ css_error parse_border_side(css_language *c,
CSS_PROP_BORDER_TOP_WIDTH + side,
0, BORDER_WIDTH_MEDIUM);
if (error != CSS_OK)
- goto parse_border_side_cleanup;
+ goto css__parse_border_side_cleanup;
}
error = css_stylesheet_merge_style(result, color_style);
if (error != CSS_OK)
- goto parse_border_side_cleanup;
+ goto css__parse_border_side_cleanup;
error = css_stylesheet_merge_style(result, style_style);
if (error != CSS_OK)
- goto parse_border_side_cleanup;
+ goto css__parse_border_side_cleanup;
error = css_stylesheet_merge_style(result, width_style);
-parse_border_side_cleanup:
+css__parse_border_side_cleanup:
css_stylesheet_style_destroy(color_style);
css_stylesheet_style_destroy(style_style);
css_stylesheet_style_destroy(width_style);
@@ -261,7 +261,7 @@ parse_border_side_cleanup:
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_colour_specifier(css_language *c,
+css_error css__parse_colour_specifier(css_language *c,
const parserutils_vector *vector, int *ctx,
uint32_t *result)
{
@@ -292,9 +292,9 @@ css_error parse_colour_specifier(css_language *c,
}
if (token->type == CSS_TOKEN_IDENT) {
- error = parse_named_colour(c, token->idata, result);
+ error = css__parse_named_colour(c, token->idata, result);
if (error != CSS_OK && c->sheet->quirks_allowed) {
- error = parse_hash_colour(token->idata, result);
+ error = css__parse_hash_colour(token->idata, result);
if (error == CSS_OK)
c->sheet->quirks_used = true;
}
@@ -304,14 +304,14 @@ css_error parse_colour_specifier(css_language *c,
return error;
} else if (token->type == CSS_TOKEN_HASH) {
- error = parse_hash_colour(token->idata, result);
+ error = css__parse_hash_colour(token->idata, result);
if (error != CSS_OK)
*ctx = orig_ctx;
return error;
} else if (c->sheet->quirks_allowed &&
token->type == CSS_TOKEN_NUMBER) {
- error = parse_hash_colour(token->idata, result);
+ error = css__parse_hash_colour(token->idata, result);
if (error == CSS_OK)
c->sheet->quirks_used = true;
else
@@ -320,7 +320,7 @@ css_error parse_colour_specifier(css_language *c,
return error;
} else if (c->sheet->quirks_allowed &&
token->type == CSS_TOKEN_DIMENSION) {
- error = parse_hash_colour(token->idata, result);
+ error = css__parse_hash_colour(token->idata, result);
if (error == CSS_OK)
c->sheet->quirks_used = true;
else
@@ -374,7 +374,7 @@ css_error parse_colour_specifier(css_language *c,
else
int_only = false;
- num = number_from_lwc_string(token->idata,
+ num = css__number_from_lwc_string(token->idata,
int_only, &consumed);
if (consumed != lwc_string_length(token->idata))
goto invalid;
@@ -440,7 +440,7 @@ invalid:
* \return CSS_OK on success,
* CSS_INVALID if the colour name is unknown
*/
-css_error parse_named_colour(css_language *c, lwc_string *data,
+css_error css__parse_named_colour(css_language *c, lwc_string *data,
uint32_t *result)
{
static const uint32_t colourmap[LAST_COLOUR + 1 - FIRST_COLOUR] = {
@@ -620,7 +620,7 @@ css_error parse_named_colour(css_language *c, lwc_string *data,
* \return CSS_OK on success,
* CSS_INVALID if the input is invalid
*/
-css_error parse_hash_colour(lwc_string *data, uint32_t *result)
+css_error css__parse_hash_colour(lwc_string *data, uint32_t *result)
{
uint8_t r = 0, g = 0, b = 0, a = 0xff;
size_t len = lwc_string_length(data);
@@ -667,7 +667,7 @@ css_error parse_hash_colour(lwc_string *data, uint32_t *result)
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_unit_specifier(css_language *c,
+css_error css__parse_unit_specifier(css_language *c,
const parserutils_vector *vector, int *ctx,
uint32_t default_unit,
css_fixed *length, uint32_t *unit)
@@ -688,14 +688,14 @@ css_error parse_unit_specifier(css_language *c,
return CSS_INVALID;
}
- num = number_from_lwc_string(token->idata, false, &consumed);
+ num = css__number_from_lwc_string(token->idata, false, &consumed);
if (token->type == CSS_TOKEN_DIMENSION) {
size_t len = lwc_string_length(token->idata);
const char *data = lwc_string_data(token->idata);
css_unit temp_unit = CSS_UNIT_PX;
- error = parse_unit_keyword(data + consumed, len - consumed,
+ error = css__parse_unit_keyword(data + consumed, len - consumed,
&temp_unit);
if (error != CSS_OK) {
*ctx = orig_ctx;
@@ -729,7 +729,7 @@ css_error parse_unit_specifier(css_language *c,
/* Try to parse the unit keyword, ignoring errors */
token = parserutils_vector_iterate(vector, &temp_ctx);
if (token != NULL && token->type == CSS_TOKEN_IDENT) {
- error = parse_unit_keyword(
+ error = css__parse_unit_keyword(
lwc_string_data(token->idata),
lwc_string_length(token->idata),
&temp_unit);
@@ -763,7 +763,7 @@ css_error parse_unit_specifier(css_language *c,
* \return CSS_OK on success,
* CSS_INVALID on encountering an unknown keyword
*/
-css_error parse_unit_keyword(const char *ptr, size_t len, css_unit *unit)
+css_error css__parse_unit_keyword(const char *ptr, size_t len, css_unit *unit)
{
if (len == 4) {
if (strncasecmp(ptr, "grad", 4) == 0)
@@ -917,7 +917,7 @@ cleanup:
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error comma_list_to_style(css_language *c,
+css_error css__comma_list_to_style(css_language *c,
const parserutils_vector *vector, int *ctx,
bool (*reserved)(css_language *c, const css_token *ident),
css_code_t (*get_value)(css_language *c, const css_token *token, bool first),
diff --git a/src/parse/properties/utils.h b/src/parse/properties/utils.h
index 66b706d..e5315bb 100644
--- a/src/parse/properties/utils.h
+++ b/src/parse/properties/utils.h
@@ -5,8 +5,8 @@
* Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_properties_utils_h_
-#define css_parse_properties_utils_h_
+#ifndef css_css__parse_properties_utils_h_
+#define css_css__parse_properties_utils_h_
#include "parse/language.h"
@@ -36,7 +36,7 @@ enum border_side_e { BORDER_SIDE_TOP = 0, BORDER_SIDE_RIGHT = 1, BORDER_SIDE_BOT
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_side(css_language *c,
+css_error css__parse_border_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum border_side_e side);
@@ -55,7 +55,7 @@ css_error parse_border_side(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_side_color(css_language *c,
+css_error css__parse_border_side_color(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -74,7 +74,7 @@ css_error parse_border_side_color(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_side_style(css_language *c,
+css_error css__parse_border_side_style(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -94,7 +94,7 @@ css_error parse_border_side_style(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_border_side_width(css_language *c,
+css_error css__parse_border_side_width(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -114,7 +114,7 @@ css_error parse_border_side_width(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_side(css_language *c,
+css_error css__parse_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -133,7 +133,7 @@ css_error parse_side(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_margin_side(css_language *c,
+css_error css__parse_margin_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -151,7 +151,7 @@ css_error parse_margin_side(css_language *c,
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_padding_side(css_language *c,
+css_error css__parse_padding_side(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result, enum css_properties_e op);
@@ -161,27 +161,27 @@ css_error parse_padding_side(css_language *c,
-css_error parse_list_style_type_value(css_language *c,
+css_error css__parse_list_style_type_value(css_language *c,
const css_token *token, uint16_t *value);
-css_error parse_colour_specifier(css_language *c,
+css_error css__parse_colour_specifier(css_language *c,
const parserutils_vector *vector, int *ctx,
uint32_t *result);
-css_error parse_named_colour(css_language *c, lwc_string *data,
+css_error css__parse_named_colour(css_language *c, lwc_string *data,
uint32_t *result);
-css_error parse_hash_colour(lwc_string *data, uint32_t *result);
+css_error css__parse_hash_colour(lwc_string *data, uint32_t *result);
-css_error parse_unit_specifier(css_language *c,
+css_error css__parse_unit_specifier(css_language *c,
const parserutils_vector *vector, int *ctx,
uint32_t default_unit,
css_fixed *length, uint32_t *unit);
-css_error parse_unit_keyword(const char *ptr, size_t len,
+css_error css__parse_unit_keyword(const char *ptr, size_t len,
css_unit *unit);
-css_error comma_list_to_style(css_language *c,
+css_error css__comma_list_to_style(css_language *c,
const parserutils_vector *vector, int *ctx,
bool (*reserved)(css_language *c, const css_token *ident),
css_code_t (*get_value)(css_language *c, const css_token *token, bool first),
diff --git a/src/parse/properties/voice_family.c b/src/parse/properties/voice_family.c
index 339d470..9ef52be 100644
--- a/src/parse/properties/voice_family.c
+++ b/src/parse/properties/voice_family.c
@@ -83,7 +83,7 @@ static css_code_t voice_family_value(css_language *c, const css_token *token, bo
* Post condition: \a *ctx is updated with the next token to process
* If the input is invalid, then \a *ctx remains unchanged.
*/
-css_error parse_voice_family(css_language *c,
+css_error css__parse_voice_family(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style *result)
{
@@ -113,7 +113,7 @@ css_error parse_voice_family(css_language *c,
} else {
*ctx = orig_ctx;
- error = comma_list_to_style(c, vector, ctx,
+ error = css__comma_list_to_style(c, vector, ctx,
voice_family_reserved, voice_family_value,
result);
if (error != CSS_OK) {
diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h
index 45f6f79..78b7dda 100644
--- a/src/parse/propstrings.h
+++ b/src/parse/propstrings.h
@@ -5,8 +5,8 @@
* Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
*/
-#ifndef css_parse_propstrings_h_
-#define css_parse_propstrings_h_
+#ifndef css_css__parse_propstrings_h_
+#define css_css__parse_propstrings_h_
#include "utils/utils.h"
diff --git a/src/select/computed.c b/src/select/computed.c
index 16c6b9f..5479d2f 100644
--- a/src/select/computed.c
+++ b/src/select/computed.c
@@ -306,7 +306,7 @@ css_error css_computed_style_compose(const css_computed_style *parent,
}
/* Finally, compute absolute values for everything */
- return compute_absolute_values(parent, result, compute_font_size, pw);
+ return css__compute_absolute_values(parent, result, compute_font_size, pw);
}
/******************************************************************************
@@ -322,7 +322,7 @@ css_error css_computed_style_compose(const css_computed_style *parent,
* \param pw Private word for callback
* \return CSS_OK on success.
*/
-css_error compute_absolute_values(const css_computed_style *parent,
+css_error css__compute_absolute_values(const css_computed_style *parent,
css_computed_style *style,
css_error (*compute_font_size)(void *pw,
const css_hint *parent, css_hint *size),
diff --git a/src/select/computed.h b/src/select/computed.h
index 5527742..ca9a93b 100644
--- a/src/select/computed.h
+++ b/src/select/computed.h
@@ -11,7 +11,7 @@
#include <libcss/computed.h>
#include <libcss/hint.h>
-css_error compute_absolute_values(const css_computed_style *parent,
+css_error css__compute_absolute_values(const css_computed_style *parent,
css_computed_style *style,
css_error (*compute_font_size)(void *pw,
const css_hint *parent, css_hint *size),
diff --git a/src/select/dispatch.c b/src/select/dispatch.c
index f6172c6..0b73c26 100644
--- a/src/select/dispatch.c
+++ b/src/select/dispatch.c
@@ -12,10 +12,10 @@
* Dispatch table for properties, indexed by opcode
*/
#define PROPERTY_FUNCS(pname) \
- cascade_##pname, \
- set_##pname##_from_hint, \
- initial_##pname, \
- compose_##pname
+ css__cascade_##pname, \
+ css__set_##pname##_from_hint, \
+ css__initial_##pname, \
+ css__compose_##pname
struct prop_table prop_dispatch[CSS_N_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)
{
diff --git a/src/select/select.c b/src/select/select.c
index e06bb33..0c9fb30 100644
--- a/src/select/select.c
+++ b/src/select/select.c
@@ -422,7 +422,7 @@ css_error css_select_style(css_select_ctx *ctx, void *node,
* is set to the computed value of color. */
if (parent == NULL) {
/* Only compute absolute values for the base element */
- error = compute_absolute_values(NULL,
+ error = css__compute_absolute_values(NULL,
state.results->styles[CSS_PSEUDO_ELEMENT_NONE],
handler->compute_font_size, pw);
if (error != CSS_OK)
@@ -882,7 +882,7 @@ css_error match_selectors_in_sheet(css_select_ctx *ctx,
bool process = true;
/* Selectors must be matched in ascending order of specificity
- * and rule index. (c.f. outranks_existing())
+ * and rule index. (c.f. css__outranks_existing())
*
* Pick the least specific/earliest occurring selector.
*/
@@ -1300,7 +1300,7 @@ css_error cascade_style(const css_style *style, css_select_state *state)
return CSS_OK;
}
-bool outranks_existing(uint16_t op, bool important, css_select_state *state,
+bool css__outranks_existing(uint16_t op, bool important, css_select_state *state,
bool inherit)
{
prop_state *existing = &state->props[op][state->current_pseudo];
diff --git a/src/select/select.h b/src/select/select.h
index a5a4b64..c0ba7cf 100644
--- a/src/select/select.h
+++ b/src/select/select.h
@@ -64,7 +64,7 @@ static inline void advance_bytecode(css_style *style, uint32_t n_bytes)
style->bytecode = style->bytecode + (n_bytes / sizeof(css_code_t));
}
-bool outranks_existing(uint16_t op, bool important, css_select_state *state,
+bool css__outranks_existing(uint16_t op, bool important, css_select_state *state,
bool inherit);
#endif
diff --git a/src/stylesheet.c b/src/stylesheet.c
index 0847c77..285c6be 100644
--- a/src/stylesheet.c
+++ b/src/stylesheet.c
@@ -317,7 +317,7 @@ css_error css_stylesheet_append_data(css_stylesheet *sheet,
if (sheet->parser == NULL)
return CSS_INVALID;
- return css_parser_parse_chunk(sheet->parser, data, len);
+ return css_parser_css__parse_chunk(sheet->parser, data, len);
}
/**
diff --git a/src/utils/utils.c b/src/utils/utils.c
index b5f53da..94b15e1 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -7,7 +7,7 @@
#include "utils/utils.h"
-css_fixed number_from_lwc_string(lwc_string *string,
+css_fixed css__number_from_lwc_string(lwc_string *string,
bool int_only, size_t *consumed)
{
size_t len;
diff --git a/src/utils/utils.h b/src/utils/utils.h
index 1fe2d46..4859dea 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -34,7 +34,7 @@
#define N_ELEMENTS(x) (sizeof((x)) / sizeof((x)[0]))
#endif
-css_fixed number_from_lwc_string(lwc_string *string, bool int_only,
+css_fixed css__number_from_lwc_string(lwc_string *string, bool int_only,
size_t *consumed);
static inline bool isDigit(uint8_t c)
diff --git a/test/csdetect.c b/test/csdetect.c
index aa72ce2..efd764d 100644
--- a/test/csdetect.c
+++ b/test/csdetect.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
return 1;
}
- ctx.buflen = parse_filesize(argv[1]);
+ ctx.buflen = css__parse_filesize(argv[1]);
if (ctx.buflen == 0)
return 1;
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
ctx.indata = false;
ctx.inenc = false;
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.bufused > 0 && ctx.buf[ctx.bufused - 1] == '\n')
diff --git a/test/lex-auto.c b/test/lex-auto.c
index 70f9f44..044d9dd 100644
--- a/test/lex-auto.c
+++ b/test/lex-auto.c
@@ -36,7 +36,7 @@ typedef struct line_ctx {
} line_ctx;
static bool handle_line(const char *data, size_t datalen, void *pw);
-static void parse_expected(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_expected(line_ctx *ctx, const char *data, size_t len);
static const char *string_from_type(css_token_type type);
static css_token_type string_to_type(const char *data, size_t len);
static void run_test(const uint8_t *data, size_t len,
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
return 1;
}
- ctx.buflen = parse_filesize(argv[1]);
+ ctx.buflen = css__parse_filesize(argv[1]);
if (ctx.buflen == 0)
return 1;
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
ctx.indata = false;
ctx.inexp = false;
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.bufused > 0)
@@ -127,17 +127,17 @@ bool handle_line(const char *data, size_t datalen, void *pw)
if (data[datalen - 1] == '\n')
datalen -= 1;
- parse_expected(ctx, data, datalen);
+ css__parse_expected(ctx, data, datalen);
}
}
return true;
}
-void parse_expected(line_ctx *ctx, const char *data, size_t len)
+void css__parse_expected(line_ctx *ctx, const char *data, size_t len)
{
css_token_type type;
- const char *colon = parse_strnchr(data, len, ':');
+ const char *colon = css__parse_strnchr(data, len, ':');
if (colon == NULL)
colon = data + len;
diff --git a/test/number.c b/test/number.c
index bd5128f..12728fb 100644
--- a/test/number.c
+++ b/test/number.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
return 1;
}
- ctx.buflen = parse_filesize(argv[1]);
+ ctx.buflen = css__parse_filesize(argv[1]);
if (ctx.buflen == 0)
return 1;
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
ctx.indata = false;
ctx.inexp = false;
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.bufused > 0)
@@ -120,7 +120,7 @@ void run_test(const uint8_t *data, size_t len, const char *exp, size_t explen)
assert(lwc_intern_string((const char *)data, len, &in) == lwc_error_ok);
- result = number_from_lwc_string(in, false, &consumed);
+ result = css__number_from_lwc_string(in, false, &consumed);
print_css_fixed(buf, sizeof(buf), result);
diff --git a/test/parse-auto.c b/test/parse-auto.c
index 8b0a36b..0d26829 100644
--- a/test/parse-auto.c
+++ b/test/parse-auto.c
@@ -46,7 +46,7 @@ typedef struct line_ctx {
} line_ctx;
static bool handle_line(const char *data, size_t datalen, void *pw);
-static void parse_expected(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_expected(line_ctx *ctx, const char *data, size_t len);
static void run_test(const uint8_t *data, size_t len,
exp_entry *exp, size_t explen);
static bool validate_rule_selector(css_rule_selector *s, exp_entry *e);
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
return 1;
}
- ctx.buflen = parse_filesize(argv[1]);
+ ctx.buflen = css__parse_filesize(argv[1]);
if (ctx.buflen == 0)
return 1;
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
ctx.inerrors = false;
ctx.inexp = false;
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.bufused > 0)
@@ -203,14 +203,14 @@ bool handle_line(const char *data, size_t datalen, void *pw)
if (data[datalen - 1] == '\n')
datalen -= 1;
- parse_expected(ctx, data, datalen);
+ css__parse_expected(ctx, data, datalen);
}
}
return true;
}
-void parse_expected(line_ctx *ctx, const char *data, size_t len)
+void css__parse_expected(line_ctx *ctx, const char *data, size_t len)
{
/* Ignore blanks or lines that don't start with | */
if (len == 0 || data[0] != '|')
diff --git a/test/parse.c b/test/parse.c
index efb555e..255cd5b 100644
--- a/test/parse.c
+++ b/test/parse.c
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
size_t read = fread(buf, 1, CHUNK_SIZE, fp);
assert(read == CHUNK_SIZE);
- error = css_parser_parse_chunk(parser, buf, CHUNK_SIZE);
+ error = css_parser_css__parse_chunk(parser, buf, CHUNK_SIZE);
assert(error == CSS_OK || error == CSS_NEEDDATA);
len -= CHUNK_SIZE;
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
size_t read = fread(buf, 1, len, fp);
assert(read == len);
- error = css_parser_parse_chunk(parser, buf, len);
+ error = css_parser_css__parse_chunk(parser, buf, len);
assert(error == CSS_OK || error == CSS_NEEDDATA);
len = 0;
diff --git a/test/parse2-auto.c b/test/parse2-auto.c
index 50426d2..877c0f5 100644
--- a/test/parse2-auto.c
+++ b/test/parse2-auto.c
@@ -30,7 +30,7 @@ typedef struct line_ctx {
} line_ctx;
static bool handle_line(const char *data, size_t datalen, void *pw);
-static void parse_expected(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_expected(line_ctx *ctx, const char *data, size_t len);
static void run_test(const uint8_t *data, size_t len,
const char *exp, size_t explen);
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
return 1;
}
- ctx.buflen = parse_filesize(argv[1]);
+ ctx.buflen = css__parse_filesize(argv[1]);
if (ctx.buflen == 0)
return 1;
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
ctx.inerrors = false;
ctx.inexp = false;
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.bufused > 0)
@@ -156,14 +156,14 @@ bool handle_line(const char *data, size_t datalen, void *pw)
ctx->bufused += datalen;
}
if (ctx->inexp) {
- parse_expected(ctx, data, datalen);
+ css__parse_expected(ctx, data, datalen);
}
}
return true;
}
-void parse_expected(line_ctx *ctx, const char *data, size_t len)
+void css__parse_expected(line_ctx *ctx, const char *data, size_t len)
{
while (ctx->expused + len >= ctx->explen) {
size_t required = ctx->explen == 0 ? 64 : ctx->explen * 2;
diff --git a/test/select-auto.c b/test/select-auto.c
index 5b21b66..c81d097 100644
--- a/test/select-auto.c
+++ b/test/select-auto.c
@@ -65,13 +65,13 @@ typedef struct line_ctx {
} line_ctx;
static bool handle_line(const char *data, size_t datalen, void *pw);
-static void parse_tree(line_ctx *ctx, const char *data, size_t len);
-static void parse_tree_data(line_ctx *ctx, const char *data, size_t len);
-static void parse_sheet(line_ctx *ctx, const char *data, size_t len);
-static void parse_media_list(const char **data, size_t *len, uint64_t *media);
-static void parse_pseudo_list(const char **data, size_t *len,
+static void css__parse_tree(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_tree_data(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_sheet(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_media_list(const char **data, size_t *len, uint64_t *media);
+static void css__parse_pseudo_list(const char **data, size_t *len,
uint32_t *element);
-static void parse_expected(line_ctx *ctx, const char *data, size_t len);
+static void css__parse_expected(line_ctx *ctx, const char *data, size_t len);
static void run_test(line_ctx *ctx, const char *exp, size_t explen);
static void destroy_tree(node *root);
@@ -207,7 +207,7 @@ int main(int argc, char **argv)
lwc_intern_string("class", SLEN("class"), &ctx.attr_class);
lwc_intern_string("id", SLEN("id"), &ctx.attr_id);
- assert(parse_testfile(argv[1], handle_line, &ctx) == true);
+ assert(css__parse_testfile(argv[1], handle_line, &ctx) == true);
/* and run final test */
if (ctx.tree != NULL)
@@ -240,7 +240,7 @@ bool handle_line(const char *data, size_t datalen, void *pw)
ctx->inexp = false;
} else {
/* Assume start of stylesheet */
- parse_sheet(ctx, data + 1, datalen - 1);
+ css__parse_sheet(ctx, data + 1, datalen - 1);
ctx->intree = false;
ctx->insheet = true;
@@ -264,7 +264,7 @@ bool handle_line(const char *data, size_t datalen, void *pw)
ctx->sheets[ctx->n_sheets - 1].sheet)
== CSS_OK);
- parse_sheet(ctx, data + 1, datalen - 1);
+ css__parse_sheet(ctx, data + 1, datalen - 1);
} else {
error = css_stylesheet_append_data(
ctx->sheets[ctx->n_sheets - 1].sheet,
@@ -291,7 +291,7 @@ bool handle_line(const char *data, size_t datalen, void *pw)
} else {
/* Start state */
if (strncasecmp(data+1, "tree", 4) == 0) {
- parse_tree(ctx, data + 5, datalen - 5);
+ css__parse_tree(ctx, data + 5, datalen - 5);
ctx->intree = true;
ctx->insheet = false;
@@ -302,21 +302,21 @@ bool handle_line(const char *data, size_t datalen, void *pw)
} else {
if (ctx->intree) {
/* Not interested in the '|' */
- parse_tree_data(ctx, data + 1, datalen - 1);
+ css__parse_tree_data(ctx, data + 1, datalen - 1);
} else if (ctx->insheet) {
error = css_stylesheet_append_data(
ctx->sheets[ctx->n_sheets - 1].sheet,
(const uint8_t *) data, datalen);
assert(error == CSS_OK || error == CSS_NEEDDATA);
} else if (ctx->inexp) {
- parse_expected(ctx, data, datalen);
+ css__parse_expected(ctx, data, datalen);
}
}
return true;
}
-void parse_tree(line_ctx *ctx, const char *data, size_t len)
+void css__parse_tree(line_ctx *ctx, const char *data, size_t len)
{
const char *p = data;
const char *end = data + len;
@@ -334,7 +334,7 @@ void parse_tree(line_ctx *ctx, const char *data, size_t len)
if (p < end) {
left = end - p;
- parse_media_list(&p, &left, &ctx->media);
+ css__parse_media_list(&p, &left, &ctx->media);
end = p + left;
}
@@ -342,11 +342,11 @@ void parse_tree(line_ctx *ctx, const char *data, size_t len)
if (p < end) {
left = end - p;
- parse_pseudo_list(&p, &left, &ctx->pseudo_element);
+ css__parse_pseudo_list(&p, &left, &ctx->pseudo_element);
}
}
-void parse_tree_data(line_ctx *ctx, const char *data, size_t len)
+void css__parse_tree_data(line_ctx *ctx, const char *data, size_t len)
{
const char *p = data;
const char *end = data + len;
@@ -455,7 +455,7 @@ void parse_tree_data(line_ctx *ctx, const char *data, size_t len)
}
}
-void parse_sheet(line_ctx *ctx, const char *data, size_t len)
+void css__parse_sheet(line_ctx *ctx, const char *data, size_t len)
{
const char *p;
const char *end = data + len;
@@ -488,7 +488,7 @@ void parse_sheet(line_ctx *ctx, const char *data, size_t len)
if (p < end) {
size_t ignored = end - p;
- parse_media_list(&p, &ignored, &media);
+ css__parse_media_list(&p, &ignored, &media);
}
/** \todo How are we going to handle @import? */
@@ -510,7 +510,7 @@ void parse_sheet(line_ctx *ctx, const char *data, size_t len)
ctx->n_sheets++;
}
-void parse_media_list(const char **data, size_t *len, uint64_t *media)
+void css__parse_media_list(const char **data, size_t *len, uint64_t *media)
{
const char *p = *data;
const char *end = p + *len;
@@ -583,7 +583,7 @@ void parse_media_list(const char **data, size_t *len, uint64_t *media)
*len = end - p;
}
-void parse_pseudo_list(const char **data, size_t *len, uint32_t *element)
+void css__parse_pseudo_list(const char **data, size_t *len, uint32_t *element)
{
const char *p = *data;
const char *end = p + *len;
@@ -635,7 +635,7 @@ void parse_pseudo_list(const char **data, size_t *len, uint32_t *element)
*len = end - p;
}
-void parse_expected(line_ctx *ctx, const char *data, size_t len)
+void css__parse_expected(line_ctx *ctx, const char *data, size_t len)
{
while (ctx->expused + len >= ctx->explen) {
size_t required = ctx->explen == 0 ? 64 : ctx->explen * 2;
diff --git a/test/testutils.h b/test/testutils.h
index 5471fed..1a13e5b 100644
--- a/test/testutils.h
+++ b/test/testutils.h
@@ -34,10 +34,10 @@ void __assert2(const char *expr, const char *function,
typedef bool (*line_func)(const char *data, size_t datalen, void *pw);
-static size_t parse_strlen(const char *str, size_t limit);
-char *parse_strnchr(const char *str, size_t len, int chr);
-bool parse_testfile(const char *filename, line_func callback, void *pw);
-size_t parse_filesize(const char *filename);
+static size_t css__parse_strlen(const char *str, size_t limit);
+char *css__parse_strnchr(const char *str, size_t len, int chr);
+bool css__parse_testfile(const char *filename, line_func callback, void *pw);
+size_t css__parse_filesize(const char *filename);
/**
* Testcase datafile parser driver
@@ -47,7 +47,7 @@ size_t parse_filesize(const char *filename);
* \param pw Pointer to client-specific private data
* \return true on success, false otherwise.
*/
-bool parse_testfile(const char *filename, line_func callback, void *pw)
+bool css__parse_testfile(const char *filename, line_func callback, void *pw)
{
FILE *fp;
char buf[300];
@@ -62,7 +62,7 @@ bool parse_testfile(const char *filename, line_func callback, void *pw)
if (buf[0] == '\n')
continue;
- if (!callback(buf, parse_strlen(buf, sizeof buf - 1), pw)) {
+ if (!callback(buf, css__parse_strlen(buf, sizeof buf - 1), pw)) {
fclose(fp);
return false;
}
@@ -80,7 +80,7 @@ bool parse_testfile(const char *filename, line_func callback, void *pw)
* \param limit Upper bound on string length
* \return String length
*/
-size_t parse_strlen(const char *str, size_t limit)
+size_t css__parse_strlen(const char *str, size_t limit)
{
size_t len = 0;
@@ -105,7 +105,7 @@ size_t parse_strlen(const char *str, size_t limit)
* \param chr Character to search for
* \return Pointer to character in string, or NULL if not found
*/
-char *parse_strnchr(const char *str, size_t len, int chr)
+char *css__parse_strnchr(const char *str, size_t len, int chr)
{
size_t i;
@@ -129,7 +129,7 @@ char *parse_strnchr(const char *str, size_t len, int chr)
* \param filename Name of file to read size of
* \return File size (in bytes), or 0 on error
*/
-size_t parse_filesize(const char *filename)
+size_t css__parse_filesize(const char *filename)
{
FILE *fp;
size_t len = 0;