Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 10646)
+++ trunk/doc/developer/renames	(revision 10647)
@@ -1703,3 +1703,8 @@
 draw_rat_callback -> pcb_rat_draw_callback
 EraseRat -> pcb_rat_invalidate_erase
 DrawRat -> pcb_rat_invalidate_draw
+draw_text_callback -> pcb_text_draw_callback
+XORDrawText -> pcb_text_draw_xor
+DrawTextLowLevel -> pcb_text_draw
+EraseText -> pcb_text_invalidate_erase
+DrawText -> pcb_text_invalidate_draw
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 10646)
+++ trunk/src/action_helper.c	(revision 10647)
@@ -956,7 +956,7 @@
 																		Note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) {
 						pcb_undo_add_obj_to_create(PCB_TYPE_TEXT, CURRENT, text, text);
 						pcb_undo_inc_serial();
-						DrawText(CURRENT, text);
+						pcb_text_invalidate_draw(CURRENT, text);
 						pcb_draw();
 					}
 				}
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 10646)
+++ trunk/src/crosshair.c	(revision 10647)
@@ -301,7 +301,7 @@
 			PCB_END_LOOP;
 			PCB_TEXT_LOOP(layer);
 			{
-				XORDrawText(text, x, y);
+				pcb_text_draw_xor(text, x, y);
 			}
 			PCB_END_LOOP;
 			/* the tmp polygon has n+1 points because the first
@@ -511,7 +511,7 @@
 	case PCB_TYPE_TEXT:
 		{
 			pcb_text_t *text = (pcb_text_t *) pcb_crosshair.AttachedObject.Ptr2;
-			XORDrawText(text, dx, dy);
+			pcb_text_draw_xor(text, dx, dy);
 			break;
 		}
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 10646)
+++ trunk/src/draw.c	(revision 10647)
@@ -447,7 +447,7 @@
 	pcb_r_search(Layer->arc_tree, screen, NULL, draw_arc_callback, Layer, NULL);
 
 	/* draw the layer text on screen */
-	pcb_r_search(Layer->text_tree, screen, NULL, draw_text_callback, Layer, NULL);
+	pcb_r_search(Layer->text_tree, screen, NULL, pcb_text_draw_callback, Layer, NULL);
 
 	lflg = pcb_layer_flags_(PCB, Layer);
 
@@ -500,7 +500,7 @@
 		break;
 	case PCB_TYPE_TEXT:
 	case PCB_TYPE_ELEMENT_NAME:
-		EraseText((pcb_layer_t *) lptr, (pcb_text_t *) ptr);
+		pcb_text_invalidate_erase((pcb_layer_t *) lptr, (pcb_text_t *) ptr);
 		break;
 	case PCB_TYPE_POLYGON:
 		pcb_poly_invalidate_erase((pcb_polygon_t *) ptr);
@@ -546,7 +546,7 @@
 		break;
 	case PCB_TYPE_TEXT:
 		if (((pcb_layer_t *) ptr1)->meta.real.vis)
-			DrawText((pcb_layer_t *) ptr1, (pcb_text_t *) ptr2);
+			pcb_text_invalidate_draw((pcb_layer_t *) ptr1, (pcb_text_t *) ptr2);
 		break;
 	case PCB_TYPE_POLYGON:
 		if (((pcb_layer_t *) ptr1)->meta.real.vis)
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 10646)
+++ trunk/src/obj_elem.c	(revision 10647)
@@ -1824,7 +1824,7 @@
 	else
 		pcb_gui->set_color(Output.fgGC, conf_core.appearance.color.invisible_objects);
 
-	DrawTextLowLevel(&PCB_ELEM_TEXT_VISIBLE(PCB, element), PCB->minSlk);
+	pcb_text_draw(&PCB_ELEM_TEXT_VISIBLE(PCB, element), PCB->minSlk);
 
 }
 
@@ -1982,7 +1982,7 @@
 	if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element)) {
 		return;
 	}
-	DrawText(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element));
+	pcb_text_invalidate_draw(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element));
 }
 
 void DrawElement(pcb_element_t *Element)
@@ -1996,7 +1996,7 @@
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element))
 		return;
-	DrawText(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element));
+	pcb_text_invalidate_draw(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element));
 }
 
 void DrawElementPackage(pcb_element_t *Element)
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 10646)
+++ trunk/src/obj_pad.c	(revision 10647)
@@ -462,7 +462,7 @@
 	text.fid = 0;
 	text.Direction = (vert ? 1 : 0) + (flip_x ? 2 : 0);
 
-	DrawTextLowLevel(&text, 0);
+	pcb_text_draw(&text, 0);
 }
 
 static void _draw_pad(pcb_hid_gc_t gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask)
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 10646)
+++ trunk/src/obj_pinvia.c	(revision 10647)
@@ -1009,7 +1009,7 @@
 
 	if (pcb_gui->gui)
 		pcb_draw_doing_pinout++;
-	DrawTextLowLevel(&text, 0);
+	pcb_text_draw(&text, 0);
 	if (pcb_gui->gui)
 		pcb_draw_doing_pinout--;
 }
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 10646)
+++ trunk/src/obj_subc.c	(revision 10647)
@@ -281,7 +281,7 @@
 			XORPolygon(poly, DX, DY, 0);
 
 		textlist_foreach(&ly->Text, &it, text)
-			XORDrawText(text, DX, DY);
+			pcb_text_draw_xor(text, DX, DY);
 	}
 
 	/* draw global objects */
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 10646)
+++ trunk/src/obj_text.c	(revision 10647)
@@ -311,7 +311,7 @@
 		return (NULL);
 	if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_TEXT, Layer, Text, Text);
-		EraseText(Layer, Text);
+		pcb_text_invalidate_erase(Layer, Text);
 		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 		Text->Scale = value;
@@ -318,7 +318,7 @@
 		pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text);
 		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
-		DrawText(Layer, Text);
+		pcb_text_invalidate_draw(Layer, Text);
 		return (Text);
 	}
 	return (NULL);
@@ -332,7 +332,7 @@
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
 		return (NULL);
-	EraseText(Layer, Text);
+	pcb_text_invalidate_erase(Layer, Text);
 	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	Text->TextString = ctx->chgname.new_name;
@@ -341,7 +341,7 @@
 	pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text);
 	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
-	DrawText(Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
 	return (old);
 }
 
@@ -350,7 +350,7 @@
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
 		return (NULL);
-	EraseText(Layer, Text);
+	pcb_text_invalidate_erase(Layer, Text);
 	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) {
 		pcb_undo_add_obj_to_clear_poly(PCB_TYPE_TEXT, Layer, Text, Text, pcb_false);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
@@ -361,7 +361,7 @@
 		pcb_undo_add_obj_to_clear_poly(PCB_TYPE_TEXT, Layer, Text, Text, pcb_true);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	}
-	DrawText(Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
 	return (Text);
 }
 
@@ -389,7 +389,7 @@
 	text = pcb_text_new(Layer, pcb_font(PCB, Text->fid, 1), Text->X + ctx->copy.DeltaX,
 											 Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, PCB_FLAG_FOUND));
 	pcb_text_copy_meta(text, Text);
-	DrawText(Layer, text);
+	pcb_text_invalidate_draw(Layer, text);
 	pcb_undo_add_obj_to_create(PCB_TYPE_TEXT, Layer, text, text);
 	return (text);
 }
@@ -400,9 +400,9 @@
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 	if (Layer->meta.real.vis) {
-		EraseText(Layer, Text);
+		pcb_text_invalidate_erase(Layer, Text);
 		pcb_text_move(Text, ctx->move.dx, ctx->move.dy);
-		DrawText(Layer, Text);
+		pcb_text_invalidate_draw(Layer, Text);
 		pcb_draw();
 	}
 	else
@@ -448,10 +448,10 @@
 	if (ctx->move.dst_layer != layer) {
 		pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_TEXT, layer, text, text);
 		if (layer->meta.real.vis)
-			EraseText(layer, text);
+			pcb_text_invalidate_erase(layer, text);
 		text = pcb_textop_move_to_layer_low(ctx, layer, text, ctx->move.dst_layer);
 		if (ctx->move.dst_layer->meta.real.vis)
-			DrawText(ctx->move.dst_layer, text);
+			pcb_text_invalidate_draw(ctx->move.dst_layer, text);
 		if (layer->meta.real.vis || ctx->move.dst_layer->meta.real.vis)
 			pcb_draw();
 	}
@@ -474,7 +474,7 @@
 {
 	/* erase from screen */
 	if (Layer->meta.real.vis) {
-		EraseText(Layer, Text);
+		pcb_text_invalidate_erase(Layer, Text);
 		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text);
 		if (!ctx->remove.bulk)
 			pcb_draw();
@@ -515,13 +515,13 @@
 /* rotates a text object and redraws it */
 void *pcb_textop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
 {
-	EraseText(Layer, Text);
+	pcb_text_invalidate_erase(Layer, Text);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 	pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
 	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
-	DrawText(Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
 	pcb_draw();
 	return (Text);
 }
@@ -716,13 +716,13 @@
 	}
 }
 
-void DrawTextLowLevel(pcb_text_t *Text, pcb_coord_t min_line_width)
+void pcb_text_draw(pcb_text_t *Text, pcb_coord_t min_line_width)
 {
 	DrawTextLowLevel_(Text, min_line_width, 0, 0, 0);
 }
 
 
-pcb_r_dir_t draw_text_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_layer_t *layer = cl;
 	pcb_text_t *text = (pcb_text_t *) b;
@@ -744,22 +744,22 @@
 		min_silk_line = PCB->minSlk;
 	else
 		min_silk_line = PCB->minWid;
-	DrawTextLowLevel(text, min_silk_line);
+	pcb_text_draw(text, min_silk_line);
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
 
 /* erases a text on a layer */
-void EraseText(pcb_layer_t *Layer, pcb_text_t *Text)
+void pcb_text_invalidate_erase(pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	pcb_draw_invalidate(Text);
 }
 
-void DrawText(pcb_layer_t *Layer, pcb_text_t *Text)
+void pcb_text_invalidate_draw(pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	pcb_draw_invalidate(Text);
 }
 
-void XORDrawText(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y)
+void pcb_text_draw_xor(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y)
 {
 	DrawTextLowLevel_(text, 0, 1, x, y);
 }
Index: trunk/src/obj_text_draw.h
===================================================================
--- trunk/src/obj_text_draw.h	(revision 10646)
+++ trunk/src/obj_text_draw.h	(revision 10647)
@@ -29,11 +29,11 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-pcb_r_dir_t draw_text_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl);
 #endif
 
-void DrawTextLowLevel(pcb_text_t *Text, pcb_coord_t min_line_width);
-void EraseText(pcb_layer_t *Layer, pcb_text_t *Text);
-void DrawText(pcb_layer_t *Layer, pcb_text_t *Text);
-void XORDrawText(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y);
+void pcb_text_draw(pcb_text_t *Text, pcb_coord_t min_line_width);
+void pcb_text_invalidate_erase(pcb_layer_t *Layer, pcb_text_t *Text);
+void pcb_text_invalidate_draw(pcb_layer_t *Layer, pcb_text_t *Text);
+void pcb_text_draw_xor(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y);
 
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 10646)
+++ trunk/src/select.c	(revision 10647)
@@ -164,7 +164,7 @@
 			layer = (pcb_layer_t *) ptr1;
 			pcb_undo_add_obj_to_flag(PCB_TYPE_TEXT, ptr1, ptr2, ptr2);
 			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, text);
-			DrawText(layer, text);
+			pcb_text_invalidate_draw(layer, text);
 			break;
 		}
 
@@ -346,7 +346,7 @@
 						&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) {
 					append(PCB_TYPE_TEXT, layer, text);
 					if (pcb_text_is_visible(PCB, layer, text))
-						DrawText(layer, text);
+						pcb_text_invalidate_draw(layer, text);
 				}
 			}
 		}
@@ -689,7 +689,7 @@
 				&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) {
 			pcb_undo_add_obj_to_flag(PCB_TYPE_TEXT, layer, text, text);
 			PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, text);
-			DrawText(layer, text);
+			pcb_text_invalidate_draw(layer, text);
 			changed = pcb_true;
 		}
 	}
Index: trunk/src/stub_draw.c
===================================================================
--- trunk/src/stub_draw.c	(revision 10646)
+++ trunk/src/stub_draw.c	(revision 10647)
@@ -42,7 +42,7 @@
 	t.fid = 0; /* use the default font */
 	t.Scale = 150;
 	t.Flags = pcb_no_flags();
-	DrawTextLowLevel(&t, 0);
+	pcb_text_draw(&t, 0);
 }
 
 static pcb_bool dummy_mouse(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
Index: trunk/src_plugins/draw_csect/draw_csect.c
===================================================================
--- trunk/src_plugins/draw_csect/draw_csect.c	(revision 10646)
+++ trunk/src_plugins/draw_csect/draw_csect.c	(revision 10647)
@@ -67,7 +67,7 @@
 	t.Scale = scale;
 	t.fid = 0; /* use the default font */
 	t.Flags = pcb_no_flags();
-	DrawTextLowLevel(&t, 0);
+	pcb_text_draw(&t, 0);
 	return &t;
 }
 
@@ -83,7 +83,7 @@
 	t.Scale = scale;
 	t.fid = 0; /* use the default font */
 	t.Flags = pcb_no_flags();
-	DrawTextLowLevel(&t, th);
+	pcb_text_draw(&t, th);
 	return &t;
 }
 
@@ -102,11 +102,11 @@
 
 	if (pcb_gui->gui) { /* it is unreadable on black&white and on most exporters */
 		pcb_gui->set_color(gc, bgcolor);
-		DrawTextLowLevel(&t, 1000000);
+		pcb_text_draw(&t, 1000000);
 	}
 
 	pcb_gui->set_color(gc, fgcolor);
-	DrawTextLowLevel(&t, 0);
+	pcb_text_draw(&t, 0);
 
 	return &t;
 }
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 10646)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 10647)
@@ -90,7 +90,7 @@
 	t.X -= w * (align & 3) / 2;
 	if (t.X < 0)
 		t.X = 0;
-	DrawTextLowLevel(&t, 0);
+	pcb_text_draw(&t, 0);
 	if (align & 8)
 		fab_line(gc, t.X,
 						 t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10),
@@ -292,7 +292,7 @@
 		PCB_END_LOOP;
 		PCB_TEXT_LOOP(layer);
 		{
-			DrawTextLowLevel(text, 0);
+			pcb_text_draw(text, 0);
 		}
 		PCB_END_LOOP;
 		pcb_gui->set_line_width(gc, FAB_LINE_W);
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 10646)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 10647)
@@ -58,7 +58,7 @@
 	t.Scale = scale;
 	t.fid = fid;
 	t.Flags = pcb_no_flags();
-	DrawTextLowLevel(&t, 0);
+	pcb_text_draw(&t, 0);
 	return &t;
 }