--- loncom/xml/lonplot.pm	2003/10/24 17:35:32	1.92
+++ loncom/xml/lonplot.pm	2004/03/08 17:31:37	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.92 2003/10/24 17:35:32 matthew Exp $
+# $Id: lonplot.pm,v 1.95 2004/03/08 17:31:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -244,7 +244,7 @@ my %gnuplot_defaults =
 	 test        => sub {$_[0]=~/^(Polar|Cartesian)$/},
 	 description => 'Plot type:',
 	 edit_type   => 'choice',
-         choices     => ['Polar','Cartesian']
+         choices     => ['Cartesian','Polar']
          },
      );
 
@@ -401,7 +401,7 @@ required.  Unfortunately, you must make
 in the order gnuplot expects the data.
 </p><p>
 Specifying the data should usually be done with a perl variable or array, 
-such as \@Xdata and \@Ydata.  You may also specify numerical data seperated 
+such as \@Xdata and \@Ydata.  You may also specify numerical data separated 
 by commas.  Again, the order of the <b>data</b> tags is important.  The
 first tag will be the X data and the second will be the Y data.
 </p>
@@ -512,7 +512,7 @@ sub end_gnuplot {
     my $randnumber;
     # need to call rand everytime start_script would evaluate, as the
     # safe space rand number generator and the global rand generator 
-    # are not seperate
+    # are not separate
     if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
 	$target eq 'answer') {
       $randnumber=int(rand(1000));
@@ -659,9 +659,8 @@ sub start_title {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/title");
 	$result.=&Apache::edit::rebuild_tag($token);
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/title",$parser);
     }
     return $result;
 }
@@ -693,9 +692,8 @@ sub start_xlabel {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/xlabel");
 	$result.=&Apache::edit::rebuild_tag($token);	
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/xlabel",$parser);
     }
     return $result;
 }
@@ -728,9 +726,8 @@ sub start_ylabel {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/ylabel");
 	$result.=&Apache::edit::rebuild_tag($token);
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/ylabel",$parser);
     }
     return $result;
 }
@@ -770,8 +767,7 @@ sub start_label {
 	&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%label_defaults));
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/label");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/label",$parser);
     }
     return $result;
 }
@@ -849,8 +845,7 @@ sub start_function {
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/function");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/function",$parser);
     }
     return $result;
 }
@@ -892,7 +887,7 @@ sub start_data {
 	my @data;
 	if ($datatext =~ /,/) { # comma deliminated
 	    @data = split /,/,$datatext;
-	} else { # Assume it's space seperated.
+	} else { # Assume it's space separated.
 	    @data = split / /,$datatext;
 	}
 	for (my $i=0;$i<=$#data;$i++) {
@@ -927,8 +922,7 @@ sub start_data {
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/data");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/data",$parser);
     }
     return $result;
 }