Diff for /loncom/xml/lonplot.pm between versions 1.12 and 1.19

version 1.12, 2001/12/20 22:36:35 version 1.19, 2001/12/27 19:47:02
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 12/15/01 Matthew  # 12/15/01 Matthew
 # 12/18 12/19 12/20 Matthew  # 12/17 12/18 12/19 12/20 12/21 Matthew
 package Apache::lonplot;  package Apache::lonplot;
   
 use strict;  use strict;
Line 34  use Apache::File; Line 34  use Apache::File;
 use Apache::response;  use Apache::response;
 use Apache::lonxml;  use Apache::lonxml;
   
 use Digest::MD5 qw(md5_base64);  
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::lonplot',('plot'));    &Apache::lonxml::register('Apache::lonplot',('plot'));
 }  }
Line 53  sub BEGIN { Line 51  sub BEGIN {
 ##  grid  ##  grid
 ##  border  ##  border
 ##  font  ##  font
   ##  align
 ##  ##
 ##  @labels: $labels[$i] = \%label  ##  @labels: $labels[$i] = \%label
 ##           %label: text, xpos, ypos, justify  ##           %label: text, xpos, ypos, justify
 ##   ##
 ##  @curves: $curves[$i] = \%curve  ##  @curves: $curves[$i] = \%curve
 ##        %curve: name, linestyle, ( function | data )  ##           %curve: name, linestyle, ( function | data )
 ##  ##
 ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],  ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],
 ##                            [y1,y2,y3,y4] ]  ##                            [y1,y2,y3,y4] ]
Line 68  sub BEGIN { Line 67  sub BEGIN {
 ## Tests used in checking the validitity of input  ## Tests used in checking the validitity of input
 ##  ##
 my $int_test       = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};  my $int_test       = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
 my $real_test      = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/};  my $real_test      = 
       sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
 my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};  my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};  my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
 my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/};  my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
 my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};  my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};
 my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};  my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};
 my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^(\w+ ?)+$/};  my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w\(\)]+ ?)+$/};
 ##  ##
 ## Default values for attributes of elements  ## Default values for attributes of elements
 ##  ##
Line 87  my %plot_defaults = Line 87  my %plot_defaults =
      transparent  => {default => 'off',     test => $onoff_test },       transparent  => {default => 'off',     test => $onoff_test },
      grid         => {default => 'off',     test => $onoff_test },       grid         => {default => 'off',     test => $onoff_test },
      border       => {default => 'on',      test => $onoff_test },       border       => {default => 'on',      test => $onoff_test },
      font         => {default => 'medium',  test => $sml_test   }       font         => {default => 'medium',  test => $sml_test   },
        align        => {default => 'left',    test => 
     sub {$_[0]=~/^(left|right|center)$/} }
      );       );
   
 my %key_defaults =   my %key_defaults = 
Line 111  my %axis_defaults = Line 113  my %axis_defaults =
      xmin      => {default => '-10.0',   test => $real_test },       xmin      => {default => '-10.0',   test => $real_test },
      xmax      => {default => ' 10.0',   test => $real_test },       xmax      => {default => ' 10.0',   test => $real_test },
      ymin      => {default => '-10.0',   test => $real_test },       ymin      => {default => '-10.0',   test => $real_test },
      ymax      => {default => ' 10.0',   test => $real_test }       ymax      => {default => ' 10.0',   test => $real_test },
        linestyle => {default => 'points',  test => $linestyle_test}
      );       );
   
 my %curve_defaults =   my %curve_defaults = 
     (      (
      color     => {default => 'x000000', test => $color_test             },       color     => {default => 'x000000', test => $color_test     },
      name      => {default => 'x000000', test => sub {1} },#sub {$_[0]=~/^[\w ]*$/} },       name      => {default => '',        test => $words_test     },
      linestyle => {default => 'lines',   test => $linestyle_test         }       linestyle => {default => 'lines',   test => $linestyle_test }
      );       );
   
 ##  ##
Line 133  sub start_plot { Line 136  sub start_plot {
     #      #
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &Apache::lonxml::register('Apache::lonplot',  
      ('title','xlabel','ylabel','key','axis','label','curve'));  
     push (@Apache::lonxml::namespace,'plot');  
     ## Always evaluate the insides of the <plot></plot> tags  
     my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);  
     $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);  
     &Apache::lonxml::newparser($parser,\$inside);  
     ##-------------------------------------------------------  
     &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,  
     $tagstack->[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    &Apache::lonxml::register('Apache::lonplot',
         ('title','xlabel','ylabel','key','axis','label','curve'));
    push (@Apache::lonxml::namespace,'plot');
    ## Always evaluate the insides of the <plot></plot> tags
    my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
    $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
    &Apache::lonxml::newparser($parser,\$inside);
    ##-------------------------------------------------------
    &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
    $tagstack->[-1]);
     }      }
     return '';      return '';
 }  }
Line 155  sub end_plot { Line 158  sub end_plot {
  ('title','xlabel','ylabel','key','axis','label','curve'));   ('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';      my $result = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  ## Determine filename -- Need to use the 'id' thingy that Gerd    ##
  ## mentioned.   ## Make sure we have all the input we need:
    if (! defined(%plot  )) { &set_defaults(\%plot,\%plot_defaults); }
    if (! defined(%key   )) {} # No key for this plot
    if (! defined(%axis  )) { &set_defaults(\%axis,\%axis_defaults); }
    if (! defined($title )) {} # No title for this plot
    if (! defined($xlabel)) {} # No xlabel for this plot
    if (! defined($ylabel)) {} # No ylabel for this plot
    if ($#labels < 0) { } # No labels for this plot
    if ($#curves < 0) { 
       &Apache::lonxml::warning("No curves specified for plot!!!!");
       return '';
    }
    my $curve;
    foreach $curve (@curves) {
       if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
    &Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");
    return '';
       }
    }
    ##
    ## Determine filename
  my $tmpdir = '/home/httpd/perl/tmp/';   my $tmpdir = '/home/httpd/perl/tmp/';
  my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.   my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
     '_plot.data';      '_'.time.'_'.$$.'_plot.data';
  ## Write the plot description to the file   ## Write the plot description to the file
  my $fh=Apache::File->new(">$tmpdir$filename");   my $fh=Apache::File->new(">$tmpdir$filename");
  $result .= '<pre>';  
  $result .= $filename.$/;  
  print $fh &write_gnuplot_file();   print $fh &write_gnuplot_file();
  $result .= '</pre>'.$/;   close($fh);
  ## return image tag for the plot   ## return image tag for the plot
  $result .= <<"ENDIMAGE";   $result .= <<"ENDIMAGE";
 <img src = "/cgi-bin/plot.gif?$filename"   <img src    = "/cgi-bin/plot.gif?$filename" 
      alt = "/cgi-bin/plot.gif?$filename" />       width  = "$plot{'width'}" 
        height = "$plot{'height'}"
        align  = "$plot{'align'}"
        alt    = "/cgi-bin/plot.gif?$filename" />
 ENDIMAGE  ENDIMAGE
     }      }
     return $result;      return $result;
Line 179  ENDIMAGE Line 203  ENDIMAGE
 sub start_key {  sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,  
     $tagstack->[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 198  sub end_key { Line 222  sub end_key {
 ##------------------------------------------------------------------- title  ##------------------------------------------------------------------- title
 sub start_title {  sub start_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);  
     my $result='';      my $result='';
     if ($target eq 'web') {      if ($target eq 'web') {
    $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 218  sub end_title { Line 242  sub end_title {
 sub start_xlabel {  sub start_xlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 237  sub end_xlabel { Line 261  sub end_xlabel {
 sub start_ylabel {  sub start_ylabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 256  sub end_ylabel { Line 280  sub end_ylabel {
 sub start_label {  sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my %label;  
     &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,  
     $tagstack->[-1]);  
     $label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);  
     if (! &$words_test($label{'text'})) {  
  # I should probably warn about it, too.  
  $label{'text'} = 'Illegal text';  
     }  
     push(@labels,\%label);  
     if ($target eq 'web') {      if ($target eq 'web') {
  # This routine should never return anything.   my %label;
    &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
    $label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
    if (! &$words_test($label{'text'})) {
       # I should probably warn about it, too.
       $label{'text'} = 'Illegal text';
    }
    push(@labels,\%label);
     }      }
       # This routine should never return anything.
     return $result;      return $result;
 }  }
   
Line 284  sub end_label { Line 308  sub end_label {
 sub start_curve {  sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my %curve;  
     &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,  
     $tagstack->[-1]);  
     push (@curves,\%curve);  
     &Apache::lonxml::register('Apache::lonplot',('function','data'));  
     push (@Apache::lonxml::namespace,'curve');  
     if ($target eq 'web') {      if ($target eq 'web') {
    my %curve;
    &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
    push (@curves,\%curve);
    &Apache::lonxml::register('Apache::lonplot',('function','data'));
    push (@Apache::lonxml::namespace,'curve');
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 299  sub start_curve { Line 323  sub start_curve {
 sub end_curve {  sub end_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';      my $result = '';
     pop @Apache::lonxml::namespace;  
     &Apache::lonxml::deregister('Apache::lonplot',('function','data'));  
     if ($target eq 'web') {      if ($target eq 'web') {
    pop @Apache::lonxml::namespace;
    &Apache::lonxml::deregister('Apache::lonplot',('function','data'));
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 310  sub end_curve { Line 334  sub end_curve {
 sub start_function {  sub start_function {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if (exists($curves[-1]->{'data'})) {  
  &Apache::lonxml::warning('Use of <function> precludes use of <data>.  The <data> will be omitted in favor of the <function> declaration.');  
  delete $curves[-1]->{'data'} ;  
     }  
     $curves[-1]->{'function'} =   
  &Apache::lonxml::get_all_text("/function",$$parser[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    if (exists($curves[-1]->{'data'})) {
       &Apache::lonxml::warning('Use of <function> precludes use of <data>.  The <data> will be omitted in favor of the <function> declaration.');
       delete $curves[-1]->{'data'} ;
    }
    $curves[-1]->{'function'} = 
       &Apache::lonxml::get_all_text("/function",$$parser[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 334  sub end_function { Line 358  sub end_function {
 sub start_data {  sub start_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if (exists($curves[-1]->{'function'})) {  
  &Apache::lonxml::warning('Use of <data> precludes use of <function>.'.  
             '  The <function> will be omitted in favor of the <data>'.  
             ' declaration.');  
  delete($curves[-1]->{'function'});  
     }  
     my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);  
     $datatext =~ s/\s+//g;  # No whitespace, numbers must be seperated  
                             # by commas  
     if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {  
  &Apache::lonxml::warning('Malformed data: '.$datatext);  
  $datatext = '';  
     }  
     # Need to do some error checking on the @data array -   
     # make sure it's all numbers and make sure each array   
     # is of the same length.  
     my @data = split /,/,$datatext;  
     for (my $i=0;$i<=$#data;$i++) {  
  # Check that it's non-empty  
  # Check that it's a number  
  # Maybe I need a 'debug=on' switch to list the data set  
  #    out in a warning?  
     }  
     push  @{$curves[-1]->{'data'}},\@data;  
     if ($target eq 'web') {      if ($target eq 'web') {
    if (exists($curves[-1]->{'function'})) {
       &Apache::lonxml::warning('Use of <data> precludes use of .'.
       '<function>.  The <function> will be omitted in favor of '.
               'the <data> declaration.');
       delete($curves[-1]->{'function'});
    }
    my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
    $datatext =~ s/\s+/ /g;  
    # Need to do some error checking on the @data array - 
    # make sure it's all numbers and make sure each array 
    # is of the same length.
    my @data;
    if ($datatext =~ /,/) {
       @data = split /,/,$datatext;
    } else { # Assume it's space seperated.
       @data = split / /,$datatext;
    }
    for (my $i=0;$i<=$#data;$i++) {
       # Check that it's non-empty
       if (! defined($data[$i])) {
    &Apache::lonxml::warning(
       'undefined <data> value.  Replacing with '.
       ' pi/e = 1.15572734979092');
    $data[$i] = 1.15572734979092;
       }
       # Check that it's a number
       if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
    &Apache::lonxml::warning(
       'Bad <data> value of '.$data[$i].'  Replacing with '.
       ' pi/e = 1.15572734979092');
    $data[$i] = 1.15572734979092;
       }
    }
    push  @{$curves[-1]->{'data'}},\@data;
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 377  sub end_data { Line 411  sub end_data {
 sub start_axis {  sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,  
     $tagstack->[-1]);  
     if ($target eq 'web') {      if ($target eq 'web') {
    &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
    $tagstack->[-1]);
  # This routine should never return anything.   # This routine should never return anything.
     }      }
     return $result;      return $result;
Line 394  sub end_axis { Line 428  sub end_axis {
     return $result;      return $result;
 }  }
   
   ##----------------------------------------------------------- set_defaults
   sub set_defaults {
       my $var      = shift;
       my $defaults = shift;
       my $key;
       foreach $key (keys %$defaults) {
    $var->{$key} = $defaults->{$key}->{'default'};
       }
   }
   
 ##------------------------------------------------------------------- misc  ##------------------------------------------------------------------- misc
 sub get_attributes{  sub get_attributes{
     my $values   = shift;      my $values   = shift;
Line 401  sub get_attributes{ Line 445  sub get_attributes{
     my $parstack = shift;      my $parstack = shift;
     my $safeeval = shift;      my $safeeval = shift;
     my $tag      = shift;      my $tag      = shift;
     my $attr;      foreach my $attr (keys %{$defaults}) {
     foreach $attr (keys %{$defaults}) {  
  $values->{$attr} =    $values->{$attr} = 
              &Apache::lonxml::get_param($attr,$parstack,$safeeval);      &Apache::lonxml::get_param($attr,$parstack,$safeeval);
  if ($values->{$attr} eq '' | !defined($values->{$attr})) {   if ($values->{$attr} eq '' | !defined($values->{$attr})) {
     $values->{$attr} = $defaults->{$attr}->{'default'};      $values->{$attr} = $defaults->{$attr}->{'default'};
     next;      next;
Line 419  sub get_attributes{ Line 462  sub get_attributes{
     }      }
     return ;      return ;
 }  }
   ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {  sub write_gnuplot_file {
     my $gnuplot_input = '';      my $gnuplot_input = '';
     my $curve;      my $curve;
Line 427  sub write_gnuplot_file { Line 470  sub write_gnuplot_file {
     my @Colors;      my @Colors;
     push @Colors, $plot{'bgcolor'};      push @Colors, $plot{'bgcolor'};
     push @Colors, $plot{'fgcolor'};       push @Colors, $plot{'fgcolor'}; 
     push @Colors, $axis{'color'};      push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
     push @Colors, $axis{'color'};   
     foreach $curve (@curves) {      foreach $curve (@curves) {
  push @Colors, ($curve->{'color'} ne '' ?    push @Colors, ($curve->{'color'} ne '' ? 
        $curve->{'color'}       :          $curve->{'color'}       : 
        $plot{'fgcolor'}      );         $plot{'fgcolor'}        );
     }      }
     # set term      # set term
     $gnuplot_input .= 'set term gif ';      $gnuplot_input .= 'set term gif ';
Line 446  sub write_gnuplot_file { Line 488  sub write_gnuplot_file {
     $gnuplot_input .= ($plot{'border'} eq 'on'?      $gnuplot_input .= ($plot{'border'} eq 'on'?
        'set border'.$/           :         'set border'.$/           :
        'set noborder'.$/         );    # title, xlabel, ylabel         'set noborder'.$/         );    # title, xlabel, ylabel
     {      $gnuplot_input .= "set output\n";
     $gnuplot_input .= <<"ENDLABELS";      $gnuplot_input .= "set title  \"$title\"\n"  if (defined($title)) ;
 set output       $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
 set title  "$title"      $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
 set xlabel "$xlabel"      if (defined(%axis)) {
 set ylabel "$ylabel"   $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 set xrange \[$axis{'xmin'}:$axis{'xmax'}\]   $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
 set yrange \[$axis{'ymin'}:$axis{'ymax'}\]  
 ENDLABELS  
     }      }
     # Key      # Key
     if (defined($key{'pos'})) {      if (defined(%key)) {
  $gnuplot_input .= 'set key '.$key{'pos'}.' ';   $gnuplot_input .= 'set key '.$key{'pos'}.' ';
  if ($key{'title'} ne '') {   if ($key{'title'} ne '') {
     $gnuplot_input .= 'title "'.$key{'title'}.'" ';      $gnuplot_input .= 'title "'.$key{'title'}.'" ';
Line 465  ENDLABELS Line 505  ENDLABELS
  $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;   $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     } else {      } else {
  $gnuplot_input .= 'set nokey'.$/;   $gnuplot_input .= 'set nokey'.$/;
     }          }
     # labels      # labels
     my $label;      my $label;
     foreach $label (@labels) {      foreach $label (@labels) {

Removed from v.1.12  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>