fix set/dxcq et al as off

Changes

@@ -4,6 +4,7 @@
 3. Added set/dxcq and set/dxitu zone commands [Translators: I have added
 dxcqu, dxcqs, dxitus and dxituu to Messages].
 4. Add new Commands to manuals (g0vgs)
+5. make sure that none of the above set/dx... commands are defaulted on
 22Feb03=======================================================================
 1. changed qrz.com address 
 2. added Charlie's [K1XX] new wpxloc.raw data stuff to get WA1, KC3 type 

perl/DXCommandmode.pm

@@ -109,6 +109,11 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 
+	# sort out new dx spot stuff
+	$user->wantdxcq(0) unless defined $user->{wantdxcq};
+	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
+	$user->wantusstate(0) unless defined $user->{wantusstate};
+
 	# sort out registration
 	if ($main::reqreg == 1) {
 		$self->{registered} = $user->registered;

sgml/commands2sgml.pl

@@ -15,6 +15,9 @@
 # Taiwanese suicide squirrels attacking your rabbit are also not my fault.
 #
 # Ian (M0AZM) 20030210.
+#
+# $Id$
+#
 
 print STDERR localtime() ." ($$) $0 Starting\n";
 
@@ -31,45 +34,33 @@ my $count = 0 ;
 my ($cmd, $line) ;
 my %help ;
 
-# Default output level
+# Default output level, take $ARGV[0] as being a level
-my $level = 0 ;
+my $level = shift || 0 ;
-
-# Command line parameters
-if(my $var = shift(@ARGV))
-    {
-    $level = $var ;
-    }
 
 # Disable line buffering
 $| = 1 ;
 
 # SGML headers
-if($HEADERS)
+if ($HEADERS) {
-    {
     print("<!doctype linuxdoc system>\n") ;
     print("<article>\n") ;
     print("<sect>\n") ;
 }
 
 # Loop until EOF
-while(<>) 
+while (<>) {
-    {
+
     # Ignore comments
-    if(m/^#/)
+    next if /^\s*\#/;
-        {
-        next;
-        }
 
 	chomp $_;
     
 	# Is this a command definition line?
 	# if(m/^=== ([\d])\^([\w,\W]*)\^([\w,\W]*)/)
-    if(m/^=== ([\d])\^(.*)\^(.*)/)
+	if (/^=== ([\d])\^(.*)\^(.*)/) {
-        {
 		$count++ ;
         
-        if($DEBUG)
+		if ($DEBUG) {
-            {
 			print("Level       $1\n") ;
 			print("Command     $2\n") ;
 			print("Description $3\n") ;
@@ -81,29 +72,29 @@ while(<>)
 		$help{$cmd}{level} = $1 ;
 		$help{$cmd}{command} = $2 ;
 		$help{$cmd}{description} = $3 ;
-        }
+	} else {
 		# Not a command definition line - Carry On Appending(tm)....
-    else
-        {
 		$help{$cmd}{comment} .= $_ . "\n" ;
 	}
 	# print("$_\n") ;
 }
 
 # Go through all of the records in the hash in order
-foreach $cmd (sort(keys %help))
+foreach $cmd (sort(keys %help)) {
-    {
+
 	# Level checking goes here.
-    if($help{$cmd}{level} > $level) { next ; }
+	next if $help{$cmd}{level} > $level;
     
 	# Need to change characters that SGML doesn't like at this point.
 	# Perhaps we should use a function for each of these variables?
 	# Deal with < and >
 	$help{$cmd}{command} =~ s/</&lt;/g ;
 	$help{$cmd}{command} =~ s/>/&gt;/g ;
+
 	# Deal with [ and ]
 	$help{$cmd}{command} =~ s/\[/&lsqb;/g ;
 	$help{$cmd}{command} =~ s/\]/&rsqb;/g ;
+
 	# Change to lower case
 	$help{$cmd}{command} = lc($help{$cmd}{command}) ;
 
@@ -112,15 +103,14 @@ foreach $cmd (sort(keys %help))
 	$help{$cmd}{description} =~ s/>/&gt;/g ;
 
 	# Deal with < and >
-    if($help{$cmd}{comment})
+	if ($help{$cmd}{comment}) {
-        {
 		$help{$cmd}{comment} =~ s/</&lt;/g ;
 		$help{$cmd}{comment} =~ s/>/&gt;/g ;
 	}
 
 	# Output the section details and command summary.
 	print("<sect1>$help{$cmd}{command}") ;
-    if($level > 0) { print(" ($help{$cmd}{level})") ; }
+	print(" ($help{$cmd}{level})") if $level > 0;
 	print("\n\n") ;
 	print("<P>\n") ;
 	print("<tt>\n") ;
@@ -137,27 +127,18 @@ foreach $cmd (sort(keys %help))
 	my $block = 0 ;
 
 	# Is the comment field blank?  Then trying to split will error - lets not.
-    if(!$help{$cmd}{comment})
+	next unless $help{$cmd}{comment};
-        {
-        next;
-        }
 
 	# Work through the comments line by line
-    foreach $line (split('\n', $help{$cmd}{comment}))
+	foreach $line (split('\n', $help{$cmd}{comment})) {
-        {
 		# Leading whitespace or not?
-        if($line =~ m/^\s+\S+/)
+		if ($line =~ /^\s+\S+/) {
-            {
+			if (!$block) {
-            if(!$block) 
-                {
 				$block = 1 ;
 				print("<tscreen><verb>\n") ; 
 			}
-            }
+		} else {
-        else
+			if ($block) {
-            {
-            if($block)
-                {
 				$block = 0 ;
 				print("</verb></tscreen>\n") ;
 			}
@@ -166,8 +147,7 @@ foreach $cmd (sort(keys %help))
 	}
     
 	# We fell out of the command comments still in a block - Ouch....
-    if($block)
+	if ($block) {
-        {
 		print("</verb></tscreen>\n\n") ;
 	}
 }