Index: trunk/src_plugins/io_eagle/read.c
===================================================================
--- trunk/src_plugins/io_eagle/read.c	(revision 20911)
+++ trunk/src_plugins/io_eagle/read.c	(revision 20912)
@@ -761,7 +761,7 @@
 		shapes[current_layer].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
 		switch (shape) { /*need shapes for {mask, paste, top} +/- (inner), &/or {bottom, paste, mask}*/
 			case EAGLE_PSH_SQUARE:
-				pcb_shape_rect(&shapes[current_layer++], dx + clr, dy + clr);
+				pcb_shape_rect(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 				shapes[current_layer].layer_mask = PCB_LYT_TOP | PCB_LYT_PASTE;
 				shapes[current_layer].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
 				pcb_shape_rect(&shapes[current_layer++], dx, dy);
@@ -770,11 +770,11 @@
 				pcb_shape_rect(&shapes[current_layer++], dx, dy);
 				break;
 			case EAGLE_PSH_OCTAGON:
-/*			      need_an_octagon_shape_gen(&shapes[current_layer++], dx+clr);
+/*			      need_an_octagon_shape_gen(&shapes[current_layer++], dx+mask_gap);
 				break;*/
 			case EAGLE_PSH_ROUND:
 			case EAGLE_PSH_LONG:
-				pcb_shape_oval(&shapes[current_layer++], dx + clr, dy + clr);
+				pcb_shape_oval(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 				shapes[current_layer].layer_mask = PCB_LYT_TOP | PCB_LYT_PASTE;
 				shapes[current_layer].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
 				pcb_shape_oval(&shapes[current_layer++], dx, dy);
@@ -783,7 +783,7 @@
 				pcb_shape_oval(&shapes[current_layer++], dx, dy);
 				break;
 			case EAGLE_PSH_SMD: /* will need to address roundness in due course */
-				pcb_shape_rect(&shapes[current_layer++], dx + clr, dy + clr);
+				pcb_shape_rect(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 				shapes[current_layer].layer_mask = PCB_LYT_TOP | PCB_LYT_PASTE;
 				shapes[current_layer].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
 				pcb_shape_rect(&shapes[current_layer++], dx, dy);
@@ -801,7 +801,7 @@
 				pcb_shape_rect(&shapes[current_layer++], dx, dy);
 				break;
 			case EAGLE_PSH_OCTAGON: /* or should this just be round ? */
-/*			      need_an_octagon_shape_gen(&shapes[current_layer++], dx+clr);
+/*			      need_an_octagon_shape_gen(&shapes[current_layer++], dx+mask_gap);
 				break;*/
 			case EAGLE_PSH_ROUND:
 			case EAGLE_PSH_LONG: /* or should this just be round ? */
@@ -819,10 +819,10 @@
 			pcb_shape_rect(&shapes[current_layer++], dx, dy);
 			shapes[current_layer].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER;
 			shapes[current_layer].comb = 0;
-			pcb_shape_rect(&shapes[current_layer++], dx + clr, dy + clr);
+			pcb_shape_rect(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 			break;
 		case EAGLE_PSH_OCTAGON:
-/*		      need_an_octagon_shape_gen(&shapes[current_layer++], dx+clr);
+/*		      need_an_octagon_shape_gen(&shapes[current_layer++], dx+mask_gap);
 			break;*/
 		case EAGLE_PSH_ROUND:
 		case EAGLE_PSH_LONG:
@@ -832,7 +832,7 @@
 			pcb_shape_oval(&shapes[current_layer++], dx, dy);
 			shapes[current_layer].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER;
 			shapes[current_layer].comb = 0;
-			pcb_shape_oval(&shapes[current_layer++], dx + clr, dy + clr);
+			pcb_shape_oval(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 			break;
 		case EAGLE_PSH_SMD: /* will need to address roundness in due course */
 			if (onbottom) {
@@ -842,12 +842,12 @@
 				pcb_shape_rect(&shapes[current_layer++], dx, dy);
 				shapes[current_layer].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER;
 				shapes[current_layer].comb = 0;
-				pcb_shape_rect(&shapes[current_layer++], dx + clr, dy + clr);
+				pcb_shape_rect(&shapes[current_layer++], dx + mask_gap, dy + mask_gap);
 			}
 			break;
 	}
 	shapes[current_layer].layer_mask = 0;
-	return pcb_pstk_new_from_shape(data, x, y, drill_dia, plated, clr, shapes);
+	return pcb_pstk_new_from_shape(data, x, y, drill_dia, plated, mask_gap, shapes);
 }
 
 static int eagle_read_smd(read_state_t *st, trnode_t *subtree, void *obj, int type)