--- loncom/xml/lonplot.pm	2012/07/17 10:49:53	1.162
+++ loncom/xml/lonplot.pm	2012/12/05 19:30:28	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.162 2012/07/17 10:49:53 foxr Exp $
+# $Id: lonplot.pm,v 1.170 2012/12/05 19:30:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -132,7 +132,12 @@ my $real_test      =
     sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
 my $pos_real_test  =
     sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/};
-my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/};
+my $color_test;
+if ($version < 4.6) {
+    $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~/^x[\da-fA-F]{6}$/};
+} else {
+    $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~/^\#[\da-fA-F]{6}$/};
+}
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
 my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
 my $sml_test       = sub {$_[0]=~/^(\d+|small|medium|large)$/};
@@ -463,7 +468,13 @@ my %tic_defaults =
 	 description => 'Number of minor tics per major tic mark',
 	 edit_type   => 'entry',
 	 size        => '10'
-	 },         
+	 }, 
+     rotate => {
+	 default => 'off',
+	 test    => $onoff_test,
+	 description => 'Rotate tic label by 90 degrees if on',
+	 edit_type   => 'onoff'
+     }
      );
 
 my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero');
@@ -537,6 +548,7 @@ my %axis_defaults =
      	},
      );
 
+
 my @curve_edit_order = ('color','name','linestyle','linewidth','linetype',
 			'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle', 
 			'arrowlength', 'arrowangle', 'arrowbackangle'
@@ -649,6 +661,8 @@ my %curve_defaults =
 undef %Apache::lonplot::plot;
 my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
 
+my $current_tics;		# Reference to the current tick hash
+
 sub start_gnuplot {
     undef(%Apache::lonplot::plot);   undef(%key);    undef(%axis);
     undef($title);  undef($xlabel); undef($ylabel);
@@ -748,6 +762,8 @@ sub start_xtics {
     if ($target eq 'web' || $target eq 'tex') {
 	&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
 		    $tagstack->[-1]);
+	$current_tics = \%xtics;
+	&Apache::lonxml::register('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'xtics');
 	$result .= &edit_attributes($target,$token,\%tic_defaults,
@@ -766,6 +782,7 @@ sub end_xtics {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web' || $target eq 'tex') {
+	&Apache::lonxml::deregister('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_end($target,$token);
     }
@@ -779,6 +796,8 @@ sub start_ytics {
     if ($target eq 'web' || $target eq 'tex') {
 	&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
 		    $tagstack->[-1]);
+	$current_tics = \%ytics;
+	&Apache::lonxml::register('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'ytics');
 	$result .= &edit_attributes($target,$token,\%tic_defaults,
@@ -797,12 +816,55 @@ sub end_ytics {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web' || $target eq 'tex') {
+	&Apache::lonxml::deregister('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_end($target,$token);
     }
     return $result;
 }
 
+
+##----------------------------------------------------------------
+#
+#  Tic handling:
+#   The <tic> tag allows users to specify exact Tic positions and labels
+#   for each axis.  In this version we only support level 0 tics (major tic).
+#   Each tic has associated with it a position and a label
+#   $current_tics is a reference to the current tick description hash.
+#   We add elements to an array  in that has: ticspecs whose elements
+#   are 'pos' - the tick position and 'label' - the tic label.
+#
+
+
+sub start_tic {
+    my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style)  = @_;
+
+    my $result = '';
+    if ($target eq 'web' || $target eq 'tex') {
+	my $tic_location = &Apache::lonxml::get_param('location', $parstack, $safeeval);
+	my $tic_label    = &Apache::lonxml::get_all_text('/tic', $parser);
+
+	# Tic location must e a real:
+
+	if (!&$real_test($tic_location)) {
+	    &Apache::lonxml::warning("Tic location: $tic_location must be a real number");
+	} else {
+
+	    if (!defined  $current_tics->{'ticspecs'}) {
+		$current_tics->{'ticspecs'} = [];
+	    }
+	    my $ticspecs = $current_tics->{'ticspecs'};
+	    push (@$ticspecs, {'pos' => $tic_location, 'label' => $tic_label});
+	}
+    }
+
+    return $result;
+}
+
+sub end_tic {
+    return '';
+}
+
 ##-----------------------------------------------------------------font
 my %font_properties =
     (
@@ -1457,6 +1519,8 @@ sub start_function {
 						     $style);
 	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
         $function=~s/\^/\*\*/gs;
+	$function=~ s/^\s+//;	# Trim leading
+	$function=~ s/\s+$//;   # And trailing whitespace.
 	$curves[-1]->{'function'} = $function; 
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
@@ -1652,30 +1716,47 @@ sub generate_tics {
 
     if (defined %$spec) {
 
+	
 
+	# Major tics: - If there are 'ticspecs' these override any other
+	#               specifications:
 
-	# Major tics:
-
+	
+	
 	$result .= "set $type $spec->{'location'}  ";
 	$result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror ';
-	$result .= "$spec->{'start'}, ";
-	$result .= "$spec->{'increment'}, ";
-	$result .= "$spec->{'end'} ";
+	if ($spec->{'rotate'} eq 'on') {
+	    $result .= ' rotate ';
+	}
+	if (defined $spec->{'ticspecs'}) {
+	    $result .= '( ';
+	    my @ticspecs;
+	    my $ticinfo = $spec->{'ticspecs'};
+	    foreach my $tic (@$ticinfo) {
+		push(@ticspecs,  '"' . $tic->{'label'} . '" ' . $tic->{'pos'} );
+	    }
+	    $result .= join(', ', (@ticspecs));
+	    $result .= ' )';
+	} else {
+	    $result .= "$spec->{'start'}, ";
+	    $result .= "$spec->{'increment'}, ";
+	    $result .= "$spec->{'end'} ";
+	}
 	if ($target eq 'tex' ) {
 	    $result .= 'font "Helvetica,22"';
 	}
 	$result .= "\n";
-
+	
 	# minor frequency:
-
+	
 	if ($spec->{'minorfreq'} != 0) {
 	    $result .= "set m$type $spec->{'minorfreq'}\n";
 	}
     } else {
 	$result .= "set $type font " . '"Helvetica,22"' ."\n";
     }
-
-
+    
+    
     return $result;
 }
 
@@ -1807,8 +1888,8 @@ sub write_gnuplot_file {
     $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
     # title, xlabel, ylabel
     # titles
-    my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
-    my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';
+    my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' offset 0, -0.5 ' : '';
+    my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' offset -0.5, 0 ' : '';
 
     if ($target eq 'tex') {
 	$gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
@@ -1903,24 +1984,23 @@ sub write_gnuplot_file {
     #
     my $linestyle_index = 50;
     my $line_width   = '';
+    my $plots;
 
     # If arrows are needed there will be an arrow style for each as well:
     #
 
     my $arrow_style_index = 50;
 
-    my $plot_command;
-    my $plot_type;
-
     for (my $i = 0;$i<=$#curves;$i++) {
 	$curve = $curves[$i];
-	$plot_command.= ', ' if ($i > 0);
+	my $plot_command;
+	my $plot_type = ', ' if ($i > 0);
 	if ($target eq 'tex') {
 	    $curve->{'linewidth'} *= 2;
 	}
 	$line_width = $curve->{'linewidth'};
 	if (exists($curve->{'function'})) {
-	    $plot_type    = 
+	    $plot_type  .= 
 		$curve->{'function'}.' title "'.
 		$curve->{'name'}.'" with '.
                 $curve->{'linestyle'};
@@ -1944,7 +2024,7 @@ sub write_gnuplot_file {
 	    print $fh $datatext;
 	    close($fh);
 	    #   generate gnuplot text
-	    $plot_type = '"'.$datafilename.'" title "'.
+	    $plot_type .= '"'.$datafilename.'" title "'.
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
 	}
@@ -1966,10 +2046,6 @@ sub write_gnuplot_file {
 	my $color = $curve->{'color'};
 	$color =~ s/^x/#/;	        # Convert xhex color -> #hex color.   
 
-	my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
-	$gnuplot_input .= $style_command;
-
-
 
 	if (($curve->{'linestyle'} eq 'points')      ||
 	    ($curve->{'linestyle'} eq 'linespoints') ||
@@ -2000,8 +2076,8 @@ sub write_gnuplot_file {
 	    $arrow_style_index++;
 	}
 
-
-
+        my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
+        $gnuplot_input .= $style_command;
 
 	# The condition below is because gnuplot lumps the linestyle in with the 
 	# arrowstyle _sigh_.
@@ -2010,11 +2086,13 @@ sub write_gnuplot_file {
 	    $plot_command.= " ls $linestyle_index";
 	}
 
-	$gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
+	$plots .= $plot_type . ' ' . $plot_command;
 	$linestyle_index++;	# Each curve get a unique linestyle.
     }
+    $gnuplot_input .= 'plot '.$plots;
     # Write the output to a file.
-    &Apache::lonnet::logthis($gnuplot_input);
+
+    # &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input.
     open (my $fh, "> $tmpdir$filename.data");
     binmode($fh, ':utf8');
     print $fh $gnuplot_input;