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

Diff for /loncom/xml/londefdef.pm between versions 1.234 and 1.237

version 1.234, 2004/08/19 20:20:40 version 1.237, 2004/08/25 19:08:32
Line 66  sub initialize_londefdef { Line 66  sub initialize_londefdef {
     @Apache::londefdef::description=();      @Apache::londefdef::description=();
     $Apache::londefdef::DD_redirection=0;      $Apache::londefdef::DD_redirection=0;
     $Apache::londefdef::DT_redirection=0;      $Apache::londefdef::DT_redirection=0;
       @Apache::londefdef::alphabit=('A'..'Z');
       $Apache::londefdef::alphabit_index=0;
 }  }
   
 #======================= TAG SUBROUTINES =====================  #======================= TAG SUBROUTINES =====================
Line 1485  sub start_li { Line 1487  sub start_li {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my  $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1);   my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
    my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
  if ($type=~/circle/) {   if ($type=~/circle/) {
     $currentstring .= ' \item[o] ';      $currentstring .= ' \item[o] ';
  } elsif ($type=~/square/) {   } elsif ($type=~/square/) {
     $currentstring .= ' \item[$\Box$] ';      $currentstring .= ' \item[$\Box$] ';
  } elsif ($type ne '') {    } elsif ($type eq 'A') {
     $currentstring .= ' \item['.$type.'] ';      $currentstring .= ' \item['.$Apache::londefdef::alphabit[$Apache::londefdef::alphabit_index].']';
       $Apache::londefdef::alphabit_index++;
    } elsif ($type eq 'a') {
       my $lower_case=lc $Apache::londefdef::alphabit[$Apache::londefdef::alphabit_index];
       $currentstring .= ' \item['.$lower_case.']';
       $Apache::londefdef::alphabit_index++;
    } elsif ($value ne '') {
       $currentstring .= ' \item['.$value.'] ';
  } else {   } else {
     $currentstring .= ' \item ';      $currentstring .= ' \item ';
  }     }  
Line 1630  sub start_ol { Line 1640  sub start_ol {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    $Apache::londefdef::alpabit_index=0;
  my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);   my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
  if ($type eq '1') {   if ($type eq '1') {
     $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.      $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
Line 2421  sub start_img { Line 2432  sub start_img {
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
         #if uploaded restore the path  
  if ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/simplepage\/([^\/]+)$/) {  
     $src=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$3;  
  } elsif ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) {  
     $src=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3;  
  }  
  #if original gif/jpg/png file exist do following:   #if original gif/jpg/png file exist do following:
  if (-e $src) {   if (-e $src) {
     #what is the image size?      #what is the image size?
Removed from v.1.234  
changed lines
  Added in v.1.237

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