diff --git a/include/mycss/declaration/default_entries.h b/include/mycss/declaration/default_entries.h index 9690932..f1d0df5 100644 --- a/include/mycss/declaration/default_entries.h +++ b/include/mycss/declaration/default_entries.h @@ -50,7 +50,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_min_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MIN_WIDTH, MyCSS_PROPERTY_MIN_WIDTH__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -59,7 +59,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_min_width = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_min_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MIN_HEIGHT, MyCSS_PROPERTY_MIN_HEIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -68,7 +68,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_min_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_max_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MAX_WIDTH, MyCSS_PROPERTY_MAX_WIDTH_NONE, NULL, false, @@ -77,7 +77,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_max_width = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_max_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MAX_HEIGHT, MyCSS_PROPERTY_MAX_HEIGHT_NONE, NULL, false, @@ -86,7 +86,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_max_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_direction = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_DIRECTION, MyCSS_PROPERTY_DIRECTION_LTR, NULL, false, @@ -104,7 +104,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_ = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_unicode_bidi = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_UNICODE_BIDI, MyCSS_PROPERTY_UNICODE_BIDI_NORMAL, NULL, false, @@ -113,7 +113,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_unicode_bidi = }; static mycss_declaration_entry_t mycss_declaration_default_entry_writing_mode = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WRITING_MODE, MyCSS_PROPERTY_WRITING_MODE_HORIZONTAL_TB, NULL, false, @@ -122,7 +122,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_writing_mode = }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_orientation = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ORIENTATION, MyCSS_PROPERTY_TEXT_ORIENTATION_MIXED, NULL, false, @@ -131,7 +131,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_orientatio }; static mycss_declaration_entry_t mycss_declaration_default_entry_glyph_orientation_vertical = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_GLYPH_ORIENTATION_VERTICAL, MyCSS_PROPERTY_TYPE_UNDEF, NULL, false, @@ -140,7 +140,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_glyph_orientati }; static mycss_declaration_entry_t mycss_declaration_default_entry_box_sizing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BOX_SIZING, MyCSS_PROPERTY_BOX_SIZING_CONTENT_BOX, NULL, false, @@ -149,7 +149,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_box_sizing = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_cursor = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CURSOR, MyCSS_PROPERTY_CURSOR_AUTO, NULL, false, @@ -158,7 +158,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_cursor = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_line = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_LINE, MyCSS_PROPERTY_TEXT_DECORATION_LINE_NONE, NULL, false, @@ -167,7 +167,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_COLOR, MyCSS_PROPERTY_TEXT_DECORATION_COLOR_CURRENTCOLOR, NULL, false, @@ -176,7 +176,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_STYLE, MyCSS_PROPERTY_TEXT_DECORATION_STYLE_SOLID, NULL, false, @@ -185,7 +185,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_skip = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_SKIP, MyCSS_PROPERTY_VALUE_UNDEF, &(unsigned int){MyCSS_PROPERTY_TEXT_DECORATION_SKIP_OBJECTS}, false, @@ -194,7 +194,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_transform = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_TRANSFORM, MyCSS_PROPERTY_TEXT_TRANSFORM_NONE, NULL, false, @@ -203,7 +203,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_transform }; static mycss_declaration_entry_t mycss_declaration_default_entry_white_space = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WHITE_SPACE, MyCSS_PROPERTY_WHITE_SPACE_NORMAL, NULL, false, @@ -212,7 +212,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_white_space = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_tab_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TAB_SIZE, MyCSS_PROPERTY_VALUE__NUMBER, &(mycss_values_number_t){{8}, false}, false, @@ -221,7 +221,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_tab_size = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_break = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_BREAK, MyCSS_PROPERTY_WORD_BREAK_NORMAL, NULL, false, @@ -230,7 +230,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_break = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_line_break = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LINE_BREAK, MyCSS_PROPERTY_LINE_BREAK_AUTO, NULL, false, @@ -239,7 +239,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_line_break = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_hyphens = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_HYPHENS, MyCSS_PROPERTY_HYPHENS_MANUAL, NULL, false, @@ -248,7 +248,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_hyphens = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_wrap = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_WRAP, MyCSS_PROPERTY_OVERFLOW_WRAP_NORMAL, NULL, false, @@ -257,7 +257,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_wrap = }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_wrap = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_WRAP, MyCSS_PROPERTY_WORD_WRAP_NORMAL, NULL, false, @@ -266,7 +266,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_wrap = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN, MyCSS_PROPERTY_TEXT_ALIGN_START, NULL, false, @@ -275,7 +275,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_all = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN_ALL, MyCSS_PROPERTY_TEXT_ALIGN_ALL_START, NULL, false, @@ -284,7 +284,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_all }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_last = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN_LAST, MyCSS_PROPERTY_TEXT_ALIGN_LAST_AUTO, NULL, false, @@ -293,7 +293,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_last }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_justify = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_JUSTIFY, MyCSS_PROPERTY_TEXT_JUSTIFY_AUTO, NULL, false, @@ -302,7 +302,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_justify = }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_spacing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_SPACING, MyCSS_PROPERTY_WORD_SPACING_NORMAL, NULL, false, @@ -311,7 +311,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_spacing = }; static mycss_declaration_entry_t mycss_declaration_default_entry_letter_spacing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LETTER_SPACING, MyCSS_PROPERTY_LETTER_SPACING_NORMAL, NULL, false, @@ -320,7 +320,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_letter_spacing }; static mycss_declaration_entry_t mycss_declaration_default_entry_position = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_POSITION, MyCSS_PROPERTY_POSITION_STATIC, NULL, false, @@ -329,7 +329,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_position = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TOP, MyCSS_PROPERTY_TOP_AUTO, NULL, false, @@ -338,7 +338,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_RIGHT, MyCSS_PROPERTY_RIGHT_AUTO, NULL, false, @@ -347,7 +347,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_right = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BOTTOM, MyCSS_PROPERTY_BOTTOM_AUTO, NULL, false, @@ -356,7 +356,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_bottom = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LEFT, MyCSS_PROPERTY_LEFT_AUTO, NULL, false, @@ -365,7 +365,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_left = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_z_index = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_Z_INDEX, MyCSS_PROPERTY_Z_INDEX_AUTO, NULL, false, @@ -374,7 +374,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_z_index = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_COLOR, MyCSS_PROPERTY_VALUE_UNDEF, NULL, false, @@ -383,7 +383,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_color = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_SIZE, MyCSS_PROPERTY_BACKGROUND_SIZE_AUTO, NULL, false, @@ -392,7 +392,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_size }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_origin = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_ORIGIN, MyCSS_PROPERTY_BACKGROUND_ORIGIN_PADDING_BOX, NULL, false, @@ -401,7 +401,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_orig }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_clip = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_CLIP, MyCSS_PROPERTY_BACKGROUND_CLIP_BORDER_BOX, NULL, false, @@ -410,7 +410,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_clip }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_position = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_POSITION, MyCSS_PROPERTY_VALUE_UNDEF, &(mycss_values_background_position_t){ {{(&(mycss_values_percentage_t){{0}, false})}, MyCSS_PROPERTY_VALUE__PERCENTAGE}, @@ -424,7 +424,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_posi }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_attachment = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_ATTACHMENT, MyCSS_PROPERTY_BACKGROUND_ATTACHMENT_SCROLL, NULL, false, @@ -433,7 +433,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_atta }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_repeat = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_REPEAT, MyCSS_PROPERTY_BACKGROUND_REPEAT_REPEAT, NULL, false, @@ -442,7 +442,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_repe }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_image = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_IMAGE, MyCSS_PROPERTY_BACKGROUND_IMAGE_NONE, NULL, false, @@ -451,7 +451,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_imag }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_COLOR, MyCSS_PROPERTY_BACKGROUND_COLOR_TRANSPARENT, NULL, false, @@ -460,7 +460,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_colo }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_WIDTH, MyCSS_PROPERTY_BORDER_TOP_MEDIUM, NULL, false, @@ -469,7 +469,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_widt }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_WIDTH, MyCSS_PROPERTY_BORDER_RIGHT_MEDIUM, NULL, false, @@ -478,7 +478,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_wi }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_WIDTH, MyCSS_PROPERTY_BORDER_BOTTOM_MEDIUM, NULL, false, @@ -487,7 +487,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_w }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_WIDTH, MyCSS_PROPERTY_BORDER_LEFT_MEDIUM, NULL, false, @@ -496,7 +496,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_wid }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_STYLE, MyCSS_PROPERTY_BORDER_TOP_NONE, NULL, false, @@ -505,7 +505,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_styl }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_STYLE, MyCSS_PROPERTY_BORDER_RIGHT_NONE, NULL, false, @@ -514,7 +514,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_st }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_STYLE, MyCSS_PROPERTY_BORDER_BOTTOM_NONE, NULL, false, @@ -523,7 +523,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_s }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_STYLE, MyCSS_PROPERTY_BORDER_LEFT_NONE, NULL, false, @@ -532,7 +532,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_sty }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_COLOR, MyCSS_PROPERTY_BORDER_TOP_COLOR_CURRENTCOLOR, NULL, false, @@ -541,7 +541,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_colo }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_COLOR, MyCSS_PROPERTY_BORDER_RIGHT_COLOR_CURRENTCOLOR, NULL, false, @@ -550,7 +550,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_co }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_COLOR, MyCSS_PROPERTY_BORDER_BOTTOM_COLOR_CURRENTCOLOR, NULL, false, @@ -559,7 +559,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_c }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_COLOR, MyCSS_PROPERTY_BORDER_LEFT_COLOR_CURRENTCOLOR, NULL, false, @@ -568,7 +568,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_col }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_left_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_LEFT_RADIUS, MyCSS_PROPERTY_BORDER_TOP_LEFT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -577,7 +577,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_left }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_right_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_RIGHT_RADIUS, MyCSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -586,7 +586,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_righ }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_right_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_RIGHT_RADIUS, MyCSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -595,7 +595,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_r }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_left_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_LEFT_RADIUS, MyCSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -604,7 +604,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_l }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_TOP, MyCSS_PROPERTY_PADDING_TOP__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -613,7 +613,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_RIGHT, MyCSS_PROPERTY_PADDING_RIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -622,7 +622,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_right = }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_BOTTOM, MyCSS_PROPERTY_PADDING_BOTTOM__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -631,7 +631,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_bottom }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_LEFT, MyCSS_PROPERTY_PADDING_LEFT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -640,7 +640,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_left = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_TOP, MyCSS_PROPERTY_MARGIN_TOP__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -649,7 +649,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_RIGHT, MyCSS_PROPERTY_MARGIN_RIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -658,7 +658,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_right = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_BOTTOM, MyCSS_PROPERTY_MARGIN_BOTTOM__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -667,7 +667,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_bottom = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_LEFT, MyCSS_PROPERTY_MARGIN_LEFT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -676,7 +676,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_left = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_float = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FLOAT, MyCSS_PROPERTY_FLOAT_NONE, NULL, false, @@ -685,7 +685,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_float = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_clear = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CLEAR, MyCSS_PROPERTY_CLEAR_NONE, NULL, false, @@ -694,7 +694,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_clear = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_clear_after = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CLEAR_AFTER, MyCSS_PROPERTY_CLEAR_AFTER_NONE, NULL, false, @@ -703,7 +703,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_clear_after = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_x = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_X, MyCSS_PROPERTY_OVERFLOW_X_VISIBLE, NULL, false, @@ -712,7 +712,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_x = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_y = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_Y, MyCSS_PROPERTY_OVERFLOW_Y_VISIBLE, NULL, false, @@ -721,7 +721,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_y = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_visibility = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_VISIBILITY, MyCSS_PROPERTY_VISIBILITY_VISIBLE, NULL, false, @@ -730,7 +730,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_visibility = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_float_displace = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FLOAT_DISPLACE, MyCSS_PROPERTY_FLOAT_DISPLACE_LINE, NULL, false, @@ -739,7 +739,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_float_displace }; static mycss_declaration_entry_t mycss_declaration_default_entry_display = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_DISPLAY, MyCSS_PROPERTY_DISPLAY_INLINE, NULL, false, @@ -748,7 +748,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_display = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_weight = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_WEIGHT, MyCSS_PROPERTY_FONT_WEIGHT_NORMAL, NULL, false, @@ -757,7 +757,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_weight = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_STYLE, MyCSS_PROPERTY_FONT_STYLE_NORMAL, NULL, false, @@ -766,7 +766,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_style = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_SIZE, MyCSS_PROPERTY_FONT_SIZE_MEDIUM, NULL, false, @@ -775,7 +775,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_size = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_size_adjust = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_SIZE_ADJUST, MyCSS_PROPERTY_FONT_SIZE_ADJUST_NONE, NULL, false, @@ -784,7 +784,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_size_adjus }; static mycss_declaration_entry_t mycss_declaration_default_entry_line_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LINE_HEIGHT, MyCSS_PROPERTY_LINE_HEIGHT_NORMAL, NULL, false, @@ -793,7 +793,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_line_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_vertical_align = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_VERTICAL_ALIGN, MyCSS_PROPERTY_VERTICAL_ALIGN_BASELINE, NULL, false, diff --git a/source/mycss/declaration/default_entries.h b/source/mycss/declaration/default_entries.h index 9690932..f1d0df5 100644 --- a/source/mycss/declaration/default_entries.h +++ b/source/mycss/declaration/default_entries.h @@ -50,7 +50,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_min_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MIN_WIDTH, MyCSS_PROPERTY_MIN_WIDTH__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -59,7 +59,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_min_width = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_min_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MIN_HEIGHT, MyCSS_PROPERTY_MIN_HEIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -68,7 +68,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_min_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_max_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MAX_WIDTH, MyCSS_PROPERTY_MAX_WIDTH_NONE, NULL, false, @@ -77,7 +77,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_max_width = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_max_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MAX_HEIGHT, MyCSS_PROPERTY_MAX_HEIGHT_NONE, NULL, false, @@ -86,7 +86,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_max_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_direction = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_DIRECTION, MyCSS_PROPERTY_DIRECTION_LTR, NULL, false, @@ -104,7 +104,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_ = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_unicode_bidi = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_UNICODE_BIDI, MyCSS_PROPERTY_UNICODE_BIDI_NORMAL, NULL, false, @@ -113,7 +113,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_unicode_bidi = }; static mycss_declaration_entry_t mycss_declaration_default_entry_writing_mode = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WRITING_MODE, MyCSS_PROPERTY_WRITING_MODE_HORIZONTAL_TB, NULL, false, @@ -122,7 +122,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_writing_mode = }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_orientation = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ORIENTATION, MyCSS_PROPERTY_TEXT_ORIENTATION_MIXED, NULL, false, @@ -131,7 +131,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_orientatio }; static mycss_declaration_entry_t mycss_declaration_default_entry_glyph_orientation_vertical = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_GLYPH_ORIENTATION_VERTICAL, MyCSS_PROPERTY_TYPE_UNDEF, NULL, false, @@ -140,7 +140,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_glyph_orientati }; static mycss_declaration_entry_t mycss_declaration_default_entry_box_sizing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BOX_SIZING, MyCSS_PROPERTY_BOX_SIZING_CONTENT_BOX, NULL, false, @@ -149,7 +149,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_box_sizing = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_cursor = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CURSOR, MyCSS_PROPERTY_CURSOR_AUTO, NULL, false, @@ -158,7 +158,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_cursor = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_line = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_LINE, MyCSS_PROPERTY_TEXT_DECORATION_LINE_NONE, NULL, false, @@ -167,7 +167,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_COLOR, MyCSS_PROPERTY_TEXT_DECORATION_COLOR_CURRENTCOLOR, NULL, false, @@ -176,7 +176,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_STYLE, MyCSS_PROPERTY_TEXT_DECORATION_STYLE_SOLID, NULL, false, @@ -185,7 +185,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration_skip = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_DECORATION_SKIP, MyCSS_PROPERTY_VALUE_UNDEF, &(unsigned int){MyCSS_PROPERTY_TEXT_DECORATION_SKIP_OBJECTS}, false, @@ -194,7 +194,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_decoration }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_transform = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_TRANSFORM, MyCSS_PROPERTY_TEXT_TRANSFORM_NONE, NULL, false, @@ -203,7 +203,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_transform }; static mycss_declaration_entry_t mycss_declaration_default_entry_white_space = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WHITE_SPACE, MyCSS_PROPERTY_WHITE_SPACE_NORMAL, NULL, false, @@ -212,7 +212,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_white_space = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_tab_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TAB_SIZE, MyCSS_PROPERTY_VALUE__NUMBER, &(mycss_values_number_t){{8}, false}, false, @@ -221,7 +221,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_tab_size = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_break = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_BREAK, MyCSS_PROPERTY_WORD_BREAK_NORMAL, NULL, false, @@ -230,7 +230,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_break = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_line_break = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LINE_BREAK, MyCSS_PROPERTY_LINE_BREAK_AUTO, NULL, false, @@ -239,7 +239,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_line_break = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_hyphens = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_HYPHENS, MyCSS_PROPERTY_HYPHENS_MANUAL, NULL, false, @@ -248,7 +248,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_hyphens = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_wrap = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_WRAP, MyCSS_PROPERTY_OVERFLOW_WRAP_NORMAL, NULL, false, @@ -257,7 +257,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_wrap = }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_wrap = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_WRAP, MyCSS_PROPERTY_WORD_WRAP_NORMAL, NULL, false, @@ -266,7 +266,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_wrap = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN, MyCSS_PROPERTY_TEXT_ALIGN_START, NULL, false, @@ -275,7 +275,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_all = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN_ALL, MyCSS_PROPERTY_TEXT_ALIGN_ALL_START, NULL, false, @@ -284,7 +284,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_all }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_last = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_ALIGN_LAST, MyCSS_PROPERTY_TEXT_ALIGN_LAST_AUTO, NULL, false, @@ -293,7 +293,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_align_last }; static mycss_declaration_entry_t mycss_declaration_default_entry_text_justify = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TEXT_JUSTIFY, MyCSS_PROPERTY_TEXT_JUSTIFY_AUTO, NULL, false, @@ -302,7 +302,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_text_justify = }; static mycss_declaration_entry_t mycss_declaration_default_entry_word_spacing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_WORD_SPACING, MyCSS_PROPERTY_WORD_SPACING_NORMAL, NULL, false, @@ -311,7 +311,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_word_spacing = }; static mycss_declaration_entry_t mycss_declaration_default_entry_letter_spacing = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LETTER_SPACING, MyCSS_PROPERTY_LETTER_SPACING_NORMAL, NULL, false, @@ -320,7 +320,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_letter_spacing }; static mycss_declaration_entry_t mycss_declaration_default_entry_position = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_POSITION, MyCSS_PROPERTY_POSITION_STATIC, NULL, false, @@ -329,7 +329,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_position = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_TOP, MyCSS_PROPERTY_TOP_AUTO, NULL, false, @@ -338,7 +338,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_RIGHT, MyCSS_PROPERTY_RIGHT_AUTO, NULL, false, @@ -347,7 +347,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_right = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BOTTOM, MyCSS_PROPERTY_BOTTOM_AUTO, NULL, false, @@ -356,7 +356,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_bottom = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LEFT, MyCSS_PROPERTY_LEFT_AUTO, NULL, false, @@ -365,7 +365,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_left = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_z_index = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_Z_INDEX, MyCSS_PROPERTY_Z_INDEX_AUTO, NULL, false, @@ -374,7 +374,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_z_index = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_COLOR, MyCSS_PROPERTY_VALUE_UNDEF, NULL, false, @@ -383,7 +383,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_color = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_SIZE, MyCSS_PROPERTY_BACKGROUND_SIZE_AUTO, NULL, false, @@ -392,7 +392,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_size }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_origin = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_ORIGIN, MyCSS_PROPERTY_BACKGROUND_ORIGIN_PADDING_BOX, NULL, false, @@ -401,7 +401,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_orig }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_clip = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_CLIP, MyCSS_PROPERTY_BACKGROUND_CLIP_BORDER_BOX, NULL, false, @@ -410,7 +410,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_clip }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_position = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_POSITION, MyCSS_PROPERTY_VALUE_UNDEF, &(mycss_values_background_position_t){ {{(&(mycss_values_percentage_t){{0}, false})}, MyCSS_PROPERTY_VALUE__PERCENTAGE}, @@ -424,7 +424,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_posi }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_attachment = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_ATTACHMENT, MyCSS_PROPERTY_BACKGROUND_ATTACHMENT_SCROLL, NULL, false, @@ -433,7 +433,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_atta }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_repeat = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_REPEAT, MyCSS_PROPERTY_BACKGROUND_REPEAT_REPEAT, NULL, false, @@ -442,7 +442,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_repe }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_image = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_IMAGE, MyCSS_PROPERTY_BACKGROUND_IMAGE_NONE, NULL, false, @@ -451,7 +451,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_imag }; static mycss_declaration_entry_t mycss_declaration_default_entry_background_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BACKGROUND_COLOR, MyCSS_PROPERTY_BACKGROUND_COLOR_TRANSPARENT, NULL, false, @@ -460,7 +460,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_background_colo }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_WIDTH, MyCSS_PROPERTY_BORDER_TOP_MEDIUM, NULL, false, @@ -469,7 +469,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_widt }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_WIDTH, MyCSS_PROPERTY_BORDER_RIGHT_MEDIUM, NULL, false, @@ -478,7 +478,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_wi }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_WIDTH, MyCSS_PROPERTY_BORDER_BOTTOM_MEDIUM, NULL, false, @@ -487,7 +487,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_w }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_width = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_WIDTH, MyCSS_PROPERTY_BORDER_LEFT_MEDIUM, NULL, false, @@ -496,7 +496,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_wid }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_STYLE, MyCSS_PROPERTY_BORDER_TOP_NONE, NULL, false, @@ -505,7 +505,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_styl }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_STYLE, MyCSS_PROPERTY_BORDER_RIGHT_NONE, NULL, false, @@ -514,7 +514,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_st }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_STYLE, MyCSS_PROPERTY_BORDER_BOTTOM_NONE, NULL, false, @@ -523,7 +523,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_s }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_STYLE, MyCSS_PROPERTY_BORDER_LEFT_NONE, NULL, false, @@ -532,7 +532,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_sty }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_COLOR, MyCSS_PROPERTY_BORDER_TOP_COLOR_CURRENTCOLOR, NULL, false, @@ -541,7 +541,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_colo }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_RIGHT_COLOR, MyCSS_PROPERTY_BORDER_RIGHT_COLOR_CURRENTCOLOR, NULL, false, @@ -550,7 +550,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_right_co }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_COLOR, MyCSS_PROPERTY_BORDER_BOTTOM_COLOR_CURRENTCOLOR, NULL, false, @@ -559,7 +559,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_c }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_color = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_LEFT_COLOR, MyCSS_PROPERTY_BORDER_LEFT_COLOR_CURRENTCOLOR, NULL, false, @@ -568,7 +568,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_left_col }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_left_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_LEFT_RADIUS, MyCSS_PROPERTY_BORDER_TOP_LEFT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -577,7 +577,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_left }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_right_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_TOP_RIGHT_RADIUS, MyCSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -586,7 +586,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_top_righ }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_right_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_RIGHT_RADIUS, MyCSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -595,7 +595,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_r }; static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_left_radius = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_BORDER_BOTTOM_LEFT_RADIUS, MyCSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -604,7 +604,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_border_bottom_l }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_TOP, MyCSS_PROPERTY_PADDING_TOP__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -613,7 +613,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_RIGHT, MyCSS_PROPERTY_PADDING_RIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -622,7 +622,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_right = }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_BOTTOM, MyCSS_PROPERTY_PADDING_BOTTOM__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -631,7 +631,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_bottom }; static mycss_declaration_entry_t mycss_declaration_default_entry_padding_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_PADDING_LEFT, MyCSS_PROPERTY_PADDING_LEFT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -640,7 +640,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_padding_left = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_top = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_TOP, MyCSS_PROPERTY_MARGIN_TOP__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -649,7 +649,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_top = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_right = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_RIGHT, MyCSS_PROPERTY_MARGIN_RIGHT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -658,7 +658,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_right = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_bottom = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_BOTTOM, MyCSS_PROPERTY_MARGIN_BOTTOM__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -667,7 +667,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_bottom = }; static mycss_declaration_entry_t mycss_declaration_default_entry_margin_left = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_MARGIN_LEFT, MyCSS_PROPERTY_MARGIN_LEFT__LENGTH, &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF}, false, @@ -676,7 +676,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_margin_left = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_float = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FLOAT, MyCSS_PROPERTY_FLOAT_NONE, NULL, false, @@ -685,7 +685,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_float = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_clear = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CLEAR, MyCSS_PROPERTY_CLEAR_NONE, NULL, false, @@ -694,7 +694,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_clear = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_clear_after = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_CLEAR_AFTER, MyCSS_PROPERTY_CLEAR_AFTER_NONE, NULL, false, @@ -703,7 +703,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_clear_after = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_x = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_X, MyCSS_PROPERTY_OVERFLOW_X_VISIBLE, NULL, false, @@ -712,7 +712,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_x = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_y = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_OVERFLOW_Y, MyCSS_PROPERTY_OVERFLOW_Y_VISIBLE, NULL, false, @@ -721,7 +721,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_overflow_y = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_visibility = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_VISIBILITY, MyCSS_PROPERTY_VISIBILITY_VISIBLE, NULL, false, @@ -730,7 +730,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_visibility = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_float_displace = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FLOAT_DISPLACE, MyCSS_PROPERTY_FLOAT_DISPLACE_LINE, NULL, false, @@ -739,7 +739,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_float_displace }; static mycss_declaration_entry_t mycss_declaration_default_entry_display = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_DISPLAY, MyCSS_PROPERTY_DISPLAY_INLINE, NULL, false, @@ -748,7 +748,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_display = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_weight = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_WEIGHT, MyCSS_PROPERTY_FONT_WEIGHT_NORMAL, NULL, false, @@ -757,7 +757,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_weight = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_style = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_STYLE, MyCSS_PROPERTY_FONT_STYLE_NORMAL, NULL, false, @@ -766,7 +766,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_style = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_size = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_SIZE, MyCSS_PROPERTY_FONT_SIZE_MEDIUM, NULL, false, @@ -775,7 +775,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_size = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_font_size_adjust = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_FONT_SIZE_ADJUST, MyCSS_PROPERTY_FONT_SIZE_ADJUST_NONE, NULL, false, @@ -784,7 +784,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_font_size_adjus }; static mycss_declaration_entry_t mycss_declaration_default_entry_line_height = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_LINE_HEIGHT, MyCSS_PROPERTY_LINE_HEIGHT_NORMAL, NULL, false, @@ -793,7 +793,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_line_height = { }; static mycss_declaration_entry_t mycss_declaration_default_entry_vertical_align = { - MyCSS_PROPERTY_TYPE_HEIGHT, + MyCSS_PROPERTY_TYPE_VERTICAL_ALIGN, MyCSS_PROPERTY_VERTICAL_ALIGN_BASELINE, NULL, false, diff --git a/source/mycss/property/parser_background.c b/source/mycss/property/parser_background.c index b470629..c86612e 100644 --- a/source/mycss/property/parser_background.c +++ b/source/mycss/property/parser_background.c @@ -512,7 +512,7 @@ bool mycss_property_parser_background(mycss_entry_t* entry, mycss_token_t* token if(background->image->value == NULL) background->image->value = mycss_values_create(entry, sizeof(mycss_values_image_list_t)); - background->repeat->type = MyCSS_PROPERTY_TYPE_BACKGROUND_IMAGE; + background->image->type = MyCSS_PROPERTY_TYPE_BACKGROUND_IMAGE; mycss_values_image_t *image = mycss_values_image_list_add_entry(entry, background->image->value); image->type = MyCSS_PROPERTY_VALUE_NONE; @@ -603,7 +603,6 @@ bool mycss_property_parser_background(mycss_entry_t* entry, mycss_token_t* token mycss_stack_push(entry->declaration->stack, dec_entry->value, mycss_property_parser_background_step_end); dec_entry->value = value; - mycss_stack_push(entry->declaration->stack, NULL, mycss_property_parser_color_after); return mycss_property_parser_destroy_string(&str, true); } diff --git a/source/mycss/values/destroy.c b/source/mycss/values/destroy.c index 09057cb..7a8fde2 100644 --- a/source/mycss/values/destroy.c +++ b/source/mycss/values/destroy.c @@ -357,7 +357,7 @@ mycss_values_url_t * mycss_values_destroy_url(mycss_entry_t* entry, mycss_values return NULL; if(value->str.data) - mycss_values_destroy_string(entry, &value->str, true); + mycss_values_destroy_string(entry, &value->str, false); if(self_destroy) { mycss_values_destroy(entry, (void*)value); @@ -603,15 +603,27 @@ mycss_values_background_list_t * mycss_values_destroy_background(mycss_entry_t* if(value == NULL) return NULL; + mycss_values_background_t* bg_entry; + for(size_t i = 0; i < value->entries_length; i++) { - mycss_values_destroy_color(entry, value->entries[i].color->value, true); - mycss_values_destroy_image(entry, value->entries[i].image->value, true); - mycss_values_destroy_background_position(entry, value->entries[i].position->value, true); - mycss_values_destroy_background_size(entry, value->entries[i].size->value, true); - mycss_values_destroy_background_repeat(entry, value->entries[i].repeat->value, true); - mycss_values_destroy_type_list(entry, value->entries[i].attachment->value, true); - mycss_values_destroy_type_list(entry, value->entries[i].clip->value, true); - mycss_values_destroy_type_list(entry, value->entries[i].origin->value, true); + bg_entry = &value->entries[i]; + + if(bg_entry->color) + mycss_values_destroy_color(entry, bg_entry->color->value, true); + if(bg_entry->image) + mycss_values_destroy_image(entry, bg_entry->image->value, true); + if(bg_entry->position) + mycss_values_destroy_background_position(entry, bg_entry->position->value, true); + if(bg_entry->size) + mycss_values_destroy_background_size(entry, bg_entry->size->value, true); + if(bg_entry->repeat) + mycss_values_destroy_background_repeat(entry, bg_entry->repeat->value, true); + if(bg_entry->attachment) + mycss_values_destroy_type_list(entry, bg_entry->attachment->value, true); + if(bg_entry->clip) + mycss_values_destroy_type_list(entry, bg_entry->clip->value, true); + if(bg_entry->origin) + mycss_values_destroy_type_list(entry, bg_entry->origin->value, true); } mycss_values_destroy(entry, (void*)value->entries);