Index: dimension.c
===================================================================
--- dimension.c	(revision 28830)
+++ dimension.c	(revision 28831)
@@ -237,27 +237,14 @@
 	return edit;
 }
 
-
-
-static void pcb_dimension_edit_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
+static void pcb_dimension_float_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
-	pcb_trace("dim: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
 	dimension_clear(subc);
 }
 
-static void pcb_dimension_edit_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
-{
-	pcb_trace("dim: edit geo %ld %ld\n", subc->ID, edit_obj->ID);
-	dimension_gen(subc, edit_obj);
-}
 
-static void pcb_dimension_float_pre(pcb_subc_t *subc, pcb_any_obj_t *floater)
+static void pcb_dimension_dimline_geo(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("dim: float pre %ld %ld\n", subc->ID, floater->ID);
-}
-
-static void pcb_dimension_float_geo(pcb_subc_t *subc, pcb_any_obj_t *floater)
-{
 	dimension *dim;
 	pcb_any_obj_t *edit_obj;
 	pcb_line_t *fline = floater, bline;
@@ -301,6 +288,13 @@
 	dimension_gen(subc, edit_obj);
 }
 
+static void pcb_dimension_float_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
+{
+/* TODO: call this when role is not "edit" */
+/*	pcb_dimension_dimline_geo(subc, edit_obj)*/
+	dimension_gen(subc, edit_obj);
+}
+
 static void pcb_dimension_float_new(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
 	pcb_trace("dim: float new %ld %ld\n", subc->ID, floater->ID);
@@ -321,8 +315,8 @@
 	"dimension",
 	pcb_dimension_draw_mark,
 	pcb_dimension_get_edit_obj,
-	pcb_dimension_edit_pre,
-	pcb_dimension_edit_geo,
+	NULL,
+	NULL,
 	pcb_dimension_float_pre,
 	pcb_dimension_float_geo,
 	pcb_dimension_float_new,
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 28830)
+++ line_of_vias.c	(revision 28831)
@@ -174,13 +174,13 @@
 
 
 
-static void pcb_line_of_vias_edit_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
+static void pcb_line_of_vias_float_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
 	pcb_trace("LoV: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
 	line_of_vias_clear(subc);
 }
 
-static void pcb_line_of_vias_edit_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
+static void pcb_line_of_vias_float_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
 	pcb_trace("LoV: edit geo %ld %ld\n", subc->ID, edit_obj->ID);
 	line_of_vias_gen(subc, edit_obj);
@@ -210,10 +210,10 @@
 	"line-of-vias",
 	pcb_line_of_vias_draw_mark,
 	pcb_line_of_vias_get_edit_obj,
-	pcb_line_of_vias_edit_pre,
-	pcb_line_of_vias_edit_geo,
-	NULL, /* float_pre */
-	NULL, /* float_geo */
+	NULL,
+	NULL,
+	pcb_line_of_vias_float_pre,
+	pcb_line_of_vias_float_geo,
 	pcb_line_of_vias_float_new,
 	pcb_line_of_vias_chg_attr,
 	pcb_line_of_vias_del_pre