--- loncom/xml/lonplot.pm	2012/02/13 11:24:16	1.154
+++ loncom/xml/lonplot.pm	2012/07/04 11:09:22	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.154 2012/02/13 11:24:16 foxr Exp $
+# $Id: lonplot.pm,v 1.158 2012/07/04 11:09:22 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,11 +98,16 @@ BEGIN {
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.
 
-my %linetypes =
+my %linetypes =			# For png use these linetypes.
     (
      solid          => 1,
      dashed         => 0
     );
+my %ps_linetypes = 		# For ps the line types are different!
+   (
+    solid          => 0,
+    dashed         => 7
+   );
 
 my %linestyles = 
     (
@@ -624,7 +629,18 @@ sub start_gnuplot {
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%gnuplot_defaults));
+
 	if ($constructtag) {
+	    #
+	    # The color chooser does not prepent x to the color values
+	    # Do that here:
+	    #
+	    foreach my $attribute ('bgcolor', 'fgcolor') {
+		my $value = $token->[2]{$attribute};
+		if (defined $value && !($value =~ /^x/)) {
+		    $token->[2]{$attribute} = 'x' . $value;
+		}
+	    }
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -1355,6 +1371,13 @@ sub start_curve {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%curve_defaults));
 	if ($constructtag) {
+	    #
+	    # Fix up the color attribute as jcolor does not prepend an x
+	    #
+	    my $value = $token->[2]{'color'};
+	    if (defined $value && !($value =~ /^x/)) {
+		$token->[2]{'color'} = 'x' . $value;
+	    }
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -1501,7 +1524,17 @@ sub start_axis {
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%axis_defaults));
+
 	if ($constructtag) {
+	    #
+	    #  Fix up the color attribute since jchooser does not
+	    #  prepend an x to the color:
+	    #
+	    my $value = $token->[2]{'color'};
+	    if (defined $value && !($value =~ /^x/)) {
+		$token->[2]{'color'} = 'x' . $value;
+	    }
+
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -1594,6 +1627,7 @@ sub write_gnuplot_file {
 		       $curve->{'color'}       : 
 		       $Apache::lonplot::plot{'fgcolor'}        );
     }
+    
     # set term
     if ($target eq 'web') {
 	$gnuplot_input .= 'set terminal png enhanced nocrop ';
@@ -1606,7 +1640,7 @@ sub write_gnuplot_file {
 	# set output
 	$gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {
-	$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";
+	$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} dash ";
 	if (!$font_properties->{'tex_no_file'}) {
 	    $gnuplot_input .=
 		'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
@@ -1806,40 +1840,30 @@ sub write_gnuplot_file {
         $gnuplot_input .="\n";
     }
     # curves
-    $gnuplot_input .= 'plot ';
+    #
+    # Each curve will have its very own linestyle.
+    # (This should work just fine in web rendition I think).
+    #  The line_xxx variables will hold the elements of the line style.
+    #  type (solid/dashed), color, width
+    #
+    my $linestyle_index = 50;
+    my $line_width   = '';
+
+    my $plot_command;
+    my $plot_type;
+
     for (my $i = 0;$i<=$#curves;$i++) {
 	$curve = $curves[$i];
-	$gnuplot_input.= ', ' if ($i > 0);
+	$plot_command.= ', ' if ($i > 0);
 	if ($target eq 'tex') {
 	    $curve->{'linewidth'} *= 2;
 	}
+	$line_width = $curve->{'linewidth'};
 	if (exists($curve->{'function'})) {
-	    $gnuplot_input.= 
+	    $plot_type    = 
 		$curve->{'function'}.' title "'.
 		$curve->{'name'}.'" with '.
                 $curve->{'linestyle'};
-
-            if (($curve->{'linestyle'} eq 'points')      ||
-                ($curve->{'linestyle'} eq 'linespoints') ||
-                ($curve->{'linestyle'} eq 'errorbars')   ||
-                ($curve->{'linestyle'} eq 'xerrorbars')  ||
-                ($curve->{'linestyle'} eq 'yerrorbars')  ||
-                ($curve->{'linestyle'} eq 'xyerrorbars')) {
-                $gnuplot_input.=' pointtype '.$curve->{'pointtype'};
-                $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
-            } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
-                $gnuplot_input.= ' '.$curve->{'limit'};
-            } elsif ($curve->{'linetype'} ne '' &&
-                     $curve->{'linestyle'} eq 'lines') {
-                $gnuplot_input.= ' linetype ';
-                $gnuplot_input.= $linetypes{$curve->{'linetype'}};
-                $gnuplot_input.= ' linecolor rgb "';
-                # convert color from xaaaaaa to #aaaaaa
-                $curve->{'color'} =~ s/^x/#/;
-                $gnuplot_input.= $curve->{'color'}.'"';
-            }
-            $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
-
 	} elsif (exists($curve->{'data'})) {
 	    # Store data values in $datatext
 	    my $datatext = '';
@@ -1860,30 +1884,48 @@ sub write_gnuplot_file {
 	    print $fh $datatext;
 	    close($fh);
 	    #   generate gnuplot text
-	    $gnuplot_input.= '"'.$datafilename.'" title "'.
+	    $plot_type = '"'.$datafilename.'" title "'.
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
-            if (($curve->{'linestyle'} eq 'points')      ||
-                ($curve->{'linestyle'} eq 'linespoints') ||
-                ($curve->{'linestyle'} eq 'errorbars')   ||
-                ($curve->{'linestyle'} eq 'xerrorbars')  ||
-                ($curve->{'linestyle'} eq 'yerrorbars')  ||
-                ($curve->{'linestyle'} eq 'xyerrorbars')) {
-                $gnuplot_input.=' pointtype '.$curve->{'pointtype'};
-                $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
-            } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
-                $gnuplot_input.= ' '.$curve->{'limit'};
-            } elsif ($curve->{'linetype'} ne '' &&
-                     $curve->{'linestyle'} eq 'lines') {
-                $gnuplot_input.= ' linetype ';
-                $gnuplot_input.= $linetypes{$curve->{'linetype'}};
-                $gnuplot_input.= ' linecolor rgb "';
-                # convert color from xaaaaaa to #aaaaaa
-                $curve->{'color'} =~ s/^x/#/;
-                $gnuplot_input.= $curve->{'color'}.'"';
-            }
-                $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; 
 	}
+	my $pointtype = '';
+	my $pointsize = '';
+
+	if (($curve->{'linestyle'} eq 'points')      ||
+	    ($curve->{'linestyle'} eq 'linespoints') ||
+	    ($curve->{'linestyle'} eq 'errorbars')   ||
+	    ($curve->{'linestyle'} eq 'xerrorbars')  ||
+	    ($curve->{'linestyle'} eq 'yerrorbars')  ||
+	    ($curve->{'linestyle'} eq 'xyerrorbars')) {
+	    
+	    $pointtype =' pointtype '.$curve->{'pointtype'};
+	    $pointsize =' pointsize '.$curve->{'pointsize'};
+	} elsif ($curve->{'linestyle'} eq 'filledcurves') { 
+	    $plot_command.= ' '.$curve->{'limit'};
+	} 
+
+
+	# Figure out the linestyle:
+
+	my $lt = $curve->{'linetype'} ne '' ? $curve->{'linetype'} 
+	                : 'solid';	# Line type defaults to solid.
+	# The mapping of lt -> the actual gnuplot line type depends on the target:
+
+	if ($target eq 'tex') {
+	    $lt = $ps_linetypes{$lt};
+	} else {
+	    $lt = $linetypes{$lt}
+	}
+
+	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;
+
+	$plot_command.= " ls $linestyle_index";
+	$gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
+	$linestyle_index++;	# Each curve get a unique linestyle.
     }
     # Write the output to a file.
     open (my $fh,">$tmpdir$filename.data");