Fixed background-position: center center being invalid CSS

include/modest/style/map.h

@@ -41,6 +41,12 @@ void modest_style_map_collate_declaration_padding(modest_t* modest, myhtml_tree_
 void modest_style_map_collate_declaration_margin(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
 void modest_style_map_collate_declaration_border_width(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
 void modest_style_map_collate_declaration_border_style(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_background(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_border(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_border_top(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_border_bottom(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_border_left(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
+void modest_style_map_collate_declaration_border_right(modest_t* modest, myhtml_tree_node_t* node, mycss_declaration_entry_t* decl, mycss_property_type_t type, modest_style_raw_specificity_t* spec);
 
 #ifdef __cplusplus
 } /* extern "C" */

include/modest/style/map_resource.h

@@ -39,6 +39,7 @@ static const modest_style_map_collate_f modest_style_map_static_collate_declarat
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_background,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
@@ -50,6 +51,7 @@ static const modest_style_map_collate_f modest_style_map_static_collate_declarat
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_border,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
@@ -58,6 +60,7 @@ static const modest_style_map_collate_f modest_style_map_static_collate_declarat
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_border_bottom,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
@@ -78,21 +81,18 @@ static const modest_style_map_collate_f modest_style_map_static_collate_declarat
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_border_left,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
-    modest_style_map_collate_declaration_for_all,
-    modest_style_map_collate_declaration_for_all,
-    modest_style_map_collate_declaration_for_all,
-    modest_style_map_collate_declaration_for_all,
-    modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_border_right,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_border_style,
-    modest_style_map_collate_declaration_for_all,
+    modest_style_map_collate_declaration_border_top,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,
     modest_style_map_collate_declaration_for_all,

include/mycss/declaration/default_entries.h

@@ -801,4 +801,16 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_vertical_align
     NULL, NULL
 };
 
+static mycss_declaration_entry_t mycss_declaration_default_entry_border_spacing = {
+    MyCSS_PROPERTY_TYPE_BORDER_SPACING,
+    MyCSS_PROPERTY_VALUE_UNDEF,
+    &(mycss_values_shorthand_two_type_t){
+        &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF},
+        &(mycss_values_length_t){{0}, false, MyCSS_UNIT_TYPE_UNDEF},
+    },
+    false,
+    MyCSS_DECLARATION_FLAGS_READ_ONLY,
+    NULL, NULL
+};
+
 #endif /* MyCSS_DECLARATION_DEFAULT_ENTRIES_H */

include/mycss/declaration/default_resources.h

@@ -92,7 +92,7 @@ static mycss_declaration_entry_t * mycss_declaration_default_entry_index_type[My
 	&mycss_declaration_default_entry_border_right_color,
 	&mycss_declaration_default_entry_border_right_style,
 	&mycss_declaration_default_entry_border_right_width,
-	&mycss_declaration_default_entry_undef,
+	&mycss_declaration_default_entry_border_spacing,
 	&mycss_declaration_default_entry_undef,
 	&mycss_declaration_default_entry_undef,
 	&mycss_declaration_default_entry_border_top_color,

include/mycss/declaration/entry_destroy.h

@@ -48,6 +48,7 @@ mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_image(myc
 mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_repeat(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
 mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_position(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
 mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_size(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
+mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_spacing(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
 
 #ifdef __cplusplus
 } /* extern "C" */

include/mycss/declaration/entry_destroy_resources.h

@@ -90,7 +90,7 @@ static mycss_callback_declaration_destroy_f mycss_declaration_entry_destroy_map_
 	mycss_declaration_entry_destroy_undef,
 	mycss_declaration_entry_destroy_undef,
 	mycss_declaration_entry_destroy_undef,
-	mycss_declaration_entry_destroy_undef,
+	mycss_declaration_entry_destroy_border_spacing,
 	mycss_declaration_entry_destroy_border_style,
 	mycss_declaration_entry_destroy_border_x,
 	mycss_declaration_entry_destroy_undef,

include/mycss/declaration/serialization_resources.h

@@ -90,7 +90,7 @@ static mycss_declaration_serialization_f mycss_declaration_serialization_map_by_
 	mycss_declaration_serialization_undef,
 	mycss_declaration_serialization_undef,
 	mycss_declaration_serialization_undef,
-	mycss_declaration_serialization_undef,
+	mycss_declaration_serialization_shorthand_two_type,
 	mycss_declaration_serialization_shorthand_four,
 	mycss_declaration_serialization_border_x,
 	mycss_declaration_serialization_undef,

include/mycss/property/const.h

@@ -1117,6 +1117,12 @@ enum mycss_property_border_top_right_radius {
 }
 typedef mycss_property_border_top_right_radius_t;
 
+enum mycss_property_border_spacing {
+    MyCSS_PROPERTY_BORDER_SPACING_INHERIT    = 0x0092,
+    MyCSS_PROPERTY_BORDER_SPACING__LENGTH    = 0x019a,
+}
+typedef mycss_property_border_spacing_t;
+
 enum mycss_property_border_top_style {
 	MyCSS_PROPERTY_BORDER_TOP_STYLE_NONE    = 0x00d3,
 	MyCSS_PROPERTY_BORDER_TOP_STYLE_SOLID   = 0x013d,

include/mycss/property/parser.h

@@ -131,6 +131,7 @@ bool mycss_property_parser_border_right(mycss_entry_t* entry, mycss_token_t* tok
 bool mycss_property_parser_border_right_color(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
 bool mycss_property_parser_border_right_style(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
 bool mycss_property_parser_border_right_width(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
+bool mycss_property_parser_short_two_type(mycss_entry_t* entry, mycss_token_t* token);
 bool mycss_property_parser_border_spacing(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
 bool mycss_property_parser_border_style(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
 bool mycss_property_parser_border_top(mycss_entry_t* entry, mycss_token_t* token, bool last_response);

include/mycss/values/destroy.h

@@ -66,7 +66,7 @@ mycss_values_cross_fade_t * mycss_values_destroy_cross_fade(mycss_entry_t* entry
 mycss_values_image_list_t * mycss_values_destroy_image_list(mycss_entry_t* entry, mycss_values_image_list_t* value, bool self_destroy);
 
 /* Background */
-mycss_values_background_list_t * mycss_values_destroy_background(mycss_entry_t* entry, mycss_values_background_list_t* value, bool self_destroy);
+mycss_values_background_t * mycss_values_destroy_background(mycss_entry_t* entry, mycss_values_background_t* value, bool self_destroy);
 mycss_values_background_repeat_list_t * mycss_values_destroy_background_repeat(mycss_entry_t* entry, mycss_values_background_repeat_list_t* value, bool self_destroy);
 mycss_values_background_position_t * mycss_values_destroy_background_position(mycss_entry_t* entry, mycss_values_background_position_t* value, bool self_destroy);
 mycss_values_background_size_list_t * mycss_values_destroy_background_size(mycss_entry_t* entry, mycss_values_background_size_list_t* value, bool self_destroy);

include/mycss/values/values.h

@@ -67,7 +67,6 @@ typedef struct mycss_values_background_position mycss_values_background_position
 typedef struct mycss_values_background_size_list mycss_values_background_size_list_t;
 typedef struct mycss_values_background_size_entry mycss_values_background_size_entry_t;
 typedef struct mycss_values_background mycss_values_background_t;
-typedef struct mycss_values_background_list mycss_values_background_list_t;
 
 typedef struct mycss_values_border mycss_values_border_t;
 
@@ -472,10 +471,6 @@ struct mycss_values_background {
     mycss_declaration_entry_t* color;
 };
 
-struct mycss_values_background_list {
-    mycss_values_background_t* entries;
-    size_t entries_length;
-};
 
 struct mycss_values_background_repeat {
     mycss_property_background_t horizontal;
@@ -518,9 +513,6 @@ mycss_values_image_t * mycss_values_image_list_add_entry(mycss_entry_t* entry, m
 mycss_values_background_repeat_t * mycss_values_background_repeat_list_add_entry(mycss_entry_t* entry, mycss_values_background_repeat_list_t *list);
 mycss_values_background_size_entry_t * mycss_values_background_size_list_add_entry(mycss_entry_t* entry, mycss_values_background_size_list_t *list);
 
-mycss_values_background_t * mycss_values_background_list_add_entry(mycss_entry_t* entry, mycss_values_background_list_t *list);
-mycss_values_background_t * mycss_values_background_list_current_entry(mycss_values_background_list_t *list);
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

source/modest/finder/pseudo_class.c

@@ -425,6 +425,8 @@ bool modest_finder_selector_sub_type_pseudo_class_undef(modest_finder_t* finder,
 
 bool modest_finder_selector_sub_type_pseudo_class_active(modest_finder_t* finder, myhtml_tree_node_t* base_node, mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec)
 {
+    if (base_node->token)
+	return modest_finder_match_attribute_only_key(base_node->token->attr_first, "active", 6);
     return false;
 }
 
@@ -506,10 +508,14 @@ bool modest_finder_selector_sub_type_pseudo_class_checked(modest_finder_t* finde
             attr = attr->next;
         }
     }
-    else if(base_node->tag_id == MyHTML_TAG_OPTION) {
+    else if(base_node->tag_id == MyHTML_TAG_OPTION)
+    {
         return modest_finder_match_attribute_only_key(base_node->token->attr_first, "selected", 8);
     }
-
+    else if(base_node->token && base_node->tag_id >= MyHTML_TAG_LAST_ENTRY)
+    {
+	return modest_finder_match_attribute_only_key(base_node->token->attr_first, "checked", 7);
+    }
     return false;
 }
 
@@ -600,6 +606,14 @@ bool modest_finder_selector_sub_type_pseudo_class_disabled(modest_finder_t* find
 
         return false;
     }
+
+    /* custom HTML tag*/
+    if(base_node->token && base_node->tag_id >= MyHTML_TAG_LAST_ENTRY)
+    {
+	if (modest_finder_match_attribute_only_key(base_node->token->attr_first, "disabled", 8))
+	    return true;
+	return false;
+    }
 
     return false;
 }
@@ -668,6 +682,8 @@ bool modest_finder_selector_sub_type_pseudo_class_first_of_type(modest_finder_t*
 
 bool modest_finder_selector_sub_type_pseudo_class_focus(modest_finder_t* finder, myhtml_tree_node_t* base_node, mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec)
 {
+    if (base_node->token)
+	return modest_finder_match_attribute_only_key(base_node->token->attr_first, "focus", 5);
     return false;
 }
 
@@ -678,6 +694,8 @@ bool modest_finder_selector_sub_type_pseudo_class_future(modest_finder_t* finder
 
 bool modest_finder_selector_sub_type_pseudo_class_hover(modest_finder_t* finder, myhtml_tree_node_t* base_node, mycss_selectors_entry_t* selector, mycss_selectors_specificity_t* spec)
 {
+    if (base_node->token)
+	return modest_finder_match_attribute_only_key(base_node->token->attr_first, "hover", 5);
     return false;
 }
 

source/modest/finder/thread.c

@@ -334,8 +334,11 @@ bool modest_finder_thread_spec_is_up(modest_style_raw_specificity_t* spec_f, mod
 
     if(spec_f->c > spec_t->c)
         return true;
+    else if(spec_f->c < spec_t->c)
+        return false;
 
-    return false;
+    /* when a property is repeated with multiple values take the last one*/
+    return true;
 }
 
 void modest_finder_thread_declaratin_append(modest_finder_thread_found_context_t* found_context, bool is_low_priority,