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,
+ struct svgtiny_parse_state *state);
static svgtiny_code svgtiny_add_path(float *p, unsigned int n,
struct svgtiny_parse_state *state);
static void _svgtiny_parse_color(const char *s, svgtiny_colour *c,
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);
exc = dom_element_get_attribute(svg, state.interned_viewBox,
&view_box);
svgtiny_parse_paint_attributes(path, &state);
svgtiny_parse_transform_attributes(path, &state);
+ svgtiny_parse_styles(path, &state);
/* read d attribute */
exc = dom_element_get_attribute(path, state.interned_d, &path_d_str);
&x, &y, &width, &height);
svgtiny_parse_paint_attributes(rect, &state);
svgtiny_parse_transform_attributes(rect, &state);
+ svgtiny_parse_styles(rect, &state);
p = malloc(13 * sizeof p[0]);
if (!p) {
svgtiny_parse_paint_attributes(circle, &state);
svgtiny_parse_transform_attributes(circle, &state);
+ svgtiny_parse_styles(circle, &state);
if (r < 0) {
state.diagram->error_line = -1; /* circle->line; */
svgtiny_parse_paint_attributes(ellipse, &state);
svgtiny_parse_transform_attributes(ellipse, &state);
+ svgtiny_parse_styles(ellipse, &state);
if (rx < 0 || ry < 0) {
state.diagram->error_line = -1; /* ellipse->line; */
svgtiny_parse_paint_attributes(line, &state);
svgtiny_parse_transform_attributes(line, &state);
+ svgtiny_parse_styles(line, &state);
p = malloc(7 * sizeof p[0]);
if (!p) {
svgtiny_parse_paint_attributes(poly, &state);
svgtiny_parse_transform_attributes(poly, &state);
+ svgtiny_parse_styles(poly, &state);
exc = dom_element_get_attribute(poly, state.interned_points,
&points_str);
{
dom_string *attr;
dom_exception exc;
- 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
- * 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, and css_stylesheet_destroy() checks
- * for that case. */
- css_stylesheet *inline_sheet = NULL;
-
- /* Initialize this to NULL for the same reason: so that we can
- * safely destroy it later even if we never populated it. */
- css_select_results *styles = NULL;
exc = dom_element_get_attribute(node, state->interned_fill, &attr);
if (exc == DOM_NO_ERR && attr != NULL) {
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
+ /* Parse a few properties "by hand" until they can
be supported in libcss. */
char *style = strndup(dom_string_data(attr),
dom_string_byte_length(attr));
free(style);
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;
- }
- 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;
- }
-
- fill_opacity_type = css_computed_fill_opacity(
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- &fill_opacity);
- stroke_opacity_type = css_computed_stroke_opacity(
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- &stroke_opacity);
- css_select_results_destroy(styles);
-
- 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);
- }
}
}
}
+/**
+ * Parse element styles.
+ *
+ * First we parse any inline "style" attributes. We then compose the
+ * element's style with any parent styles. Finally, we compute any
+ * 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_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
+ * 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, and css_stylesheet_destroy() checks
+ * for that case. */
+ css_stylesheet *inline_sheet = NULL;
+
+ /* Initialize this to NULL for the same reason: so that we can
+ * safely destroy it later even if we never populated it. */
+ css_select_results *styles = NULL;
+
+
+ dom_exception exc;
+ dom_string *attr;
+
+ exc = dom_element_get_attribute(node, state->interned_style, &attr);
+ if (exc != DOM_NO_ERR) {
+ return NULL;
+ }
+ if (attr != NULL) {
+ inline_sheet = svgtiny_parse_style_inline(
+ (uint8_t *)dom_string_data(attr),
+ dom_string_byte_length(attr));
+ 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(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ &stroke_opacity);
+ css_select_results_destroy(styles);
+
+ 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);
+ }
+}
/**
* Parse a transform string.
projects / libsvgtiny.git / commitdiff