Diff for /loncom/xml/lonplot.pm between versions 1.146 and 1.148

version 1.146, 2008/06/09 10:07:01 version 1.148, 2008/09/02 19:55:23
Line 1362  sub start_function { Line 1362  sub start_function {
         my $function = &Apache::lonxml::get_all_text("/function",$parser,          my $function = &Apache::lonxml::get_all_text("/function",$parser,
      $style);       $style);
  $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);   $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
           $function=~s/\^/\*\*/gs;
  $curves[-1]->{'function'} = $function;    $curves[-1]->{'function'} = $function; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');   $result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
Line 1695  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.146  
changed lines
  Added in v.1.148


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