Index: trunk/src_plugins/export_c_draw/export_c_draw.c
===================================================================
--- trunk/src_plugins/export_c_draw/export_c_draw.c	(revision 33963)
+++ trunk/src_plugins/export_c_draw/export_c_draw.c	(revision 33964)
@@ -147,8 +147,14 @@
 	if (!c_draw_cam.active)
 		pcb_hid_save_and_show_layer_ons(save_ons);
 
+	fprintf(f, "/*** generated by pcb-rnd using export_c_draw ***/\n");
+	fprintf(f, "{\n");
+	fprintf(f, "	rnd_color_t clr;\n");
+
 	c_draw_hid_export_to_file(f, options, &xform);
 
+	fprintf(f, "}\n");
+
 	if (!c_draw_cam.active)
 		pcb_hid_restore_layer_ons(save_ons);
 
@@ -245,8 +251,8 @@
 static void use_gc(rnd_hid_gc_t gc)
 {
 	if (gc->color.packed != gc->last_color.packed) {
-		fprintf(f, "rnd_color_load_int(&clr, %d, %d, %d, %d);\n", gc->color.r, gc->color.g, gc->color.b, gc->color.a);
-		fprintf(f, "rnd_render->set_color(gc, &clr)\n");
+		fprintf(f, "	rnd_color_load_int(&clr, %d, %d, %d, %d);\n", gc->color.r, gc->color.g, gc->color.b, gc->color.a);
+		fprintf(f, "	rnd_render->set_color(gc, &clr);\n");
 		gc->last_color = gc->color;
 	}
 	if (gc->style != gc->last_style) {
@@ -256,11 +262,11 @@
 			case rnd_cap_square:  caps = "rnd_cap_square"; break;
 			case rnd_cap_round:   caps = "rnd_cap_round"; break;
 		}
-		fprintf(f, "rnd_hid_set_line_cap(gc, %s);\n", caps);
+		fprintf(f, "	rnd_hid_set_line_cap(gc, %s);\n", caps);
 		gc->last_style = gc->style;
 	}
 	if (gc->capw != gc->last_capw) {
-		rnd_fprintf(f, "rnd_hid_set_line_cap(gc, PCB_MM_TO_COORD(%mm));\n", gc->capw);
+		rnd_fprintf(f, "	rnd_hid_set_line_width(gc, RND_MM_TO_COORD(%mm));\n", gc->capw);
 		gc->last_capw = gc->capw;
 	}
 
@@ -294,13 +300,13 @@
 static void c_draw_draw_line(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2)
 {
 	use_gc(gc);
-	rnd_fprintf(f, "rnd_render->draw_line(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm));\n", x1, y1, x2, y2);
+	rnd_fprintf(f, "	rnd_render->draw_line(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm));\n", x1, y1, x2, y2);
 }
 
 static void c_draw_draw_arc(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t start_angle, rnd_angle_t delta_angle)
 {
 	use_gc(gc);
-	rnd_fprintf(f, "rnd_render->draw_arc(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), %f, %f\n",
+	rnd_fprintf(f, "	rnd_render->draw_arc(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), %f, %f);\n",
 		cx, cy, width, height, start_angle, delta_angle);
 }
 
@@ -307,7 +313,7 @@
 static void c_draw_fill_circle(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t radius)
 {
 	use_gc(gc);
-	rnd_fprintf(f, "rnd_render->draw_fill_circle(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm)\n",
+	rnd_fprintf(f, "	rnd_render->fill_circle(gc, RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm), RND_MM_TO_COORD(%mm));\n",
 		cx, cy, radius);
 }