Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 27339)
+++ trunk/src/plug_io.h	(revision 27340)
@@ -84,9 +84,6 @@
 	/* Write the buffer to a file. Return 0 on success. */
 	int (*write_buffer)(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
 
-	/* Write the idxth subcircuit from buffer to a file. Return 0 on success. */
-	int (*write_buffer_subc)(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, long idx);
-
 	/* Write subcircuit(s) from 'e' to a library file. If subc_idx is -1, write
 	   all subcircuits as a library (if the format allows), else write only
 	   th sucb_idxth subcircuit as a footprint. Return 0 on success. */
Index: trunk/src_plugins/extedit/extedit.c
===================================================================
--- trunk/src_plugins/extedit/extedit.c	(revision 27339)
+++ trunk/src_plugins/extedit/extedit.c	(revision 27340)
@@ -267,7 +267,7 @@
 					goto quit1;
 				}
 
-				if (io_lihata_write_element(plug_io_lihata_default, f, pcb_buffers[bn].Data) != 0) {
+				if (io_lihata_write_element(plug_io_lihata_default, f, pcb_buffers[bn].Data, 0) != 0) {
 					fclose(f);
 					pcb_message(PCB_MSG_ERROR, "Failed to export target objects to lihata footprint.\n");
 					goto quit1;
Index: trunk/src_plugins/io_autotrax/io_autotrax.c
===================================================================
--- trunk/src_plugins/io_autotrax/io_autotrax.c	(revision 27339)
+++ trunk/src_plugins/io_autotrax/io_autotrax.c	(revision 27340)
@@ -79,7 +79,6 @@
 	io_autotrax.parse_footprint = NULL;
 	io_autotrax.parse_font = NULL;
 	io_autotrax.write_buffer = NULL;
-	io_autotrax.write_buffer_subc = NULL;
 	io_autotrax.write_footprint = NULL;
 	io_autotrax.write_pcb = io_autotrax_write_pcb;
 	io_autotrax.default_fmt = "Protel autotrax";
Index: trunk/src_plugins/io_dsn/io_dsn.c
===================================================================
--- trunk/src_plugins/io_dsn/io_dsn.c	(revision 27339)
+++ trunk/src_plugins/io_dsn/io_dsn.c	(revision 27340)
@@ -76,7 +76,6 @@
 	io_dsn.parse_footprint = NULL;
 	io_dsn.parse_font = NULL;
 	io_dsn.write_buffer = NULL;
-	io_dsn.write_buffer_subc = NULL;
 	io_dsn.write_footprint = NULL;
 	io_dsn.write_pcb = io_dsn_write_pcb;
 	io_dsn.default_fmt = "dsn";
Index: trunk/src_plugins/io_eagle/io_eagle.c
===================================================================
--- trunk/src_plugins/io_eagle/io_eagle.c	(revision 27339)
+++ trunk/src_plugins/io_eagle/io_eagle.c	(revision 27340)
@@ -75,7 +75,6 @@
 /*	io_eagle_xml.parse_footprint = NULL;
 	io_eagle_xml.parse_font = NULL;
 	io_eagle_xml.write_buffer = io_eagle_write_buffer;
-	io_eagle_xml.write_buffer_subc = io_eagle_write_buffer_subc;
 	io_eagle_xml.write_footprint = io_eagle_write_element;
 	io_eagle_xml.write_pcb = io_eagle_write_pcb;*/
 	io_eagle_xml.default_fmt = "eagle";
@@ -95,7 +94,6 @@
 /*	io_eagle_bin.parse_footprint = NULL;
 	io_eagle_bin.parse_font = NULL;
 	io_eagle_bin.write_buffer = io_eagle_write_buffer;
-	io_eagle_bin.write_buffer_subc = io_eagle_write_buffer_subc;
 	io_eagle_bin.write_footprint = io_eagle_write_element;
 	io_eagle_bin.write_pcb = io_eagle_write_pcb;*/
 	io_eagle_bin.default_fmt = "eagle";
@@ -115,7 +113,6 @@
 	io_eagle_dru.parse_footprint = NULL;
 	io_eagle_dru.parse_font = NULL;
 	io_eagle_dru.write_buffer = NULL;
-	io_eagle_dru.write_buffer_subc = NULL;
 	io_eagle_dru.write_footprint = NULL;
 	io_eagle_dru.write_pcb = /*io_eagle_write_pcb_dru*/ NULL;
 	io_eagle_dru.default_fmt = "eagle";
Index: trunk/src_plugins/io_hyp/io_hyp.c
===================================================================
--- trunk/src_plugins/io_hyp/io_hyp.c	(revision 27339)
+++ trunk/src_plugins/io_hyp/io_hyp.c	(revision 27340)
@@ -177,7 +177,6 @@
 /*	io_hyp.parse_footprint = NULL;
 	io_hyp.parse_font = NULL;
 	io_hyp.write_buffer = io_hyp_write_buffer;
-	io_hyp.write_buffer_subc = io_hyp_write_buffer_subc;
 	io_hyp.write_footprint = io_hyp_write_element;*/
 	io_hyp.write_pcb = io_hyp_write_pcb;
 	io_hyp.default_fmt = "hyp";
Index: trunk/src_plugins/io_lihata/write.h
===================================================================
--- trunk/src_plugins/io_lihata/write.h	(revision 27339)
+++ trunk/src_plugins/io_lihata/write.h	(revision 27340)
@@ -34,8 +34,7 @@
 int io_lihata_write_pcb_v6(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
 int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_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_buffer_subc(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, long idx);
-int io_lihata_write_element(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *dt);
+int io_lihata_write_element(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *dt, long subc_idx);
 
 void *io_lihata_save_as_subd_init(const pcb_plug_io_t *ctx, pcb_hid_dad_subdialog_t *sub, pcb_plug_iot_t type);
 void io_lihata_save_as_subd_uninit(const pcb_plug_io_t *ctx, void *plg_ctx, pcb_hid_dad_subdialog_t *sub, pcb_bool apply);
Index: trunk/src_plugins/io_mentor_cell/io_mentor_cell.c
===================================================================
--- trunk/src_plugins/io_mentor_cell/io_mentor_cell.c	(revision 27339)
+++ trunk/src_plugins/io_mentor_cell/io_mentor_cell.c	(revision 27340)
@@ -70,7 +70,6 @@
 	io_mentor_cell.parse_footprint = NULL;
 	io_mentor_cell.parse_font = NULL;
 	io_mentor_cell.write_buffer = NULL;
-	io_mentor_cell.write_buffer_subc = NULL;
 	io_mentor_cell.write_footprint = NULL;
 	io_mentor_cell.write_pcb = NULL;
 	io_mentor_cell.default_fmt = "mentor_cell";