Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26921)
+++ trunk/src/hid.h	(revision 26922)
@@ -27,6 +27,7 @@
 
 typedef struct pcb_hid_attr_val_s  pcb_hid_attr_val_t;
 typedef struct pcb_hid_attribute_s pcb_hid_attribute_t;
+typedef struct pcb_hid_attribute_s pcb_export_opt_t;
 
 /* Human Interface Device */
 
@@ -229,7 +230,7 @@
 	   set up the selectable options.  In command line mode, these are
 	   used to interpret command line options.  If n_ret_ is non-NULL,
 	   the number of attributes is stored there.  */
-	pcb_hid_attribute_t *(*get_export_options)(pcb_hid_t *hid, int *n_ret);
+	pcb_export_opt_t *(*get_export_options)(pcb_hid_t *hid, int *n_ret);
 
 	/* Exports (or print) the current PCB.  The options given represent
 	   the choices made from the options returned from
@@ -405,7 +406,7 @@
 	   by window placement. Returns opaque hid_ctx.
 	   (Hid_ctx shall save pcb_hid_t so subsequent attr_dlg_*() calls don't have
 	   it as an argument) */
-	void *(*attr_dlg_new)(pcb_hid_t *hid, const char *id, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
+	void *(*attr_dlg_new)(pcb_hid_t *hid, const char *id, pcb_export_opt_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 	int (*attr_dlg_run)(void *hid_ctx);
 	void (*attr_dlg_raise)(void *hid_ctx); /* raise the window to top */
 	void (*attr_dlg_free)(void *hid_ctx); /* results_ is avalibale after this call */
@@ -619,7 +620,7 @@
 /* non-zero if DAD dialogs are available currently */
 #define PCB_HAVE_GUI_ATTR_DLG \
 	((pcb_gui != NULL) && (pcb_gui->gui) && (pcb_gui->attr_dlg_new != NULL) && (pcb_gui->attr_dlg_new != pcb_nogui_attr_dlg_new))
-void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
+void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_export_opt_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 
 int pcb_hid_dock_enter(pcb_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id);
 void pcb_hid_dock_leave(pcb_hid_dad_subdialog_t *sub);
Index: trunk/src/hid_cam.c
===================================================================
--- trunk/src/hid_cam.c	(revision 26921)
+++ trunk/src/hid_cam.c	(revision 26922)
@@ -158,7 +158,7 @@
 	return buf;
 }
 
-void pcb_derive_default_filename(const char *pcbfile, pcb_hid_attribute_t * filename_attrib, const char *suffix)
+void pcb_derive_default_filename(const char *pcbfile, pcb_export_opt_t *filename_attrib, const char *suffix)
 {
 	if (filename_attrib->default_val.str_value)
 		free((char *)filename_attrib->default_val.str_value);
@@ -318,7 +318,7 @@
 	}
 }
 
-int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_hid_attribute_t *attr_tbl, int numa, pcb_hid_attr_val_t *options)
+int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_export_opt_t *attr_tbl, int numa, pcb_hid_attr_val_t *options)
 {
 	char *curr, *next, *purpose;
 
Index: trunk/src/hid_cam.h
===================================================================
--- trunk/src/hid_cam.h	(revision 26921)
+++ trunk/src/hid_cam.h	(revision 26922)
@@ -28,7 +28,7 @@
 	int exported_grps;
 } pcb_cam_t;
 
-int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_hid_attribute_t *attr_tbl, int numa, pcb_hid_attr_val_t *options);
+int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_export_opt_t *attr_tbl, int numa, pcb_hid_attr_val_t *options);
 
 /* Finish cam export, free all memory, mark cam export inactive and report
    the number of layer groups exported */
@@ -86,7 +86,7 @@
 
 /* Returns a filename base that can be used to output the layer; if flags is 0,
    look it up. Copies result in dest (which should be at least PCB_DERIVE_FN_SUFF_LEN bytes wide). */
-void pcb_derive_default_filename(const char *pcbfile, pcb_hid_attribute_t * filename_attrib, const char *suffix);
+void pcb_derive_default_filename(const char *pcbfile, pcb_export_opt_t *filename_attrib, const char *suffix);
 
 /* Same as pcb_derive_default_filename() but returns an allocated string
    directly, instead  of manipulating an attribute */
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 26921)
+++ trunk/src/hid_nogui.c	(revision 26922)
@@ -54,7 +54,7 @@
 	int nothing_interesting_here;
 } hid_gc_s;
 
-static pcb_hid_attribute_t *nogui_get_export_options(pcb_hid_t *hid, int *n_ret)
+static pcb_export_opt_t *nogui_get_export_options(pcb_hid_t *hid, int *n_ret)
 {
 	if (n_ret != NULL)
 		*n_ret = 0;
@@ -350,7 +350,7 @@
 		return pcb_strdup(answer);
 }
 
-void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny)
+void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_export_opt_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny)
 {
 	CRASH("attr_dlg_new");
 }
Index: trunk/src/hid_nogui.h
===================================================================
--- trunk/src/hid_nogui.h	(revision 26921)
+++ trunk/src/hid_nogui.h	(revision 26922)
@@ -5,7 +5,7 @@
 pcb_hid_t *pcb_hid_nogui_get_hid(void);
 
 /* For checking if attr dialogs are not available: */
-void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
+void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_export_opt_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 
 int pcb_nogui_progress(long so_far, long total, const char *message);
 
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 26921)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 26922)
@@ -89,7 +89,7 @@
 #define HA_skipsolder  2
 #define HA_antialias   3
 
-static pcb_hid_attribute_t bboard_options[] = {
+static pcb_export_opt_t bboard_options[] = {
 /*
 %start-doc options "Breadboard Export"
 @ftable @code
@@ -158,7 +158,7 @@
 * Export filter implementation starts here
 ********************************************/
 
-static pcb_hid_attribute_t *bboard_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *bboard_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (bboard_options[HA_bboardfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &bboard_options[HA_bboardfile], ".png");
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 26921)
+++ trunk/src_plugins/export_bom/bom.c	(revision 26922)
@@ -25,7 +25,7 @@
 
 const char *bom_cookie = "bom HID";
 
-static pcb_hid_attribute_t bom_options[] = {
+static pcb_export_opt_t bom_options[] = {
 /* %start-doc options "8 BOM Creation"
 @ftable @code
 @item --bomfile <string>
@@ -64,7 +64,7 @@
 	struct _BomList *next;
 } BomList;
 
-static pcb_hid_attribute_t *bom_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *bom_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (bom_options[HA_bomfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &bom_options[HA_bomfile], ".bom");
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 26921)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 26922)
@@ -78,7 +78,7 @@
 
 static pcb_hid_t dsn_hid;
 
-static pcb_hid_attribute_t dsn_options[] = {
+static pcb_export_opt_t dsn_options[] = {
 	{"dsnfile", "SPECCTRA output file",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 #define HA_dsnfile 0
@@ -105,7 +105,7 @@
 
 static const char *dsn_filename;
 
-static pcb_hid_attribute_t *dsn_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *dsn_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (dsn_options[HA_dsnfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &dsn_options[HA_dsnfile], ".dsn");
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 26921)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 26922)
@@ -108,7 +108,7 @@
 #include "dxf_draw.c"
 
 
-pcb_hid_attribute_t dxf_attribute_list[] = {
+pcb_export_opt_t dxf_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "93 DXF Options"
@@ -200,7 +200,7 @@
 
 static pcb_hid_attr_val_t dxf_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *dxf_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *dxf_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".dxf";
 
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 26921)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 26922)
@@ -156,7 +156,7 @@
 } hid_gc_s;
 
 
-static pcb_hid_attribute_t excellon_options[] = {
+static pcb_export_opt_t excellon_options[] = {
 
 /* %start-doc options "90 excellon Export"
 @ftable @code
@@ -190,7 +190,7 @@
 
 static pcb_hid_attr_val_t excellon_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *excellon_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *excellon_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (excellon_options[HA_excellonfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &excellon_options[HA_excellonfile], "");
Index: trunk/src_plugins/export_fidocadj/fidocadj.c
===================================================================
--- trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 26921)
+++ trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 26922)
@@ -66,7 +66,7 @@
 
 const char *fidocadj_cookie = "fidocadj HID";
 
-pcb_hid_attribute_t fidocadj_attribute_list[] = {
+pcb_export_opt_t fidocadj_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 	{"outfile", "Output file name",
@@ -84,7 +84,7 @@
 
 static pcb_hid_attr_val_t fidocadj_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *fidocadj_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *fidocadj_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".fcd";
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 26921)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 26922)
@@ -150,7 +150,7 @@
 	NULL
 };
 
-pcb_hid_attribute_t gcode_attribute_list[] = {
+pcb_export_opt_t gcode_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 	{"basename", "File name prefix",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
@@ -234,7 +234,7 @@
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
-static pcb_hid_attribute_t *gcode_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *gcode_get_export_options(pcb_hid_t *hid, int *n)
 {
 	static int last_unit_value = -1;
 
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 26921)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 26922)
@@ -203,7 +203,7 @@
 	NULL
 };
 
-static pcb_hid_attribute_t gerber_options[] = {
+static pcb_export_opt_t gerber_options[] = {
 
 /* %start-doc options "90 Gerber Export"
 @ftable @code
@@ -260,7 +260,7 @@
 
 static pcb_hid_attr_val_t gerber_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *gerber_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *gerber_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (gerber_options[HA_gerberfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &gerber_options[HA_gerberfile], "");
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 26921)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 26922)
@@ -396,7 +396,7 @@
 
 /*** export hid administration and API/glu ***/
 
-static pcb_hid_attribute_t ipcd356_options[] = {
+static pcb_export_opt_t ipcd356_options[] = {
 /* %start-doc options "8 IPC-D-356 Netlist Export"
 @ftable @code
 @item --netlist-file <string>
@@ -416,7 +416,7 @@
 
 static pcb_hid_attr_val_t ipcd356_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *ipcd356_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *ipcd356_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL) && (ipcd356_options[HA_ipcd356_filename].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &ipcd356_options[HA_ipcd356_filename], ".net");
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 26921)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 26922)
@@ -92,7 +92,7 @@
 
 #define THMAX PCB_MM_TO_COORD(100)
 
-pcb_hid_attribute_t openems_attribute_list[] = {
+pcb_export_opt_t openems_attribute_list[] = {
 	{"outfile", "Graphics output file",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 #define HA_openemsfile 0
@@ -157,7 +157,7 @@
 
 static pcb_hid_attr_val_t openems_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *openems_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *openems_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".m";
 	pcb_mesh_t *mesh = pcb_mesh_get(MESH_NAME);
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 26921)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 26922)
@@ -83,7 +83,7 @@
 static int scad_layer_cnt;
 static vti0_t scad_comp;
 
-pcb_hid_attribute_t openscad_attribute_list[] = {
+pcb_export_opt_t openscad_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "93 DXF Options"
@@ -127,7 +127,7 @@
 
 static pcb_hid_attr_val_t openscad_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *openscad_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *openscad_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".scad";
 
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 26921)
+++ trunk/src_plugins/export_png/png.c	(revision 26922)
@@ -237,7 +237,7 @@
 static const color_struct silk_top_shadow = {0x151515FF, 21, 21, 21, 255};
 static const color_struct silk_bottom_shadow = {0x0E0E0EFF, 14, 14, 14, 255};
 
-pcb_hid_attribute_t png_attribute_list[] = {
+pcb_export_opt_t png_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "93 PNG Options"
@@ -485,7 +485,7 @@
 	return result;
 }
 
-static pcb_hid_attribute_t *png_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *png_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = get_file_suffix();
 
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 26921)
+++ trunk/src_plugins/export_ps/eps.c	(revision 26922)
@@ -47,7 +47,7 @@
 static int fast_erase = -1;
 static pcb_composite_op_t drawing_mode;
 
-static pcb_hid_attribute_t eps_attribute_list[] = {
+static pcb_export_opt_t eps_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "92 Encapsulated Postscript Export"
@@ -119,7 +119,7 @@
 
 static pcb_hid_attr_val_t eps_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *eps_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *eps_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (eps_attribute_list[HA_psfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &eps_attribute_list[HA_psfile], ".eps");
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 26921)
+++ trunk/src_plugins/export_ps/ps.c	(revision 26922)
@@ -47,7 +47,7 @@
 
 static pcb_cam_t ps_cam;
 
-pcb_hid_attribute_t ps_attribute_list[] = {
+pcb_export_opt_t ps_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "91 Postscript Export"
@@ -339,7 +339,7 @@
 	pcb_composite_op_t drawing_mode;
 } global;
 
-static pcb_hid_attribute_t *ps_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *ps_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL) && (ps_attribute_list[HA_psfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &ps_attribute_list[HA_psfile], ".ps");
@@ -1238,7 +1238,7 @@
 	pcb_fprintf(global.f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2);
 }
 
-pcb_hid_attribute_t ps_calib_attribute_list[] = {
+pcb_export_opt_t ps_calib_attribute_list[] = {
 	{"lprcommand", "Command to print",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 };
Index: trunk/src_plugins/export_stat/stat.c
===================================================================
--- trunk/src_plugins/export_stat/stat.c	(revision 26921)
+++ trunk/src_plugins/export_stat/stat.c	(revision 26922)
@@ -69,7 +69,7 @@
 
 const char *stat_cookie = "stat HID";
 
-pcb_hid_attribute_t stat_attribute_list[] = {
+pcb_export_opt_t stat_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 	{"outfile", "Output file name",
@@ -109,7 +109,7 @@
 
 static pcb_hid_attr_val_t stat_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *stat_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *stat_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".stat.lht";
 
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 26921)
+++ trunk/src_plugins/export_svg/svg.c	(revision 26922)
@@ -125,7 +125,7 @@
 	/* INNER */  { "#222222", "#111111", "#000000", PCB_MM_TO_COORD(0) }
 };
 
-pcb_hid_attribute_t svg_attribute_list[] = {
+pcb_export_opt_t svg_attribute_list[] = {
 	/* other HIDs expect this to be first.  */
 
 /* %start-doc options "93 SVG Options"
@@ -198,7 +198,7 @@
 
 static pcb_hid_attr_val_t svg_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *svg_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *svg_get_export_options(pcb_hid_t *hid, int *n)
 {
 	const char *suffix = ".svg";
 
Index: trunk/src_plugins/export_test/export_test.c
===================================================================
--- trunk/src_plugins/export_test/export_test.c	(revision 26921)
+++ trunk/src_plugins/export_test/export_test.c	(revision 26922)
@@ -22,7 +22,7 @@
 
 const char *export_test_cookie = "export_test HID";
 
-static pcb_hid_attribute_t export_test_options[] = {
+static pcb_export_opt_t export_test_options[] = {
 /* %start-doc options "8 export_test Creation"
 @ftable @code
 @item --export_testfile <string>
@@ -41,7 +41,7 @@
 
 static const char *export_test_filename;
 
-static pcb_hid_attribute_t *export_test_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *export_test_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if ((PCB != NULL)  && (export_test_options[HA_export_testfile].default_val.str_value == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &export_test_options[HA_export_testfile], ".export_test");
Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c
===================================================================
--- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 26921)
+++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 26922)
@@ -38,7 +38,7 @@
 static int pcb_fuse_changed;
 static char fuse_cwd[PCB_PATH_MAX];
 
-static pcb_hid_attribute_t *export_vfs_fuse_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *export_vfs_fuse_get_export_options(pcb_hid_t *hid, int *n)
 {
 	return 0;
 }
Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c
===================================================================
--- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 26921)
+++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 26922)
@@ -24,7 +24,7 @@
 
 const char *export_vfs_mc_cookie = "export_vfs_mc HID";
 
-static pcb_hid_attribute_t export_vfs_mc_options[] = {
+static pcb_export_opt_t export_vfs_mc_options[] = {
 	{"cmd", "mc command",
 	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 #define HA_export_vfs_mc_cmd 0
@@ -40,7 +40,7 @@
 
 static pcb_hid_attr_val_t export_vfs_mc_values[NUM_OPTIONS];
 
-static pcb_hid_attribute_t *export_vfs_mc_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *export_vfs_mc_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if (n)
 		*n = NUM_OPTIONS;
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 26921)
+++ trunk/src_plugins/export_xy/xy.c	(revision 26922)
@@ -48,7 +48,7 @@
 #define MAX_TEMP_NAME_LEN 128
 
 
-static pcb_hid_attribute_t xy_options[] = {
+static pcb_export_opt_t xy_options[] = {
 /* %start-doc options "8 XY Creation"
 @ftable @code
 @item --xyfile <string>
@@ -96,7 +96,7 @@
 	}
 }
 
-static pcb_hid_attribute_t *xy_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *xy_get_export_options(pcb_hid_t *hid, int *n)
 {
 	static int last_unit_value = -1;
 	conf_listitem_t *li;
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 26921)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 26922)
@@ -34,7 +34,7 @@
 	pcb_core_gc_t core_gc;
 } hid_gc_s;
 
-static pcb_hid_attribute_t *batch_get_export_options(pcb_hid_t *hid, int *n_ret)
+static pcb_export_opt_t *batch_get_export_options(pcb_hid_t *hid, int *n_ret)
 {
 	if (n_ret != NULL)
 		*n_ret = 0;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26921)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26922)
@@ -246,7 +246,7 @@
 static int stdin_listen = 0;
 static char *background_image_file = 0;
 
-pcb_hid_attribute_t lesstif_attribute_list[] = {
+pcb_export_opt_t lesstif_attribute_list[] = {
 	{"install", "Install private colormap",
 		PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &use_private_colormap},
 #define HA_colormap 0
@@ -771,10 +771,10 @@
 
 /* ---------------------------------------------------------------------- */
 
-static pcb_hid_attribute_t *lesstif_get_export_options(pcb_hid_t *hid, int *n)
+static pcb_export_opt_t *lesstif_get_export_options(pcb_hid_t *hid, int *n)
 {
 	if (n != NULL)
-		*n = sizeof(lesstif_attribute_list) / sizeof(pcb_hid_attribute_t);
+		*n = sizeof(lesstif_attribute_list) / sizeof(pcb_export_opt_t);
 	return lesstif_attribute_list;
 }
 
@@ -1638,7 +1638,7 @@
 
 	for (ha = hid_attr_nodes; ha; ha = ha->next)
 		for (i = 0; i < ha->n; i++) {
-			pcb_hid_attribute_t *a = ha->attributes + i;
+			pcb_export_opt_t *a = ha->attributes + i;
 			switch (a->type) {
 			case PCB_HATT_INTEGER:
 			case PCB_HATT_COORD:
@@ -1674,7 +1674,7 @@
 
 	for (ha = hid_attr_nodes; ha; ha = ha->next)
 		for (i = 0; i < ha->n; i++) {
-			pcb_hid_attribute_t *a = ha->attributes + i;
+			pcb_export_opt_t *a = ha->attributes + i;
 			XrmOptionDescRec *o = new_options + acount;
 			char *tmpopt, *tmpres;
 			XtResource *r = new_resources + rcount;
@@ -1790,7 +1790,7 @@
 	rcount = 0;
 	for (ha = hid_attr_nodes; ha; ha = ha->next)
 		for (i = 0; i < ha->n; i++) {
-			pcb_hid_attribute_t *a = ha->attributes + i;
+			pcb_export_opt_t *a = ha->attributes + i;
 			val_union *v = new_values + rcount;
 			switch (a->type) {
 			case PCB_HATT_INTEGER:
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 26921)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 26922)
@@ -31,7 +31,7 @@
 	int nop;
 } hid_gc_s;
 
-static pcb_hid_attribute_t *remote_get_export_options(pcb_hid_t *hid, int *n_ret)
+static pcb_export_opt_t *remote_get_export_options(pcb_hid_t *hid, int *n_ret)
 {
 	if (n_ret != NULL)
 		*n_ret = 0;