text rewrite

1 files changed, 19 insertions, 19 deletions

diff --git a/rsvg-paint-server.c b/rsvg-paint-server.c
index fe1c7bfd..a41ef271 100644
--- a/rsvg-paint-server.c
+++ b/rsvg-paint-server.c
@@ -214,8 +214,8 @@ rsvg_stop_set_atts (RsvgNode *self, RsvgHandle *ctx,
 			if ((value = rsvg_property_bag_lookup (atts, "offset")))
 				{
 					/* either a number [0,1] or a percentage */
-					RsvgLength length = _rsvg_css_parse_length_struct (value);
-					offset = _rsvg_css_hand_normalize_length_struct(&length, rsvg_dpi_percentage (ctx), 1., 0.);
+					RsvgLength length = _rsvg_css_parse_length (value);
+					offset = _rsvg_css_hand_normalize_length(&length, rsvg_dpi_percentage (ctx), 1., 0.);
 					
 					if (offset < 0.)
 						offset = 0.;
@@ -265,19 +265,19 @@ rsvg_linear_gradient_set_atts (RsvgNode * self, RsvgHandle *ctx, RsvgPropertyBag
 			if ((value = rsvg_property_bag_lookup (atts, "id")))
 				rsvg_defs_register_name (ctx->defs, value, self);
 			if ((value = rsvg_property_bag_lookup (atts, "x1"))){
-				grad->x1 = _rsvg_css_parse_length_struct (value);
+				grad->x1 = _rsvg_css_parse_length (value);
 				grad->hasx1 = TRUE;
 			}				
 			if ((value = rsvg_property_bag_lookup (atts, "y1"))){
-				grad->y1 = _rsvg_css_parse_length_struct (value);
+				grad->y1 = _rsvg_css_parse_length (value);
 				grad->hasy1 = TRUE;
 			}				
 			if ((value = rsvg_property_bag_lookup (atts, "x2"))){
-				grad->x2 = _rsvg_css_parse_length_struct (value);
+				grad->x2 = _rsvg_css_parse_length (value);
 				grad->hasx2 = TRUE;
 			}	
 			if ((value = rsvg_property_bag_lookup (atts, "y2"))){
-				grad->y2 = _rsvg_css_parse_length_struct (value);
+				grad->y2 = _rsvg_css_parse_length (value);
 				grad->hasy2 = TRUE;
 			}	
 		if ((value = rsvg_property_bag_lookup (atts, "spreadMethod")))
@@ -323,8 +323,8 @@ rsvg_new_linear_gradient (void)
 	grad->super.type = RSVG_NODE_LINGRAD;
 	_rsvg_affine_identity(grad->affine);
 	grad->has_current_color = FALSE;
-	grad->x1 = grad->y1 = grad->y2 = _rsvg_css_parse_length_struct ("0");
-	grad->x2 = _rsvg_css_parse_length_struct ("1");
+	grad->x1 = grad->y1 = grad->y2 = _rsvg_css_parse_length ("0");
+	grad->x2 = _rsvg_css_parse_length ("1");
 	grad->fallback = NULL;
 	grad->obj_bbox = TRUE;
 	grad->spread = RSVG_GRADIENT_PAD;
@@ -344,27 +344,27 @@ rsvg_radial_gradient_set_atts (RsvgNode * self, RsvgHandle *ctx, RsvgPropertyBag
 			if ((value = rsvg_property_bag_lookup (atts, "id")))
 				rsvg_defs_register_name (ctx->defs, value, self);
 			if ((value = rsvg_property_bag_lookup (atts, "cx"))){
-				grad->cx = _rsvg_css_parse_length_struct (value);
+				grad->cx = _rsvg_css_parse_length (value);
 				grad->hascx = TRUE;
 				if (!grad->hasfx)
 					grad->fx = grad->cx;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "cy"))){
-				grad->cy = _rsvg_css_parse_length_struct (value);	
+				grad->cy = _rsvg_css_parse_length (value);	
 				grad->hascy = TRUE;
 				if (!grad->hasfy)
 					grad->fy = grad->cy;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "r"))){
-				grad->r = _rsvg_css_parse_length_struct (value);	
+				grad->r = _rsvg_css_parse_length (value);	
 				grad->hasr = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "fx"))){
-				grad->fx = _rsvg_css_parse_length_struct (value);	
+				grad->fx = _rsvg_css_parse_length (value);	
 				grad->hasfx = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "fy"))){
-				grad->fy = _rsvg_css_parse_length_struct (value);
+				grad->fy = _rsvg_css_parse_length (value);
 				grad->hasfy = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "xlink:href")))
@@ -409,7 +409,7 @@ rsvg_new_radial_gradient (void)
 	grad->obj_bbox = TRUE;
 	grad->spread = RSVG_GRADIENT_PAD;
 	grad->fallback = NULL;
-	grad->cx = grad->cy = grad->r = grad->fx = grad->fy = _rsvg_css_parse_length_struct("0.5");
+	grad->cx = grad->cy = grad->r = grad->fx = grad->fy = _rsvg_css_parse_length("0.5");
 	grad->super.set_atts = rsvg_radial_gradient_set_atts;
 	grad->hascx = grad->hascy = grad->hasfx = grad->hasfy = grad->hasr = grad->hasbbox = grad->hasspread = grad->hastransform = FALSE;
 	return &grad->super;
@@ -434,19 +434,19 @@ rsvg_pattern_set_atts (RsvgNode * self, RsvgHandle *ctx, RsvgPropertyBag *atts)
 				pattern->hasvbox = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "x"))){
-				pattern->x = _rsvg_css_parse_length_struct (value);
+				pattern->x = _rsvg_css_parse_length (value);
 				pattern->hasx = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "y"))){
-				pattern->y = _rsvg_css_parse_length_struct (value);
+				pattern->y = _rsvg_css_parse_length (value);
 				pattern->hasy = TRUE;			
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "width"))){
-				pattern->width = _rsvg_css_parse_length_struct (value);
+				pattern->width = _rsvg_css_parse_length (value);
 				pattern->haswidth = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "height"))){
-				pattern->height = _rsvg_css_parse_length_struct (value);
+				pattern->height = _rsvg_css_parse_length (value);
 				pattern->hasheight = TRUE;
 			}
 			if ((value = rsvg_property_bag_lookup (atts, "xlink:href")))
@@ -485,7 +485,7 @@ rsvg_new_pattern (void)
 	pattern->obj_bbox = TRUE;
 	pattern->obj_cbbox = FALSE;
 	pattern->x = pattern->y = pattern->width = pattern->height = 
-		_rsvg_css_parse_length_struct("0");
+		_rsvg_css_parse_length("0");
 	pattern->vbx = 0;
 	pattern->vby = 0;
 	pattern->vbw = 1;