src/svgtiny.c: use case-sensitive comparisons for SVG element names

[libsvgtiny.git] / src / svgtiny_css.c

diff --git a/src/svgtiny_css.c b/src/svgtiny_css.c
index a5a75214a57239d3bbfb150768dc1611531007ae..be2460279a1a18a46f3586880eb61c13016be7b0 100644 (file)
--- a/src/svgtiny_css.c
+++ b/src/svgtiny_css.c
@@ -73,6 +73,35 @@ static css_error get_libcss_node_data(void *pw, void *node,
 static struct css_select_handler svgtiny_select_handler;
 
 
+/* Every call to svgtiny_select_style() needs this, so let's only make
+ * one copy. */
+static const css_media media_all = {
+       .type = CSS_MEDIA_ALL,
+};
+
+/**
+ * Convenient wrapper around css_select_style()
+ *
+ * \param state         The current state of the libsvgtiny parser
+ * \param node          The node that we're getting styles for
+ * \param inline_sheet  The inline stylesheet for the given node
+ * \param result        Address at which to store the results array
+ */
+css_error svgtiny_select_style(struct svgtiny_parse_state *state,
+                               dom_element *node,
+                               const css_stylesheet *inline_sheet,
+                               css_select_results **result)
+{
+       return css_select_style(state->select_ctx,
+                       node,
+                       &state->unit_ctx,
+                       &media_all,
+                       inline_sheet,
+                       &svgtiny_select_handler,
+                       state,
+                       result);
+}
+
 /**
  * Resolve a relative URL to an absolute one by doing nothing. This is
  * the simplest possible implementation of a URL resolver, needed for
@@ -1841,8 +1870,10 @@ css_error node_presentational_hint(void *pw, void *node,
 /**
  * User-agent defaults for CSS properties
  *
- * For the moment, we provide no defaults, because libsvgtiny does not
- * yet support any CSS properties that might need them.
+ * Ideally we would provide _no_ defaults here, because we don't yet
+ * support any CSS properties that can use them. However, we run into
+ * libcss parent/child style composition issues unless these defaults
+ * are provided. And it's harmless to provide them, so let's do it.
  *
  * \param pw            Pointer to the current SVG parser state; unused
  * \param property      LibCSS property identifier; unused
@@ -1854,9 +1885,28 @@ css_error ua_default_for_property(void *pw, uint32_t property,
        css_hint *hint)
 {
        UNUSED(pw);
-       UNUSED(property);
-       UNUSED(hint);
-       return CSS_INVALID;
+       switch (property) {
+       case CSS_PROP_COLOR:
+               hint->data.color = 0xff000000;
+               hint->status = CSS_COLOR_COLOR;
+               break;
+       case CSS_PROP_FONT_FAMILY:
+               hint->data.strings = NULL;
+               hint->status = CSS_FONT_FAMILY_SANS_SERIF;
+               break;
+       case CSS_PROP_QUOTES:
+               hint->data.strings = NULL;
+               hint->status = CSS_QUOTES_NONE;
+               break;
+       case CSS_PROP_VOICE_FAMILY:
+               hint->data.strings = NULL;
+               hint->status = 0;
+               break;
+       default:
+               return CSS_INVALID;
+       }
+
+       return CSS_OK;
 }
 
 
@@ -1931,15 +1981,12 @@ css_error set_libcss_node_data(void *pw, void *node,
        void *old_data;
 
        /* A unique "userdata key" (a string) is used to identify this
-        * data. The fourth parameter (NULL) is a "user handler
-        * function." We will eventually have one, but for now we set
-        * it to NULL to avoid a circular reference mess that would
-        * break the build temporarily. */
+        * data. */
        state = (struct svgtiny_parse_state *)pw;
        dom_node_set_user_data((dom_node *)node,
                                state->interned_userdata_key,
                                libcss_node_data,
-                               NULL,
+                               svgtiny_dom_user_data_handler,
                                &old_data);
 
        /* dom_node_set_user_data() always returns DOM_NO_ERR */
@@ -2020,3 +2067,5 @@ static css_select_handler svgtiny_select_handler = {
        set_libcss_node_data,
        get_libcss_node_data,
 };
+
+