X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny.c;h=db0d59b02cd72209a51f409d7f62aef338bb64e3;hb=476045efcd3d938d5ac506eafef3b1551fa8edac;hp=ee0c59c1eff64a7fa434d22b25d5d1f9dcf7c11f;hpb=f66051cab457438eefd23e1e2c6e2197894b2d52;p=libsvgtiny.git

diff --git a/src/svgtiny.c b/src/svgtiny.c
index ee0c59c..db0d59b 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -17,6 +17,8 @@
 #include <dom/dom.h>
 #include <dom/bindings/xml/xmlparser.h>
 
+#include <libcss/libcss.h>
+
 #include "svgtiny.h"
 #include "svgtiny_internal.h"
 
@@ -38,6 +40,12 @@
 #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,
 		struct svgtiny_parse_state state);
 static svgtiny_code svgtiny_parse_path(dom_element *path,
@@ -610,6 +618,7 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 		const char *buffer, size_t size, const char *url,
 		int viewport_width, int viewport_height)
 {
+	css_error css_code;
 	dom_document *document;
 	dom_exception exc;
 	dom_xml_parser *parser;
@@ -695,6 +704,17 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 	state.viewport_width = viewport_width;
 	state.viewport_height = viewport_height;
 
+
+	/* Initialize CSS context */
+	if (state.select_ctx == NULL) {
+		css_code = css_select_ctx_create(&state.select_ctx);
+		if (css_code != CSS_OK) {
+			dom_node_unref(svg);
+			dom_node_unref(document);
+			return svgtiny_LIBCSS_ERROR;
+		}
+	}
+
 #define SVGTINY_STRING_ACTION2(s,n)					\
 	if (dom_string_create_interned((const uint8_t *) #n,		\
 				       strlen(#n), &state.interned_##s)	\
@@ -718,17 +738,22 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 	state.ctm.d = 1; /*(float) viewport_height / (float) height;*/
 	state.ctm.e = 0; /*x;*/
 	state.ctm.f = 0; /*y;*/
-	/*state.style = css_base_style;
-	state.style.font_size.value.length.value = option_font_size * 0.1;*/
 	state.fill = 0x000000;
 	state.stroke = svgtiny_TRANSPARENT;
 	state.stroke_width = 1;
 
 	/* parse tree */
-	code = svgtiny_parse_svg(svg, state);
+	code = svgtiny_preparse_styles(svg, state);
+	if (code == svgtiny_OK) {
+		code = svgtiny_parse_svg(svg, state);
+	}
 
 	dom_node_unref(svg);
 	dom_node_unref(document);
+	css_code = css_select_ctx_destroy(state.select_ctx);
+	if (css_code != CSS_OK) {
+		code = svgtiny_LIBCSS_ERROR;
+	}
 
 cleanup:
 	svgtiny_cleanup_state_local(&state);
@@ -741,6 +766,172 @@ cleanup:
 }
 
 
+/**
+ * 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
+ * makes a single pass through the document and we'd like all style
+ * information to be available during that pass. Specifically, we'd
+ * like a <style> sheet at the end of the document to affect the
+ * rendering of elements at its beginning.
+ *
+ * The element-parsing inner loop here is essentially the same as
+ * that within svgtiny_parse_svg().
+ */
+svgtiny_code svgtiny_preparse_styles(dom_element *svg,
+		struct svgtiny_parse_state state)
+{
+	dom_element *child;
+	dom_exception exc;
+
+	exc = dom_node_get_first_child(svg, (dom_node **) (void *) &child);
+	if (exc != DOM_NO_ERR) {
+		return svgtiny_LIBDOM_ERROR;
+	}
+	while (child != NULL) {
+		dom_element *next;
+		dom_node_type nodetype;
+		svgtiny_code code = svgtiny_OK;
+
+		exc = dom_node_get_node_type(child, &nodetype);
+		if (exc != DOM_NO_ERR) {
+			dom_node_unref(child);
+			return svgtiny_LIBDOM_ERROR;
+		}
+		if (nodetype == DOM_ELEMENT_NODE) {
+			dom_string *nodename;
+			exc = dom_node_get_node_name(child, &nodename);
+			if (exc != DOM_NO_ERR) {
+				dom_node_unref(child);
+				return svgtiny_LIBDOM_ERROR;
+			}
+
+			if (dom_string_caseless_isequal(state.interned_style,
+							nodename)) {
+				/* We have a <style> element, parse it */
+				code = svgtiny_parse_style_element(child,
+								state);
+			}
+
+
+			dom_string_unref(nodename);
+		}
+		if (code != svgtiny_OK) {
+			dom_node_unref(child);
+			return code;
+		}
+		exc = dom_node_get_next_sibling(child,
+						(dom_node **) (void *) &next);
+		dom_node_unref(child);
+		if (exc != DOM_NO_ERR) {
+			return svgtiny_LIBDOM_ERROR;
+		}
+		child = next;
+	}
+
+	return svgtiny_OK;
+}
+
 /**
  * Parse a <svg> or <g> element node.
  */
@@ -1687,9 +1878,6 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 /*	state.ctm.e = px - state.origin_x; */
 /*	state.ctm.f = py - state.origin_y; */
 
-	/*struct css_style style = state.style;
-	style.font_size.value.length.value *= state.ctm.a;*/
-
         exc = dom_node_get_first_child(text, &child);
 	if (exc != DOM_NO_ERR) {
 		return svgtiny_LIBDOM_ERROR;
@@ -1819,7 +2007,7 @@ static float _svgtiny_parse_length(const char *s, int viewport_size,
 	int num_length = strspn(s, "0123456789+-.");
 	const char *unit = s + num_length;
 	float n = atof((const char *) s);
-	float font_size = 20; /*css_len2px(&state.style.font_size.value.length, 0);*/
+	float font_size = 20;
 
 	UNUSED(state);
 
@@ -2013,13 +2201,7 @@ void svgtiny_parse_font_attributes(dom_element *node,
 
 	for (attr = node->properties; attr; attr = attr->next) {
 		if (strcmp((const char *) attr->name, "font-size") == 0) {
-			/*if (css_parse_length(
-					(const char *) attr->children->content,
-					&state->style.font_size.value.length,
-					true, true)) {
-				state->style.font_size.size =
-						CSS_FONT_SIZE_LENGTH;
-			}*/
+			/* TODO */
 		}
         }
 #endif