X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny.c;h=d16a761300ad7b0657eb7b59478a085af06b1cae;hb=b94bca14bb7cd65bda2a92454a17a2e0d0b7234c;hp=8cb1eff2f283adf74b00eb42dc6b1bed4078bcd0;hpb=35b69b465e986a90df6396c39fac35fec3298418;p=libsvgtiny.git

diff --git a/src/svgtiny.c b/src/svgtiny.c
index 8cb1eff..d16a761 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -40,6 +40,10 @@
 #define degToRad(angleInDegrees) ((angleInDegrees) * M_PI / 180.0)
 #define radToDeg(angleInRadians) ((angleInRadians) * 180.0 / M_PI)
 
+static svgtiny_code svgtiny_parse_style_element(dom_element *style,
+		struct svgtiny_parse_state state);
+static css_stylesheet *svgtiny_parse_style_inline(const uint8_t *data,
+		size_t len);
 static svgtiny_code svgtiny_preparse_styles(dom_element *svg,
 		struct svgtiny_parse_state state);
 static svgtiny_code svgtiny_parse_svg(dom_element *svg,
@@ -761,6 +765,108 @@ cleanup:
 	return code;
 }
 
+
+/**
+ * Parse a single <style> element, appending the result to the CSS
+ * select context within the given parser state.
+ */
+svgtiny_code svgtiny_parse_style_element(dom_element *style,
+		struct svgtiny_parse_state state)
+{
+	css_stylesheet *sheet;
+	css_error code;
+	dom_exception exc;
+
+	code = svgtiny_create_stylesheet(&sheet, false);
+	if (code != CSS_OK) {
+		return svgtiny_LIBCSS_ERROR;
+	}
+
+	/* Parse the style element's "media" attribute if it has
+	   one. We don't do anything with it right now. */
+	dom_string *media_attr;
+	exc = dom_element_get_attribute(style, state.interned_media,
+					&media_attr);
+	if (exc != DOM_NO_ERR) {
+		css_stylesheet_destroy(sheet);
+		return svgtiny_LIBDOM_ERROR;
+	}
+
+	if (media_attr) {
+		/* Here's where we'd actually change the media type if
+		   we were going to use it */
+		dom_string_unref(media_attr);
+	}
+
+	dom_string *data;
+	dom_node_get_text_content(style, &data);
+	if (data == NULL) {
+		/* Empty stylesheet? That's fine. */
+		css_stylesheet_destroy(sheet);
+		return svgtiny_OK;
+	}
+
+	code = css_stylesheet_append_data(sheet,
+					  (uint8_t *)dom_string_data(data),
+					  dom_string_byte_length(data));
+	if (code != CSS_OK && code != CSS_NEEDDATA) {
+		dom_string_unref(data);
+		css_stylesheet_destroy(sheet);
+		return svgtiny_LIBCSS_ERROR;
+	}
+
+	code = css_stylesheet_data_done(sheet);
+	if (code != CSS_OK) {
+		dom_string_unref(data);
+		css_stylesheet_destroy(sheet);
+		return svgtiny_LIBCSS_ERROR;
+	}
+
+	code = css_select_ctx_append_sheet(state.select_ctx,
+		sheet,
+		CSS_ORIGIN_AUTHOR,
+		NULL);
+	if (code != CSS_OK) {
+		dom_string_unref(data);
+		return svgtiny_LIBCSS_ERROR;
+	}
+
+	dom_string_unref(data);
+	return svgtiny_OK;
+}
+
+
+/**
+ * Parse the contents of an inline style and return (a pointer to) the
+ * corresponding stylesheet for use with css_select_style(). Returns
+ * NULL if anything goes wrong.
+ */
+css_stylesheet *svgtiny_parse_style_inline(const uint8_t *data,
+		size_t len)
+{
+	css_stylesheet *sheet;
+	css_error code;
+
+	code = svgtiny_create_stylesheet(&sheet, true);
+	if (code != CSS_OK) {
+		return NULL;
+	}
+
+	code = css_stylesheet_append_data(sheet, data, len);
+	if (code != CSS_OK && code != CSS_NEEDDATA) {
+		css_stylesheet_destroy(sheet);
+		return NULL;
+	}
+
+	code = css_stylesheet_data_done(sheet);
+	if (code != CSS_OK) {
+		css_stylesheet_destroy(sheet);
+		return NULL;
+	}
+
+	return sheet;
+}
+
 /**
  * Parse all <style> elements within a root <svg> element. This
  * should be called before svgtiny_parse_svg() because that function
@@ -803,6 +909,8 @@ svgtiny_code svgtiny_preparse_styles(dom_element *svg,
 			if (dom_string_caseless_isequal(state.interned_style,
 							nodename)) {
 				/* We have a <style> element, parse it */
+				code = svgtiny_parse_style_element(child,
+								state);
 			}
 
 
@@ -1947,6 +2055,13 @@ void svgtiny_parse_paint_attributes(dom_element *node,
 	dom_string *attr;
 	dom_exception exc;
 
+	/* We store the result of svgtiny_parse_style_inline() in
+	 * inline_sheet, and that function returns NULL on error; in
+	 * particular you do not need to css_stylesheet_destroy() the
+	 * result if it is NULL. We initialize inline_sheet to NULL to
+	 * retain the same semantics. */
+	css_stylesheet *inline_sheet = NULL;
+
 	exc = dom_element_get_attribute(node, state->interned_fill, &attr);
 	if (exc == DOM_NO_ERR && attr != NULL) {
 		svgtiny_parse_color(attr, &state->fill, &state->fill_grad, state);
@@ -1968,6 +2083,14 @@ void svgtiny_parse_paint_attributes(dom_element *node,
 
 	exc = dom_element_get_attribute(node, state->interned_style, &attr);
 	if (exc == DOM_NO_ERR && attr != NULL) {
+		/* First parse the style attribute into a libcss stylesheet
+		   in case any of its properties are known to libcss. */
+		inline_sheet = svgtiny_parse_style_inline(
+					(uint8_t *)dom_string_data(attr),
+					dom_string_byte_length(attr));
+
+		/* Parse any other properties "by hand" until they can
+		   be supported in libcss. */
 		char *style = strndup(dom_string_data(attr),
 				      dom_string_byte_length(attr));
 		const char *s;
@@ -2000,6 +2123,10 @@ void svgtiny_parse_paint_attributes(dom_element *node,
 		free(style);
 		dom_string_unref(attr);
 	}
+
+	if (inline_sheet != NULL) {
+		css_stylesheet_destroy(inline_sheet);
+	}
 }