Index: trunk/src/font_act.c
===================================================================
--- trunk/src/font_act.c	(revision 36699)
+++ trunk/src/font_act.c	(revision 36700)
@@ -120,7 +120,7 @@
 	const char *fname = NULL, *sid = NULL;
 	static char *default_file = NULL;
 	rnd_font_id_t fid;
-	pcb_font_t *fnt;
+	rnd_font_t *fnt;
 	int r;
 
 	RND_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str);
@@ -133,7 +133,7 @@
 			rnd_message(RND_MSG_ERROR, "SaveFontTo(): when second argument is present, it must be an integer\n");
 			return 1;
 		}
-		if (pcb_font_old(PCB_ACT_BOARD, fid, 0) == NULL) {
+		if (pcb_font(PCB_ACT_BOARD, fid, 0) == NULL) {
 			rnd_message(RND_MSG_ERROR, "SaveFontTo(): can not fetch font ID %d\n", fid);
 			return 1;
 		}
@@ -141,7 +141,7 @@
 	else
 		fid = conf_core.design.text_font_id;
 
-	fnt = pcb_font_old(PCB_ACT_BOARD, fid, 0);
+	fnt = pcb_font(PCB_ACT_BOARD, fid, 0);
 	if (fnt == NULL) {
 		rnd_message(RND_MSG_ERROR, "SaveFontTo(): failed to fetch font %d\n", fid);
 		return 1;
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 36699)
+++ trunk/src/plug_io.c	(revision 36700)
@@ -535,7 +535,7 @@
 	return res;
 }
 
-int pcb_write_font(pcb_font_t *Ptr, const char *Filename, const char *fmt)
+int pcb_write_font(rnd_font_t *Ptr, const char *Filename, const char *fmt)
 {
 	int res/*, newfmt = 0*/;
 	pcb_plug_io_t *p = pcb_io_find_writer(PCB_IOT_FONT, fmt);
Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 36699)
+++ trunk/src/plug_io.h	(revision 36700)
@@ -125,7 +125,7 @@
 	int (*write_pcb)(pcb_plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, rnd_bool emergency);
 
 	/* Attempt to write the font to file. Return 0 on success. */
-	int (*write_font)(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename);
+	int (*write_font)(pcb_plug_io_t *ctx, rnd_font_t *font, const char *Filename);
 
 	/* OPTIONAL: save-as subdialog; sub is the parent's, already initialized
 	   subdialog; init() returns an plugin-allocated context that is then
@@ -155,7 +155,7 @@
 int pcb_parse_footprint(pcb_data_t *Ptr, const char *name, const char *fmt);
 int pcb_parse_font(rnd_font_t *Ptr, const char *Filename);
 int pcb_write_footprint_data(FILE *f, pcb_data_t *e, const char *fmt, long subc_idx);
-int pcb_write_font(pcb_font_t *Ptr, const char *Filename, const char *fmt);
+int pcb_write_font(rnd_font_t *Ptr, const char *Filename, const char *fmt);
 
 /* map a footprint file: always returns head with 0 or 1 or more mapping results */
 pcb_plug_fp_map_t *pcb_io_map_footprint_file(rnd_hidlib_t *hl, const char *fn, pcb_plug_fp_map_t *head, int need_tags, const char **fmt);
Index: trunk/src_plugins/io_lihata/write.h
===================================================================
--- trunk/src_plugins/io_lihata/write.h	(revision 36699)
+++ trunk/src_plugins/io_lihata/write.h	(revision 36700)
@@ -34,7 +34,7 @@
 int io_lihata_write_pcb_v6(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, rnd_bool emergency);
 int io_lihata_write_pcb_v7(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, rnd_bool emergency);
 int io_lihata_write_pcb_v8(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, rnd_bool emergency);
-int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename);
+int io_lihata_write_font(pcb_plug_io_t *ctx, rnd_font_t *font, const char *Filename);
 int io_lihata_write_buffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
 int io_lihata_write_subcs_head(pcb_plug_io_t *ctx, void **udata, FILE *f, int lib, long num_subcs);
 int io_lihata_write_subcs_subc(pcb_plug_io_t *ctx, void **udata, FILE *f, pcb_subc_t *subc);