--- loncom/xml/lonplot.pm	2001/12/21 16:59:01	1.14
+++ loncom/xml/lonplot.pm	2001/12/21 20:06:25	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.14 2001/12/21 16:59:01 matthew Exp $
+# $Id: lonplot.pm,v 1.15 2001/12/21 20:06:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,10 +71,10 @@ my $int_test       = sub {$_[0]=~s/\s+//
 my $real_test      = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/};
 my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
-my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/};
+my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
 my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};
 my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};
-my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^(\w+ ?)+$/};
+my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w\(\)]+ ?)+$/};
 ##
 ## Default values for attributes of elements
 ##
@@ -111,7 +111,8 @@ my %axis_defaults =
      xmin      => {default => '-10.0',   test => $real_test },
      xmax      => {default => ' 10.0',   test => $real_test },
      ymin      => {default => '-10.0',   test => $real_test },
-     ymax      => {default => ' 10.0',   test => $real_test }
+     ymax      => {default => ' 10.0',   test => $real_test },
+     linestyle => {default => 'points',  test => $linestyle_test}
      );
 
 my %curve_defaults = 
@@ -432,7 +433,7 @@ sub get_attributes{
     my $attr;
     foreach $attr (keys %{$defaults}) {
 	$values->{$attr} = 
-	             &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	    &Apache::lonxml::get_param($attr,$parstack,$safeeval);
 	if ($values->{$attr} eq '' | !defined($values->{$attr})) {
 	    $values->{$attr} = $defaults->{$attr}->{'default'};
 	    next;
@@ -447,7 +448,7 @@ sub get_attributes{
     }
     return ;
 }
-
+##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {
     my $gnuplot_input = '';
     my $curve;
@@ -456,7 +457,6 @@ sub write_gnuplot_file {
     push @Colors, $plot{'bgcolor'};
     push @Colors, $plot{'fgcolor'}; 
     push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
-    push @Colors, $Colors[-1];  # Redundancy
     foreach $curve (@curves) {
 	push @Colors, ($curve->{'color'} ne '' ? 
 		       $curve->{'color'}       :