Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 33276)
+++ trunk/src_plugins/export_bom/bom.c	(revision 33277)
@@ -252,7 +252,7 @@
 
 static int bom_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0);
+	rnd_export_register_opts2(hid, bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 33276)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 33277)
@@ -624,7 +624,7 @@
 
 	rnd_hid_register_hid(&dsn_hid);
 
-	rnd_export_register_opts(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0);
+	rnd_export_register_opts2(&dsn_hid, dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0);
 	return 0;
 }
 
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 33276)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 33277)
@@ -344,7 +344,7 @@
 
 static int dxf_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0);
+	rnd_export_register_opts2(hid, dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 33276)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 33277)
@@ -300,7 +300,7 @@
 
 static int excellon_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(excellon_options, NUM_OPTIONS, excellon_cookie, 0);
+	rnd_export_register_opts2(hid, excellon_options, NUM_OPTIONS, excellon_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_fidocadj/fidocadj.c
===================================================================
--- trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 33276)
+++ trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 33277)
@@ -346,7 +346,7 @@
 
 static int fidocadj_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0);
+	rnd_export_register_opts2(hid, fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 33276)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 33277)
@@ -376,7 +376,7 @@
 
 static int gcode_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), pcb_export_gcode_cookie, 0);
+	rnd_export_register_opts2(hid, gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), pcb_export_gcode_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 33276)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 33277)
@@ -420,7 +420,7 @@
 
 static int gerber_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(gerber_options, NUM_OPTIONS, gerber_cookie, 0);
+	rnd_export_register_opts2(hid, gerber_options, NUM_OPTIONS, gerber_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 33276)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 33277)
@@ -496,6 +496,6 @@
 
 	rnd_hid_register_hid(&ipcd356_hid);
 
-	rnd_export_register_opts(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0);
+	rnd_export_register_opts2(&ipcd356_hid, ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0);
 	return 0;
 }
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 33276)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 33277)
@@ -100,7 +100,7 @@
 static int lpr_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
 	lpr_get_export_options(hid, 0);
-	rnd_export_register_opts(lpr_options, num_lpr_options, lpr_cookie, 0);
+	rnd_export_register_opts2(hid, lpr_options, num_lpr_options, lpr_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 33276)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 33277)
@@ -727,7 +727,7 @@
 
 static int openems_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0);
+	rnd_export_register_opts2(hid, openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 33276)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 33277)
@@ -355,7 +355,7 @@
 
 static int openscad_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0);
+	rnd_export_register_opts2(hid, openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 33276)
+++ trunk/src_plugins/export_png/png.c	(revision 33277)
@@ -791,7 +791,7 @@
 
 static int png_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0);
+	rnd_export_register_opts2(hid, png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 33276)
+++ trunk/src_plugins/export_ps/eps.c	(revision 33277)
@@ -358,7 +358,7 @@
 
 static int eps_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0);
+	rnd_export_register_opts2(hid, eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 33276)
+++ trunk/src_plugins/export_ps/ps.c	(revision 33277)
@@ -671,7 +671,7 @@
 
 static int ps_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0);
+	rnd_export_register_opts2(hid, ps_attribute_list, NUM_OPTIONS, ps_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_stat/stat.c
===================================================================
--- trunk/src_plugins/export_stat/stat.c	(revision 33276)
+++ trunk/src_plugins/export_stat/stat.c	(revision 33277)
@@ -372,7 +372,7 @@
 
 static int stat_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0);
+	rnd_export_register_opts2(hid, stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_stl/export_stl.c
===================================================================
--- trunk/src_plugins/export_stl/export_stl.c	(revision 33276)
+++ trunk/src_plugins/export_stl/export_stl.c	(revision 33277)
@@ -509,7 +509,7 @@
 
 static int stl_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0]), stl_cookie, 0);
+	rnd_export_register_opts2(hid, stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0]), stl_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 33276)
+++ trunk/src_plugins/export_svg/svg.c	(revision 33277)
@@ -387,7 +387,7 @@
 
 static int svg_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0);
+	rnd_export_register_opts2(hid, svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c
===================================================================
--- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 33276)
+++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 33277)
@@ -132,7 +132,7 @@
 
 static int export_vfs_mc_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0);
+	rnd_export_register_opts2(hid, export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 33276)
+++ trunk/src_plugins/export_xy/xy.c	(revision 33277)
@@ -839,7 +839,7 @@
 
 static int xy_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0);
+	rnd_export_register_opts2(hid, xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }
 
Index: trunk/src_plugins/io_tedax/tetest.c
===================================================================
--- trunk/src_plugins/io_tedax/tetest.c	(revision 33276)
+++ trunk/src_plugins/io_tedax/tetest.c	(revision 33277)
@@ -235,7 +235,7 @@
 static const char *tedax_etest_cookie = "tEDAx etest";
 static int tedax_etest_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	rnd_export_register_opts(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]), tedax_etest_cookie, 0);
+	rnd_export_register_opts2(hid, tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]), tedax_etest_cookie, 0);
 	return rnd_hid_parse_command_line(argc, argv);
 }