Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4808)
+++ trunk/src/action_helper.c	(revision 4809)
@@ -648,7 +648,7 @@
 				{
 					pcb_arc_t *arc;
 					Coord wx, wy;
-					Angle sa, dir;
+					pcb_angle_t sa, dir;
 
 					wx = Note.X - Crosshair.AttachedBox.Point1.X;
 					wy = Note.Y - Crosshair.AttachedBox.Point1.Y;
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4808)
+++ trunk/src/buffer.c	(revision 4809)
@@ -274,7 +274,7 @@
 	RotateBoxLowLevel(&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number);
 }
 
-void FreeRotateBuffer(pcb_buffer_t *Buffer, Angle angle)
+void FreeRotateBuffer(pcb_buffer_t *Buffer, pcb_angle_t angle)
 {
 	double cosa, sina;
 
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 4808)
+++ trunk/src/change.c	(revision 4809)
@@ -599,7 +599,7 @@
  * changes the angle of all selected and visible object types
  * returns pcb_true if anything has changed
  */
-pcb_bool ChangeSelectedAngle(int types, int is_start, Angle Difference, pcb_bool fixIt)
+pcb_bool ChangeSelectedAngle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt)
 {
 	pcb_bool change = pcb_false;
 	pcb_opctx_t ctx;
@@ -621,7 +621,7 @@
  * changes the radius of all selected and visible object types
  * returns pcb_true if anything has changed
  */
-pcb_bool ChangeSelectedRadius(int types, int is_start, Angle Difference, pcb_bool fixIt)
+pcb_bool ChangeSelectedRadius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt)
 {
 	pcb_bool change = pcb_false;
 	pcb_opctx_t ctx;
@@ -849,7 +849,7 @@
  * changes the angles of the passed object (e.g. arc start/ctx->chgsize.delta)
  * Returns pcb_true if anything is changed
  */
-pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, Angle a, pcb_bool fixIt)
+pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool fixIt)
 {
 	pcb_bool change;
 	pcb_opctx_t ctx;
Index: trunk/src/change.h
===================================================================
--- trunk/src/change.h	(revision 4808)
+++ trunk/src/change.h	(revision 4809)
@@ -106,8 +106,8 @@
 void ChangePCBSize(Coord, Coord);
 void *ChangeObjectPinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name);
 pcb_bool ChangeObjectRadius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, Coord r, pcb_bool absolute);
-pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, Angle a, pcb_bool absolute);
-pcb_bool ChangeSelectedAngle(int types, int is_start, Angle Difference, pcb_bool fixIt);
-pcb_bool ChangeSelectedRadius(int types, int is_start, Angle Difference, pcb_bool fixIt);
+pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool absolute);
+pcb_bool ChangeSelectedAngle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt);
+pcb_bool ChangeSelectedRadius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt);
 
 #endif
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4808)
+++ trunk/src/crosshair.c	(revision 4809)
@@ -135,7 +135,7 @@
 	pcb_arc_t arc;
 	pcb_box_t *bx;
 	Coord wx, wy;
-	Angle sa, dir;
+	pcb_angle_t sa, dir;
 	Coord wid = thick / 2;
 
 	wx = Crosshair.X - Crosshair.AttachedBox.Point1.X;
@@ -197,7 +197,7 @@
 	oy = -(dx * h + 0.5 * SGN(dx));
 	gui->draw_line(Crosshair.GC, x1 + ox, y1 + oy, x2 + ox, y2 + oy);
 	if (coord_abs(ox) >= pixel_slop || coord_abs(oy) >= pixel_slop) {
-		Angle angle = atan2(dx, dy) * 57.295779;
+		pcb_angle_t angle = atan2(dx, dy) * 57.295779;
 		gui->draw_line(Crosshair.GC, x1 - ox, y1 - oy, x2 - ox, y2 - oy);
 		gui->draw_arc(Crosshair.GC, x1, y1, thick / 2, thick / 2, angle - 180, 180);
 		gui->draw_arc(Crosshair.GC, x2, y2, thick / 2, thick / 2, angle, 180);
Index: trunk/src/drc.h
===================================================================
--- trunk/src/drc.h	(revision 4808)
+++ trunk/src/drc.h	(revision 4809)
@@ -33,7 +33,7 @@
 	char *title;
 	char *explanation;
 	Coord x, y;
-	Angle angle;
+	pcb_angle_t angle;
 	int have_measured;
 	Coord measured_value;
 	Coord required_value;
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4808)
+++ trunk/src/find_drc.c	(revision 4809)
@@ -45,7 +45,7 @@
 	* pcb_drc_violation_new(const char *title,
 													const char *explanation,
 													Coord x, Coord y,
-													Angle angle,
+													pcb_angle_t angle,
 													pcb_bool have_measured,
 													Coord measured_value,
 													Coord required_value, int object_count, long int *object_id_list, int *object_type_list)
Index: trunk/src/find_geo.c
===================================================================
--- trunk/src/find_geo.c	(revision 4808)
+++ trunk/src/find_geo.c	(revision 4809)
@@ -63,7 +63,7 @@
 	( IsPointInPad((PV)->X, (PV)->Y, MAX((PV)->Thickness/2 +Bloat,0), (Pad)))
 
 /* reduce arc start angle and delta to 0..360 */
-static void normalize_angles(Angle * sa, Angle * d)
+static void normalize_angles(pcb_angle_t * sa, pcb_angle_t * d)
 {
 	if (*d < 0) {
 		*sa += *d;
@@ -77,7 +77,7 @@
 static int radius_crosses_arc(double x, double y, pcb_arc_t *arc)
 {
 	double alpha = atan2(y - arc->Y, -x + arc->X) * PCB_RAD_TO_DEG;
-	Angle sa = arc->StartAngle, d = arc->Delta;
+	pcb_angle_t sa = arc->StartAngle, d = arc->Delta;
 
 	normalize_angles(&sa, &d);
 	if (alpha < 0)
@@ -150,8 +150,8 @@
 	if (dl < 0.5) {
 		if ((Arc1->Width - t >= Arc2->Width - t2 && Arc1->Width - t <= Arc2->Width + t2)
 				|| (Arc1->Width + t >= Arc2->Width - t2 && Arc1->Width + t <= Arc2->Width + t2)) {
-			Angle sa1 = Arc1->StartAngle, d1 = Arc1->Delta;
-			Angle sa2 = Arc2->StartAngle, d2 = Arc2->Delta;
+			pcb_angle_t sa1 = Arc1->StartAngle, d1 = Arc1->Delta;
+			pcb_angle_t sa2 = Arc2->StartAngle, d2 = Arc2->Delta;
 			/* NB the endpoints have already been checked,
 			   so we just compare the angles */
 
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 4808)
+++ trunk/src/hid.h	(revision 4809)
@@ -280,7 +280,7 @@
 	   given width, whereas "fill" means to fill to a zero-width
 	   outline.  */
 	void (*draw_line) (pcb_hid_gc_t gc_, Coord x1_, Coord y1_, Coord x2_, Coord y2_);
-	void (*draw_arc) (pcb_hid_gc_t gc_, Coord cx_, Coord cy_, Coord xradius_, Coord yradius_, Angle start_angle_, Angle delta_angle_);
+	void (*draw_arc) (pcb_hid_gc_t gc_, Coord cx_, Coord cy_, Coord xradius_, Coord yradius_, pcb_angle_t start_angle_, pcb_angle_t delta_angle_);
 	void (*draw_rect) (pcb_hid_gc_t gc_, Coord x1_, Coord y1_, Coord x2_, Coord y2_);
 	void (*fill_circle) (pcb_hid_gc_t gc_, Coord cx_, Coord cy_, Coord radius_);
 	void (*fill_polygon) (pcb_hid_gc_t gc_, int n_coords_, Coord * x_, Coord * y_);
Index: trunk/src/hid_draw_helpers.c
===================================================================
--- trunk/src/hid_draw_helpers.c	(revision 4808)
+++ trunk/src/hid_draw_helpers.c	(revision 4809)
@@ -236,7 +236,7 @@
 		gui->draw_line(gc, x1 + ox, y1 + oy, x2 + ox, y2 + oy);
 
 		if (labs(ox) >= pixel_slop || coord_abs(oy) >= pixel_slop) {
-			Angle angle = atan2(dx, dy) * 57.295779;
+			pcb_angle_t angle = atan2(dx, dy) * 57.295779;
 			gui->draw_line(gc, x1 - ox, y1 - oy, x2 - ox, y2 - oy);
 			gui->draw_arc(gc, x1, y1, t, t, angle - 180, 180);
 			gui->draw_arc(gc, x2, y2, t, t, angle, 180);
Index: trunk/src/hid_extents.c
===================================================================
--- trunk/src/hid_extents.c	(revision 4808)
+++ trunk/src/hid_extents.c	(revision 4809)
@@ -83,7 +83,7 @@
 	PEY(y2, gc->width);
 }
 
-static void extents_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle end_angle)
+static void extents_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t end_angle)
 {
 	/* Naive but good enough.  */
 	PEX(cx, width + gc->width);
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 4808)
+++ trunk/src/hid_nogui.c	(revision 4809)
@@ -98,7 +98,7 @@
 	CRASH("draw_line");
 }
 
-static void nogui_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle end_angle)
+static void nogui_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t end_angle)
 {
 	CRASH("draw_arc");
 }
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 4808)
+++ trunk/src/obj_arc.c	(revision 4809)
@@ -70,7 +70,7 @@
 {
 	double ca1, ca2, sa1, sa2;
 	double minx, maxx, miny, maxy;
-	Angle ang1, ang2;
+	pcb_angle_t ang1, ang2;
 	Coord width;
 
 	/* first put angles into standard form:
@@ -141,7 +141,7 @@
 }
 
 /* doesn't these belong in change.c ?? */
-void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, Angle new_sa, Angle new_da)
+void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da)
 {
 	if (new_da >= 360) {
 		new_da = 360;
@@ -172,7 +172,7 @@
 
 
 /* creates a new arc on a layer */
-pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, pcb_flag_t Flags)
+pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, pcb_angle_t sa, pcb_angle_t dir, Coord Thickness, Coord Clearance, pcb_flag_t Flags)
 {
 	pcb_arc_t *Arc;
 
@@ -339,7 +339,7 @@
 /* changes the angle of an arc (is_primary 0=start or 1=end) */
 void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
-	Angle value, *dst;
+	pcb_angle_t value, *dst;
 	void *a0, *a1;
 
 	if (TEST_FLAG(PCB_FLAG_LOCK, Arc))
Index: trunk/src/obj_arc.h
===================================================================
--- trunk/src/obj_arc.h	(revision 4808)
+++ trunk/src/obj_arc.h	(revision 4809)
@@ -36,7 +36,7 @@
 	Coord Thickness, Clearance;
 	Coord Width, Height,					/* length of axis */
 	  X, Y;												/* center coordinates */
-	Angle StartAngle, Delta;			/* the two limiting angles in degrees */
+	pcb_angle_t StartAngle, Delta;			/* the two limiting angles in degrees */
 	gdl_elem_t link;              /* an arc is in a list: either on a layer or in an element */
 };
 
@@ -49,10 +49,10 @@
 /*** Utility ***/
 void SetArcBoundingBox(pcb_arc_t *Arc);
 pcb_box_t *GetArcEnds(pcb_arc_t *Arc);
-void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, Angle new_sa, Angle new_da);
+void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da);
 void ChangeArcRadii(pcb_layer_t *Layer, pcb_arc_t *a, Coord new_width, Coord new_height);
 void *RemoveArc(pcb_layer_t *Layer, pcb_arc_t *Arc);
-pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, pcb_flag_t Flags);
+pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, pcb_angle_t sa, pcb_angle_t dir, Coord Thickness, Coord Clearance, pcb_flag_t Flags);
 
 /* Add objects without creating them or making any "sanity modifications" to them */
 void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc);
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4808)
+++ trunk/src/obj_elem.c	(revision 4809)
@@ -391,7 +391,7 @@
 	return (pcb_true);
 }
 
-void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, Coord X, Coord Y, double cosa, double sina, Angle angle)
+void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, Coord X, Coord Y, double cosa, double sina, pcb_angle_t angle)
 {
 	/* solder side objects need a different orientation */
 
@@ -596,7 +596,7 @@
 
 /* creates a new arc in an element */
 pcb_arc_t *CreateNewArcInElement(pcb_element_t *Element, Coord X, Coord Y,
-	Coord Width, Coord Height, Angle angle, Angle delta, Coord Thickness)
+	Coord Width, Coord Height, pcb_angle_t angle, pcb_angle_t delta, Coord Thickness)
 {
 	pcb_arc_t *arc = GetElementArcMemory(Element);
 
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 4808)
+++ trunk/src/obj_elem.h	(revision 4809)
@@ -59,7 +59,7 @@
 int LoadFootprintByName(pcb_buffer_t *Buffer, const char *Footprint);
 pcb_bool SmashBufferElement(pcb_buffer_t *Buffer);
 pcb_bool ConvertBufferToElement(pcb_buffer_t *Buffer);
-void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, Coord X, Coord Y, double cosa, double sina, Angle angle);
+void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, Coord X, Coord Y, double cosa, double sina, pcb_angle_t angle);
 pcb_bool ChangeElementSide(pcb_element_t *Element, Coord yoff);
 pcb_bool ChangeSelectedElementSide(void);
 pcb_element_t *CopyElementLowLevel(pcb_data_t *Data, pcb_element_t *Dest, pcb_element_t *Src, pcb_bool uniqueName, Coord dx, Coord dy);
@@ -82,7 +82,7 @@
 	int TextScale, pcb_flag_t TextFlags, pcb_bool uniqueName);
 
 pcb_arc_t *CreateNewArcInElement(pcb_element_t *Element, Coord X, Coord Y,
-	Coord Width, Coord Height, Angle angle, Angle delta, Coord Thickness);
+	Coord Width, Coord Height, pcb_angle_t angle, pcb_angle_t delta, Coord Thickness);
 
 pcb_line_t *CreateNewLineInElement(pcb_element_t *Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness);
 
Index: trunk/src/operation.h
===================================================================
--- trunk/src/operation.h	(revision 4808)
+++ trunk/src/operation.h	(revision 4809)
@@ -49,8 +49,8 @@
 
 typedef struct {
 	pcb_board_t *pcb;
-	int is_primary;           /* whether the primary parameter should be changed */
-	Angle delta, absolute;    /* same as above, but for angles */
+	int is_primary;                 /* whether the primary parameter should be changed */
+	pcb_angle_t delta, absolute;    /* same as above, but for angles */
 } pcb_opctx_chgangle_t;
 
 typedef struct {
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 4808)
+++ trunk/src/pcb-printf.c	(revision 4809)
@@ -620,7 +620,7 @@
 					if (gds_append_len(&spec, ".0f", 3) != 0) goto err;
 					if (suffix == SUFFIX)
 						if (gds_append_len(&spec, " deg", 4) != 0) goto err;
-					tmplen = sprintf(tmp, spec.array, (double) va_arg(args, Angle));
+					tmplen = sprintf(tmp, spec.array, (double) va_arg(args, pcb_angle_t));
 					if (gds_append_len(string, tmp, tmplen) != 0) goto err;
 					break;
 				case 'A':
@@ -627,7 +627,7 @@
 					if (gds_append_len(&spec, ".0f", 3) != 0) goto err;
 					/* if (suffix == SUFFIX)
 						if (gds_append_len(&spec, " deg", 4) != 0) goto err;*/
-					tmplen = sprintf(tmp, spec.array, 10*((double) va_arg(args, Angle))); /* kicad legacy needs decidegrees */
+					tmplen = sprintf(tmp, spec.array, 10*((double) va_arg(args, pcb_angle_t))); /* kicad legacy needs decidegrees */
 					if (gds_append_len(string, tmp, tmplen) != 0) goto err;
 					break;
 				case '+':
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4808)
+++ trunk/src/search.c	(revision 4809)
@@ -906,8 +906,8 @@
 	/* Calculate angle of point from arc center */
 	double p_dist = Distance(X, Y, Arc->X, Arc->Y);
 	double p_cos = (X - Arc->X) / p_dist;
-	Angle p_ang = acos(p_cos) * PCB_RAD_TO_DEG;
-	Angle ang1, ang2;
+	pcb_angle_t p_ang = acos(p_cos) * PCB_RAD_TO_DEG;
+	pcb_angle_t ang1, ang2;
 
 	/* Convert StartAngle, Delta into bounding angles in [0, 720) */
 	if (Arc->Delta > 0) {
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4808)
+++ trunk/src/undo.c	(revision 4809)
@@ -109,7 +109,7 @@
 } ClearPolyType, *ClearPolyTypePtr;
 
 typedef struct {
-	Angle angle[2];
+	pcb_angle_t angle[2];
 } AngleChangeType;
 
 typedef struct {								/* information about netlist lib changes */
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 4808)
+++ trunk/src/unit.c	(revision 4809)
@@ -282,7 +282,7 @@
 }
 
 /* Bring an angle into [0, 360) range */
-Angle NormalizeAngle(Angle a)
+pcb_angle_t NormalizeAngle(pcb_angle_t a)
 {
 	while (a < 0)
 		a += 360.0;
Index: trunk/src/unit.h
===================================================================
--- trunk/src/unit.h	(revision 4808)
+++ trunk/src/unit.h	(revision 4809)
@@ -31,7 +31,7 @@
 #include "config.h"
 
 /* typedef ... Coord;				pcb base unit, typedef'd in config.h */
-typedef double Angle;						/* degrees */
+typedef double pcb_angle_t;						/* degrees */
 
 enum pcb_allow_e {
 	NO_PRINT = 0,									/* suffixes we can read but not print (i.e., "inch") */
@@ -119,7 +119,7 @@
 double unit_to_factor(const pcb_unit_t * unit);
 Coord unit_to_coord(const pcb_unit_t *, double);
 pcb_increments_t *get_increments_struct(const char *suffix);
-Angle NormalizeAngle(Angle a);
+pcb_angle_t NormalizeAngle(pcb_angle_t a);
 
 /* PCB/physical unit conversions */
 #define PCB_COORD_TO_MIL(n)	((n) / 25400.0)
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 4808)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 4809)
@@ -260,7 +260,7 @@
 #warning TODO: remove x1;y1;x2;y2
 static void
 bboard_draw_arc_cairo(/*Coord x1, Coord y1, Coord x2, Coord y2,*/ Coord x,
-											Coord y, Coord w, Coord h, Angle sa, Angle a, Coord thickness)
+											Coord y, Coord w, Coord h, pcb_angle_t sa, pcb_angle_t a, Coord thickness)
 {
 	ASSERT_CAIRO;
 
@@ -391,7 +391,7 @@
 	Coord ex, ey;
 	Coord ox = 0, oy = 0;
 	int w, h;
-	Angle tmp_angle = 0.0;
+	pcb_angle_t tmp_angle = 0.0;
 	char *model_angle, *s = 0, *s1, *s2, *fname = NULL;
 	pcb_bool offset_in_model = pcb_false;
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 4808)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 4809)
@@ -770,9 +770,9 @@
 	gdImageLine(gcode_im, pcb_to_gcode(x1), pcb_to_gcode(y1), pcb_to_gcode(x2), pcb_to_gcode(y2), gdBrushed);
 }
 
-static void gcode_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void gcode_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 
 	/*
 	 * in gdImageArc, 0 degrees is to the right and +90 degrees is down
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 4808)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 4809)
@@ -50,7 +50,7 @@
 static void gerber_set_line_width(pcb_hid_gc_t gc, Coord width);
 static void gerber_set_draw_xor(pcb_hid_gc_t gc, int _xor);
 static void gerber_draw_line(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
-static void gerber_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle);
+static void gerber_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle);
 static void gerber_draw_rect(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
 static void gerber_fill_circle(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord radius);
 static void gerber_fill_rect(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
@@ -973,7 +973,7 @@
 
 }
 
-static void gerber_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void gerber_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	pcb_bool m = pcb_false;
 	double arcStartX, arcStopX, arcStartY, arcStopY;
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 4808)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 4809)
@@ -893,9 +893,9 @@
 	gdImageLine(nelma_im, pcb_to_nelma(x1), pcb_to_nelma(y1), pcb_to_nelma(x2), pcb_to_nelma(y2), gdBrushed);
 }
 
-static void nelma_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void nelma_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 
 	/*
 	 * in gdImageArc, 0 degrees is to the right and +90 degrees is down
Index: trunk/src_plugins/export_openscad/scad.c
===================================================================
--- trunk/src_plugins/export_openscad/scad.c	(revision 4808)
+++ trunk/src_plugins/export_openscad/scad.c	(revision 4809)
@@ -987,7 +987,7 @@
 }
 
 
-static void scad_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void scad_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	int i, n_steps, x, y, ox = 0, oy = 0, sa;
 	float angle;
Index: trunk/src_plugins/export_openscad/scadcomp.c
===================================================================
--- trunk/src_plugins/export_openscad/scadcomp.c	(revision 4808)
+++ trunk/src_plugins/export_openscad/scadcomp.c	(revision 4809)
@@ -288,7 +288,7 @@
 static void scad_export_model(int model_type, pcb_element_t * element, pcb_bool imported, FILE * f, char *line, int size)
 {
 	char *model_rotation, *model_translate, *model_scale, *model_angle;
-	Angle tmp_angle = (Angle) 0;
+	pcb_angle_t tmp_angle = (pcb_angle_t) 0;
 	Coord tx, ty, tz;
 	float fx, fy, fz;
 
@@ -347,9 +347,9 @@
 
 
 
-extern void FreeRotateBuffer(pcb_buffer_t * Buffer, Angle angle);
+extern void FreeRotateBuffer(pcb_buffer_t * Buffer, pcb_angle_t angle);
 
-static int scad_calculate_bbox(pcb_element_t * element, Angle angle, float *w, float *h, float *ox, float *oy)
+static int scad_calculate_bbox(pcb_element_t * element, pcb_angle_t angle, float *w, float *h, float *ox, float *oy)
 {
 	return 0;
 
@@ -377,7 +377,7 @@
 static void scad_export_bbox(pcb_element_t * element)
 {
 	char *model_angle, *bbox;
-	Angle tmp_angle = (Angle) 0;
+	pcb_angle_t tmp_angle = (pcb_angle_t) 0;
 	float w = 0., h = 0., t = 0., ox = 0., oy = 0.;
 	int x = element->MarkX, y = element->MarkY;
 	int n, ln;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 4808)
+++ trunk/src_plugins/export_png/png.c	(revision 4809)
@@ -1370,9 +1370,9 @@
 	}
 }
 
-static void png_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void png_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 
 	/*
 	 * zero angle arcs need special handling as gd will output either
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 4808)
+++ trunk/src_plugins/export_ps/eps.c	(revision 4809)
@@ -41,7 +41,7 @@
 static void eps_set_draw_xor(pcb_hid_gc_t gc, int _xor);
 static void eps_draw_rect(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
 static void eps_draw_line(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
-static void eps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle);
+static void eps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle);
 static void eps_fill_rect(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
 static void eps_fill_circle(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord radius);
 static void eps_fill_polygon(pcb_hid_gc_t gc, int n_coords, Coord * x, Coord * y);
@@ -540,9 +540,9 @@
 	pcb_fprintf(f, "%mi %mi %mi %mi %s\n", x1, y1, x2, y2, gc->erase ? "tc" : "t");
 }
 
-static void eps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void eps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 	if (delta_angle > 0) {
 		sa = start_angle;
 		ea = start_angle + delta_angle;
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 4808)
+++ trunk/src_plugins/export_ps/ps.c	(revision 4809)
@@ -1126,9 +1126,9 @@
 	pcb_fprintf(global.f, "%mi %mi %mi %mi t\n", x1, y1, x2, y2);
 }
 
-static void ps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void ps_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 	if (delta_angle > 0) {
 		sa = start_angle;
 		ea = start_angle + delta_angle;
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 4808)
+++ trunk/src_plugins/export_svg/svg.c	(revision 4809)
@@ -575,10 +575,10 @@
 	}
 }
 
-static void svg_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void svg_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	Coord x1, y1, x2, y2;
-	Angle sa, ea;
+	pcb_angle_t sa, ea;
 
 	TRX(cx); TRY(cy);
 
Index: trunk/src_plugins/gl/hidgl.c
===================================================================
--- trunk/src_plugins/gl/hidgl.c	(revision 4808)
+++ trunk/src_plugins/gl/hidgl.c	(revision 4809)
@@ -163,7 +163,7 @@
 
 #define MIN_TRIANGLES_PER_CAP 3
 #define MAX_TRIANGLES_PER_CAP 90
-static void draw_cap(Coord width, Coord x, Coord y, Angle angle, double scale)
+static void draw_cap(Coord width, Coord x, Coord y, pcb_angle_t angle, double scale)
 {
 	float last_capx, last_capy;
 	float capx, capy;
@@ -259,7 +259,7 @@
 
 #define MIN_SLICES_PER_ARC 6
 #define MAX_SLICES_PER_ARC 360
-void hidgl_draw_arc(Coord width, Coord x, Coord y, Coord rx, Coord ry, Angle start_angle, Angle delta_angle, double scale)
+void hidgl_draw_arc(Coord width, Coord x, Coord y, Coord rx, Coord ry, pcb_angle_t start_angle, pcb_angle_t delta_angle, double scale)
 {
 	float last_inner_x, last_inner_y;
 	float last_outer_x, last_outer_y;
Index: trunk/src_plugins/gl/hidgl.h
===================================================================
--- trunk/src_plugins/gl/hidgl.h	(revision 4808)
+++ trunk/src_plugins/gl/hidgl.h	(revision 4809)
@@ -63,7 +63,7 @@
 void hidgl_draw_grid(pcb_box_t * drawn_area);
 void hidgl_set_depth(float depth);
 void hidgl_draw_line(int cap, Coord width, Coord x1, Coord y1, Coord x2, Coord y2, double scale);
-void hidgl_draw_arc(Coord width, Coord vx, Coord vy, Coord vrx, Coord vry, Angle start_angle, Angle delta_angle, double scale);
+void hidgl_draw_arc(Coord width, Coord vx, Coord vy, Coord vrx, Coord vry, pcb_angle_t start_angle, pcb_angle_t delta_angle, double scale);
 void hidgl_draw_rect(Coord x1, Coord y1, Coord x2, Coord y2);
 void hidgl_fill_circle(Coord vx, Coord vy, Coord vr, double scale);
 void hidgl_fill_polygon(int n_coords, Coord * x, Coord * y);
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 4808)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 4809)
@@ -126,7 +126,7 @@
 	gpmi_event(h->module, HIDE_draw_line, h, gc, x1, y1, x2, y2);
 }
 
-void gpmi_hid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, Angle start_angle, Angle delta_angle)
+void gpmi_hid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	hid_t *h = hid_gpmi_data_get(exporter);
 	gpmi_event(h->module, HIDE_draw_arc, h, gc, cx, cy, xradius, yradius, start_angle, delta_angle);
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 4808)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 4809)
@@ -211,7 +211,7 @@
 {
 }
 
-static void batch_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle end_angle)
+static void batch_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t end_angle)
 {
 }
 
Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 4808)
+++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 4809)
@@ -602,7 +602,7 @@
 	gdk_draw_line(gport->drawable, priv->u_gc, dx1, dy1, dx2, dy2);
 }
 
-void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, Angle start_angle, Angle delta_angle)
+void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	gint vrx, vry;
 	gint w, h, radius;
Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 4808)
+++ trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 4809)
@@ -490,7 +490,7 @@
 	hidgl_draw_line(gc->cap, gc->width, x1, y1, x2, y2, gport->view.coord_per_px);
 }
 
-void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, Angle start_angle, Angle delta_angle)
+void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	USE_GC(gc);
 
Index: trunk/src_plugins/hid_gtk/gui-drc-window.h
===================================================================
--- trunk/src_plugins/hid_gtk/gui-drc-window.h	(revision 4808)
+++ trunk/src_plugins/hid_gtk/gui-drc-window.h	(revision 4809)
@@ -49,7 +49,7 @@
 	char *explanation;
 	Coord x_coord;
 	Coord y_coord;
-	Angle angle;
+	pcb_angle_t angle;
 	pcb_bool have_measured;
 	Coord measured_value;
 	Coord required_value;
Index: trunk/src_plugins/hid_gtk/gui.h
===================================================================
--- trunk/src_plugins/hid_gtk/gui.h	(revision 4808)
+++ trunk/src_plugins/hid_gtk/gui.h	(revision 4809)
@@ -416,7 +416,7 @@
 void ghid_set_line_width(pcb_hid_gc_t gc, Coord width);
 void ghid_set_draw_xor(pcb_hid_gc_t gc, int _xor);
 void ghid_draw_line(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
-void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, Angle start_angle, Angle delta_angle);
+void ghid_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle);
 void ghid_draw_rect(pcb_hid_gc_t gc, Coord x1, Coord y1, Coord x2, Coord y2);
 void ghid_fill_circle(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord radius);
 void ghid_fill_polygon(pcb_hid_gc_t gc, int n_coords, Coord * x, Coord * y);
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4808)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4809)
@@ -2256,7 +2256,7 @@
 	if (dx == 0 && dy == 0)
 		buf = pcb_strdup_printf("%m+%+.*mS, %+.*mS", UUNIT, prec, dx, prec, dy);
 	else {
-		Angle angle = atan2(dy, -dx) * 180 / M_PI;
+		pcb_angle_t angle = atan2(dy, -dx) * 180 / M_PI;
 		Coord dist = Distance(0, 0, dx, dy);
 
 		buf = pcb_strdup_printf("%m+%+.*mS, %+.*mS (%.*mS, %.2f\260)", UUNIT, prec, dx, prec, dy, prec, dist, angle);
@@ -3083,7 +3083,7 @@
 	}
 }
 
-static void lesstif_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle)
+static void lesstif_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	if ((pinout || conf_core.editor.thin_draw) && gc->erase)
 		return;
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 4808)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 4809)
@@ -233,7 +233,7 @@
 		proto_send_draw_line(idx, x1, y1, x2, y2);
 }
 
-static void remote_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle end_angle)
+static void remote_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord width, Coord height, pcb_angle_t start_angle, pcb_angle_t end_angle)
 {
 #warning TODO
 }
Index: trunk/src_plugins/io_kicad/read.c
===================================================================
--- trunk/src_plugins/io_kicad/read.c	(revision 4808)
+++ trunk/src_plugins/io_kicad/read.c	(revision 4809)
@@ -470,8 +470,8 @@
 	char *end;
 	double val;
 	Coord centreX, centreY, endX, endY, width, height, Thickness, Clearance;
-	Angle startAngle = 0.0;
-	Angle delta = 360.0; /* these defaults allow a gr_circle to be parsed, which does not specify (angle XXX) */
+	pcb_angle_t startAngle = 0.0;
+	pcb_angle_t delta = 360.0; /* these defaults allow a gr_circle to be parsed, which does not specify (angle XXX) */
 	pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */
 	int PCBLayer = 0; /* sane default value */
 
@@ -991,9 +991,9 @@
 	int refdesScaling  = 100;
 	unsigned long tally = 0, featureTally, required;
 	Coord moduleX, moduleY, X, Y, X1, Y1, X2, Y2, centreX, centreY, endX, endY, width, height, Thickness, Clearance, padXsize, padYsize, drill, refdesX, refdesY;
-	Angle startAngle = 0.0;
-	Angle endAngle = 0.0;
-	Angle delta = 360.0; /* these defaults allow a fp_circle to be parsed, which does not specify (angle XXX) */
+	pcb_angle_t startAngle = 0.0;
+	pcb_angle_t endAngle = 0.0;
+	pcb_angle_t delta = 360.0; /* these defaults allow a fp_circle to be parsed, which does not specify (angle XXX) */
 	double val;
 	double glyphWidth = 1.27; /* a reasonable approximation of pcb glyph width, ~=  5000 centimils */
 	unsigned direction = 0; /* default is horizontal */
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 4808)
+++ trunk/src_plugins/io_lihata/read.c	(revision 4809)
@@ -102,7 +102,7 @@
 }
 
 /* Load the Angle value of a text node into res. Return 0 on success */
-static int parse_angle(Angle *res, lht_node_t *nd)
+static int parse_angle(pcb_angle_t *res, lht_node_t *nd)
 {
 	double tmp;
 	pcb_bool success;
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 4808)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 4809)
@@ -108,7 +108,7 @@
 	delegatee_->draw_line(gc, x1, y1, x2, y2);
 }
 
-static void log_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, Angle start_angle, Angle delta_angle) {
+static void log_draw_arc(pcb_hid_gc_t gc, Coord cx, Coord cy, Coord xradius, Coord yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle) {
 	pcb_fprintf(out_, "draw_arc(gc, %mm, %mm, rx=%mm, ry=%mm, start_angle=%.1f, delta_a=%.1f)\n",
 					cx, cy, xradius, yradius, start_angle, delta_angle);
 	delegatee_->draw_arc(gc, cx, cy, xradius, yradius, start_angle, delta_angle);
Index: trunk/src_plugins/propedit/props.h
===================================================================
--- trunk/src_plugins/propedit/props.h	(revision 4808)
+++ trunk/src_plugins/propedit/props.h	(revision 4809)
@@ -46,7 +46,7 @@
 typedef union {
 	const char *string;
 	Coord coord;
-	Angle angle;
+	pcb_angle_t angle;
 	int i;
 } pcb_propval_t;
 
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 4808)
+++ trunk/src_plugins/propedit/propsel.c	(revision 4809)
@@ -42,12 +42,12 @@
 
 #define type2field_String string
 #define type2field_Coord coord
-#define type2field_Angle angle
+#define type2field_pcb_angle_t angle
 #define type2field_int i
 
 #define type2TYPE_String PCB_PROPT_STRING
 #define type2TYPE_Coord PCB_PROPT_COORD
-#define type2TYPE_Angle PCB_PROPT_ANGLE
+#define type2TYPE_pcb_angle_t PCB_PROPT_ANGLE
 #define type2TYPE_int PCB_PROPT_INT
 
 #define map_add_prop(ctx, name, type, val) \
@@ -104,8 +104,8 @@
 	map_add_prop(ctx, "p/trace/clearance", Coord, arc->Clearance);
 	map_add_prop(ctx, "p/arc/width",       Coord, arc->Width);
 	map_add_prop(ctx, "p/arc/height",      Coord, arc->Height);
-	map_add_prop(ctx, "p/arc/angle/start", Angle, arc->StartAngle);
-	map_add_prop(ctx, "p/arc/angle/delta", Angle, arc->Delta);
+	map_add_prop(ctx, "p/arc/angle/start", pcb_angle_t, arc->StartAngle);
+	map_add_prop(ctx, "p/arc/angle/delta", pcb_angle_t, arc->Delta);
 	map_attr(ctx, &arc->Attributes);
 }