--- loncom/xml/lonplot.pm	2008/06/03 10:49:00	1.145
+++ loncom/xml/lonplot.pm	2009/01/30 03:20:10	1.151
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.145 2008/06/03 10:49:00 foxr Exp $
+# $Id: lonplot.pm,v 1.151 2009/01/30 03:20:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,9 @@
 # http://www.lon-capa.org/
 #
 
+
+
+
 package Apache::lonplot;
 
 use strict;
@@ -57,6 +60,8 @@ BEGIN {
 }
 
 
+=pod
+
 ## 
 ## Description of data structures:
 ##
@@ -88,6 +93,8 @@ BEGIN {
 ##                                                               ##
 ###################################################################
 
+=cut
+
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.
 
@@ -496,7 +503,7 @@ my %axis_defaults =
      yformat      => {
          default     => 'on',
          test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
-         description => 'X-axis number formatting',
+         description => 'Y-axis number formatting',
          edit_type   => 'choice',
          choices     => ['on', 'off', '2e', '2f'],
          },
@@ -757,6 +764,7 @@ sub get_font {
 	$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
     }
     if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+#	$selected_font = $font_properties{'classic'};
 	$size = $Apache::lonplot::plot{'texfont'};
     }
     return ($size, $selected_font);
@@ -1361,6 +1369,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');
@@ -1431,7 +1440,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');
@@ -1675,20 +1684,36 @@ sub write_gnuplot_file {
 	$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
 	$gnuplot_input .= "$xtics{'start'}, ";
 	$gnuplot_input .= "$xtics{'increment'}, ";
-	$gnuplot_input .= "$xtics{'end'}\n";
+	$gnuplot_input .= "$xtics{'end'} ";
+	if ($target eq 'tex') {
+	    $gnuplot_input .= 'font "Helvetica,22"';     # Needed in iso 8859-1 enc.
+	}
+	$gnuplot_input .= "\n";
         if ($xtics{'minorfreq'} != 0) {
             $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
         } 
+    } else {
+	if ($target eq 'tex') {
+	    $gnuplot_input .= 'set xtics font "Helvetica,22"'."\n"; # needed in iso 8859-1 enc
+	}
     }
     if (%ytics) {    
 	$gnuplot_input .= "set ytics $ytics{'location'} ";
 	$gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
 	$gnuplot_input .= "$ytics{'start'}, ";
 	$gnuplot_input .= "$ytics{'increment'}, ";
-        $gnuplot_input .= "$ytics{'end'}\n";
+        $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";
         } 
+    } else {
+	if ($target eq 'tex') {
+	    $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.
+	}
     }
     # axis
     if (%axis) {
@@ -1998,3 +2023,118 @@ sub insert_data {
 __END__
 
 
+=head1 NAME
+
+Apache::lonplot.pm
+
+=head1 SYNOPSIS
+
+XML-based plotter of graphs
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES (parsing and edit rendering)
+
+=over
+
+=item start_gnuplot()
+
+=item end_gnuplot()
+
+=item start_xtics()
+
+=item end_xtics()
+
+=item start_ytics()
+
+=item end_ytics()
+
+=item get_font()
+
+=item start_key()
+
+=item end_key()
+
+=item parse_label()
+
+=item replace_entities()
+
+=item start_title()
+
+=item end_title()
+
+=item start_xlabel()
+
+=item end_xlabel()
+
+=item start_ylabel()
+
+=item end_label()
+
+=item start_curve()
+
+=item end_curve()
+
+=item start_function()
+
+=item end_function()
+
+=item start_data()
+
+=item end_data()
+
+=item start_axis()
+
+=item end_axis
+
+=back
+
+=head1 SUBROUTINES (Utility)
+
+=over
+
+=item set_defaults()
+
+=item get_attributes()
+
+=item write_gnuplot_file()
+
+=item check_inputs()
+
+=item edit_attributes()
+
+=back
+
+=head1 SUBROUTINES (Insertion functions for editing plots)
+
+=over
+
+=item insert_gnuplot()
+
+=item insert_tics()
+
+=item insert_xtics()
+
+=item insert_key()
+
+=item insert_axis()
+
+=item insert_title()
+
+=item insert_xlabel()
+
+=item insert_ylabel()
+
+=item insert_label()
+
+=item insert_curve()
+
+=item insert_function()
+
+=item insert_data()
+
+=back
+
+=cut