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

Diff for /loncom/xml/londefdef.pm between versions 1.100 and 1.101

version 1.100, 2002/11/09 22:05:33 version 1.101, 2002/11/15 15:01:16
Line 1310  sub start_table { Line 1310  sub start_table {
  push @Apache::londefdef::table, $aa;    push @Apache::londefdef::table, $aa; 
  $Apache::londefdef::table[-1]{'row_number'} = -1;   $Apache::londefdef::table[-1]{'row_number'} = -1;
  $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';   $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
  my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);   my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1); 
  unless (defined $border) { $border = 0; }   unless (defined $border) { $border = 0; }
  if ($border) {    if ($border) { 
     $Apache::londefdef::table[-1]{'hinc'} = '\hline ';       $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
Line 1324  sub start_table { Line 1324  sub start_table {
  my $width;   my $width;
  foreach my $key (keys(%{$token->[2]})) {   foreach my $key (keys(%{$token->[2]})) {
     if ($key =~ /^width$/i) {      if ($key =~ /^width$/i) {
  $width = &Apache::lonxml::get_param($key,$parstack,$safeeval);   $width = &Apache::lonxml::get_param($key,$parstack,$safeeval,undef,1);
     }      }
  }   }
  if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }   if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
Line 1422  sub start_table { Line 1422  sub start_table {
  if ($signature) {   if ($signature) {
     my $NumberEmptyLength = $how_many_columns - $filled_columns;      my $NumberEmptyLength = $how_many_columns - $filled_columns;
     my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;      my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
     my $shorthand = ($NumberEmptyLength+1)*4;      my $shorthand = ($filled_columns+1)*4;
     $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;      $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
  }   }
  $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 ';
Line 1449  sub start_table { Line 1449  sub start_table {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $Apache::londefdef::table[-1]{'row_number'}++;   $Apache::londefdef::table[-1]{'row_number'}++;
  my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);   my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
  if ($alignchar ne '') {   if ($alignchar ne '') {
     push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;      push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
  } else {   } else {
Line 1479  sub start_table { Line 1479  sub start_table {
             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),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 1522  sub start_table { Line 1522  sub start_table {
             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),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 1575  sub start_table { Line 1575  sub start_table {
   $height_param = $image->Get('height') * $scaling;;    $height_param = $image->Get('height') * $scaling;;
   undef $image;    undef $image;
   #do we have any specified size of the picture?    #do we have any specified size of the picture?
   my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,
   my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);                                                               undef,1); 
   my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval,
                                                                undef,1); 
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
                                                            undef,1);
   if ($TeXwidth ne '') {      if ($TeXwidth ne '') {  
       if ($TeXwidth=~/(\d+)\s*\%/) {        if ($TeXwidth=~/(\d+)\s*\%/) {
   $width_param = $1*$ENV{'form.textwidth'}/100;    $width_param = $1*$ENV{'form.textwidth'}/100;
Line 1624  sub start_table { Line 1627  sub start_table {
   }    }
       } else {        } else {
   #original image file doesn't exist so check the alt attribute    #original image file doesn't exist so check the alt attribute
   my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);    my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
                   if ($alt) {                    if ($alt) {
       $currentstring .= ' '.$alt.' ';        $currentstring .= ' '.$alt.' ';
   } else {    } else {
Line 1729  sub start_allow { Line 1732  sub start_allow {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  $token->[2]->{'src'};   $token->[2]->{'src'};
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     &image_replication($src);      &image_replication($src);
     my $result;      my $result;
     if ($target eq 'edit') {      if ($target eq 'edit') {
Line 1796  sub end_allow { Line 1799  sub end_allow {
     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') {
  my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);   my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
        $currentstring .= '<b>'.$display.'</b>';;         $currentstring .= '<b>'.$display.'</b>';;
     }      }
            return $currentstring;             return $currentstring;
Line 1814  sub end_allow { Line 1817  sub end_allow {
     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') {
  my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);   my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
        $currentstring .= '<b>'.$display.'</b>';;         $currentstring .= '<b>'.$display.'</b>';;
     }      }
            return $currentstring;             return $currentstring;
Line 1832  sub end_allow { Line 1835  sub end_allow {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'tex') {              if ($target eq 'tex') {
  my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);   my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
  $currentstring .= '\vskip '.$howmuch.' ';   $currentstring .= '\vskip '.$howmuch.' ';
     }      }
            return $currentstring;             return $currentstring;
Removed from v.1.100  
changed lines
  Added in v.1.101

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