Index: trunk/src_plugins/rbs_routing/stretch.c
===================================================================
--- trunk/src_plugins/rbs_routing/stretch.c	(revision 38785)
+++ trunk/src_plugins/rbs_routing/stretch.c	(revision 38786)
@@ -15,8 +15,14 @@
 		return -1;
 	}
 
-	rbss->from.type = ADDR_ARC_END | ADDR_ARC_CONVEX;
-	rbss->from.obj.arc = gl->a1;
+	if (gl->a1->r == 0) {
+		rbss->from.type = ADDR_ARC_END | ADDR_POINT;
+		rbss->from.obj.pt = gl->a1->parent_pt;
+	}
+	else {
+		rbss->from.type = ADDR_ARC_END | ADDR_ARC_CONVEX;
+		rbss->from.obj.arc = gl->a1;
+	}
 	rbss->from.last_real = NULL;
 	gl->a1->new_r = gl->a1->r;
 	gl->a1->new_sa = gl->a1->sa;
@@ -25,8 +31,15 @@
 	gl->a1->new_in_use = 1;
 
 
-	rbss->to.type = ADDR_ARC_START | ADDR_ARC_CONVEX;
-	rbss->to.obj.arc = gl->a2;
+
+	if (gl->a2->r == 0) {
+		rbss->to.type = ADDR_ARC_END | ADDR_POINT;
+		rbss->to.obj.pt = gl->a2->parent_pt;
+	}
+	else {
+		rbss->to.type = ADDR_ARC_START | ADDR_ARC_CONVEX;
+		rbss->to.obj.arc = gl->a2;
+	}
 	rbss->to.last_real = NULL;
 	gl->a2->new_r = gl->a2->r;
 	gl->a2->new_sa = gl->a2->sa;
@@ -54,7 +67,7 @@
 
 int rbsr_stretch_line_to_coords(rbsr_stretch_t *rbss, rnd_coord_t tx, rnd_coord_t ty)
 {
-	grbs_addr_t *a1;
+	grbs_addr_t *a1, *a2;
 	if (rbss->via != NULL) {
 		grbs_point_unreg(&rbss->map.grbs, rbss->via);
 		rbss->via->x = RBSR_R2G(tx);
@@ -62,21 +75,33 @@
 		grbs_point_reg(&rbss->map.grbs, rbss->via);
 	}
 	else
-		rbss->via = grbs_point_new(&rbss->map.grbs, RBSR_R2G(tx), RBSR_R2G(ty), RBSR_R2G(RND_MM_TO_COORD(0.1)), RBSR_R2G(RND_MM_TO_COORD(0.1)));
+		rbss->via = grbs_point_new(&rbss->map.grbs, RBSR_R2G(tx), RBSR_R2G(ty), RBSR_R2G(RND_MM_TO_COORD(2.1)), RBSR_R2G(RND_MM_TO_COORD(0.1)));
 
 	a1 = grbs_path_next(&rbss->map.grbs, rbss->tn, &rbss->from, rbss->via, GRBS_ADIR_CONVEX_CW);
+	if (a1 == NULL) {
+		rnd_message(RND_MSG_ERROR, "rbsr_stretch_line_to_coord(): failed to route to a2\n");
+		return -1;
+	}
 
+	rbss->to.obj.arc->new_in_use = 0; /* avoid spiral detection */
+	a2 = path_path_next_to_addr(&rbss->map.grbs, rbss->tn, a1, &rbss->to);
+	if (a2 == NULL) {
+		rnd_message(RND_MSG_ERROR, "rbsr_stretch_line_to_coord(): failed to route to a2\n");
+		return -1;
+	}
+
 	rbsr_map_debug_draw(&rbss->map, "rbss3.svg");
 	rbsr_map_debug_dump(&rbss->map, "rbss3.dump");
 
 
+	/* realize backward */
+	grbs_path_realize(&rbss->map.grbs,rbss->tn, a2, 0);
+	grbs_path_realize(&rbss->map.grbs, rbss->tn, a1, 0);
 	grbs_path_realize(&rbss->map.grbs, rbss->tn, &rbss->from, 0);
-	grbs_path_realize(&rbss->map.grbs, rbss->tn, a1, 0);
-	grbs_path_realize(&rbss->map.grbs, rbss->tn, &rbss->to, 0);
 
 
 	rbsr_map_debug_draw(&rbss->map, "rbss4.svg");
 	rbsr_map_debug_dump(&rbss->map, "rbss4.dump");
 
-
+	return 0;
 }