X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny_internal.h;h=5ece69d42c1ab66cfa52a46321e31d3f9b67fe8e;hb=7b8fc7bb381c266a4f1ecde5b10bb4c09e2f9bc0;hp=542a0d0cd565cbdbbb0714d19c278f71d75e4ed7;hpb=f15555ee16921352ec00f90e8687b4a17f8195bb;p=libsvgtiny.git

diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h
index 542a0d0..5ece69d 100644
--- a/src/svgtiny_internal.h
+++ b/src/svgtiny_internal.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 
 #include <dom/dom.h>
+#include <libcss/libcss.h>
 
 #ifndef UNUSED
 #define UNUSED(x) ((void) (x))
@@ -24,6 +25,16 @@ struct svgtiny_gradient_stop {
 #define svgtiny_MAX_STOPS 10
 #define svgtiny_LINEAR_GRADIENT 0x2000000
 
+struct svgtiny_parse_state_gradient {
+	unsigned int linear_gradient_stop_count;
+	dom_string *gradient_x1, *gradient_y1, *gradient_x2, *gradient_y2;
+	struct svgtiny_gradient_stop gradient_stop[svgtiny_MAX_STOPS];
+	bool gradient_user_space_on_use;
+	struct {
+		float a, b, c, d, e, f;
+	} gradient_transform;
+};
+
 struct svgtiny_parse_state {
 	struct svgtiny_diagram *diagram;
 	dom_document *document;
@@ -36,27 +47,48 @@ struct svgtiny_parse_state {
 		float a, b, c, d, e, f;
 	} ctm;
 
-	/*struct css_style style;*/
+	/* A libcss context to hold any stylesheets that are present
+	 * in the SVG document. This should be pre-populated rather
+	 * than on-the-fly, because, for example, a <style> sheet at
+	 * the end of the document should affect the SVG elements that
+	 * precede it. */
+	css_select_ctx *select_ctx;
+
+	/* A libcss unit context. This is used to compute and compose
+	 * styles, and is convenient to create once and pass along
+	 * with the rest of the state. */
+	css_unit_ctx unit_ctx;
+
+	/* Keep track of the parent element's computed style so that
+	 * we can compose its children's computed styles with it. */
+	css_computed_style *parent_style;
 
 	/* paint attributes */
 	svgtiny_colour fill;
 	svgtiny_colour stroke;
 	int stroke_width;
 
+	/* alpha */
+	float fill_opacity;
+	float stroke_opacity;
+
 	/* gradients */
-	unsigned int linear_gradient_stop_count;
-	dom_string *gradient_x1, *gradient_y1, *gradient_x2, *gradient_y2;
-	struct svgtiny_gradient_stop gradient_stop[svgtiny_MAX_STOPS];
-	bool gradient_user_space_on_use;
-	struct {
-		float a, b, c, d, e, f;
-	} gradient_transform;
+	struct svgtiny_parse_state_gradient fill_grad;
+	struct svgtiny_parse_state_gradient stroke_grad;
 
 	/* Interned strings */
 #define SVGTINY_STRING_ACTION2(n,nn) dom_string *interned_##n;
 #include "svgtiny_strings.h"
 #undef SVGTINY_STRING_ACTION2
 
+	/* Where we store the interned copy of the SVG XML namespace,
+	 *
+	 *   http://www.w3.org/2000/svg
+	 *
+	 * We handle it separately it has a different type
+	 * (lwc_string) than those above (dom_string).
+	 */
+	lwc_string *interned_svg_xmlns;
 };
 
 struct svgtiny_list;
@@ -65,6 +97,7 @@ struct svgtiny_list;
 float svgtiny_parse_length(dom_string *s, int viewport_size,
 		const struct svgtiny_parse_state state);
 void svgtiny_parse_color(dom_string *s, svgtiny_colour *c,
+		struct svgtiny_parse_state_gradient *grad,
 		struct svgtiny_parse_state *state);
 void svgtiny_parse_transform(char *s, float *ma, float *mb,
 		float *mc, float *md, float *me, float *mf);
@@ -79,8 +112,18 @@ char *svgtiny_strndup(const char *s, size_t n);
 #define strndup svgtiny_strndup
 #endif
 
+/* svgtiny_css.c */
+css_error svgtiny_create_stylesheet(css_stylesheet **sheet,
+		bool inline_style);
+css_error svgtiny_select_style(struct svgtiny_parse_state *state,
+			dom_element *node,
+			const css_stylesheet *inline_sheet,
+			css_select_results **result);
+
 /* svgtiny_gradient.c */
-void svgtiny_find_gradient(const char *id, struct svgtiny_parse_state *state);
+void svgtiny_find_gradient(const char *id,
+		struct svgtiny_parse_state_gradient *grad,
+		struct svgtiny_parse_state *state);
 svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n,
 		struct svgtiny_parse_state *state);
 
@@ -94,9 +137,4 @@ void *svgtiny_list_get(struct svgtiny_list *list,
 void *svgtiny_list_push(struct svgtiny_list *list);
 void svgtiny_list_free(struct svgtiny_list *list);
 
-/* colors.gperf */
-const struct svgtiny_named_color *
-		svgtiny_color_lookup(register const char *str,
-				register unsigned int len);
-
 #endif