Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 16363) +++ trunk/src/plug_io.c (revision 16364) @@ -258,9 +258,9 @@ /* try all plugins that said it could handle the file */ for(n = 0; n < len; n++) { - if ((available[n].plug->parse_element == NULL) || (!accepts[n])) /* can't parse or doesn't want to parse this file */ + if ((available[n].plug->parse_footprint == NULL) || (!accepts[n])) /* can't parse or doesn't want to parse this file */ continue; - res = available[n].plug->parse_element(available[n].plug, Ptr, Filename); + res = available[n].plug->parse_footprint(available[n].plug, Ptr, Filename); if (res == 0) { if (Ptr->loader == NULL) /* if the loader didn't set this (to some more fine grained, e.g. depending on file format version) */ Ptr->loader = available[n].plug; @@ -396,8 +396,8 @@ newfmt = 1; } - if ((p != NULL) && (p->write_element != NULL)) - res = p->write_element(p, f, e); + if ((p != NULL) && (p->write_footprint != NULL)) + res = p->write_footprint(p, f, e); if ((res == 0) && (newfmt)) e->loader = p; Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 16363) +++ trunk/src/plug_io.h (revision 16364) @@ -72,7 +72,7 @@ int (*parse_pcb)(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest); /* Attempt to load an element from Filename to Ptr. Return 0 on success. */ - int (*parse_element)(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name); + int (*parse_footprint)(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name); /* Attempt to load fonts from a file. Return 0 on success. */ int (*parse_font)(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename); @@ -82,7 +82,7 @@ int (*write_buffer)(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only); /* Write element data to a file. Return 0 on success. */ - int (*write_element)(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *e); + int (*write_footprint)(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *e); /* Write PCB to f; there's a copy of the file we are going to "overwrite", named in old_filename and the new file name we are Index: trunk/src_plugins/io_autotrax/io_autotrax.c =================================================================== --- trunk/src_plugins/io_autotrax/io_autotrax.c (revision 16363) +++ trunk/src_plugins/io_autotrax/io_autotrax.c (revision 16364) @@ -78,10 +78,10 @@ io_autotrax.fmt_support_prio = io_autotrax_fmt; io_autotrax.test_parse = io_autotrax_test_parse; io_autotrax.parse_pcb = io_autotrax_read_pcb; - io_autotrax.parse_element = NULL; + io_autotrax.parse_footprint = NULL; io_autotrax.parse_font = NULL; io_autotrax.write_buffer = NULL; - io_autotrax.write_element = NULL; + io_autotrax.write_footprint = NULL; io_autotrax.write_pcb = io_autotrax_write_pcb; io_autotrax.default_fmt = "Protel autotrax"; io_autotrax.description = "Protel autotrax and easytrax"; Index: trunk/src_plugins/io_eagle/io_eagle.c =================================================================== --- trunk/src_plugins/io_eagle/io_eagle.c (revision 16363) +++ trunk/src_plugins/io_eagle/io_eagle.c (revision 16364) @@ -72,10 +72,10 @@ io_eagle_xml.fmt_support_prio = io_eagle_fmt; io_eagle_xml.test_parse = io_eagle_test_parse_xml; io_eagle_xml.parse_pcb = io_eagle_read_pcb_xml; -/* io_eagle_xml.parse_element = NULL; +/* 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_element = io_eagle_write_element; + io_eagle_xml.write_footprint = io_eagle_write_element; io_eagle_xml.write_pcb = io_eagle_write_pcb;*/ io_eagle_xml.default_fmt = "eagle"; io_eagle_xml.description = "eagle xml"; @@ -91,10 +91,10 @@ io_eagle_bin.fmt_support_prio = io_eagle_fmt; io_eagle_bin.test_parse = io_eagle_test_parse_bin; io_eagle_bin.parse_pcb = io_eagle_read_pcb_bin; -/* io_eagle_bin.parse_element = NULL; +/* 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_element = io_eagle_write_element; + io_eagle_bin.write_footprint = io_eagle_write_element; io_eagle_bin.write_pcb = io_eagle_write_pcb;*/ io_eagle_bin.default_fmt = "eagle"; io_eagle_bin.description = "eagle bin"; @@ -110,10 +110,10 @@ io_eagle_dru.fmt_support_prio = io_eagle_fmt; io_eagle_dru.test_parse = io_eagle_test_parse_dru; io_eagle_dru.parse_pcb = io_eagle_read_pcb_dru; - io_eagle_dru.parse_element = NULL; + io_eagle_dru.parse_footprint = NULL; io_eagle_dru.parse_font = NULL; io_eagle_dru.write_buffer = NULL; - io_eagle_dru.write_element = NULL; + io_eagle_dru.write_footprint = NULL; io_eagle_dru.write_pcb = /*io_eagle_write_pcb_dru*/ NULL; io_eagle_dru.default_fmt = "eagle"; io_eagle_dru.description = "eagle dru"; Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 16363) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 16364) @@ -172,10 +172,10 @@ io_hyp.fmt_support_prio = io_hyp_fmt; io_hyp.test_parse = io_hyp_test_parse; io_hyp.parse_pcb = io_hyp_read_pcb; -/* io_hyp.parse_element = NULL; +/* io_hyp.parse_footprint = NULL; io_hyp.parse_font = NULL; io_hyp.write_buffer = io_hyp_write_buffer; - io_hyp.write_element = io_hyp_write_element;*/ + io_hyp.write_footprint = io_hyp_write_element;*/ io_hyp.write_pcb = io_hyp_write_pcb; io_hyp.default_fmt = "hyp"; io_hyp.description = "hyperlynx"; Index: trunk/src_plugins/io_kicad/io_kicad.c =================================================================== --- trunk/src_plugins/io_kicad/io_kicad.c (revision 16363) +++ trunk/src_plugins/io_kicad/io_kicad.c (revision 16364) @@ -77,10 +77,10 @@ io_kicad.fmt_support_prio = io_kicad_fmt; io_kicad.test_parse = io_kicad_test_parse; io_kicad.parse_pcb = io_kicad_read_pcb; - io_kicad.parse_element = io_kicad_parse_element; + io_kicad.parse_footprint = io_kicad_parse_element; io_kicad.parse_font = NULL; io_kicad.write_buffer = io_kicad_write_buffer; - io_kicad.write_element = io_kicad_write_element; + io_kicad.write_footprint = io_kicad_write_element; io_kicad.write_pcb = io_kicad_write_pcb; io_kicad.default_fmt = "kicad"; io_kicad.description = "Kicad, s-expression"; Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 16363) +++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 16364) @@ -63,10 +63,10 @@ io_kicad_legacy.plugin_data = NULL; io_kicad_legacy.fmt_support_prio = io_kicad_legacy_fmt; io_kicad_legacy.parse_pcb = NULL; - io_kicad_legacy.parse_element = NULL; + io_kicad_legacy.parse_footprint = NULL; io_kicad_legacy.parse_font = NULL; io_kicad_legacy.write_buffer = io_kicad_legacy_write_buffer; - io_kicad_legacy.write_element = io_kicad_legacy_write_element; + io_kicad_legacy.write_footprint = io_kicad_legacy_write_element; io_kicad_legacy.write_pcb = io_kicad_legacy_write_pcb; io_kicad_legacy.default_fmt = "kicadl"; io_kicad_legacy.description = "Kicad, legacy format"; Index: trunk/src_plugins/io_lihata/io_lihata.c =================================================================== --- trunk/src_plugins/io_lihata/io_lihata.c (revision 16363) +++ trunk/src_plugins/io_lihata/io_lihata.c (revision 16364) @@ -73,11 +73,11 @@ plug_io_lihata_v5.fmt_support_prio = io_lihata_fmt; plug_io_lihata_v5.test_parse = io_lihata_test_parse; plug_io_lihata_v5.parse_pcb = io_lihata_parse_pcb; - plug_io_lihata_v5.parse_element = io_lihata_parse_element; + plug_io_lihata_v5.parse_footprint = io_lihata_parse_element; plug_io_lihata_v5.parse_font = io_lihata_parse_font; plug_io_lihata_v5.write_font = io_lihata_write_font; plug_io_lihata_v5.write_buffer = io_lihata_write_buffer; - plug_io_lihata_v5.write_element = io_lihata_write_element; + plug_io_lihata_v5.write_footprint = io_lihata_write_element; plug_io_lihata_v5.write_pcb = io_lihata_write_pcb_v5; plug_io_lihata_v5.default_fmt = "lihata"; plug_io_lihata_v5.description = "lihata board v5"; @@ -92,11 +92,11 @@ plug_io_lihata_v4.fmt_support_prio = io_lihata_fmt; plug_io_lihata_v4.test_parse = io_lihata_test_parse; plug_io_lihata_v4.parse_pcb = io_lihata_parse_pcb; - plug_io_lihata_v4.parse_element = io_lihata_parse_element; + plug_io_lihata_v4.parse_footprint = io_lihata_parse_element; plug_io_lihata_v4.parse_font = io_lihata_parse_font; plug_io_lihata_v4.write_font = io_lihata_write_font; plug_io_lihata_v4.write_buffer = io_lihata_write_buffer; - plug_io_lihata_v4.write_element = io_lihata_write_element; + plug_io_lihata_v4.write_footprint = io_lihata_write_element; plug_io_lihata_v4.write_pcb = io_lihata_write_pcb_v4; plug_io_lihata_v4.default_fmt = "lihata"; plug_io_lihata_v4.description = "lihata board v4"; @@ -111,11 +111,11 @@ plug_io_lihata_v3.fmt_support_prio = io_lihata_fmt; plug_io_lihata_v3.test_parse = io_lihata_test_parse; plug_io_lihata_v3.parse_pcb = io_lihata_parse_pcb; - plug_io_lihata_v3.parse_element = io_lihata_parse_element; + plug_io_lihata_v3.parse_footprint = io_lihata_parse_element; plug_io_lihata_v3.parse_font = io_lihata_parse_font; plug_io_lihata_v3.write_font = io_lihata_write_font; plug_io_lihata_v3.write_buffer = io_lihata_write_buffer; - plug_io_lihata_v3.write_element = io_lihata_write_element; + plug_io_lihata_v3.write_footprint = io_lihata_write_element; plug_io_lihata_v3.write_pcb = io_lihata_write_pcb_v3; plug_io_lihata_v3.default_fmt = "lihata"; plug_io_lihata_v3.description = "lihata board v3"; @@ -130,11 +130,11 @@ plug_io_lihata_v2.fmt_support_prio = io_lihata_fmt; plug_io_lihata_v2.test_parse = io_lihata_test_parse; plug_io_lihata_v2.parse_pcb = io_lihata_parse_pcb; - plug_io_lihata_v2.parse_element = NULL; + plug_io_lihata_v2.parse_footprint = NULL; plug_io_lihata_v2.parse_font = io_lihata_parse_font; plug_io_lihata_v2.write_font = io_lihata_write_font; plug_io_lihata_v2.write_buffer = NULL; - plug_io_lihata_v2.write_element = NULL; + plug_io_lihata_v2.write_footprint = NULL; plug_io_lihata_v2.write_pcb = io_lihata_write_pcb_v2; plug_io_lihata_v2.default_fmt = "lihata"; plug_io_lihata_v2.description = "lihata board v2"; @@ -149,11 +149,11 @@ plug_io_lihata_v1.fmt_support_prio = io_lihata_fmt; plug_io_lihata_v1.test_parse = io_lihata_test_parse; plug_io_lihata_v1.parse_pcb = io_lihata_parse_pcb; - plug_io_lihata_v1.parse_element = NULL; + plug_io_lihata_v1.parse_footprint = NULL; plug_io_lihata_v1.parse_font = io_lihata_parse_font; plug_io_lihata_v1.write_font = io_lihata_write_font; plug_io_lihata_v1.write_buffer = NULL; - plug_io_lihata_v1.write_element = NULL; + plug_io_lihata_v1.write_footprint = NULL; plug_io_lihata_v1.write_pcb = io_lihata_write_pcb_v1; plug_io_lihata_v1.default_fmt = "lihata"; plug_io_lihata_v1.description = "lihata board v1"; Index: trunk/src_plugins/io_mentor_cell/io_mentor_cell.c =================================================================== --- trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 16363) +++ trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 16364) @@ -67,10 +67,10 @@ io_mentor_cell.fmt_support_prio = io_mentor_cell_fmt; io_mentor_cell.test_parse = io_mentor_cell_test_parse; io_mentor_cell.parse_pcb = io_mentor_cell_read_pcb; - io_mentor_cell.parse_element = NULL; + io_mentor_cell.parse_footprint = NULL; io_mentor_cell.parse_font = NULL; io_mentor_cell.write_buffer = NULL; - io_mentor_cell.write_element = NULL; + io_mentor_cell.write_footprint = NULL; io_mentor_cell.write_pcb = NULL; io_mentor_cell.default_fmt = "mentor_cell"; io_mentor_cell.description = "Mentor graphics cell footprint lib"; Index: trunk/src_plugins/io_pcb/io_pcb.c =================================================================== --- trunk/src_plugins/io_pcb/io_pcb.c (revision 16363) +++ trunk/src_plugins/io_pcb/io_pcb.c (revision 16364) @@ -72,10 +72,10 @@ io_pcb[0].fmt_support_prio = io_pcb_fmt; io_pcb[0].test_parse = io_pcb_test_parse; io_pcb[0].parse_pcb = io_pcb_ParsePCB; - io_pcb[0].parse_element = io_pcb_ParseElement; + io_pcb[0].parse_footprint = io_pcb_ParseElement; io_pcb[0].parse_font = io_pcb_ParseFont; io_pcb[0].write_buffer = io_pcb_WriteBuffer; - io_pcb[0].write_element = io_pcb_WriteSubcData; + io_pcb[0].write_footprint = io_pcb_WriteSubcData; io_pcb[0].write_pcb = io_pcb_WritePCB; io_pcb[0].default_fmt = "pcb"; io_pcb[0].description = "geda/pcb - mainline (centimils)"; @@ -90,7 +90,7 @@ io_pcb[1].plugin_data = &ctx[1]; io_pcb[1].fmt_support_prio = io_pcb_fmt; io_pcb[1].write_buffer = io_pcb_WriteBuffer; - io_pcb[1].write_element = io_pcb_WriteSubcData; + io_pcb[1].write_footprint = io_pcb_WriteSubcData; io_pcb[1].write_pcb = io_pcb_WritePCB; io_pcb[1].default_fmt = "pcb"; io_pcb[1].description = "geda/pcb - readable units"; @@ -105,7 +105,7 @@ io_pcb[2].plugin_data = &ctx[2]; io_pcb[2].fmt_support_prio = io_pcb_fmt; io_pcb[2].write_buffer = io_pcb_WriteBuffer; - io_pcb[2].write_element = io_pcb_WriteSubcData; + io_pcb[2].write_footprint = io_pcb_WriteSubcData; io_pcb[2].write_pcb = io_pcb_WritePCB; io_pcb[2].default_fmt = "pcb"; io_pcb[2].description = "geda/pcb - nanometer"; Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 16363) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 16364) @@ -196,10 +196,10 @@ io_tedax.fmt_support_prio = io_tedax_fmt; io_tedax.test_parse = io_tedax_test_parse; io_tedax.parse_pcb = io_tedax_parse_pcb; - io_tedax.parse_element = io_tedax_parse_element; + io_tedax.parse_footprint = io_tedax_parse_element; io_tedax.parse_font = NULL; io_tedax.write_buffer = io_tedax_write_buffer; - io_tedax.write_element = io_tedax_write_element; + io_tedax.write_footprint = io_tedax_write_element; io_tedax.write_pcb = NULL; io_tedax.default_fmt = "tEDAx"; io_tedax.description = "Trivial EDA eXchange format";