Diff for /loncom/xml/lonplot.pm between versions 1.147 and 1.148.2.2

version 1.147, 2008/06/10 12:48:30 version 1.148.2.2, 2009/03/18 14:05:19
Line 496  my %axis_defaults = Line 496  my %axis_defaults =
      yformat      => {       yformat      => {
          default     => 'on',           default     => 'on',
          test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},           test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
          description => 'X-axis number formatting',           description => 'Y-axis number formatting',
          edit_type   => 'choice',           edit_type   => 'choice',
          choices     => ['on', 'off', '2e', '2f'],           choices     => ['on', 'off', '2e', '2f'],
          },           },
Line 1433  sub start_data { Line 1433  sub start_data {
  }   }
  # complain if the number of data points is not the same as   # complain if the number of data points is not the same as
  # in previous sets of data.   # 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      &Apache::lonxml::warning
  ('Number of data points is not consistent with previous '.   ('Number of data points is not consistent with previous '.
  'number of data points');   'number of data points');
Line 1696  sub write_gnuplot_file { Line 1696  sub write_gnuplot_file {
  $gnuplot_input .= "$ytics{'start'}, ";   $gnuplot_input .= "$ytics{'start'}, ";
  $gnuplot_input .= "$ytics{'increment'}, ";   $gnuplot_input .= "$ytics{'increment'}, ";
         $gnuplot_input .= "$ytics{'end'} ";          $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) {          if ($ytics{'minorfreq'} != 0) {
             $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";              $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
         }           } 
  if ($target eq 'tex') {  
     $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.  
  }  
  $gnuplot_input .= "\n";  
   
     } else {      } else {
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.      $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.

Removed from v.1.147  
changed lines
  Added in v.1.148.2.2


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