Diff for /loncom/xml/londefdef.pm between versions 1.108 and 1.111

version 1.108, 2003/01/30 23:30:24 version 1.111, 2003/02/05 23:17:32
Line 52  use Image::Magick; Line 52  use Image::Magick;
   
 BEGIN {  BEGIN {
   
     &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','u','ul','var','wbr'));      &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr'));
   
 }  }
   
Line 108  sub end_m { Line 108  sub end_m {
   }    }
   return $currentstring;    return $currentstring;
 }  }
   
   sub start_tthoption {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $result;
     if ($target eq 'web') {
         my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser);
         $inside=~s/^\s*//;
         if ($ENV{'browser.mathml'}) {
     &tth::ttmoptions($inside);
         } else {
     &tth::tthoptions($inside);
         }
     }
   }
   
   sub end_tthoption {
     my ($target,$token) = @_;
     my $result;
     return $result;
   }
   
 #-- <html> tag      #-- <html> tag    
 sub start_html {  sub start_html {
     my ($target,$token) = @_;      my ($target,$token) = @_;
Line 1434  sub start_table { Line 1455  sub start_table {
     my $shorthand = ($filled_columns+1)*4;      my $shorthand = ($filled_columns+1)*4;
     $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;      $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
  }   }
    if ($how_many_columns==1) {  #start of block with width correction for one column table
     $output=~s/^\s*\\parbox{([^}]*)}/\\parbox{\\textwidth - 1 cm}/;
    }                            #end of block with width correction for one column table
  $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';   $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
  if ($#Apache::londefdef::table > 0) {   if ($#Apache::londefdef::table > 0) {
     $inmemory = $Apache::londefdef::table[-1]{'output'};      $inmemory = $Apache::londefdef::table[-1]{'output'};
Line 1487  sub start_table { Line 1511  sub start_table {
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);   my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
  if ($what_to_push eq '') {   if ($what_to_push eq '') {
     $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;      $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
Line 1495  sub start_table { Line 1519  sub start_table {
     push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;      push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
  $Apache::londefdef::table[-1]{'counter_columns'}++;   $Apache::londefdef::table[-1]{'counter_columns'}++;
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
 ;  
     }       } 
    return $currentstring;     return $currentstring;
  }           }        
Line 2562  sub image_replication { Line 2585  sub image_replication {
  my $newsrc = $src;   my $newsrc = $src;
  $newsrc =~ s/\.(gif|jpg|png)$/.eps/;   $newsrc =~ s/\.(gif|jpg|png)$/.eps/;
  if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {   if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
     $newsrc =~ s/\.ps$/\.eps/;      $newsrc =~ s/\.eps$/\.ps/;
     &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);      &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
  }   }
     }      }

Removed from v.1.108  
changed lines
  Added in v.1.111


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