PPD for Nessie: Simplified definitions of default values

ppd/PPD.pm

@@ -35,7 +35,8 @@ our @EXPORT = qw(define_group define_ui_group switch_group declare get set maybe
 #		  Default => 1,		# if this is the default value
 #		},
 #	],
-#	Default => key,		# default value if not marked inside Values
+#	Default => key,		# default value; if not specified, use the value marked with Default=1,
+#				# or the first value if none is marked
 #	Custom => [		# further values with custom parameters (mostly a CUPS extension)
 #		PS => string,		# PS code invocation to emit (with parameters on the stack)
 #					# For JCL options, a JCL command is given with "\1" etc.

ppd/gen-nessie-xcpt

@@ -126,7 +126,6 @@ option({
 		[ 'Other',				'Other Type',					'other'				],
 		)
 	],
-	Default => 'SystemDefault',
 });
 
 option({
@@ -161,7 +160,6 @@ option({
 		[ 'Other',		'Other Color',		'other'			],
 		)
 	],
-	Default => 'SystemDefault',
 });
 
 option({
@@ -171,7 +169,7 @@ option({
 	Priority => 30,
 	JCL => 1,
 	Values => [
-		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('INPUT_TRAY', 'automatic'), Default => 1 },
+		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('INPUT_TRAY', 'automatic') },
 		{ Key => 'Tray1', Name => 'Tray 1', PS => jopt('INPUT_TRAY', 'tray-1') },
 		{ Key => 'Tray2', Name => 'Tray 2', PS => jopt('INPUT_TRAY', 'tray-2') },
 		{ Key => 'Tray3', Name => 'Tray 3', PS => jopt('INPUT_TRAY', 'tray-3') },
@@ -196,7 +194,7 @@ option({
 	Priority => 50,
 	JCL => 1,
 	Values => [
-		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('OUTPUT', 'automatic'), Default => 1 },
+		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('OUTPUT', 'automatic') },
 		{ Key => 'Middle', Name => 'Center Tray', PS => jopt('OUTPUT', 'center') },
 		{ Key => 'Left', Name => 'Left Top Tray', PS => jopt('OUTPUT', 'left') },
 		{ Key => 'RightTop', Name => 'Right Top Tray', PS => jopt('OUTPUT', 'right-top') },
@@ -224,7 +222,7 @@ option({
 	Priority => 55,
 	JCL => 1,
 	Values => [
-		{ Key => 'None', Name => 'No Staple', PS => jopt('FINISH_STAPLE', ""), Default => 1 },
+		{ Key => 'None', Name => 'No Staple', PS => jopt('FINISH_STAPLE', "") },
 		{ Key => 'SinglePortrait', Name => '1 Staple (Portrait)', PS => jopt('FINISH_STAPLE', '20') },
 		{ Key => 'SingleLandscape', Name => '1 Staple (Landscape)', PS => jopt('FINISH_STAPLE', '21') },
 		{ Key => 'DualPortrait', Name => '2 Staples (Portrait)', PS => jopt('FINISH_STAPLE', '28') },
@@ -239,7 +237,7 @@ option({
 	Priority => 56,
 	JCL => 1,
 	Values => [
-		{ Key => 'None', Name => 'No Hole Punching', PS => jopt('FINISH_PUNCH', ""), Default => 1 },
+		{ Key => 'None', Name => 'No Hole Punching', PS => jopt('FINISH_PUNCH', "") },
 		{ Key => '2HolePunch', Name => '2 Hole Punch', PS => jopt('FINISH_PUNCH', '90 94') },
 		{ Key => '4HolePunch', Name => '4 Hole Punch', PS => jopt('FINISH_PUNCH', '92 93') },
 	],
@@ -252,7 +250,7 @@ option({
 	Priority => 58,
 	JCL => 1,
 	Values => [
-		{ Key => 'None', Name => 'No Folding', PS => jopt('FINISH_FOLD', ""), Default => 1 },
+		{ Key => 'None', Name => 'No Folding', PS => jopt('FINISH_FOLD', "") },
 		{ Key => 'BiFold', Name => 'Booklet Fold', PS => jopt('FINISH_FOLD', '111') },
 		{ Key => 'BiFoldStaple', Name => 'Booklet Fold and Staple', PS => jopt('FINISH_FOLD', '110') },
 		{ Key => 'BiFoldSwap', Name => 'Booklet Fold and Swap Sides', PS => jopt('FINISH_FOLD', '113') },
@@ -270,7 +268,7 @@ option({
 	Priority => 59,
 	JCL => 1,
 	Values => [
-		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('FEED_ORIENTATION', "automatic"), Default => 1 },
+		{ Key => 'AutoSelect', Name => 'Automatically Select', PS => jopt('FEED_ORIENTATION', "automatic") },
 		{ Key => 'LongEdge', Name => 'Long Edge First', PS => jopt('FEED_ORIENTATION', 'long-edge-first') },
 		{ Key => 'ShortEdge', Name => 'Short Edge First', PS => jopt('FEED_ORIENTATION', 'short-edge-first') },
 	],
@@ -297,8 +295,8 @@ option({
 	Priority => 70,
 	JCL => 1,
 	Values => [
-		{ Key => 'Mono', Name => 'Monochromatic', PS => jopt('COLOR', 'mono'), Default => 1 },
 		{ Key => 'Color', Name => 'Color', PS => jopt('COLOR', 'color') },
+		{ Key => 'Mono', Name => 'Monochromatic', PS => jopt('COLOR', 'mono') },
 	],
 });
 
@@ -309,7 +307,7 @@ option({
 	Priority => 71,
 	JCL => 1,
 	Values => [
-		{ Key => 'Standard', Name => 'Standard', PS => jopt('QUALITY', 'standard'), Default => 1 },
+		{ Key => 'Standard', Name => 'Standard', PS => jopt('QUALITY', 'standard') },
 		{ Key => 'Enhanced', Name => 'Enhanced', PS => jopt('QUALITY', 'enhanced') },
 		{ Key => 'HighResolution', Name => 'Highest Resolution', PS => jopt('QUALITY', 'highest-resolution') },
 		{ Key => 'TonerSaver', Name => 'Toner Saver', PS => jopt('QUALITY', 'toner-saver') },