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

Diff for /loncom/xml/londefdef.pm between versions 1.50 and 1.53

version 1.50, 2002/04/04 19:20:33 version 1.53, 2002/04/16 14:37:24
Line 50  use Apache::lonxml; Line 50  use Apache::lonxml;
   
 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'));      &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'));
   
 }  }
   
Line 114  sub end_m { Line 114  sub end_m {
               $currentstring = &Apache::lonxml::xmlbegin().                $currentstring = &Apache::lonxml::xmlbegin().
                                &Apache::lonxml::fontsettings();                                      &Apache::lonxml::fontsettings();     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
         @Apache::londefdef::table = ();
       $currentstring .= '\documentclass[letterpaper]{article}        $currentstring .= '\documentclass[letterpaper]{article}
                                  \newcommand{\keephidden}[1]{}                                              \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}                                   \usepackage[dvips]{graphicx}
Line 1264  EDITBUTTON Line 1265  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    my $aa = {};
    push @Apache::londefdef::table, $aa; 
    $Apache::londefdef::table[-1]{'row_number'} = -1;
    $Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
  my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);   my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
  my $tabletext=&Apache::lonxml::get_all_text("/table",$$parser[$#$parser]);  
  my %mystyle;  
  $tabletext = &Apache::lonxml::xmlparse('tex',$tabletext,'',%mystyle);         
  unless (defined $border) { $border = 0; }   unless (defined $border) { $border = 0; }
  my $hinc = '';   if ($border) { 
                 my $vinc = '';         $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
  my $vvinc = '';      $Apache::londefdef::table[-1]{'vinc'} = '&'; 
  if ($border) { $hinc = '\hline '; $vinc =  '&'; $vvinc =  '|';}      $Apache::londefdef::table[-1]{'vvinc'} = '|';
  my @raws = ();  
  my @columns = ();  
  my $counter_columns;  
 #serch row  
  $_ = $tabletext;  
  while (m/<tr\s*([^>]*)>/) {  
     push @raws,$1;  
                     $tabletext =~ s/<tr\s*([^>]*)>/$hinc/;  
 #serch and convert column  
     my $boundary = index($tabletext,'</tr>',0);  
     my $textchunk = substr($tabletext,0,$boundary);   
     $_ = $textchunk;  
     $counter_columns = 0;  
     while (m/<td\s*([^>]*)>/) {  
  push @columns,$1;  
  $counter_columns++;  
  $textchunk =~ s/<\/td>\s*<td\s*([^>]*)>/$vinc/;  
  $textchunk =~ s/<td\s*([^>]*)>//;  
  $textchunk =~ s/<\/td>//;  
  $_ = $textchunk;  
     }  
     substr($tabletext,0,$boundary) = $textchunk;  
 #convert row  
     $tabletext =~ s/<\/tr>/\\\\/;  
     $_ = $tabletext;  
  }  
  my $default_value = '';  
  if ($raws[1] eq 'left') {  
     $default_value = 'l';  
  } elsif ($raws[1] eq 'center') {  
     $default_value = 'c';  
  } elsif ($raws[1] eq 'right') {  
     $default_value = 'r';  
  } else {   } else {
      $default_value = 'c';      $Apache::londefdef::table[-1]{'hinc'} = ''; 
       $Apache::londefdef::table[-1]{'vinc'} = ''; 
       $Apache::londefdef::table[-1]{'vvinc'} = '';
  }   }
  my $header_of_table = '{'.$vvinc;      } 
      return $currentstring;
    }
           sub end_table {
       my ($target,$token) = @_;
               my $currentstring = '';
               if ($target eq 'web') {
                 $currentstring = $token->[2];     
       } elsif ($target eq 'tex') {
    my $inmemory = '';
    my $output = '';
    my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
  my $in;   my $in;
  for ($in=0;$in<=$counter_columns;$in++) {   for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
     if ($columns[$in] eq 'left') {      $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
  $header_of_table .= 'l'.$vvinc;  
     } elsif ($columns[$in] eq 'center') {  
  $header_of_table .= 'c'.$vvinc;  
     } elsif ($columns[$in] eq 'right') {  
  $header_of_table .= 'r'.$vvinc;  
     } else {  
        $header_of_table .= $default_value.$vvinc;  
     }  
  }   }
  $header_of_table .= '}';   $header_of_table .= '}';
  $currentstring .= '\begin{tabular}'.$header_of_table.$tabletext.$hinc.'\end{tabular}';   for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
       $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
       chop $output;
       $output .= ' \\\\ ';
    }
    $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
    if ($#Apache::londefdef::table > 0) {
       $inmemory = $Apache::londefdef::table[-1]{'output'};
       pop @Apache::londefdef::table;
       $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
    } else {
       $currentstring = $Apache::londefdef::table[-1]{'output'};
       $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
       pop @Apache::londefdef::table;
    }
       }
      return $currentstring;
    }
   #-- <tr> tag
           sub start_tr {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
               my $currentstring = '';
               if ($target eq 'web') {
                 $currentstring = $token->[4];     
       } elsif ($target eq 'tex') {
    $Apache::londefdef::table[-1]{'row_number'}++;
    my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
    if ($alignchar ne '') {
       push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
    } else {
       push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
    }
    push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
    $Apache::londefdef::table[-1]{'counter_columns'} = -1;
   
     }       } 
    return $currentstring;     return $currentstring;
    }        
           sub end_tr {
       my ($target,$token) = @_;
               my $currentstring = '';
               if ($target eq 'web') {
    $currentstring = $token->[2];     
       } elsif ($target eq 'tex') {
   # $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
       }
      return $currentstring;
  }   }
         sub end_table {  #-- <td> tag
           sub start_td {
       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_td {
     my ($target,$token) = @_;      my ($target,$token) = @_;
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[2];        $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] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
     }      }
    return $currentstring;     return $currentstring;
  }   }
Removed from v.1.50  
changed lines
  Added in v.1.53

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