--- loncom/xml/lonplot.pm	2008/06/09 10:07:01	1.146
+++ loncom/xml/lonplot.pm	2008/12/11 22:48:56	1.148.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.146 2008/06/09 10:07:01 foxr Exp $
+# $Id: lonplot.pm,v 1.148.2.1 2008/12/11 22:48:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1362,6 +1362,7 @@ sub start_function {
         my $function = &Apache::lonxml::get_all_text("/function",$parser,
 						     $style);
 	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
+        $function=~s/\^/\*\*/gs;
 	$curves[-1]->{'function'} = $function; 
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
@@ -1432,7 +1433,7 @@ sub start_data {
 	}
 	# complain if the number of data points is not the same as
 	# in previous sets of data.
-	if (($curves[-1]->{'data'}) && ($#data != $#{@{$curves[-1]->{'data'}->[0]}})){
+	if (($curves[-1]->{'data'}) && ($#data != $#{$curves[-1]->{'data'}->[0]})){
 	    &Apache::lonxml::warning
 		('Number of data points is not consistent with previous '.
 		 'number of data points');
@@ -1695,14 +1696,13 @@ sub write_gnuplot_file {
 	$gnuplot_input .= "$ytics{'start'}, ";
 	$gnuplot_input .= "$ytics{'increment'}, ";
         $gnuplot_input .= "$ytics{'end'} ";
+        if ($target eq 'tex') {
+            $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.
+        }
+        $gnuplot_input .= "\n";
         if ($ytics{'minorfreq'} != 0) {
             $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
         } 
-	if ($target eq 'tex') {
-	    $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.
-	}
-	$gnuplot_input .= "\n";
-
     } else {
 	if ($target eq 'tex') {
 	    $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.