[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.257 and 1.260

version 1.257, 2005/02/18 23:22:43 version 1.260, 2005/03/02 22:26:36
Line 84  sub start_m { Line 84  sub start_m {
     my $currentstring = '';      my $currentstring = '';
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     if ($target eq 'web' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'analyze') {
  $inside ='\\documentstyle{article}'.$inside;  
  &Apache::lonxml::debug("M is starting with:$inside:");   &Apache::lonxml::debug("M is starting with:$inside:");
  my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);   my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
  if ($eval eq 'on') {   if ($eval eq 'on') {
Line 185  sub end_html { Line 184  sub end_html {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = &Apache::lonxml::xmlend($target,$parser);   $currentstring = '</html>';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 565  EDITBUTTON Line 564  EDITBUTTON
 }  }
   
 sub end_body {  sub end_body {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = &Apache::lonxml::xmlend($target,$parser);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';     $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     }       } 
Line 3750  sub image_replication { Line 3749  sub image_replication {
     $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;      $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
     if (not -e $epssrc && not -e $pssrc) {      if (not -e $epssrc && not -e $pssrc) {
  my $result=&Apache::lonnet::repcopy($epssrc);   my $result=&Apache::lonnet::repcopy($epssrc);
  if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }   if ($result ne 'OK') { &Apache::lonnet::repcopy($pssrc); }
     }      }
     return '';      return '';
 }  }
Line 3816  sub get_eps_image { Line 3815  sub get_eps_image {
     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;      $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     if (! -e $src) {      if (! -e $src) {
  if (&Apache::lonnet::repcopy($src) ne OK ) {   if (&Apache::lonnet::repcopy($src) ne 'OK' ) {
     #if replication failed try to find ps file      #if replication failed try to find ps file
     $src=~s/\.eps$/\.ps/;      $src=~s/\.eps$/\.ps/;
     #if no ps file try to replicate it      #if no ps file try to replicate it
     if (not -e $src &&      if (not -e $src &&
  &Apache::lonnet::repcopy($src) ne OK) {   &Apache::lonnet::repcopy($src) ne 'OK') {
  #if replication failed try to produce eps file dynamically   #if replication failed try to produce eps file dynamically
  $src=~s/\.ps$/\.eps/;   $src=~s/\.ps$/\.eps/;
  my $temp_file;   my $temp_file;
Removed from v.1.257  
changed lines
  Added in v.1.260

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