Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5074)
+++ trunk/doc-rnd/hacking/renames	(revision 5075)
@@ -1144,3 +1144,19 @@
 NO_SUFFIX -> PCB_UNIT_NO_SUFFIX
 SUFFIX -> PCB_UNIT_SUFFIX
 FILE_MODE -> PCB_UNIT_FILE_MODE
+NO_PRINT -> PCB_UNIT_NO_PRINT
+ALLOW_NM -> PCB_UNIT_ALLOW_NM
+ALLOW_UM -> PCB_UNIT_ALLOW_UM
+ALLOW_MM -> PCB_UNIT_ALLOW_MM
+ALLOW_CM -> PCB_UNIT_ALLOW_CM
+ALLOW_M -> PCB_UNIT_ALLOW_M
+ALLOW_KM -> PCB_UNIT_ALLOW_KM
+ALLOW_CMIL -> PCB_UNIT_ALLOW_CMIL
+ALLOW_MIL -> PCB_UNIT_ALLOW_MIL
+ALLOW_IN -> PCB_UNIT_ALLOW_IN
+ALLOW_DMIL -> PCB_UNIT_ALLOW_DMIL
+ALLOW_METRIC -> PCB_UNIT_ALLOW_METRIC
+ALLOW_IMPERIAL -> PCB_UNIT_ALLOW_IMPERIAL
+ALLOW_READABLE -> PCB_UNIT_ALLOW_READABLE
+ALLOW_NATURAL -> PCB_UNIT_ALLOW_NATURAL
+ALLOW_ALL -> PCB_UNIT_ALLOW_ALL
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 5074)
+++ trunk/src/pcb-printf.c	(revision 5075)
@@ -163,7 +163,7 @@
 		value = value_local;
 
 	if (allow == 0)
-		allow = ALLOW_ALL;
+		allow = PCB_UNIT_ALLOW_ALL;
 
 	i = printf_spec_->used + 64;
 	if (i > sizeof(printf_spec_new_local))
@@ -172,9 +172,9 @@
 		printf_spec_new = printf_spec_new_local;
 
 	/* Check our freedom in choosing units */
-	if ((allow & ALLOW_IMPERIAL) == 0)
+	if ((allow & PCB_UNIT_ALLOW_IMPERIAL) == 0)
 		family = PCB_UNIT_METRIC;
-	else if ((allow & ALLOW_METRIC) == 0)
+	else if ((allow & PCB_UNIT_ALLOW_METRIC) == 0)
 		family = PCB_UNIT_IMPERIAL;
 	else {
 		int met_votes = 0, imp_votes = 0;
@@ -279,8 +279,8 @@
 
 /* Conversion preference table */
 static human_coord_t human_coord[] = {
-	{2, ALLOW_MM,  0.001, ALLOW_UM, 1000.0, ALLOW_M     ,NULL,NULL,NULL},
-	{1, ALLOW_MIL, 0,     0,        1000.0, ALLOW_IN    ,NULL,NULL,NULL}
+	{2, PCB_UNIT_ALLOW_MM,  0.001, PCB_UNIT_ALLOW_UM, 1000.0, PCB_UNIT_ALLOW_M     ,NULL,NULL,NULL},
+	{1, PCB_UNIT_ALLOW_MIL, 0,     0,        1000.0, PCB_UNIT_ALLOW_IN    ,NULL,NULL,NULL}
 };
 #define NUM_HUMAN_COORD (sizeof(human_coord) / sizeof(human_coord[0]))
 
@@ -399,7 +399,7 @@
 	char tmp[128]; /* large enough for rendering a long long int */
 	int tmplen, retval = -1, slot_recursion = 0;
 	char *free_fmt = NULL;
-	enum pcb_allow_e mask = ALLOW_ALL;
+	enum pcb_allow_e mask = PCB_UNIT_ALLOW_ALL;
 
 	gds_init(&spec);
 
@@ -464,7 +464,7 @@
 
 			/* Get our sub-specifiers */
 			if (*fmt == '#') {
-				mask = ALLOW_CMIL;			/* This must be pcb's base unit */
+				mask = PCB_UNIT_ALLOW_CMIL;			/* This must be pcb's base unit */
 				fmt++;
 			}
 			if (*fmt == '$') {
@@ -555,28 +555,28 @@
 				count = 1;
 				switch (*fmt) {
 				case 'I':
-					if (CoordsToString(string, value, 1, &spec, ALLOW_NM, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_NM, PCB_UNIT_NO_SUFFIX) != 0) goto err;
 					break;
 				case 's':
-					if (CoordsToString(string, value, 1, &spec, ALLOW_MM | ALLOW_MIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
 					break;
 				case 'S':
-					if (CoordsToString(string, value, 1, &spec, mask & ALLOW_NATURAL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_NATURAL, suffix) != 0) goto err;
 					break;
 				case 'H':
 					if (CoordsToHumanString(string, value[0], &spec, suffix) != 0) goto err;
 					break;
 				case 'M':
-					if (CoordsToString(string, value, 1, &spec, mask & ALLOW_METRIC, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_METRIC, suffix) != 0) goto err;
 					break;
 				case 'L':
-					if (CoordsToString(string, value, 1, &spec, mask & ALLOW_IMPERIAL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_IMPERIAL, suffix) != 0) goto err;
 					break;
 				case 'k':
-					if (CoordsToString(string, value, 1, &spec, mask & ALLOW_DMIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_DMIL, suffix) != 0) goto err;
 					break;
 				case 'r':
-					if (CoordsToString(string, value, 1, &spec, ALLOW_READABLE, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_READABLE, PCB_UNIT_NO_SUFFIX) != 0) goto err;
 					break;
 					/* All these fallthroughs are deliberate */
 				case '9':
@@ -596,11 +596,11 @@
 				case '2':
 				case 'D':
 					value[count++] = va_arg(args, pcb_coord_t);
-					if (CoordsToString(string, value, count, &spec, mask & ALLOW_ALL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, count, &spec, mask & PCB_UNIT_ALLOW_ALL, suffix) != 0) goto err;
 					break;
 				case 'd':
 					value[1] = va_arg(args, pcb_coord_t);
-					if (CoordsToString(string, value, 2, &spec, ALLOW_MM | ALLOW_MIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 2, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
 					break;
 				case '*':
 					{
@@ -613,7 +613,7 @@
 							}
 						}
 						if (!found)
-							if (CoordsToString(string, value, 1, &spec, mask & ALLOW_ALL, suffix) != 0) goto err;
+							if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_ALL, suffix) != 0) goto err;
 					}
 					break;
 				case 'a':
@@ -644,7 +644,7 @@
 							}
 						}
 						if (!found)
-							if (CoordsToString(string, value, 1, &spec, ALLOW_ALL, suffix) != 0) goto err;
+							if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_ALL, suffix) != 0) goto err;
 					}
 					break;
 				}
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 5074)
+++ trunk/src/unit.c	(revision 5075)
@@ -44,35 +44,35 @@
  * to largest -- the code uses this ordering when finding
  * the best scale to use for a group of measures */
 pcb_unit_t Units[] = {
-	{0, "km", NULL, 'k', 0.000001, PCB_UNIT_METRIC, ALLOW_KM, 5,
+	{0, "km", NULL, 'k', 0.000001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_KM, 5,
 	 0.00005, 0.0005, 0.0025, 0.05, 0.25,
 	 {""}},
-	{0, "m", NULL, 'f', 0.001, PCB_UNIT_METRIC, ALLOW_M, 5,
+	{0, "m", NULL, 'f', 0.001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_M, 5,
 	 0.0005, 0.005, 0.025, 0.5, 2.5,
 	 {""}},
-	{0, "cm", NULL, 'e', 0.1, PCB_UNIT_METRIC, ALLOW_CM, 5,
+	{0, "cm", NULL, 'e', 0.1, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_CM, 5,
 	 0.005, 0.05, 0.25, 5, 25,
 	 {""}},
-	{0, "mm", NULL, 'm', 1, PCB_UNIT_METRIC, ALLOW_MM, 4,
+	{0, "mm", NULL, 'm', 1, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_MM, 4,
 	 0.005, 0.05, 0.25, 5, 25,
 	 {""}},
-	{0, "um", NULL, 'u', 1000, PCB_UNIT_METRIC, ALLOW_UM, 2,
+	{0, "um", NULL, 'u', 1000, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_UM, 2,
 	 0.005, 0.05, 0.25, 5, 25,
 	 {""}},
-	{0, "nm", NULL, 'n', 1000000, PCB_UNIT_METRIC, ALLOW_NM, 0,
+	{0, "nm", NULL, 'n', 1000000, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_NM, 0,
 	 5, 50, 2500, 5000, 25000,
 	 {""}},
 
-	{0, "in", NULL, 'i', 0.001, PCB_UNIT_IMPERIAL, ALLOW_IN, 5,
+	{0, "in", NULL, 'i', 0.001, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_IN, 5,
 	 0.1, 1.0, 5.0, 25, 100,
 	 {"inch"}},
-	{0, "mil", NULL, 'l', 1, PCB_UNIT_IMPERIAL, ALLOW_MIL, 2,
+	{0, "mil", NULL, 'l', 1, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_MIL, 2,
 	 0.1, 1.0, 10, 100, 1000,
 	 {""}},
-	{0, "dmil", NULL, 'k', 10, PCB_UNIT_IMPERIAL, ALLOW_DMIL, 1,	/* kicad legacy decimil unit */
+	{0, "dmil", NULL, 'k', 10, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_DMIL, 1,	/* kicad legacy decimil unit */
 	 0.1, 1.0, 10, 100, 1000,				/* wild guess at factors */
 	 {""}},
-	{0, "cmil", NULL, 'c', 100, PCB_UNIT_IMPERIAL, ALLOW_CMIL, 0,
+	{0, "cmil", NULL, 'c', 100, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_CMIL, 0,
 	 1, 10, 100, 1000, 10000,
 	 {"pcb"}}
 };
Index: trunk/src/unit.h
===================================================================
--- trunk/src/unit.h	(revision 5074)
+++ trunk/src/unit.h	(revision 5075)
@@ -34,33 +34,33 @@
 typedef double pcb_angle_t;						/* degrees */
 
 enum pcb_allow_e {
-	NO_PRINT = 0,									/* suffixes we can read but not print (i.e., "inch") */
-	ALLOW_NM = 1,
-	ALLOW_UM = 2,
-	ALLOW_MM = 4,
-	ALLOW_CM = 8,
-	ALLOW_M = 16,
-	ALLOW_KM = 32,
+	PCB_UNIT_NO_PRINT = 0,									/* suffixes we can read but not print (i.e., "inch") */
+	PCB_UNIT_ALLOW_NM = 1,
+	PCB_UNIT_ALLOW_UM = 2,
+	PCB_UNIT_ALLOW_MM = 4,
+	PCB_UNIT_ALLOW_CM = 8,
+	PCB_UNIT_ALLOW_M = 16,
+	PCB_UNIT_ALLOW_KM = 32,
 
-	ALLOW_CMIL = 1024,
-	ALLOW_MIL = 2048,
-	ALLOW_IN = 4096,
+	PCB_UNIT_ALLOW_CMIL = 1024,
+	PCB_UNIT_ALLOW_MIL = 2048,
+	PCB_UNIT_ALLOW_IN = 4096,
 
-	ALLOW_DMIL = 8192, /* for kicad legacy decimil units */
+	PCB_UNIT_ALLOW_DMIL = 8192, /* for kicad legacy decimil units */
 
-	ALLOW_METRIC = ALLOW_NM | ALLOW_UM | ALLOW_MM | ALLOW_CM | ALLOW_M | ALLOW_KM,
-	ALLOW_IMPERIAL = ALLOW_DMIL | ALLOW_CMIL | ALLOW_MIL | ALLOW_IN,
+	PCB_UNIT_ALLOW_METRIC = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_CM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_KM,
+	PCB_UNIT_ALLOW_IMPERIAL = PCB_UNIT_ALLOW_DMIL | PCB_UNIT_ALLOW_CMIL | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
 	/* This is all units allowed in parse_l.l */
 #if 0
-	ALLOW_READABLE = ALLOW_NM | ALLOW_UM | ALLOW_MM | ALLOW_M | ALLOW_KM | ALLOW_CMIL | ALLOW_MIL | ALLOW_IN,
+	PCB_UNIT_ALLOW_READABLE = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_KM | PCB_UNIT_ALLOW_CMIL | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
 #else
-	ALLOW_READABLE = ALLOW_CMIL,
+	PCB_UNIT_ALLOW_READABLE = PCB_UNIT_ALLOW_CMIL,
 #endif
 
 	/* Used for pcb-printf %mS - should not include unusual units like km, cmil and dmil */
-	ALLOW_NATURAL = ALLOW_NM | ALLOW_UM | ALLOW_MM | ALLOW_M | ALLOW_MIL | ALLOW_IN,
+	PCB_UNIT_ALLOW_NATURAL = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
 
-	ALLOW_ALL = ~0
+	PCB_UNIT_ALLOW_ALL = ~0
 };
 
 enum pcb_family_e { PCB_UNIT_METRIC, PCB_UNIT_IMPERIAL };
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 5074)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 5075)
@@ -1714,7 +1714,7 @@
 		return 0;
 
 	new_unit = get_unit_struct(argv[0]);
-	if (new_unit != NULL && new_unit->allow != NO_PRINT) {
+	if (new_unit != NULL && new_unit->allow != PCB_UNIT_NO_PRINT) {
 		conf_set(CFR_DESIGN, "editor/grid_unit", -1, argv[0], POL_OVERWRITE);
 		pcb_attrib_put(PCB, "PCB::grid::unit", argv[0]);
 	}
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 5074)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 5075)
@@ -394,7 +394,7 @@
 	if (argc == 0)
 		return 0;
 	new_unit = get_unit_struct(argv[0]);
-	if (new_unit != NULL && new_unit->allow != NO_PRINT) {
+	if (new_unit != NULL && new_unit->allow != PCB_UNIT_NO_PRINT) {
 		conf_set(CFR_DESIGN, "editor/grid_unit", -1, argv[0], POL_OVERWRITE);
 #warning TODO: figure what to do with increments
 #if 0
Index: trunk/src_plugins/query/query_l.c
===================================================================
--- trunk/src_plugins/query/query_l.c	(revision 5074)
+++ trunk/src_plugins/query/query_l.c	(revision 5075)
@@ -1112,37 +1112,37 @@
 case 42:
 YY_RULE_SETUP
 #line 90 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_MM); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 91 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_M); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 92 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_UM); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 93 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_CM); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 94 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_NM); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 95 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_MIL); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 96 "query_l.l"
-{ qry_lval.u = get_unit_struct_by_allow(ALLOW_IN); return T_UNIT; }
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
Index: trunk/src_plugins/query/query_l.l
===================================================================
--- trunk/src_plugins/query/query_l.l	(revision 5074)
+++ trunk/src_plugins/query/query_l.l	(revision 5075)
@@ -87,13 +87,13 @@
 
 
 
-mm              { qry_lval.u = get_unit_struct_by_allow(ALLOW_MM); return T_UNIT; }
-m               { qry_lval.u = get_unit_struct_by_allow(ALLOW_M); return T_UNIT; }
-um              { qry_lval.u = get_unit_struct_by_allow(ALLOW_UM); return T_UNIT; }
-cm              { qry_lval.u = get_unit_struct_by_allow(ALLOW_CM); return T_UNIT; }
-nm              { qry_lval.u = get_unit_struct_by_allow(ALLOW_NM); return T_UNIT; }
-mil             { qry_lval.u = get_unit_struct_by_allow(ALLOW_MIL); return T_UNIT; }
-inch            { qry_lval.u = get_unit_struct_by_allow(ALLOW_IN); return T_UNIT; }
+mm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
+m               { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
+um              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
+cm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
+nm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
+mil             { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
+inch            { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
 
 [|][|]          { return T_OR; }
 [&][&]          { return T_AND; }
Index: trunk/tests/pcb-printf/tester.c
===================================================================
--- trunk/tests/pcb-printf/tester.c	(revision 5074)
+++ trunk/tests/pcb-printf/tester.c	(revision 5075)
@@ -50,10 +50,10 @@
 			PCB_PRINTF("ma=%ma\n", 130.1234);
 			PCB_PRINTF("ma=%ma\n", 555.1234);
 
-			PCB_PRINTF("m+=%m+%mS mil\n", ALLOW_MIL, c[n]);
-			PCB_PRINTF("m+=%m+%mS mm\n", ALLOW_MM, c[n]);
-			PCB_PRINTF("m+=%m+%mS m\n", ALLOW_M, c[n]);
-			PCB_PRINTF("m+=%m+%mS mm or m\n", ALLOW_MM | ALLOW_M, c[n]);
+			PCB_PRINTF("m+=%m+%mS mil\n", PCB_UNIT_ALLOW_MIL, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm\n", PCB_UNIT_ALLOW_MM, c[n]);
+			PCB_PRINTF("m+=%m+%mS m\n", PCB_UNIT_ALLOW_M, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm or m\n", PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M, c[n]);
 		}
 	}