X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny.c;h=9a6709a7e0069aad5290d43ebad3dcc9067d58a3;hb=ea01d9a2b33d706b95f795514f5fb08ffb67de0e;hp=a70be0f50643530e86d9639204cc64b4569e3764;hpb=7b8fc7bb381c266a4f1ecde5b10bb4c09e2f9bc0;p=libsvgtiny.git

diff --git a/src/svgtiny.c b/src/svgtiny.c
index a70be0f..9a6709a 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -71,7 +71,7 @@ static void svgtiny_parse_font_attributes(dom_element *node,
 		struct svgtiny_parse_state *state);
 static void svgtiny_parse_transform_attributes(dom_element *node,
 		struct svgtiny_parse_state *state);
-static void svgtiny_parse_styles(dom_element *node,
+static css_select_results *svgtiny_parse_styles(dom_element *node,
 		struct svgtiny_parse_state *state);
 static svgtiny_code svgtiny_add_path(float *p, unsigned int n,
 		struct svgtiny_parse_state *state);
@@ -684,11 +684,11 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 		dom_node_unref(document);
 		return svgtiny_LIBDOM_ERROR;
 	}
-        if (svg == NULL) {
-                /* no root svg element */
-                dom_node_unref(document);
+	if (svg == NULL) {
+		/* no root svg element */
+		dom_node_unref(document);
 		return svgtiny_SVG_ERROR;
-        }
+	}
 
 	exc = dom_node_get_node_name(svg, &svg_name);
 	if (exc != DOM_NO_ERR) {
@@ -703,7 +703,7 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 		dom_node_unref(document);
 		return svgtiny_LIBDOM_ERROR;
 	}
-	if (!dom_string_caseless_lwc_isequal(svg_name, svg_name_lwc)) {
+	if (!dom_string_lwc_isequal(svg_name, svg_name_lwc)) {
 		lwc_string_unref(svg_name_lwc);
 		dom_string_unref(svg_name);
 		dom_node_unref(svg);
@@ -945,7 +945,7 @@ svgtiny_code svgtiny_preparse_styles(dom_element *svg,
 				return svgtiny_LIBDOM_ERROR;
 			}
 
-			if (dom_string_caseless_isequal(state.interned_style,
+			if (dom_string_isequal(state.interned_style,
 							nodename)) {
 				/* We have a <style> element, parse it */
 				code = svgtiny_parse_style_element(child,
@@ -982,13 +982,14 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 	dom_string *view_box;
 	dom_element *child;
 	dom_exception exc;
+	css_select_results *styles;
 
 	svgtiny_setup_state_local(&state);
 
 	svgtiny_parse_position_attributes(svg, state, &x, &y, &width, &height);
 	svgtiny_parse_paint_attributes(svg, &state);
 	svgtiny_parse_font_attributes(svg, &state);
-	svgtiny_parse_styles(svg, &state);
+	styles = svgtiny_parse_styles(svg, &state);
 
 	exc = dom_element_get_attribute(svg, state.interned_viewBox,
 					&view_box);
@@ -1026,6 +1027,14 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 		dom_node_type nodetype;
 		svgtiny_code code = svgtiny_OK;
 
+		/* Before we descend to one of my child elements, set
+		 * the "parent style" to my style. */
+		if (styles) {
+			/* For now at least, the root element won't
+			 * have any styles; hence the null check. */
+			state.parent_style = styles->styles[CSS_PSEUDO_ELEMENT_NONE];
+		}
+
 		exc = dom_node_get_node_type(child, &nodetype);
 		if (exc != DOM_NO_ERR) {
 			dom_node_unref(child);
@@ -1039,37 +1048,37 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 				svgtiny_cleanup_state_local(&state);
 				return svgtiny_LIBDOM_ERROR;
 			}
-			if (dom_string_caseless_isequal(state.interned_svg,
+			if (dom_string_isequal(state.interned_svg,
 							nodename))
 				code = svgtiny_parse_svg(child, state);
-			else if (dom_string_caseless_isequal(state.interned_g,
+			else if (dom_string_isequal(state.interned_g,
 							     nodename))
 				code = svgtiny_parse_svg(child, state);
-			else if (dom_string_caseless_isequal(state.interned_a,
+			else if (dom_string_isequal(state.interned_a,
 							     nodename))
 				code = svgtiny_parse_svg(child, state);
-			else if (dom_string_caseless_isequal(state.interned_path,
+			else if (dom_string_isequal(state.interned_path,
 							     nodename))
 				code = svgtiny_parse_path(child, state);
-			else if (dom_string_caseless_isequal(state.interned_rect,
+			else if (dom_string_isequal(state.interned_rect,
 							     nodename))
 				code = svgtiny_parse_rect(child, state);
-			else if (dom_string_caseless_isequal(state.interned_circle,
+			else if (dom_string_isequal(state.interned_circle,
 							     nodename))
 				code = svgtiny_parse_circle(child, state);
-			else if (dom_string_caseless_isequal(state.interned_ellipse,
+			else if (dom_string_isequal(state.interned_ellipse,
 							     nodename))
 				code = svgtiny_parse_ellipse(child, state);
-			else if (dom_string_caseless_isequal(state.interned_line,
+			else if (dom_string_isequal(state.interned_line,
 							     nodename))
 				code = svgtiny_parse_line(child, state);
-			else if (dom_string_caseless_isequal(state.interned_polyline,
+			else if (dom_string_isequal(state.interned_polyline,
 							     nodename))
 				code = svgtiny_parse_poly(child, state, false);
-			else if (dom_string_caseless_isequal(state.interned_polygon,
+			else if (dom_string_isequal(state.interned_polygon,
 							     nodename))
 				code = svgtiny_parse_poly(child, state, true);
-			else if (dom_string_caseless_isequal(state.interned_text,
+			else if (dom_string_isequal(state.interned_text,
 							     nodename))
 				code = svgtiny_parse_text(child, state);
 			dom_string_unref(nodename);
@@ -1089,6 +1098,9 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 		child = next;
 	}
 
+	/* Hoping that destroying "styles" destroys state.parent_style
+	 * as well. */
+	css_select_results_destroy(styles);
 	svgtiny_cleanup_state_local(&state);
 	return svgtiny_OK;
 }
@@ -1109,7 +1121,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 	dom_exception exc;
 	char *s, *path_d;
 	float *p; /* path elemets */
-        unsigned int palloc; /* number of path elements allocated */
+	unsigned int palloc; /* number of path elements allocated */
 	unsigned int i;
 	float last_x = 0, last_y = 0;
 	float last_cubic_x = 0, last_cubic_y = 0;
@@ -1120,7 +1132,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 
 	svgtiny_parse_paint_attributes(path, &state);
 	svgtiny_parse_transform_attributes(path, &state);
-	svgtiny_parse_styles(path, &state);
+	css_select_results_destroy(svgtiny_parse_styles(path, &state));
 
 	/* read d attribute */
 	exc = dom_element_get_attribute(path, state.interned_d, &path_d_str);
@@ -1138,15 +1150,15 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		return svgtiny_SVG_ERROR;
 	}
 
-        /* empty path is permitted it just disables the path */
-        palloc = dom_string_byte_length(path_d_str);
-        if (palloc == 0) {
+	/* empty path is permitted it just disables the path */
+	palloc = dom_string_byte_length(path_d_str);
+	if (palloc == 0) {
 		dom_string_unref(path_d_str);
 		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OK;
-        }
+	}
 
-        /* local copy of the path data allowing in-place modification */
+	/* local copy of the path data allowing in-place modification */
 	s = path_d = strndup(dom_string_data(path_d_str), palloc);
 	dom_string_unref(path_d_str);
 	if (s == NULL) {
@@ -1154,12 +1166,12 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		return svgtiny_OUT_OF_MEMORY;
 	}
 
-        /* ensure path element allocation is sensibly bounded */
-        if (palloc < 8) {
-            palloc = 8;
-        } else if (palloc > 64) {
-            palloc = palloc / 2;
-        }
+	/* ensure path element allocation is sensibly bounded */
+	if (palloc < 8) {
+		palloc = 8;
+	} else if (palloc > 64) {
+		palloc = palloc / 2;
+	}
 
 	/* allocate initial space for path elements */
 	p = malloc(sizeof p[0] * palloc);
@@ -1180,7 +1192,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		float x, y, x1, y1, x2, y2, rx, ry, rotation, large_arc, sweep;
 		int n;
 
-                /* Ensure there is sufficient space for path elements */
+		/* Ensure there is sufficient space for path elements */
 #define ALLOC_PATH_ELEMENTS(NUM_ELEMENTS)                               \
                 do {                                                    \
                         if ((palloc - i) < NUM_ELEMENTS) {              \
@@ -1206,7 +1218,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 			else
 				plot_command = svgtiny_PATH_LINE;
 			do {
-                                ALLOC_PATH_ELEMENTS(3);
+				ALLOC_PATH_ELEMENTS(3);
 				p[i++] = plot_command;
 				if ('a' <= *command) {
 					x += last_x;
@@ -1227,7 +1239,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		/* closepath (Z, z) (no arguments) */
 		} else if (sscanf(s, " %1[Zz] %n", command, &n) == 1) {
 			/*LOG(("closepath"));*/
-                        ALLOC_PATH_ELEMENTS(1);
+			ALLOC_PATH_ELEMENTS(1);
 
 			p[i++] = svgtiny_PATH_CLOSE;
 			s += n;
@@ -1238,7 +1250,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		} else if (sscanf(s, " %1[Hh] %f %n", command, &x, &n) == 2) {
 			/*LOG(("horizontal lineto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(3);
+				ALLOC_PATH_ELEMENTS(3);
 
 				p[i++] = svgtiny_PATH_LINE;
 				if (*command == 'h')
@@ -1253,7 +1265,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		} else if (sscanf(s, " %1[Vv] %f %n", command, &y, &n) == 2) {
 			/*LOG(("vertical lineto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(3);
+				ALLOC_PATH_ELEMENTS(3);
 
 				p[i++] = svgtiny_PATH_LINE;
 				if (*command == 'v')
@@ -1269,7 +1281,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 				&x1, &y1, &x2, &y2, &x, &y, &n) == 7) {
 			/*LOG(("curveto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(7);
+				ALLOC_PATH_ELEMENTS(7);
 
 				p[i++] = svgtiny_PATH_BEZIER;
 				if (*command == 'c') {
@@ -1295,7 +1307,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 				&x2, &y2, &x, &y, &n) == 5) {
 			/*LOG(("shorthand/smooth curveto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(7);
+				ALLOC_PATH_ELEMENTS(7);
 
 				p[i++] = svgtiny_PATH_BEZIER;
 				x1 = last_x + (last_x - last_cubic_x);
@@ -1321,7 +1333,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 				&x1, &y1, &x, &y, &n) == 5) {
 			/*LOG(("quadratic Bezier curveto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(7);
+				ALLOC_PATH_ELEMENTS(7);
 
 				p[i++] = svgtiny_PATH_BEZIER;
 				last_quad_x = x1;
@@ -1348,7 +1360,7 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 				&x, &y, &n) == 3) {
 			/*LOG(("shorthand/smooth quadratic Bezier curveto"));*/
 			do {
-                                ALLOC_PATH_ELEMENTS(7);
+				ALLOC_PATH_ELEMENTS(7);
 
 				p[i++] = svgtiny_PATH_BEZIER;
 				x1 = last_x + (last_x - last_quad_x);
@@ -1436,18 +1448,18 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 		return svgtiny_OK;
 	}
 
-        /* resize path element array to not be over allocated */
-        if (palloc != i) {
-                float *tp;
+	/* resize path element array to not be over allocated */
+	if (palloc != i) {
+		float *tp;
 
-                /* try the resize, if it fails just continue to use the old
-                 * allocation
-                 */
-                tp = realloc(p, sizeof p[0] * i);
-                if (tp != NULL) {
-                        p = tp;
-                }
-        }
+		/* try the resize, if it fails just continue to use the old
+		 * allocation
+		 */
+		tp = realloc(p, sizeof p[0] * i);
+		if (tp != NULL) {
+			p = tp;
+		}
+	}
 
 	err = svgtiny_add_path(p, i, &state);
 
@@ -1476,7 +1488,7 @@ svgtiny_code svgtiny_parse_rect(dom_element *rect,
 			&x, &y, &width, &height);
 	svgtiny_parse_paint_attributes(rect, &state);
 	svgtiny_parse_transform_attributes(rect, &state);
-	svgtiny_parse_styles(rect, &state);
+	css_select_results_destroy(svgtiny_parse_styles(rect, &state));
 
 	p = malloc(13 * sizeof p[0]);
 	if (!p) {
@@ -1553,7 +1565,7 @@ svgtiny_code svgtiny_parse_circle(dom_element *circle,
 
 	svgtiny_parse_paint_attributes(circle, &state);
 	svgtiny_parse_transform_attributes(circle, &state);
-	svgtiny_parse_styles(circle, &state);
+	css_select_results_destroy(svgtiny_parse_styles(circle, &state));
 
 	if (r < 0) {
 		state.diagram->error_line = -1; /* circle->line; */
@@ -1670,7 +1682,7 @@ svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
 
 	svgtiny_parse_paint_attributes(ellipse, &state);
 	svgtiny_parse_transform_attributes(ellipse, &state);
-	svgtiny_parse_styles(ellipse, &state);
+	css_select_results_destroy(svgtiny_parse_styles(ellipse, &state));
 
 	if (rx < 0 || ry < 0) {
 		state.diagram->error_line = -1; /* ellipse->line; */
@@ -1788,7 +1800,7 @@ svgtiny_code svgtiny_parse_line(dom_element *line,
 
 	svgtiny_parse_paint_attributes(line, &state);
 	svgtiny_parse_transform_attributes(line, &state);
-	svgtiny_parse_styles(line, &state);
+	css_select_results_destroy(svgtiny_parse_styles(line, &state));
 
 	p = malloc(7 * sizeof p[0]);
 	if (!p) {
@@ -1833,7 +1845,7 @@ svgtiny_code svgtiny_parse_poly(dom_element *poly,
 
 	svgtiny_parse_paint_attributes(poly, &state);
 	svgtiny_parse_transform_attributes(poly, &state);
-	svgtiny_parse_styles(poly, &state);
+	css_select_results_destroy(svgtiny_parse_styles(poly, &state));
 
 	exc = dom_element_get_attribute(poly, state.interned_points,
 					&points_str);
@@ -1883,11 +1895,11 @@ svgtiny_code svgtiny_parse_poly(dom_element *poly,
 			p[i++] = x;
 			p[i++] = y;
 			s += n;
-                } else {
+		} else {
 			break;
-                }
-        }
-        if (polygon)
+		}
+	}
+	if (polygon)
 		p[i++] = svgtiny_PATH_CLOSE;
 
 	free(points);
@@ -1924,7 +1936,7 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 /*	state.ctm.e = px - state.origin_x; */
 /*	state.ctm.f = py - state.origin_y; */
 
-        exc = dom_node_get_first_child(text, &child);
+	exc = dom_node_get_first_child(text, &child);
 	if (exc != DOM_NO_ERR) {
 		return svgtiny_LIBDOM_ERROR;
 		svgtiny_cleanup_state_local(&state);
@@ -1948,8 +1960,8 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 				svgtiny_cleanup_state_local(&state);
 				return svgtiny_LIBDOM_ERROR;
 			}
-			if (dom_string_caseless_isequal(nodename,
-							state.interned_tspan))
+			if (dom_string_isequal(nodename,
+						state.interned_tspan))
 				code = svgtiny_parse_text((dom_element *)child,
 							  state);
 			dom_string_unref(nodename);
@@ -2251,7 +2263,7 @@ void svgtiny_parse_font_attributes(dom_element *node,
 		if (strcmp((const char *) attr->name, "font-size") == 0) {
 			/* TODO */
 		}
-        }
+	}
 #endif
 }
 
@@ -2290,13 +2302,11 @@ void svgtiny_parse_transform_attributes(dom_element *node,
  * styles that we support and set the corresponding fields in the
  * parser state.
  */
-void svgtiny_parse_styles(dom_element *node,
-		struct svgtiny_parse_state *state)
+css_select_results *svgtiny_parse_styles(dom_element *node,
+			struct svgtiny_parse_state *state)
 {
 	css_error code;
-	uint8_t   fill_opacity_type;
 	css_fixed fill_opacity;
-	uint8_t   stroke_opacity_type;
 	css_fixed stroke_opacity;
 
 	/* We store the result of svgtiny_parse_style_inline() in
@@ -2310,6 +2320,9 @@ void svgtiny_parse_styles(dom_element *node,
 	 * safely destroy it later even if we never populated it. */
 	css_select_results *styles = NULL;
 
+	/* The result of composing this node's styles with its
+	 * parent's styles. */
+	css_computed_style *composed = NULL;
 
 	dom_exception exc;
 	dom_string *attr;
@@ -2325,50 +2338,45 @@ void svgtiny_parse_styles(dom_element *node,
 		dom_string_unref(attr);
 	}
 
-	struct dom_element *parent;
-	dom_element_parent_node(node, &parent);
-	if (parent == NULL) {
-		/* This is the root <svg> node, skip it.
-		 *
-		 * While initialising its selection state, libcss sets its
-		 * node_data->bloom pointer using css__get_parent_bloom().
-		 * But if there is no parent, that function returns,
-		 *
-		 *   static css_bloom empty_bloom[CSS_BLOOM_SIZE];
-		 *
-		 * A problem later arises because when libcss FINALISES its
-		 * selection state, it frees node_data->bloom! That obviously
-		 * won't work then node has no parent, i.e. if it's the root
-		 * <svg> element.
-		 */
-		css_stylesheet_destroy(inline_sheet);
-		return NULL;
-	}
-	else {
-		/* We only needed to know if it was NULL */
-		dom_node_unref(parent);
-	}
-
 	code = svgtiny_select_style(state, node, inline_sheet, &styles);
 	css_stylesheet_destroy(inline_sheet);
 	if (code != CSS_OK) {
 		return NULL;
 	}
 
-	fill_opacity_type = css_computed_fill_opacity(
-				styles->styles[CSS_PSEUDO_ELEMENT_NONE],
-				&fill_opacity);
-	stroke_opacity_type = css_computed_stroke_opacity(
+	if (state->parent_style != NULL) {
+		code = css_computed_style_compose(
+				state->parent_style,
 				styles->styles[CSS_PSEUDO_ELEMENT_NONE],
-				&stroke_opacity);
-	css_select_results_destroy(styles);
+				&state->unit_ctx,
+				&composed);
+
+		if (code != CSS_OK || composed == NULL) {
+			/* This function promises to return a
+			 * fully-composed set of styles, so if
+			 * we can't do that, we should fail. */
+			css_select_results_destroy(styles);
+			return NULL;
+		}
 
-	if (fill_opacity_type == CSS_FILL_OPACITY_SET) {
-		state->fill_opacity = FIXTOFLT(fill_opacity);
-	}
-	if (stroke_opacity_type == CSS_STROKE_OPACITY_SET) {
-		state->stroke_opacity = FIXTOFLT(stroke_opacity);
+		/* Replace my original computed styles with the
+		 * composed ones */
+		css_computed_style_destroy(
+				styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
+		styles->styles[CSS_PSEUDO_ELEMENT_NONE] = composed;
 	}
+
+	css_computed_fill_opacity(
+		styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+		&fill_opacity);
+	css_computed_stroke_opacity(
+		styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+		&stroke_opacity);
+
+	state->fill_opacity = FIXTOFLT(fill_opacity);
+	state->stroke_opacity = FIXTOFLT(stroke_opacity);
+
+	return styles;
 }
 
 /**
@@ -2394,22 +2402,22 @@ void svgtiny_parse_transform(char *s, float *ma, float *mb,
 		e = f = 0;
 		n = 0;
 		if ((sscanf(s, " matrix (%f %f %f %f %f %f ) %n",
-                            &a, &b, &c, &d, &e, &f, &n) == 6) && (n > 0))
+				&a, &b, &c, &d, &e, &f, &n) == 6) && (n > 0))
 			;
 		else if ((sscanf(s, " translate (%f %f ) %n",
-                                 &e, &f, &n) == 2) && (n > 0))
+				&e, &f, &n) == 2) && (n > 0))
 			;
 		else if ((sscanf(s, " translate (%f ) %n",
-                                 &e, &n) == 1) && (n > 0))
+				&e, &n) == 1) && (n > 0))
 			;
 		else if ((sscanf(s, " scale (%f %f ) %n",
-                                 &a, &d, &n) == 2) && (n > 0))
+				&a, &d, &n) == 2) && (n > 0))
 			;
 		else if ((sscanf(s, " scale (%f ) %n",
-                                 &a, &n) == 1) && (n > 0))
+				&a, &n) == 1) && (n > 0))
 			d = a;
 		else if ((sscanf(s, " rotate (%f %f %f ) %n",
-                                 &angle, &x, &y, &n) == 3) && (n > 0)) {
+				&angle, &x, &y, &n) == 3) && (n > 0)) {
 			angle = angle / 180 * M_PI;
 			a = cos(angle);
 			b = sin(angle);
@@ -2418,18 +2426,18 @@ void svgtiny_parse_transform(char *s, float *ma, float *mb,
 			e = -x * cos(angle) + y * sin(angle) + x;
 			f = -x * sin(angle) - y * cos(angle) + y;
 		} else if ((sscanf(s, " rotate (%f ) %n",
-                                   &angle, &n) == 1) && (n > 0)) {
+				&angle, &n) == 1) && (n > 0)) {
 			angle = angle / 180 * M_PI;
 			a = cos(angle);
 			b = sin(angle);
 			c = -sin(angle);
 			d = cos(angle);
 		} else if ((sscanf(s, " skewX (%f ) %n",
-                                   &angle, &n) == 1) && (n > 0)) {
+				&angle, &n) == 1) && (n > 0)) {
 			angle = angle / 180 * M_PI;
 			c = tan(angle);
 		} else if ((sscanf(s, " skewY (%f ) %n",
-                                   &angle, &n) == 1) && (n > 0)) {
+				&angle, &n) == 1) && (n > 0)) {
 			angle = angle / 180 * M_PI;
 			b = tan(angle);
 		} else