Index: png.c
===================================================================
--- png.c	(revision 34309)
+++ png.c	(revision 34310)
@@ -176,7 +176,7 @@
 %end-doc
 */
 	{"outfile", "Graphics output file",
-	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0},
 #define HA_pngfile 0
 
 /* %start-doc options "93 PNG Options"
@@ -187,7 +187,7 @@
 %end-doc
 */
 	{"dpi", "Scale factor (pixels/inch). 0 to scale to specified size",
-	 RND_HATT_INTEGER, 0, 10000, {100, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 10000, {100, 0, 0}, 0},
 #define HA_dpi 1
 
 /* %start-doc options "93 PNG Options"
@@ -198,7 +198,7 @@
 %end-doc
 */
 	{"x-max", "Maximum width (pixels).  0 to not constrain",
-	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0},
 #define HA_xmax 2
 
 /* %start-doc options "93 PNG Options"
@@ -209,7 +209,7 @@
 %end-doc
 */
 	{"y-max", "Maximum height (pixels).  0 to not constrain",
-	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0},
 #define HA_ymax 3
 
 /* %start-doc options "93 PNG Options"
@@ -220,7 +220,7 @@
 %end-doc
 */
 	{"xy-max", "Maximum width and height (pixels).  0 to not constrain",
-	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0},
 #define HA_xymax 4
 
 /* %start-doc options "93 PNG Options"
@@ -231,7 +231,7 @@
 %end-doc
 */
 	{"as-shown", "Export layers as shown on screen",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_as_shown 5
 
 /* %start-doc options "93 PNG Options"
@@ -242,7 +242,7 @@
 %end-doc
 */
 	{"monochrome", "Convert to monochrome",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_mono 6
 
 /* %start-doc options "93 PNG Options"
@@ -253,7 +253,7 @@
 %end-doc
 */
 	{"only-visible", "Limit the bounds of the PNG image to the visible items",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_only_visible 7
 
 /* %start-doc options "93 PNG Options"
@@ -264,7 +264,7 @@
 %end-doc
 */
 	{"use-alpha", "Make the background and any holes transparent",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_use_alpha 8
 
 /* %start-doc options "93 PNG Options"
@@ -276,7 +276,7 @@
 %end-doc
 */
 	{"format", "Export file format",
-	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, filetypes, 0},
+	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, filetypes},
 #define HA_filetype 9
 
 /* %start-doc options "93 PNG Options"
@@ -290,7 +290,7 @@
 %end-doc
 */
 	{"png-bloat", "Amount (in/mm/mil/pix) to add to trace/pad/pin edges (1 = 1/100 mil) (OBSOLETE - do not use this feature!)",
-	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0},
 #define HA_bloat 10
 
 /* %start-doc options "93 PNG Options"
@@ -302,7 +302,7 @@
 %end-doc
 */
 	{"photo-mode", "Photo-realistic export mode",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_photo_mode 11
 
 /* %start-doc options "93 PNG Options"
@@ -313,7 +313,7 @@
 %end-doc
 */
 	{"photo-flip-x", "Show reverse side of the board, left-right flip",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_photo_flip_x 12
 
 /* %start-doc options "93 PNG Options"
@@ -324,7 +324,7 @@
 %end-doc
 */
 	{"photo-flip-y", "Show reverse side of the board, up-down flip",
-	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0},
 #define HA_photo_flip_y 13
 
 /* %start-doc options "93 PNG Options"
@@ -337,7 +337,7 @@
 %end-doc
 */
 	{"photo-mask-colour", "Colour for the exported colour mask (green, red, blue, purple)",
-	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, mask_colour_names, 0},
+	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, mask_colour_names},
 #define HA_photo_mask_colour 14
 
 /* %start-doc options "93 PNG Options"
@@ -351,7 +351,7 @@
 %end-doc
 */
 	{"photo-plating", "Type of plating applied to exposed copper in photo-mode (tinned, gold, silver, copper)",
-	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, plating_type_names, 0},
+	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, plating_type_names},
 #define HA_photo_plating 15
 
 /* %start-doc options "93 PNG Options"
@@ -364,11 +364,11 @@
 %end-doc
 */
 	{"photo-silk-colour", "Colour for the exported colour silk (white, black, yellow)",
-	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, silk_colour_names, 0},
+	 RND_HATT_ENUM, 0, 0, {0, 0, 0}, silk_colour_names},
 #define HA_photo_silk_colour 16
 
 	{"cam", "CAM instruction",
-	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0},
 #define HA_cam 17
 };