Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 17203)
+++ trunk/src/crosshair.c	(revision 17204)
@@ -1055,7 +1055,7 @@
 
 	pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
 	pcb_gui->set_draw_xor(pcb_crosshair.GC, 1);
-	pcb_gui->set_line_cap(pcb_crosshair.GC, Trace_Cap);
+	pcb_gui->set_line_cap(pcb_crosshair.GC, Round_Cap);
 	pcb_gui->set_line_width(pcb_crosshair.GC, 1);
 
 	/* set initial shape */
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 17203)
+++ trunk/src/draw.c	(revision 17204)
@@ -351,7 +351,7 @@
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
 
-		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Trace_Cap);
+		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Round_Cap);
 		pcb_gui->set_line_width(pcb_draw_out.fgGC, 0);
 		pcb_gui->set_draw_xor(pcb_draw_out.fgGC, 1);
 
@@ -378,7 +378,7 @@
 		/* Draw pins' and pads' names */
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
-		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Trace_Cap);
+		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Round_Cap);
 		pcb_gui->set_line_width(pcb_draw_out.fgGC, 0);
 		if (PCB->SubcOn)
 			pcb_r_search(PCB->Data->subc_tree, drawn_area, NULL, draw_subc_label_callback, NULL, NULL);
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 17203)
+++ trunk/src/hid.h	(revision 17204)
@@ -61,9 +61,8 @@
    twice.  */
 typedef enum {
 	pcb_cap_invalid = -1,
-	Trace_Cap = 0,							/* This means we're drawing a trace, which has round caps.  */
 	Square_Cap,									/* Square pins or pads. */
-	Round_Cap,									/* Round pins or round-ended pads, thermals.  */
+	Round_Cap,									/* For normal traces, round pins */
 	Beveled_Cap									/* Octagon pins or bevel-cornered pads.  */
 } pcb_cap_style_t;
 
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 17203)
+++ trunk/src/obj_arc.c	(revision 17204)
@@ -858,13 +858,13 @@
 		}
 		else
 		pcb_gui->set_line_width(pcb_draw_out.fgGC, arc->Thickness);
-		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Trace_Cap);
+		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Round_Cap);
 		pcb_gui->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 	}
 	else
 	{
 		pcb_gui->set_line_width(pcb_draw_out.fgGC, 0);
-		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Trace_Cap);
+		pcb_gui->set_line_cap(pcb_draw_out.fgGC, Round_Cap);
 
 		if(conf_core.editor.thin_draw)
 			pcb_gui->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 17203)
+++ trunk/src/obj_line.c	(revision 17204)
@@ -998,7 +998,7 @@
 void pcb_line_draw_(pcb_line_t *line, int allow_term_gfx)
 {
 	PCB_DRAW_BBOX(line);
-	pcb_gui->set_line_cap(pcb_draw_out.fgGC, Trace_Cap);
+	pcb_gui->set_line_cap(pcb_draw_out.fgGC, Round_Cap);
 	if (!conf_core.editor.thin_draw && !conf_core.editor.wireframe_draw) {
 		if ((allow_term_gfx) && pcb_draw_term_need_gfx(line)) {
 			pcb_gui->set_line_width(pcb_draw_out.active_padGC, line->Thickness);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 17203)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 17204)
@@ -1356,7 +1356,7 @@
 
 	if (ddraw != NULL) {
 		ddraw->set_line_width(ar_gc, thickness);
-		ddraw->set_line_cap(ar_gc, Trace_Cap);
+		ddraw->set_line_cap(ar_gc, Round_Cap);
 		ddraw->set_color(ar_gc, SLayer->Color);
 
 		ddraw->draw_line(ar_gc, b.X1, b.Y1, b.X2, b.Y1);
@@ -1395,7 +1395,7 @@
 	if (ddraw == NULL)
 		return;
 
-	ddraw->set_line_cap(ar_gc, Trace_Cap);
+	ddraw->set_line_cap(ar_gc, Round_Cap);
 	ddraw->set_line_width(ar_gc, 1);
 	ddraw->set_color(ar_gc, Settings.MaskColor);
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 17203)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 17204)
@@ -581,7 +581,7 @@
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(struct hid_gc_s));
 	rv->me_pointer = &gcode_hid;
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	rv->width = 1;
 	rv->color = (struct color_struct *) malloc(sizeof(*rv->color));
 	rv->color->r = rv->color->g = rv->color->b = 0;
@@ -666,7 +666,6 @@
 
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			type = 'C';
 			r = pcb_to_gcode(gc->width / 2 + gcode_toolradius);
 			break;
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 17203)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 17204)
@@ -874,7 +874,7 @@
 static pcb_hid_gc_t gerber_make_gc(void)
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(1, sizeof(*rv));
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	return rv;
 }
 
@@ -957,7 +957,6 @@
 		lastcap = gc->cap;
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			shape = ROUND;
 			break;
 		default:
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 17203)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 17204)
@@ -687,7 +687,7 @@
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(struct hid_gc_s));
 	rv->me_pointer = &nelma_hid;
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	rv->width = 1;
 	rv->color = (struct color_struct *) malloc(sizeof(*rv->color));
 	rv->color->r = rv->color->g = rv->color->b = 0;
@@ -772,7 +772,6 @@
 
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			type = 'C';
 			r = pcb_to_nelma(gc->width / 2);
 			break;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 17203)
+++ trunk/src_plugins/export_png/png.c	(revision 17204)
@@ -1296,7 +1296,7 @@
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
 	rv->me_pointer = &png_hid;
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	rv->width = 1;
 	rv->color = (color_struct *) malloc(sizeof(color_struct));
 	rv->color->r = rv->color->g = rv->color->b = rv->color->a = 0;
@@ -1475,7 +1475,6 @@
 
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			type = 'C';
 			break;
 		default:
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 17203)
+++ trunk/src_plugins/export_ps/eps.c	(revision 17204)
@@ -398,7 +398,7 @@
 static pcb_hid_gc_t eps_make_gc(void)
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(hid_gc_s));
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	rv->width = 0;
 	rv->color = 0;
 	return rv;
@@ -492,7 +492,6 @@
 		int c;
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			c = 1;
 			break;
 		default:
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 17203)
+++ trunk/src_plugins/export_ps/ps.c	(revision 17204)
@@ -959,7 +959,7 @@
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(1, sizeof(hid_gc_s));
 	rv->me_pointer = &ps_hid;
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	return rv;
 }
 
@@ -1039,7 +1039,6 @@
 		int c;
 		switch (gc->cap) {
 		case Round_Cap:
-		case Trace_Cap:
 			c = 1;
 			break;
 		default:
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 17203)
+++ trunk/src_plugins/export_svg/svg.c	(revision 17204)
@@ -80,7 +80,6 @@
 static const char *CAPS(pcb_cap_style_t cap)
 {
 	switch (cap) {
-		case Trace_Cap:
 		case Round_Cap:
 			return "round";
 		case Square_Cap:
@@ -405,7 +404,7 @@
 {
 	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
 	rv->me_pointer = &svg_hid;
-	rv->cap = Trace_Cap;
+	rv->cap = Round_Cap;
 	rv->width = 1;
 	rv->color = NULL;
 	return rv;
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h	(revision 17203)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h	(revision 17204)
@@ -29,7 +29,6 @@
 
 /* Line or arc ending style */
 typedef enum pcb_cap_style_t_e {
- Trace_Cap,    /* filled circle (trace drawing) */
  Square_Cap,   /* rectangular lines (square pad) */
  Round_Cap,    /* round pins or round-ended pads, thermals */
  Beveled_Cap   /* octagon pins or bevel-cornered pads */
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 17203)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 17204)
@@ -588,7 +588,6 @@
 static void ghid_gdk_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
 {
 	switch (style) {
-	case Trace_Cap:
 	case Round_Cap:
 		gc->cap = GDK_CAP_ROUND;
 		gc->join = GDK_JOIN_ROUND;
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 17203)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 17204)
@@ -757,7 +757,6 @@
 	cairo_line_join_t join = CAIRO_LINE_JOIN_MITER;
 
 	switch (style) {
-	case Trace_Cap:
 	case Round_Cap:
 		cap = CAIRO_LINE_CAP_ROUND;
 		join = CAIRO_LINE_JOIN_ROUND;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 17203)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 17204)
@@ -2996,7 +2996,6 @@
 		cap = CapProjecting;
 		join = JoinMiter;
 		break;
-	case Trace_Cap:
 	case Round_Cap:
 		cap = CapRound;
 		join = JoinRound;
Index: trunk/src_plugins/lib_hid_gl/hidgl.c
===================================================================
--- trunk/src_plugins/lib_hid_gl/hidgl.c	(revision 17203)
+++ trunk/src_plugins/lib_hid_gl/hidgl.c	(revision 17204)
@@ -324,7 +324,6 @@
 		}
 
 		switch (cap) {
-		case Trace_Cap:
 		case Round_Cap:
 			circular_caps = 1;
 			break;
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 17203)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 17204)
@@ -110,7 +110,6 @@
 {
 	const char *txt = "unknown";
 	switch (style) {
-		ENUM_LOG_TEXT(Trace_Cap);
 		ENUM_LOG_TEXT(Square_Cap);
 		ENUM_LOG_TEXT(Round_Cap);
 		ENUM_LOG_TEXT(Beveled_Cap);