--- loncom/xml/lonplot.pm	2007/08/03 06:00:18	1.123
+++ loncom/xml/lonplot.pm	2008/05/12 11:13:28	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.123 2007/08/03 06:00:18 albertel Exp $
+# $Id: lonplot.pm,v 1.137 2008/05/12 11:13:28 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,11 +36,10 @@ use Apache::response;
 use Apache::lonxml;
 use Apache::edit;
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
-use vars qw/$weboutputformat $versionstring/;
+use vars qw/$weboutputformat $version/;
 
 
 
@@ -49,8 +48,9 @@ BEGIN {
     #
     # Determine the version of GNUPLOT
     $weboutputformat = 'gif';
-    $versionstring = `gnuplot --version 2>/dev/null`;
-    if ($versionstring =~ /^gnuplot 4/) {
+    my $versionstring = `gnuplot --version 2>/dev/null`;
+    ($version) = ($versionstring =~ /^gnuplot ([\d.]+)/);
+    if ($version >= 4) {
         $weboutputformat = 'png';
     }
     
@@ -91,6 +91,12 @@ BEGIN {
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.
 
+my %linetypes =
+    (
+     solid          => 1,
+     dashed         => 0
+    );
+
 my %linestyles = 
     (
      lines          => 2,     # Maybe this will be used in the future
@@ -206,9 +212,9 @@ my %gnuplot_defaults =
      font         => {
 	 default     => '9',
 	 test        => $sml_test,
-	 description => 'Size of font to use',
+	 description => 'Font size to use in web output (pts)',
 	 edit_type   => 'choice',
-	 choices     => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']]
+	 choices     => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15']
 	 },
      fontface     => {
         default     => 'sans-serif',
@@ -385,6 +391,13 @@ my %label_defaults =
 	 description => 'justification of the label text on the plot',
 	 edit_type   => 'choice',
 	 choices     => ['left','right','center']
+     },
+     rotate => {
+         default => 0,
+         test => $real_test,
+         description => 'Rotation of label (degrees)',
+         edit_type   => 'entry',
+         size        => '10',
      }
      );
 
@@ -435,7 +448,7 @@ my %tic_defaults =
 	 },         
      );
 
-my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat');
 my %axis_defaults = 
     (
      color   => {
@@ -472,10 +485,25 @@ my %axis_defaults =
 	 description => 'Maximum y-value shown in plot',	 
 	 edit_type   => 'entry',
 	 size        => '10'
-	 }
+        },
+     xformat      => {
+         default     => 'on',
+         test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+         description => 'X-axis number formatting',
+         edit_type   => 'choice',
+         choices     => ['on', 'off', '2e', '2f'],
+         },
+     yformat      => {
+         default     => 'on',
+         test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+         description => 'X-axis number formatting',
+         edit_type   => 'choice',
+         choices     => ['on', 'off', '2e', '2f'],
+         },
+
      );
 
-my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit');
+my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
 
 my %curve_defaults = 
     (
@@ -496,37 +524,44 @@ my %curve_defaults =
      linestyle => {
 	 default => 'lines',
 	 test => $linestyle_test,
-	 description => 'Line style',
+	 description => 'Plot with:',
 	 edit_type   => 'choice',
 	 choices     => [keys(%linestyles)]
 	 },
      linewidth => {
-         default     => 4,
+         default     => 1,
          test        => $int_test,
-         description => 'Line width (may not apply to all line styles)',
+         description => 'Line width (may not apply to all plot styles)',
          edit_type   => 'choice',
          choices     => [1,2,3,4,5,6,7,8,9,10]
          },
+     linetype => {
+         default     => 'solid',
+         test        => sub {$_[0]=~/^(solid|dashed)$/},
+         description => 'Line type (may not apply to all plot styles)',
+         edit_type   => 'choice',
+         choices     => ['solid', 'dashed']
+         }, 
      pointsize => {
          default     => 1,
          test        => $pos_real_test,
-         description => 'Point size (may not apply to all line styles)',
+         description => 'Point size (may not apply to all plot styles)',
          edit_type   => 'entry',
          size        => '5'
          },
      pointtype => {
          default     => 1,
          test        => $int_test,
-         description => 'Point type (may not apply to all line styles)',
+         description => 'Point type (may not apply to all plot styles)',
          edit_type   => 'choice',
          choices     => [0,1,2,3,4,5,6]
          },
      limit     => {
          default     => 'closed',
-	 test        => sub {$_[0]=~/^(closed|x1|x2|y1|y2)$/},
+	 test        => sub {$_[0]=~/^(above|below|closed|x1|x2|y1|y2)$/},
          description => 'Point to fill -- for filledcurves',
          edit_type   => 'choice',
-         choices     => ['closed','x1','x2','y1','y2']
+         choices     => ['above', 'below', 'closed','x1','x2','y1','y2']
          },
      );
 
@@ -703,6 +738,7 @@ my %font_properties =
      );
 
 sub get_font {
+    my ($target) = @_;
     my ($size, $selected_font);
 
     if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) {
@@ -712,7 +748,7 @@ sub get_font {
 	} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
 	    $size = '9';
 	} elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
-	    $size = '15';
+	    $size = '11';
 	} else {
 	    $size = '9';
 	}
@@ -720,6 +756,9 @@ sub get_font {
 	$size = $Apache::lonplot::plot{'font'};
 	$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
     }
+    if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+	$size = $Apache::lonplot::plot{'texfont'};
+    }
     return ($size, $selected_font);
 }
 
@@ -753,6 +792,122 @@ sub end_key {
     return $result;
 }
 
+sub parse_label {
+    my ($target,$text) = @_;
+    my $parser=HTML::LCParser->new(\$text);
+    my $result;
+    while (my $token=$parser->get_token) {
+	if ($token->[0] eq 'S') {
+	    if ($token->[1] eq 'sub') {
+		$result .= '_{';
+	    } elsif ($token->[1] eq 'sup') {
+		$result .= '^{';
+	    } else {
+		$result .= $token->[4];
+	    }
+	} elsif ($token->[0] eq 'E') {
+	    if ($token->[1] eq 'sub'
+		|| $token->[1] eq 'sup') {
+		$result .= '}';
+	    } else {
+		$result .= $token->[2];
+	    }
+	} elsif ($token->[0] eq 'T') {
+	    $result .= &replace_entities($target,$token->[1]);
+	}
+    }
+    return $result;
+}
+
+
+my %lookup = 
+   (  # Greek alphabet:
+
+     '(Alpha|#913)'    => {'tex' => '{/Symbol A}', 'web' => "\x{391}"},
+      '(Beta|#914)'    => {'tex' => '{/Symbol B}', 'web' => "\x{392}"},
+     '(Chi|#935)'     => {'tex' => '{/Symbol C}', 'web' => "\x{3A7}"},
+     '(Delta|#916)'   => {'tex' => '{/Symbol D}', 'web' => "\x{394}"},
+     '(Epsilon|#917)' => {'tex' => '{/Symbol E}', 'web' => "\x{395}"},
+     '(Phi|#934)'     => {'tex' => '{/Symbol F}', 'web' => "\x{3A6}"},
+     '(Gamma|#915)'   => {'tex' => '{/Symbol G}', 'web' => "\x{393}"},
+     '(Eta|#919)'     => {'tex' => '{/Symbol H}', 'web' => "\x{397}"},
+     '(Iota|#921)'    => {'tex' => '{/Symbol I}', 'web' => "\x{399}"},
+     '(Kappa|#922)'   => {'tex' => '{/Symbol K}', 'web' => "\x{39A}"},
+     '(Lambda|#923)'  => {'tex' => '{/Symbol L}', 'web' => "\x{39B}"},
+     '(Mu|#924)'      => {'tex' => '{/Symbol M}', 'web' => "\x{39C}"},
+     '(Nu|#925)'      => {'tex' => '{/Symbol N}', 'web' => "\x{39D}"},
+     '(Omicron|#927)' => {'tex' => '{/Symbol O}', 'web' => "\x{39F}"},
+     '(Pi|#928)'      => {'tex' => '{/Symbol P}', 'web' => "\x{3A0}"},
+     '(Theta|#920)'   => {'tex' => '{/Symbol Q}', 'web' => "\x{398}"},
+     '(Rho|#929)'     => {'tex' => '{/Symbol R}', 'web' => "\x{3A1}"},
+     '(Sigma|#931)'   => {'tex' => '{/Symbol S}', 'web' => "\x{3A3}"},
+     '(Tau|#932)'     => {'tex' => '{/Symbol T}', 'web' => "\x{3A4}"},
+     '(Upsilon|#933)' => {'tex' => '{/Symbol U}', 'web' => "\x{3A5}"},
+     '(Omega|#937)'   => {'tex' => '{/Symbol W}', 'web' => "\x{3A9}"},
+     '(Xi|#926)'      => {'tex' => '{/Symbol X}', 'web' => "\x{39E}"},
+     '(Psi|#936)'     => {'tex' => '{/Symbol Y}', 'web' => "\x{3A8}"},
+     '(Zeta|#918)'    => {'tex' => '{/Symbol Z}', 'web' => "\x{396}"},
+     '(alpha|#945)'   => {'tex' => '{/Symbol a}', 'web' => "\x{3B1}"},
+     '(beta|#946)'    => {'tex' => '{/Symbol b}', 'web' => "\x{3B2}"},
+     '(chi|#967)'     => {'tex' => '{/Symbol c}', 'web' => "\x{3C7}"},
+     '(delta|#948)'   => {'tex' => '{/Symbol d}', 'web' => "\x{3B4}"},
+     '(epsilon|#949)' => {'tex' => '{/Symbol e}', 'web' => "\x{3B5}"},
+     '(phi|#966)'     => {'tex' => '{/Symbol f}', 'web' => "\x{3C6}"},
+     '(gamma|#947)'   => {'tex' => '{/Symbol g}', 'web' => "\x{3B3}"},
+     '(eta|#951)'     => {'tex' => '{/Symbol h}', 'web' => "\x{3B7}"},
+     '(iota|#953)'    => {'tex' => '{/Symbol i}', 'web' => "\x{3B9}"},
+     '(kappa|#954)'   => {'tex' => '{/Symbol k}', 'web' => "\x{3BA}"},
+     '(lambda|#955)'  => {'tex' => '{/Symbol k}', 'web' => "\x{3BB}"},
+     '(mu|#956)'      => {'tex' => '{/Symbol m}', 'web' => "\x{3BC}"},
+     '(nu|#957)'      => {'tex' => '{/Symbol n}', 'web' => "\x{3BD}"},
+     '(omicron|#959)' => {'tex' => '{/Symbol o}', 'web' => "\x{3BF}"},
+     '(pi|#960)'      => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},
+     '(theta|#952)'   => {'tex' => '{/Symbol q}', 'web' => "\x{3B8}"},
+     '(rho|#961)'     => {'tex' => '{/Symbol r}', 'web' => "\x{3C1}"},
+     '(sigma|#963)'   => {'tex' => '{/Symbol s}', 'web' => "\x{3C3}"},
+     '(tau|#964)'     => {'tex' => '{/Symbol t}', 'web' => "\x{3C4}"},
+     '(upsilon|#965)' => {'tex' => '{/Symbol u}', 'web' => "\x{3C5}"},
+     '(omega|#969)'   => {'tex' => '{/Symbol w}', 'web' => "\x{3C9}"},
+     '(xi|#958)'      => {'tex' => '{/Symbol x}', 'web' => "\x{3BE}"},
+     '(psi|#968)'     => {'tex' => '{/Symbol y}', 'web' => "\x{3C8}"},
+     '(zeta|#950)'    => {'tex' => '{/Symbol z}', 'web' => "\x{3B6}"},
+
+      # Punctuation:
+      
+      '(quot|#034)'   => {'tex' =>  '\42',        'web' => '\42'},
+      '(amp|#038)'    => {'tex' =>  '\46',        'web' => '\46'},
+      '(lt|#060)'     => {'tex' =>  '\74',        'web' => '\74'},
+      '(gt|#062)'     => {'tex' =>  '\76',        'web' => '\76'},
+      '#131'          => {'tex' =>  '{/Symbol \246}', 'web' => "\x{192}"},
+      '#132'          => {'tex' => '{/Text \271}',        'web' => "\x{201e}"},
+      '#133'          => {'tex' => '{/Symbol \274}', 'web'=> "\x{2026}"},
+      '#134'          => {'tex' => '{/Text \262}',  'web' => "\x{2020}"},
+      '#135'          => {'tex' => '{/Text \263}',  'web' => "\x{2021}"},
+      '#136'          => {'tex' => '\\\\^',            'web' => '\\\\^'},
+      '#137'          => {'tex' => '{/Text \275}', 'web' => "\x{2030}"},
+      '#138'          => {'tex' => 'S',           'web' => "\x{160}"}, # no S-caron in ps fonts.
+      '#139'          => {'tex' => '<',           'web' => '<'},
+      '#140'          => {'tex' => '{/Text \352}','web' => "\x{152}"},
+      '#145'          => {'tex' => '\140',        'web' => "\x{2018}"},
+      '#146'          => {'tex' => '\47',         'web' => "\x{2019}"},
+      '#147'          => {'tex' => '{/Text \252}','web' => "\x{201c}"},
+      '#148'          => {'tex' => '{/Text \315}','web' => '\\"'},
+      '#149'          => {'tex' => '{/Symbol \267}', 'web' => "\x{2022}"},
+      
+    );
+
+
+sub replace_entities {
+    my ($target,$text) = @_;
+    $text =~ s{([_^~\{\}]|\\\\)}{\\\\$1}g;
+    while (my ($re, $replace) = each(%lookup)) {
+	my $repl = $replace->{$target};
+	$text =~ s/&$re;/$replace->{$target}/g;
+    }
+    $text =~ s{(&)}{\\\\$1}g;
+    return $text;
+}
+
 ##------------------------------------------------------------------- title
 sub start_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -764,6 +919,7 @@ sub start_title {
 	if (length($title) > $max_str_len) {
 	    $title = substr($title,0,$max_str_len);
 	}
+	$title = &parse_label($target,$title);
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
 	my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
@@ -795,6 +951,7 @@ sub start_xlabel {
 	if (length($xlabel) > $max_str_len) {
 	    $xlabel = substr($xlabel,0,$max_str_len);
 	}
+	$xlabel = &parse_label($target,$xlabel);
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
 	my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
@@ -827,6 +984,7 @@ sub start_ylabel {
 	if (length($ylabel) > $max_str_len) {
 	    $ylabel = substr($ylabel,0,$max_str_len);
 	}
+	$ylabel = &parse_label($target,$ylabel);
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
 	my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
@@ -860,7 +1018,7 @@ sub start_label {
 	$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
 	$text =~ s/\n/ /g;
 	$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
-	$label{'text'} = $text;
+	$label{'text'} = &parse_label($target,$text);
 	push(@labels,\%label);
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
@@ -1117,10 +1275,9 @@ sub get_attributes{
 ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {
     my ($tmpdir,$filename,$target)= @_;
-    my ($fontsize, $font_properties) =  &get_font();
+    my ($fontsize, $font_properties) =  &get_font($target);
     my $gnuplot_input = '';
     my $curve;
-    my $pt = $Apache::lonplot::plot{'texfont'};
     #
     # Check to be sure we do not have any empty curves
     my @curvescopy;
@@ -1212,9 +1369,15 @@ sub write_gnuplot_file {
     if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') {
         $gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/;
     }
+
     # tic scales
-    $gnuplot_input .= 'set ticscale '.
-        $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+    if ($version > 4) {
+	$gnuplot_input .= 'set tics scale '.
+	    $Apache::lonplot::plot{'major_ticscale'}.', '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+    } else {
+    	$gnuplot_input .= 'set ticscale '.
+	    $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+    }
     #boxwidth
     if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
 	$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
@@ -1233,14 +1396,17 @@ 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 ' : '';
+
     if ($target eq 'tex') {
-	$gnuplot_input .= "set title  \"$title\"  font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($title)) ;
-	$gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($xlabel));
-	$gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($ylabel));
+	$gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+	$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+	$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
     } else {
-        $gnuplot_input .= "set title  \"$title\"  \n" if (defined($title)) ;
-        $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
-        $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+        $gnuplot_input .= "set title  \"$title\"          \n" if (defined($title)) ;
+        $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+        $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
     }
     # tics
     if (%xtics) {    
@@ -1265,6 +1431,22 @@ sub write_gnuplot_file {
     }
     # axis
     if (%axis) {
+        if ($axis{'xformat'} ne 'on') {
+            $gnuplot_input .= "set format x ";
+            if ($axis{'xformat'} eq 'off') {
+                $gnuplot_input .= "\"\"\n";
+            } else {
+                $gnuplot_input .= "\"\%.".$axis{'xformat'}."\"\n";
+            }
+        }
+        if ($axis{'yformat'} ne 'on') {
+            $gnuplot_input .= "set format y ";
+            if ($axis{'yformat'} eq 'off') {
+                $gnuplot_input .= "\"\"\n";
+            } else {
+                $gnuplot_input .= "\"\%.".$axis{'yformat'}."\"\n";
+            }
+        }
 	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
     }
@@ -1282,9 +1464,14 @@ sub write_gnuplot_file {
     my $label;
     foreach $label (@labels) {
 	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
-	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+                          $label->{'xpos'}.','.$label->{'ypos'};
+        if ($label->{'rotate'} ne '') {
+            $gnuplot_input .= ' rotate by '.$label->{'rotate'};
+        }
+        $gnuplot_input .= ' '.$label->{'justify'};
+
         if ($target eq 'tex') {
-	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$pt.'pt"' ;
+	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
         }
         $gnuplot_input .= $/;
     }
@@ -1305,7 +1492,6 @@ sub write_gnuplot_file {
 		$curve->{'function'}.' title "'.
 		$curve->{'name'}.'" with '.
                 $curve->{'linestyle'};
-            $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
 
             if (($curve->{'linestyle'} eq 'points')      ||
                 ($curve->{'linestyle'} eq 'linespoints') ||
@@ -1317,7 +1503,17 @@ sub write_gnuplot_file {
                 $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 = '';
@@ -1341,7 +1537,6 @@ sub write_gnuplot_file {
 	    $gnuplot_input.= '"'.$datafilename.'" title "'.
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
-            $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
             if (($curve->{'linestyle'} eq 'points')      ||
                 ($curve->{'linestyle'} eq 'linespoints') ||
                 ($curve->{'linestyle'} eq 'errorbars')   ||
@@ -1352,11 +1547,21 @@ sub write_gnuplot_file {
                 $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'}; 
 	}
     }
     # Write the output to a file.
-    my $fh=Apache::File->new(">$tmpdir$filename.data");
+    open (my $fh,">$tmpdir$filename.data");
+    binmode($fh, ":utf8");
     print $fh $gnuplot_input;
     close($fh);
     # That's all folks.