[librsvg/rustification] RsvgLength: replace the 'char factor' field with a 'unit' enum

From: Federico Mena Quintero <federico src gnome org>
To: commits-list gnome org
Cc:
Subject: [librsvg/rustification] RsvgLength: replace the 'char factor' field with a 'unit' enum
Date: Thu, 3 Nov 2016 20:36:33 +0000 (UTC)
commit b7768db1a9cd129298737f0d0ea9fd7cd7d444a0
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Nov 3 14:24:01 2016 -0600

    RsvgLength: replace the 'char factor' field with a 'unit' enum
    
    We now have a LengthUnit enum for use with RsvgLength, instead of representing
    units with simple chars.
    
    Along with this change, the filters code was hackily sticking an 'n' into some_length.factor
    to really mean, 'this length didn't get specified in the SVG data'.  Replaced that
    with boolean foo_specified fields that the code later checks to see if the
    length in question is available.
    
    The same pattern was used in the Text code; also made it use foo_specified booleans.

 rsvg-base.c    |    2 +-
 rsvg-css.c     |   50 ++++++-----
 rsvg-filter.c  |  280 ++++++++++++++++++++------------------------------------
 rsvg-private.h |   18 ++++-
 rsvg-text.c    |   53 ++++++-----
 tests/styles.c |    6 +-
 6 files changed, 177 insertions(+), 232 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 9a43ba8..1c0e187 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -1397,7 +1397,7 @@ rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimensi
     bbox.rect.x = bbox.rect.y = 0;
     bbox.rect.width = bbox.rect.height = 1;
 
-    if (!id && (root->w.factor == 'p' || root->h.factor == 'p')
+    if (!id && (root->w.unit == LENGTH_UNIT_PERCENT || root->h.unit == LENGTH_UNIT_PERCENT)
             && !root->vbox.active)
         handle_subelement = TRUE;
     else if (!id && root->w.length != -1 && root->h.length != -1)
diff --git a/rsvg-css.c b/rsvg-css.c
index 5b359a2..6e33040 100644
--- a/rsvg-css.c
+++ b/rsvg-css.c
@@ -178,6 +178,9 @@ rsvg_css_parse_raw_length (const char *str, gboolean * in,
     return length;
 }
 
+/* https://www.w3.org/TR/SVG/types.html#DataTypeLength
+ * https://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#length-units
+ */
 RsvgLength
 _rsvg_css_parse_length (const char *str)
 {
@@ -188,19 +191,20 @@ _rsvg_css_parse_length (const char *str)
 
     out.length = rsvg_css_parse_raw_length (str, &in, &percent, &em, &ex, &relative_size);
     if (percent)
-        out.factor = 'p';
+        out.unit = LENGTH_UNIT_PERCENT;
     else if (em)
-        out.factor = 'm';
+        out.unit = LENGTH_UNIT_FONT_EM;
     else if (ex)
-        out.factor = 'x';
+        out.unit = LENGTH_UNIT_FONT_EX;
     else if (in)
-        out.factor = 'i';
+        out.unit = LENGTH_UNIT_INCH;
     else if (relative_size == RELATIVE_SIZE_LARGER)
-        out.factor = 'l';
+        out.unit = LENGTH_UNIT_RELATIVE_LARGER;
     else if (relative_size == RELATIVE_SIZE_SMALLER)
-        out.factor = 's';
+        out.unit = LENGTH_UNIT_RELATIVE_SMALLER;
     else
-        out.factor = '\0';
+        out.unit = LENGTH_UNIT_DEFAULT;
+
     return out;
 }
 
@@ -210,10 +214,10 @@ _rsvg_css_normalize_font_size (RsvgState * state, RsvgDrawingCtx * ctx)
 {
     RsvgState *parent;
 
-    switch (state->font_size.factor) {
-    case 'p':
-    case 'm':
-    case 'x':
+    switch (state->font_size.unit) {
+    case LENGTH_UNIT_PERCENT:
+    case LENGTH_UNIT_FONT_EM:
+    case LENGTH_UNIT_FONT_EX:
         parent = rsvg_state_parent (state);
         if (parent) {
             double parent_size;
@@ -232,9 +236,9 @@ _rsvg_css_normalize_font_size (RsvgState * state, RsvgDrawingCtx * ctx)
 double
 _rsvg_css_normalize_length (const RsvgLength * in, RsvgDrawingCtx * ctx, char dir)
 {
-    if (in->factor == '\0')
+    if (in->unit == LENGTH_UNIT_DEFAULT)
         return in->length;
-    else if (in->factor == 'p') {
+    else if (in->unit == LENGTH_UNIT_PERCENT) {
         if (dir == 'h')
             return in->length * ctx->vb.rect.width;
         if (dir == 'v')
@@ -242,22 +246,22 @@ _rsvg_css_normalize_length (const RsvgLength * in, RsvgDrawingCtx * ctx, char di
         if (dir == 'o')
             return in->length * rsvg_viewport_percentage (ctx->vb.rect.width,
                                                           ctx->vb.rect.height);
-    } else if (in->factor == 'm' || in->factor == 'x') {
+    } else if (in->unit == LENGTH_UNIT_FONT_EM || in->unit == LENGTH_UNIT_FONT_EX) {
         double font = _rsvg_css_normalize_font_size (rsvg_current_state (ctx), ctx);
-        if (in->factor == 'm')
+        if (in->unit == LENGTH_UNIT_FONT_EM)
             return in->length * font;
         else
             return in->length * font / 2.;
-    } else if (in->factor == 'i') {
+    } else if (in->unit == LENGTH_UNIT_INCH) {
         if (dir == 'h')
             return in->length * ctx->dpi_x;
         if (dir == 'v')
             return in->length * ctx->dpi_y;
         if (dir == 'o')
             return in->length * rsvg_viewport_percentage (ctx->dpi_x, ctx->dpi_y);
-    } else if (in->factor == 'l') {
+    } else if (in->unit == LENGTH_UNIT_RELATIVE_LARGER) {
         /* todo: "larger" */
-    } else if (in->factor == 's') {
+    } else if (in->unit == LENGTH_UNIT_RELATIVE_SMALLER) {
         /* todo: "smaller" */
     }
 
@@ -289,15 +293,15 @@ double
 _rsvg_css_hand_normalize_length (const RsvgLength * in, gdouble pixels_per_inch,
                                  gdouble width_or_height, gdouble font_size)
 {
-    if (in->factor == '\0')
+    if (in->unit == LENGTH_UNIT_DEFAULT)
         return in->length;
-    else if (in->factor == 'p')
+    else if (in->unit == LENGTH_UNIT_PERCENT)
         return in->length * width_or_height;
-    else if (in->factor == 'm')
+    else if (in->unit == LENGTH_UNIT_FONT_EM)
         return in->length * font_size;
-    else if (in->factor == 'x')
+    else if (in->unit == LENGTH_UNIT_FONT_EX)
         return in->length * font_size / 2.;
-    else if (in->factor == 'i')
+    else if (in->unit == LENGTH_UNIT_INCH)
         return in->length * pixels_per_inch;
 
     return 0;
diff --git a/rsvg-filter.c b/rsvg-filter.c
index 81cce75..4431370 100644
--- a/rsvg-filter.c
+++ b/rsvg-filter.c
@@ -95,6 +95,10 @@ typedef struct _RsvgFilterPrimitive RsvgFilterPrimitive;
 struct _RsvgFilterPrimitive {
     RsvgNode super;
     RsvgLength x, y, width, height;
+    gboolean x_specified;
+    gboolean y_specified;
+    gboolean width_specified;
+    gboolean height_specified;
     GString *in;
     GString *result;
 
@@ -117,6 +121,29 @@ rsvg_filter_primitive_free (RsvgNode *self)
 }
 
 static void
+filter_primitive_set_x_y_width_height_atts (RsvgFilterPrimitive *prim, RsvgPropertyBag *atts)
+{
+    const char *value;
+
+    if ((value = rsvg_property_bag_lookup (atts, "x"))) {
+        prim->x = _rsvg_css_parse_length (value);
+        prim->x_specified = TRUE;
+    }
+    if ((value = rsvg_property_bag_lookup (atts, "y"))) {
+        prim->y = _rsvg_css_parse_length (value);
+        prim->y_specified = TRUE;
+    }
+    if ((value = rsvg_property_bag_lookup (atts, "width"))) {
+        prim->width = _rsvg_css_parse_length (value);
+        prim->width_specified = TRUE;
+    }
+    if ((value = rsvg_property_bag_lookup (atts, "height"))) {
+        prim->height = _rsvg_css_parse_length (value);
+        prim->height_specified = TRUE;
+    }
+}
+
+static void
 rsvg_filter_primitive_render (RsvgFilterPrimitive * self, RsvgFilterContext * ctx)
 {
     self->render (self, ctx);
@@ -144,26 +171,26 @@ rsvg_filter_primitive_get_bounds (RsvgFilterPrimitive * self, RsvgFilterContext
     rsvg_bbox_insert (&box, &otherbox);
 
     if (self != NULL)
-        if (self->x.factor != 'n' || self->y.factor != 'n' ||
-            self->width.factor != 'n' || self->height.factor != 'n') {
+        if (self->x_specified || self->y_specified ||
+            self->width_specified || self->height_specified) {
 
             rsvg_bbox_init (&otherbox, &ctx->paffine);
             otherbox.virgin = 0;
             if (ctx->filter->primitiveunits == objectBoundingBox)
                 _rsvg_push_view_box (ctx->ctx, 1., 1.);
-            if (self->x.factor != 'n')
+            if (self->x_specified)
                 otherbox.rect.x = _rsvg_css_normalize_length (&self->x, ctx->ctx, 'h');
             else
                 otherbox.rect.x = 0;
-            if (self->y.factor != 'n')
+            if (self->y_specified)
                 otherbox.rect.y = _rsvg_css_normalize_length (&self->y, ctx->ctx, 'v');
             else
                 otherbox.rect.y = 0;
-            if (self->width.factor != 'n')
+            if (self->width_specified)
                 otherbox.rect.width = _rsvg_css_normalize_length (&self->width, ctx->ctx, 'h');
             else
                 otherbox.rect.width = ctx->ctx->vb.rect.width;
-            if (self->height.factor != 'n')
+            if (self->height_specified)
                 otherbox.rect.height = _rsvg_css_normalize_length (&self->height, ctx->ctx, 'v');
             else
                 otherbox.rect.height = ctx->ctx->vb.rect.height;
@@ -1010,14 +1037,9 @@ rsvg_filter_primitive_blend_set_atts (RsvgNode * node, RsvgHandle * ctx, RsvgPro
             g_string_assign (filter->in2, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, value, &filter->super.super);
     }
@@ -1027,14 +1049,12 @@ RsvgNode *
 rsvg_new_filter_primitive_blend (void)
 {
     RsvgFilterPrimitiveBlend *filter;
-    filter = g_new (RsvgFilterPrimitiveBlend, 1);
+    filter = g_new0 (RsvgFilterPrimitiveBlend, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_BLEND);
     filter->mode = normal;
     filter->super.in = g_string_new ("none");
     filter->in2 = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->super.render = rsvg_filter_primitive_blend_render;
     filter->super.super.free = rsvg_filter_primitive_blend_free;
     filter->super.super.set_atts = rsvg_filter_primitive_blend_set_atts;
@@ -1215,14 +1235,9 @@ rsvg_filter_primitive_convolve_matrix_set_atts (RsvgNode * self,
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "targetX"))) {
             has_target_x = 1;
             filter->targetx = atoi (value);
@@ -1289,12 +1304,10 @@ RsvgNode *
 rsvg_new_filter_primitive_convolve_matrix (void)
 {
     RsvgFilterPrimitiveConvolveMatrix *filter;
-    filter = g_new (RsvgFilterPrimitiveConvolveMatrix, 1);
+    filter = g_new0 (RsvgFilterPrimitiveConvolveMatrix, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_CONVOLVE_MATRIX);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->KernelMatrix = NULL;
     filter->divisor = 0;
     filter->bias = 0;
@@ -1927,14 +1940,9 @@ rsvg_filter_primitive_gaussian_blur_set_atts (RsvgNode * self,
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "stdDeviation")))
             rsvg_css_parse_number_optional_number (value, &filter->sdx, &filter->sdy);
         if ((value = rsvg_property_bag_lookup (atts, "id")))
@@ -1946,12 +1954,10 @@ RsvgNode *
 rsvg_new_filter_primitive_gaussian_blur (void)
 {
     RsvgFilterPrimitiveGaussianBlur *filter;
-    filter = g_new (RsvgFilterPrimitiveGaussianBlur, 1);
+    filter = g_new0 (RsvgFilterPrimitiveGaussianBlur, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_GAUSSIAN_BLUR);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->sdx = 0;
     filter->sdy = 0;
     filter->super.render = rsvg_filter_primitive_gaussian_blur_render;
@@ -2013,7 +2019,7 @@ rsvg_filter_primitive_offset_render (RsvgFilterPrimitive * self, RsvgFilterConte
 
     output_pixels = cairo_image_surface_get_data (output);
 
-    dx = _rsvg_css_normalize_length (&upself->dx, ctx->ctx, 'w');
+    dx = _rsvg_css_normalize_length (&upself->dx, ctx->ctx, 'h');
     dy = _rsvg_css_normalize_length (&upself->dy, ctx->ctx, 'v');
 
     ox = ctx->paffine.xx * dx + ctx->paffine.xy * dy;
@@ -2056,14 +2062,9 @@ rsvg_filter_primitive_offset_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPr
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "dx")))
             filter->dx = _rsvg_css_parse_length (value);
         if ((value = rsvg_property_bag_lookup (atts, "dy")))
@@ -2077,12 +2078,10 @@ RsvgNode *
 rsvg_new_filter_primitive_offset (void)
 {
     RsvgFilterPrimitiveOffset *filter;
-    filter = g_new (RsvgFilterPrimitiveOffset, 1);
+    filter = g_new0 (RsvgFilterPrimitiveOffset, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_OFFSET);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->dy = _rsvg_css_parse_length ("0");
     filter->dx = _rsvg_css_parse_length ("0");
     filter->super.render = rsvg_filter_primitive_offset_render;
@@ -2159,14 +2158,9 @@ rsvg_filter_primitive_merge_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPro
     if (rsvg_property_bag_size (atts)) {
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, value, &filter->super.super);
     }
@@ -2176,11 +2170,9 @@ RsvgNode *
 rsvg_new_filter_primitive_merge (void)
 {
     RsvgFilterPrimitiveMerge *filter;
-    filter = g_new (RsvgFilterPrimitiveMerge, 1);
+    filter = g_new0 (RsvgFilterPrimitiveMerge, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE);
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->super.render = rsvg_filter_primitive_merge_render;
     filter->super.super.free = rsvg_filter_primitive_merge_free;
 
@@ -2365,14 +2357,9 @@ rsvg_filter_primitive_color_matrix_set_atts (RsvgNode * self, RsvgHandle * ctx,
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "values"))) {
             unsigned int i;
             double *temp = rsvg_css_parse_number_list (value, &listlen);
@@ -2464,12 +2451,10 @@ RsvgNode *
 rsvg_new_filter_primitive_color_matrix (void)
 {
     RsvgFilterPrimitiveColorMatrix *filter;
-    filter = g_new (RsvgFilterPrimitiveColorMatrix, 1);
+    filter = g_new0 (RsvgFilterPrimitiveColorMatrix, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOR_MATRIX);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->KernelMatrix = NULL;
     filter->super.render = rsvg_filter_primitive_color_matrix_render;
     filter->super.super.free = rsvg_filter_primitive_color_matrix_free;
@@ -2681,14 +2666,9 @@ rsvg_filter_primitive_component_transfer_set_atts (RsvgNode * self, RsvgHandle *
             g_string_assign (filter->super.result, value);
         if ((value = rsvg_property_bag_lookup (atts, "in")))
             g_string_assign (filter->super.in, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, value, &filter->super.super);
     }
@@ -2699,12 +2679,10 @@ rsvg_new_filter_primitive_component_transfer (void)
 {
     RsvgFilterPrimitiveComponentTransfer *filter;
 
-    filter = g_new (RsvgFilterPrimitiveComponentTransfer, 1);
+    filter = g_new0 (RsvgFilterPrimitiveComponentTransfer, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPONENT_TRANSFER);
     filter->super.result = g_string_new ("none");
     filter->super.in = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->super.render = rsvg_filter_primitive_component_transfer_render;
     filter->super.super.free = rsvg_filter_primitive_free;
     filter->super.super.set_atts = rsvg_filter_primitive_component_transfer_set_atts;
@@ -2889,14 +2867,9 @@ rsvg_filter_primitive_erode_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPro
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "radius"))) {
             rsvg_css_parse_number_optional_number (value, &filter->rx, &filter->ry);
         }
@@ -2915,12 +2888,10 @@ RsvgNode *
 rsvg_new_filter_primitive_erode (void)
 {
     RsvgFilterPrimitiveErode *filter;
-    filter = g_new (RsvgFilterPrimitiveErode, 1);
+    filter = g_new0 (RsvgFilterPrimitiveErode, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_ERODE);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->rx = 0;
     filter->ry = 0;
     filter->mode = 0;
@@ -3132,14 +3103,9 @@ rsvg_filter_primitive_composite_set_atts (RsvgNode * self, RsvgHandle * ctx, Rsv
             g_string_assign (filter->in2, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "k1")))
             filter->k1 = g_ascii_strtod (value, NULL) * 255.;
         if ((value = rsvg_property_bag_lookup (atts, "k2")))
@@ -3157,14 +3123,12 @@ RsvgNode *
 rsvg_new_filter_primitive_composite (void)
 {
     RsvgFilterPrimitiveComposite *filter;
-    filter = g_new (RsvgFilterPrimitiveComposite, 1);
+    filter = g_new0 (RsvgFilterPrimitiveComposite, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPOSITE);
     filter->mode = COMPOSITE_MODE_OVER;
     filter->super.in = g_string_new ("none");
     filter->in2 = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->k1 = 0;
     filter->k2 = 0;
     filter->k3 = 0;
@@ -3234,14 +3198,9 @@ rsvg_filter_primitive_flood_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPro
     if (rsvg_property_bag_size (atts)) {
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, id = value, &filter->super);
         rsvg_parse_style_attrs (ctx, self->state, "feFlood", NULL, id, atts);
@@ -3252,11 +3211,10 @@ RsvgNode *
 rsvg_new_filter_primitive_flood (void)
 {
     RsvgFilterPrimitive *filter;
-    filter = g_new (RsvgFilterPrimitive, 1);
+    filter = g_new0 (RsvgFilterPrimitive, 1);
     _rsvg_node_init (&filter->super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_FLOOD);
     filter->in = g_string_new ("none");
     filter->result = g_string_new ("none");
-    filter->x.factor = filter->y.factor = filter->width.factor = filter->height.factor = 'n';
     filter->render = rsvg_filter_primitive_flood_render;
     filter->super.free = rsvg_filter_primitive_free;
     filter->super.set_atts = rsvg_filter_primitive_flood_set_atts;
@@ -3422,14 +3380,9 @@ rsvg_filter_primitive_displacement_map_set_atts (RsvgNode * self, RsvgHandle * c
             g_string_assign (filter->in2, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "xChannelSelector")))
             filter->xChannelSelector = (value)[0];
         if ((value = rsvg_property_bag_lookup (atts, "yChannelSelector")))
@@ -3445,13 +3398,11 @@ RsvgNode *
 rsvg_new_filter_primitive_displacement_map (void)
 {
     RsvgFilterPrimitiveDisplacementMap *filter;
-    filter = g_new (RsvgFilterPrimitiveDisplacementMap, 1);
+    filter = g_new0 (RsvgFilterPrimitiveDisplacementMap, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_DISPLACEMENT_MAP);
     filter->super.in = g_string_new ("none");
     filter->in2 = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->xChannelSelector = ' ';
     filter->yChannelSelector = ' ';
     filter->scale = 0;
@@ -3791,14 +3742,9 @@ rsvg_filter_primitive_turbulence_set_atts (RsvgNode * self, RsvgHandle * ctx,
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "baseFrequency")))
             rsvg_css_parse_number_optional_number (value, &filter->fBaseFreqX, &filter->fBaseFreqY);
         if ((value = rsvg_property_bag_lookup (atts, "numOctaves")))
@@ -3818,12 +3764,10 @@ RsvgNode *
 rsvg_new_filter_primitive_turbulence (void)
 {
     RsvgFilterPrimitiveTurbulence *filter;
-    filter = g_new (RsvgFilterPrimitiveTurbulence, 1);
+    filter = g_new0 (RsvgFilterPrimitiveTurbulence, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_TURBULENCE);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->fBaseFreqX = 0;
     filter->fBaseFreqY = 0;
     filter->nNumOctaves = 1;
@@ -4030,14 +3974,9 @@ rsvg_filter_primitive_image_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPro
             filter->href = g_string_new (NULL);
             g_string_assign (filter->href, value);
         }
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, value, &filter->super.super);
     }
@@ -4047,12 +3986,10 @@ RsvgNode *
 rsvg_new_filter_primitive_image (void)
 {
     RsvgFilterPrimitiveImage *filter;
-    filter = g_new (RsvgFilterPrimitiveImage, 1);
+    filter = g_new0 (RsvgFilterPrimitiveImage, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_IMAGE);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->super.render = rsvg_filter_primitive_image_render;
     filter->super.super.free = rsvg_filter_primitive_image_free;
     filter->super.super.set_atts = rsvg_filter_primitive_image_set_atts;
@@ -4596,14 +4533,9 @@ rsvg_filter_primitive_diffuse_lighting_set_atts (RsvgNode * self, RsvgHandle * c
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "kernelUnitLength")))
             rsvg_css_parse_number_optional_number (value, &filter->dx, &filter->dy);
         if ((value = rsvg_property_bag_lookup (atts, "lighting-color")))
@@ -4621,12 +4553,10 @@ RsvgNode *
 rsvg_new_filter_primitive_diffuse_lighting (void)
 {
     RsvgFilterPrimitiveDiffuseLighting *filter;
-    filter = g_new (RsvgFilterPrimitiveDiffuseLighting, 1);
+    filter = g_new0 (RsvgFilterPrimitiveDiffuseLighting, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_DIFFUSE_LIGHTING);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->surfaceScale = 1;
     filter->diffuseConstant = 1;
     filter->dx = 1;
@@ -4775,14 +4705,9 @@ rsvg_filter_primitive_specular_lighting_set_atts (RsvgNode * self, RsvgHandle *
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "lighting-color")))
             filter->lightingcolor = rsvg_css_parse_color (value, 0);
         if ((value = rsvg_property_bag_lookup (atts, "specularConstant")))
@@ -4801,12 +4726,10 @@ RsvgNode *
 rsvg_new_filter_primitive_specular_lighting (void)
 {
     RsvgFilterPrimitiveSpecularLighting *filter;
-    filter = g_new (RsvgFilterPrimitiveSpecularLighting, 1);
+    filter = g_new0 (RsvgFilterPrimitiveSpecularLighting, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_SPECULAR_LIGHTING);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->surfaceScale = 1;
     filter->specularConstant = 1;
     filter->specularExponent = 1;
@@ -4900,14 +4823,9 @@ rsvg_filter_primitive_tile_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgProp
             g_string_assign (filter->super.in, value);
         if ((value = rsvg_property_bag_lookup (atts, "result")))
             g_string_assign (filter->super.result, value);
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            filter->super.x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            filter->super.y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "width")))
-            filter->super.width = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "height")))
-            filter->super.height = _rsvg_css_parse_length (value);
+
+        filter_primitive_set_x_y_width_height_atts ((RsvgFilterPrimitive *) filter, atts);
+        
         if ((value = rsvg_property_bag_lookup (atts, "id")))
             rsvg_defs_register_name (ctx->priv->defs, value, &filter->super.super);
     }
@@ -4917,12 +4835,10 @@ RsvgNode *
 rsvg_new_filter_primitive_tile (void)
 {
     RsvgFilterPrimitiveTile *filter;
-    filter = g_new (RsvgFilterPrimitiveTile, 1);
+    filter = g_new0 (RsvgFilterPrimitiveTile, 1);
     _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_TILE);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
-    filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
-        filter->super.height.factor = 'n';
     filter->super.render = rsvg_filter_primitive_tile_render;
     filter->super.super.free = rsvg_filter_primitive_free;
     filter->super.super.set_atts = rsvg_filter_primitive_tile_set_atts;
diff --git a/rsvg-private.h b/rsvg-private.h
index e433dbd..51972b9 100644
--- a/rsvg-private.h
+++ b/rsvg-private.h
@@ -243,11 +243,27 @@ _rsvg_render_check_type (RsvgRender *render,
 #define _RSVG_RENDER_CIC(render, render_type, RenderCType) \
   ((RenderCType*) _rsvg_render_check_type ((render), (render_type)))
 
+typedef enum {
+    LENGTH_UNIT_DEFAULT,
+    LENGTH_UNIT_PERCENT,
+    LENGTH_UNIT_FONT_EM,
+    LENGTH_UNIT_FONT_EX,
+    LENGTH_UNIT_INCH,
+    LENGTH_UNIT_RELATIVE_LARGER,
+    LENGTH_UNIT_RELATIVE_SMALLER
+} LengthUnit;
+
 typedef struct {
     double length;
-    char factor;
+    LengthUnit unit;
 } RsvgLength;
 
+typedef enum {
+    LENGTH_DIR_HORIZONTAL,
+    LENGTH_DIR_VERTICAL,
+    LENGTH_DIR_BOTH
+} LengthDir;
+
 typedef struct {
     cairo_rectangle_t rect;
     cairo_matrix_t affine;
diff --git a/rsvg-text.c b/rsvg-text.c
index 52e52c3..c61a9d2 100644
--- a/rsvg-text.c
+++ b/rsvg-text.c
@@ -40,7 +40,10 @@ typedef struct _RsvgNodeText RsvgNodeText;
 
 struct _RsvgNodeText {
     RsvgNode super;
-    RsvgLength x, y, dx, dy;
+    RsvgLength x, y;
+    gboolean x_specified;
+    gboolean y_specified;
+    RsvgLength dx, dy;
 };
 
 typedef struct _RsvgNodeTref RsvgNodeTref;
@@ -122,6 +125,25 @@ _rsvg_text_chomp (RsvgState *state, GString * in, gboolean * lastwasspace)
     return out;
 }
 
+static void
+set_text_common_atts (RsvgNodeText *text, RsvgPropertyBag * atts)
+{
+    const char *value;
+
+    if ((value = rsvg_property_bag_lookup (atts, "x"))) {
+        text->x = _rsvg_css_parse_length (value);
+        text->x_specified = TRUE;
+    }
+    if ((value = rsvg_property_bag_lookup (atts, "y"))) {
+        text->y = _rsvg_css_parse_length (value);
+        text->y_specified = TRUE;
+    }
+    if ((value = rsvg_property_bag_lookup (atts, "dx")))
+        text->dx = _rsvg_css_parse_length (value);
+    if ((value = rsvg_property_bag_lookup (atts, "dy")))
+        text->dy = _rsvg_css_parse_length (value);
+}
+
 
 static void
 _rsvg_node_text_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPropertyBag * atts)
@@ -130,14 +152,8 @@ _rsvg_node_text_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPropertyBag * a
     RsvgNodeText *text = (RsvgNodeText *) self;
 
     if (rsvg_property_bag_size (atts)) {
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            text->x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            text->y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "dx")))
-            text->dx = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "dy")))
-            text->dy = _rsvg_css_parse_length (value);
+        set_text_common_atts (text, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "class")))
             klazz = value;
         if ((value = rsvg_property_bag_lookup (atts, "id"))) {
@@ -329,7 +345,7 @@ _rsvg_node_text_type_tspan (RsvgNodeText * self, RsvgDrawingCtx * ctx,
             length /= 2;
     }
 
-    if (self->x.factor != 'n') {
+    if (self->x_specified) {
         *x = _rsvg_css_normalize_length (&self->x, ctx, 'h');
         if (!PANGO_GRAVITY_IS_VERTICAL (rsvg_current_state (ctx)->text_gravity)) {
             *x -= length;
@@ -341,7 +357,7 @@ _rsvg_node_text_type_tspan (RsvgNodeText * self, RsvgDrawingCtx * ctx,
     }
     *x += dx;
 
-    if (self->y.factor != 'n') {
+    if (self->y_specified) {
         *y = _rsvg_css_normalize_length (&self->y, ctx, 'v');
         if (PANGO_GRAVITY_IS_VERTICAL (rsvg_current_state (ctx)->text_gravity)) {
             *y -= length;
@@ -361,7 +377,7 @@ _rsvg_node_text_length_tspan (RsvgNodeText * self,
                               RsvgDrawingCtx * ctx, gdouble * length,
                               gboolean * lastwasspace, gboolean usetextonly)
 {
-    if (self->x.factor != 'n' || self->y.factor != 'n')
+    if (self->x_specified || self->y_specified)
         return TRUE;
 
     if (PANGO_GRAVITY_IS_VERTICAL (rsvg_current_state (ctx)->text_gravity))
@@ -380,14 +396,8 @@ _rsvg_node_tspan_set_atts (RsvgNode * self, RsvgHandle * ctx, RsvgPropertyBag *
     RsvgNodeText *text = (RsvgNodeText *) self;
 
     if (rsvg_property_bag_size (atts)) {
-        if ((value = rsvg_property_bag_lookup (atts, "x")))
-            text->x = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "y")))
-            text->y = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "dx")))
-            text->dx = _rsvg_css_parse_length (value);
-        if ((value = rsvg_property_bag_lookup (atts, "dy")))
-            text->dy = _rsvg_css_parse_length (value);
+        set_text_common_atts (text, atts);
+
         if ((value = rsvg_property_bag_lookup (atts, "class")))
             klazz = value;
         if ((value = rsvg_property_bag_lookup (atts, "id"))) {
@@ -403,10 +413,9 @@ RsvgNode *
 rsvg_new_tspan (void)
 {
     RsvgNodeText *text;
-    text = g_new (RsvgNodeText, 1);
+    text = g_new0 (RsvgNodeText, 1);
     _rsvg_node_init (&text->super, RSVG_NODE_TYPE_TSPAN);
     text->super.set_atts = _rsvg_node_tspan_set_atts;
-    text->x.factor = text->y.factor = 'n';
     text->dx = text->dy = _rsvg_css_parse_length ("0");
     return &text->super;
 }
diff --git a/tests/styles.c b/tests/styles.c
index ff7694d..ec6c60c 100644
--- a/tests/styles.c
+++ b/tests/styles.c
@@ -34,7 +34,7 @@ static void
 assert_equal_length (RsvgLength *expected, RsvgLength *actual)
 {
     g_assert_cmpfloat (expected->length, ==, actual->length);
-    g_assert_cmpint (expected->factor, ==, actual->factor);
+    g_assert_cmpint (expected->unit, ==, actual->unit);
 }
 
 static void
@@ -98,14 +98,14 @@ static const FixtureData fixtures[] =
     {"/styles/svg-element-style", "615701", "styles/svg-class.svg", "#svg", "fill", .expected.color = 
0xff0000ff},
     {"/styles/presentation attribute in svg element", "620693", "styles/bug620693.svg", "#svg", "stroke", 
.expected.color = 0xffff0000},
     {"/styles/!important/stroke", "379629", "styles/bug379629.svg", "#base_shadow", "stroke", 
.expected.color = 0xffffc0cb /* pink */},
-    {"/styles/!important/stroke-width", "379629", "styles/bug379629.svg", "#base_shadow", "stroke-width", 
.expected.length = {POINTS_LENGTH(5.), 'i'}},
+    {"/styles/!important/stroke-width", "379629", "styles/bug379629.svg", "#base_shadow", "stroke-width", 
.expected.length = {POINTS_LENGTH(5.), LENGTH_UNIT_INCH}},
     {"/styles/!important/class", "614606", "styles/bug614606.svg", "#path6306", "fill", .expected.color = 
0xffff0000 /* red */ },
     {"/styles/!important/element", "614606", "styles/bug614606.svg", "#path6308", "fill", .expected.color = 
0xff000000},
     {"/styles/!important/#id prior than class", NULL, "styles/important.svg", "#red", "fill", 
.expected.color = 0xffff0000 },
     {"/styles/!important/class prior than type", NULL, "styles/important.svg", "#blue", "fill", 
.expected.color = 0xff0000ff },
     {"/styles/!important/presentation attribute is invalid", NULL, "styles/important.svg", "#white", "fill", 
.expected.color = 0xffffffff },
     {"/styles/!important/style prior than class", NULL, "styles/important.svg", "#pink", "fill", 
.expected.color = 0xffffc0cb },
-    /* {"/styles/selectors/descendant", "338160", "styles/bug338160.svg", "#base_shadow", "stroke-width", 
.expected.length = {2., '\0'}}, */
+    /* {"/styles/selectors/descendant", "338160", "styles/bug338160.svg", "#base_shadow", "stroke-width", 
.expected.length = {2., LENGTH_UNIT_DEFAULT}}, */
 };
 static const gint n_fixtures = G_N_ELEMENTS (fixtures);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]