Index: trunk/src/libcschem/attrib.h
===================================================================
--- trunk/src/libcschem/attrib.h	(revision 3994)
+++ trunk/src/libcschem/attrib.h	(revision 3995)
@@ -55,10 +55,10 @@
 
 /* Create source info in dst for different source addressing schemes, as
    specified in {des4:19} */
-csch_source_arg_t *csch_attrib_plugin_source_c(const char *filename, long line, long col, const char *desc);
-csch_source_arg_t *csch_attrib_plugin_source_ac(csch_chdr_t *cobj, const char *attr_name, const char *desc);
-csch_source_arg_t *csch_attrib_plugin_source_pa(csch_ahdr_t *aobj, const char *attr_name, const char *plugin_name, const char *desc);
-csch_source_arg_t *csch_attrib_plugin_source_p(const char *plugin_name, const char *desc);
+csch_source_arg_t *csch_attrib_src_c(const char *filename, long line, long col, const char *desc);
+csch_source_arg_t *csch_attrib_src_ac(csch_chdr_t *cobj, const char *attr_name, const char *desc);
+csch_source_arg_t *csch_attrib_src_pa(csch_ahdr_t *aobj, const char *attr_name, const char *plugin_name, const char *desc);
+csch_source_arg_t *csch_attrib_src_p(const char *plugin_name, const char *desc);
 
 
 typedef htsp_t csch_attribs_t;
Index: trunk/src/libcschem/attrib_src.c
===================================================================
--- trunk/src/libcschem/attrib_src.c	(revision 3994)
+++ trunk/src/libcschem/attrib_src.c	(revision 3995)
@@ -66,7 +66,7 @@
 	vts0_append(&a->source, s.array);
 }
 
-csch_source_arg_t *csch_attrib_plugin_source_c(const char *filename, long line, long col, const char *desc)
+csch_source_arg_t *csch_attrib_src_c(const char *filename, long line, long col, const char *desc)
 {
 	gds_t tmp = {0};
 	csch_source_arg_t *dst = calloc(sizeof(csch_source_arg_t), 1);
@@ -88,7 +88,7 @@
 	return dst;
 }
 
-csch_source_arg_t *csch_attrib_plugin_source_ac(csch_chdr_t *cobj, const char *attr_name, const char *desc)
+csch_source_arg_t *csch_attrib_src_ac(csch_chdr_t *cobj, const char *attr_name, const char *desc)
 {
 	gds_t tmp = {0};
 	csch_source_arg_t *dst = calloc(sizeof(csch_source_arg_t), 1);;
@@ -115,7 +115,7 @@
 }
 
 
-csch_source_arg_t *csch_attrib_plugin_source_pa(csch_ahdr_t *aobj, const char *attr_name, const char *plugin_name, const char *desc)
+csch_source_arg_t *csch_attrib_src_pa(csch_ahdr_t *aobj, const char *attr_name, const char *plugin_name, const char *desc)
 {
 	csch_source_arg_t *dst = calloc(sizeof(csch_source_arg_t), 1);;
 
@@ -141,7 +141,7 @@
 	return dst;
 }
 
-csch_source_arg_t *csch_attrib_plugin_source_p(const char *plugin_name, const char *desc)
+csch_source_arg_t *csch_attrib_src_p(const char *plugin_name, const char *desc)
 {
 	csch_source_arg_t *dst = calloc(sizeof(csch_source_arg_t), 1);;
 
Index: trunk/src/libcschem/compile.c
===================================================================
--- trunk/src/libcschem/compile.c	(revision 3994)
+++ trunk/src/libcschem/compile.c	(revision 3995)
@@ -70,7 +70,7 @@
 
 		aa = csch_attrib_get(&dst->attr, key);
 
-		src = csch_attrib_plugin_source_ac(&cgrp->hdr, a->key, "compile_attributes()");
+		src = csch_attrib_src_ac(&cgrp->hdr, a->key, "compile_attributes()");
 
 		/* attribute merging logic */
 		if (a->val != NULL) {
Index: trunk/src/libcschem/util_grp.c
===================================================================
--- trunk/src/libcschem/util_grp.c	(revision 3994)
+++ trunk/src/libcschem/util_grp.c	(revision 3995)
@@ -184,7 +184,7 @@
 {
 	csch_source_arg_t *src;
 
-	src = csch_attrib_plugin_source_c(NULL, 0, 0, NULL);
+	src = csch_attrib_src_c(NULL, 0, 0, NULL);
 
 	csch_cobj_attrib_set(sheet, grp, CSCH_ATP_USER_DEFAULT, key, val, src);
 	if (stroke != NULL)
Index: trunk/src/libcschem/util_parse.c
===================================================================
--- trunk/src/libcschem/util_parse.c	(revision 3994)
+++ trunk/src/libcschem/util_parse.c	(revision 3995)
@@ -101,7 +101,7 @@
 	switch(n->type) {
 		case LHT_TEXT: /* plain text: scalar attrib */
 			val = n->data.text.value;
-			src = csch_attrib_plugin_source_c(n->file_name, n->line, n->col, NULL);
+			src = csch_attrib_src_c(n->file_name, n->line, n->col, NULL);
 			if (dstg != NULL)
 				csch_cobj_attrib_set(sheet, dstg, prio, key, val, src);
 			else
@@ -109,7 +109,7 @@
 			break;
 		case LHT_LIST: /* array attrib */
 			/* first create the attribute as an empty array, just in case it is indeed an empty arrya with no child */
-			src = csch_attrib_plugin_source_c(n->file_name, n->line, n->col, NULL);
+			src = csch_attrib_src_c(n->file_name, n->line, n->col, NULL);
 			if (dstg != NULL)
 				csch_cobj_attrib_set(sheet, dstg, prio, key, NULL, src);
 			else
@@ -121,7 +121,7 @@
 					continue;
 				}
 				val = i->data.text.value;
-				src = csch_attrib_plugin_source_c(i->file_name, i->line, i->col, NULL);
+				src = csch_attrib_src_c(i->file_name, i->line, i->col, NULL);
 				if (dstg != NULL)
 					csch_cobj_attrib_seti(sheet, dstg, prio, key, idx, val, src);
 				else
Index: trunk/src/libcschem/util_wirenet.c
===================================================================
--- trunk/src/libcschem/util_wirenet.c	(revision 3994)
+++ trunk/src/libcschem/util_wirenet.c	(revision 3995)
@@ -101,7 +101,7 @@
 	csch_source_arg_t *src;
 	csch_cgrp_t *grp = (csch_cgrp_t *)csch_op_create(sheet, &sheet->direct, CSCH_CTYPE_GRP);
 
-	src = csch_attrib_plugin_source_c(NULL, 0, 0, "manual_draw_wirenet");
+	src = csch_attrib_src_c(NULL, 0, 0, "manual_draw_wirenet");
 
 	if (grp == NULL) {
 		rnd_message(RND_MSG_ERROR, "Internal error: failed to create direct group for wirenet\n");
@@ -457,7 +457,7 @@
 		}
 
 		if (new_name != NULL) {
-			csch_source_arg_t *src = csch_attrib_plugin_source_c(NULL, 0, 0, "graphical network merge");
+			csch_source_arg_t *src = csch_attrib_src_c(NULL, 0, 0, "graphical network merge");
 			csch_attrib_set(&grp->attr, 0, "name", new_name, src, NULL);
 			csch_wirenet_invalidate_dyntext(sheet, grp);
 		}
Index: trunk/src/plugins/io_geda/read.c
===================================================================
--- trunk/src/plugins/io_geda/read.c	(revision 3994)
+++ trunk/src/plugins/io_geda/read.c	(revision 3995)
@@ -321,7 +321,7 @@
 
 static csch_source_arg_t *geda_src(read_ctx_t *ctx)
 {
-	return csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+	return csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 }
 
 /* Create a text object and create attribue as needed. read_line returns an
@@ -487,7 +487,7 @@
 
 	TODO("if whichend is 0, swap coords?");
 
-	src = csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+	src = csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 	ctx->last = csch_alien_mkpin_line(&ctx->alien, src, parent, x1, y1, x2, y2);
 
 	return 0;
@@ -618,7 +618,7 @@
 		csch_source_arg_t *src;
 
 		grp = csch_cgrp_alloc(ctx->sheet, parent, csch_oid_new(ctx->sheet, parent));
-		src = csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+		src = csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 		csch_cobj_attrib_set(ctx->sheet, grp, CSCH_ATP_HARDWIRED, "purpose", "gEDA-path", src);
 		ctx->last = &grp->hdr;
 		penname = read_alloc_pen(ctx, parent, color, width, capstyle, dashstyle, dashlength, dashspace);
@@ -852,7 +852,7 @@
 			csch_source_arg_t *src;
 			csch_attrib_t *a = e->value;
 
-			src = csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+			src = csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 			csch_attrib_set(&dst->attr, CSCH_ATP_USER_DEFAULT-1, a->key, a->val, src, NULL);
 		}
 	}
@@ -929,7 +929,7 @@
 
 	flush_last_comp(ctx);
 	ctx->last_comp = csch_cgrp_alloc(ctx->sheet, parent, csch_oid_new(ctx->sheet, parent));
-	src = csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+	src = csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 	csch_cobj_attrib_set(ctx->sheet, ctx->last_comp, CSCH_ATP_HARDWIRED, "role", "symbol", src);
 	ctx->last_comp->x = x;
 	ctx->last_comp->y = y;
@@ -1134,7 +1134,7 @@
 	}
 
 	resgrp = csch_cgrp_alloc(ctx->sheet, &ctx->sheet->direct, csch_oid_new(ctx->sheet, &ctx->sheet->direct));
-	src = csch_attrib_plugin_source_c(ctx->fn, ctx->lineno, 0, NULL);
+	src = csch_attrib_src_c(ctx->fn, ctx->lineno, 0, NULL);
 	csch_cobj_attrib_set(ctx->sheet, resgrp, CSCH_ATP_HARDWIRED, "role", "symbol", src);
 
 	/* read the file */
Index: trunk/src/plugins/propedit/propsel.c
===================================================================
--- trunk/src/plugins/propedit/propsel.c	(revision 3994)
+++ trunk/src/plugins/propedit/propsel.c	(revision 3995)
@@ -290,7 +290,7 @@
 
 static csch_source_arg_t *propsel_src(void)
 {
-	return csch_attrib_plugin_source_c(NULL, 0, 0, "propsel user input");
+	return csch_attrib_src_c(NULL, 0, 0, "propsel user input");
 }
 
 static void toggle_attr(csch_propset_ctx_t *st, csch_cgrp_t *grp)
Index: trunk/src/plugins/sch_dialogs/dlg_attrib.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_attrib.c	(revision 3994)
+++ trunk/src/plugins/sch_dialogs/dlg_attrib.c	(revision 3995)
@@ -345,7 +345,7 @@
 
 static csch_source_arg_t *attrdlg_src(void)
 {
-	return csch_attrib_plugin_source_c(NULL, 0, 0, "attr_dlg user input");
+	return csch_attrib_src_c(NULL, 0, 0, "attr_dlg user input");
 }
 
 static void attr_val_set_meta_and_str(attrdlg_ctx_t *ctx, csch_attrib_t *a, int set_str)
Index: trunk/src/plugins/sch_dialogs/dlg_text.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_text.c	(revision 3994)
+++ trunk/src/plugins/sch_dialogs/dlg_text.c	(revision 3995)
@@ -233,7 +233,7 @@
 	const char *key = ctx->tmp.array + ctx->start + 5;
 	const char *val = ctx->dlg[ctx->wattr1].val.str;
 
-	src = csch_attrib_plugin_source_c(NULL, 0, 0, "dlg_text user input");
+	src = csch_attrib_src_c(NULL, 0, 0, "dlg_text user input");
 	csch_attr_modify_str(ctx->sheet, ctx->text->hdr.parent, CSCH_ATP_USER_DEFAULT, key, val, src, 1);
 	rnd_gui->invalidate_all(rnd_gui);
 	dyntext_dlg_text2dlg(ctx);
Index: trunk/src/plugins/sch_dialogs/quick_attr.c
===================================================================
--- trunk/src/plugins/sch_dialogs/quick_attr.c	(revision 3994)
+++ trunk/src/plugins/sch_dialogs/quick_attr.c	(revision 3995)
@@ -117,7 +117,7 @@
 		csch_source_arg_t *src;
 		const char *val = ((dlg[wenum].val.lng == 0) ? "" : roles[dlg[wenum].val.lng]);
 
-		src = csch_attrib_plugin_source_c(NULL, 0, 0, "quick_attr_role user input");
+		src = csch_attrib_src_c(NULL, 0, 0, "quick_attr_role user input");
 		csch_attr_modify_str(sheet, grp, -CSCH_ATP_USER_DEFAULT, "role", val, src, 1);
 		RND_ACT_IRES(1);
 	}
Index: trunk/src/plugins/std_devmap/compiler.c
===================================================================
--- trunk/src/plugins/std_devmap/compiler.c	(revision 3994)
+++ trunk/src/plugins/std_devmap/compiler.c	(revision 3995)
@@ -67,7 +67,7 @@
 /*	CSCH_HOOK_CONVARG(1, FGW_COBJ, devmap_comp_update, sym = fgw_cobj(&argv[1]));*/
 	CSCH_HOOK_CONVARG(2, FGW_AOBJ, devmap_comp_update, comp = fgw_aobj(&argv[2]));
 
-	del_src = csch_attrib_plugin_source_p("std_devmp", "symbol_joined_comp");
+	del_src = csch_attrib_src_p("std_devmp", "symbol_joined_comp");
 
 	csch_attrib_del(&comp->hdr.attr, cctx->view_eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "slot", del_src);
 	return 0;
@@ -95,7 +95,7 @@
 		return -1;
 	}
 
-	src = csch_attrib_plugin_source_p("std_devmap", "devmap_compile_comp1");
+	src = csch_attrib_src_p("std_devmap", "devmap_compile_comp1");
 	csch_attrib_apply(&comp->hdr.attr, comp_attrs, src);
 	return 0;
 }
@@ -205,7 +205,7 @@
 
 		while(isspace(*key)) key++; /* eat up spaces after the "->" separator */
 
-		pm_src = csch_attrib_plugin_source_pa(&comp->hdr, "portmap", "std_devmap", "applied portmap");
+		pm_src = csch_attrib_src_pa(&comp->hdr, "portmap", "std_devmap", "applied portmap");
 		csch_attrib_set(&port->hdr.attr, cctx->view_eng->eprio + CSCH_PRI_PLUGIN_NORMAL, key, val, pm_src, NULL);
 		free(ktmp);
 	}
Index: trunk/src/plugins/std_devmap/loclib.c
===================================================================
--- trunk/src/plugins/std_devmap/loclib.c	(revision 3994)
+++ trunk/src/plugins/std_devmap/loclib.c	(revision 3995)
@@ -78,7 +78,7 @@
 	csch_cgrp_t *root_grp;
 	csch_source_arg_t *src;
 
-	src = csch_attrib_plugin_source_p("std_devmap", NULL);
+	src = csch_attrib_src_p("std_devmap", NULL);
 	if (csch_loclib_get_roots(&root_dir, &root_grp, devmaster, sheet, src, alloc, &alloced) == 0)
 		devmap_sheet_init_(&sheet->hidlib, root_dir, root_grp);
 
@@ -156,7 +156,7 @@
 		return;
 	}
 
-	src = csch_attrib_plugin_source_p("std_devmap", "external lib");
+	src = csch_attrib_src_p("std_devmap", "external lib");
 	gd->loclib_name = rnd_strdup(devmap_name);
 	csch_attrib_apply(&gd->attr, dma, src);
 	csch_sheet_set_changed(sheet, 1);
Index: trunk/src/plugins/std_devmap/std_devmap.c
===================================================================
--- trunk/src/plugins/std_devmap/std_devmap.c	(revision 3994)
+++ trunk/src/plugins/std_devmap/std_devmap.c	(revision 3995)
@@ -157,7 +157,7 @@
 			if ((end != NULL) && (rnd_strcasecmp(end, ".devmap") == 0))
 				*end = '\0';
 
-			src = csch_attrib_plugin_source_p("std_devmap", "manually picked from the devmap lib");
+			src = csch_attrib_src_p("std_devmap", "manually picked from the devmap lib");
 			csch_attr_modify_str(sheet, grp, -CSCH_ATP_USER_DEFAULT, "devmap", sep+1, src, 1);
 			rnd_trace("new devmap val: '%s'\n", sep+1);
 		}
Index: trunk/src/plugins/symlib_local/symlib_local.c
===================================================================
--- trunk/src/plugins/symlib_local/symlib_local.c	(revision 3994)
+++ trunk/src/plugins/symlib_local/symlib_local.c	(revision 3995)
@@ -237,7 +237,7 @@
 	htpi_entry_t *e;
 	int alloced = 0;
 
-	src = csch_attrib_plugin_source_p("symlib_local", NULL);
+	src = csch_attrib_src_p("symlib_local", NULL);
 	if (csch_loclib_get_roots(&root_dir, &symlib, loclib_master, sheet, src, 1, &alloced) != 0)
 		return;
 
Index: trunk/src/plugins/target_none/target_none.c
===================================================================
--- trunk/src/plugins/target_none/target_none.c	(revision 3994)
+++ trunk/src/plugins/target_none/target_none.c	(revision 3995)
@@ -52,7 +52,7 @@
 	assert(port->hdr.type == CSCH_ATYPE_PORT);
 
 	if (port->name != NULL) {
-		csch_source_arg_t *src = csch_attrib_plugin_source_p("target_none", NULL);
+		csch_source_arg_t *src = csch_attrib_src_p("target_none", NULL);
 		csch_attrib_set(&port->hdr.attr, eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "display/name", port->name, src, NULL);
 	}
 
Index: trunk/src/plugins/target_pcb/target_pcb.c
===================================================================
--- trunk/src/plugins/target_pcb/target_pcb.c	(revision 3994)
+++ trunk/src/plugins/target_pcb/target_pcb.c	(revision 3995)
@@ -58,17 +58,17 @@
 
 	pinnum = csch_attrib_get_str(&port->hdr.attr, "pcb/pinnum");
 	if (pinnum != NULL)
-		src = csch_attrib_plugin_source_pa(&port->hdr, "pcb/pinnum", "tagret_pcb", NULL);
+		src = csch_attrib_src_pa(&port->hdr, "pcb/pinnum", "tagret_pcb", NULL);
 
 	if (pinnum == NULL) {
 		pinnum = csch_attrib_get_str(&port->hdr.attr, "pinnum");
 		if (pinnum != NULL)
-			src = csch_attrib_plugin_source_pa(&port->hdr, "pinnum", "tagret_pcb", NULL);
+			src = csch_attrib_src_pa(&port->hdr, "pinnum", "tagret_pcb", NULL);
 	}
 	if (pinnum == NULL) {
 		pinnum = port->name;
 		if (pinnum != NULL)
-			src = csch_attrib_plugin_source_p("tagret_pcb", "fallback on port name");
+			src = csch_attrib_src_p("tagret_pcb", "fallback on port name");
 	}
 
 	if (pinnum != NULL)