Diff for /loncom/xml/londefdef.pm between versions 1.58 and 1.61

version 1.58, 2002/05/09 18:55:47 version 1.61, 2002/05/16 00:56:46
Line 52  use Apache::File(); Line 52  use Apache::File();
   
 BEGIN {  BEGIN {
   
     &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td'));      &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','th','td'));
   
 }  }
   
Line 73  sub start_m { Line 73  sub start_m {
   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') {
       $Apache::lonxml::prevent_entity_encode++;
     my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);      my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
     $inside ='\\documentstyle{article}'.$inside;      $inside ='\\documentstyle{article}'.$inside;
     &Apache::lonxml::debug("M is starting with:$inside:");      &Apache::lonxml::debug("M is starting with:$inside:");
Line 97  sub end_m { Line 98  sub end_m {
   my ($target,$token) = @_;    my ($target,$token) = @_;
   my $currentstring = '';    my $currentstring = '';
   if ($target eq 'web') {    if ($target eq 'web') {
       $Apache::lonxml::prevent_entity_encode--;
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $currentstring = "";      $currentstring = "";
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
Line 921  EDITBUTTON Line 923  EDITBUTTON
       }        }
 #-- <font> tag  #-- <font> tag
          sub start_font {           sub start_font {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'web') {              if ($target eq 'web') {
         my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
         if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode++;}
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     }       } 
    return $currentstring;     return $currentstring;
  }   }
         sub end_font {          sub end_font {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'web') {              if ($target eq 'web') {
         my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
         if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}
               $currentstring = $token->[2];                    $currentstring = $token->[2];    
             }               } 
    return $currentstring;     return $currentstring;
Line 1378  EDITBUTTON Line 1384  EDITBUTTON
     }      }
    return $currentstring;     return $currentstring;
  }   }
   #-- <th> tag
           sub start_th {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
               my $currentstring = '';
               if ($target eq 'web') {
                 $currentstring = $token->[4];     
       } elsif ($target eq 'tex') {
    my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
    if ($what_to_push eq '') {
       $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
    }
       push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
    $Apache::londefdef::table[-1]{'counter_columns'}++;
    &Apache::lonxml::startredirection();
   ;
       } 
      return $currentstring;
    }        
           sub end_th {
       my ($target,$token) = @_;
               my $currentstring = '';
               if ($target eq 'web') {
    $currentstring = $token->[2];     
       } elsif ($target eq 'tex') {
    my $current_row = $Apache::londefdef::table[-1]{'row_number'};
    my $data=&Apache::lonxml::endredirection();
    @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\bf{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
       }
      return $currentstring;
    }
 #-- <img> tag  #-- <img> tag
         sub start_img {          sub start_img {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;

Removed from v.1.58  
changed lines
  Added in v.1.61


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