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

Diff for /loncom/xml/londefdef.pm between versions 1.240 and 1.243

version 1.240, 2004/09/02 18:04:49 version 1.243, 2004/10/18 22:02:02
Line 63  sub initialize_londefdef { Line 63  sub initialize_londefdef {
     $Apache::londefdef::TD_redirection=0;      $Apache::londefdef::TD_redirection=0;
     @Apache::londefdef::table = ();      @Apache::londefdef::table = ();
     $Apache::londefdef::select=0;      $Apache::londefdef::select=0;
     @Apache::londefdef::description=();      undef(@Apache::londefdef::description);
     $Apache::londefdef::DD_redirection=0;      @Apache::londefdef::DD=(0);
     $Apache::londefdef::DT_redirection=0;      @Apache::londefdef::DT=(0);
     $Apache::londefdef::list_index=0;      $Apache::londefdef::list_index=0;
 }  }
   
Line 151  sub start_html { Line 151  sub start_html {
     my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};      my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
     &Apache::lontexconvert::init_tth();      &Apache::lontexconvert::init_tth();
     if ($target eq 'web' || $target eq 'edit') {      if ($target eq 'web' || $target eq 'edit') {
  $currentstring = &Apache::lonxml::xmlbegin().   $currentstring = &Apache::lonxml::xmlbegin();
     &Apache::lonxml::fontsettings();       
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  @Apache::londefdef::table = ();   @Apache::londefdef::table = ();
  $currentstring .= '\documentclass[letterpaper]{book}';   $currentstring .= '\documentclass[letterpaper]{book}';
Line 190  sub start_head { Line 189  sub start_head {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4].&Apache::lonxml::fontsettings();
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1698  sub start_dl { Line 1697  sub start_dl {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\begin{description}';   $currentstring = '\begin{description}';
  @Apache::londefdef::description=();   $Apache::londefdef::DL++;
  $Apache::londefdef::DD_redirection=0;   push(@Apache::londefdef::description,[]);
  $Apache::londefdef::DT_redirection=0;   $Apache::londefdef::DD[$Apache::londefdef::DL]=0;
    $Apache::londefdef::DT[$Apache::londefdef::DL]=0;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1711  sub end_dl { Line 1711  sub end_dl {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
     push @Apache::londefdef::description,'\item['.$data.']';   foreach my $element (@{$Apache::londefdef::description[-1]}) {
     $Apache::londefdef::DT_redirection=0;  
  } elsif ($Apache::londefdef::DD_redirection) {  
     $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();  
  }  
  foreach my $element (@Apache::londefdef::description) {  
     $currentstring.=' '.$element.' ';      $currentstring.=' '.$element.' ';
  }   }
  @Apache::londefdef::description=();   pop(@Apache::londefdef::description);
  $currentstring.='\end{description}';     $currentstring.='\end{description}';  
    delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
    delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
    $Apache::londefdef::DL--;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1734  sub start_dt { Line 1732  sub start_dt {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
     push @Apache::londefdef::description,'\item['.$data.']';  
     $Apache::londefdef::DT_redirection=0;  
  } elsif ($Apache::londefdef::DD_redirection) {  
     $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();  
     $Apache::londefdef::DD_redirection=0;  
  }  
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
  $Apache::londefdef::DT_redirection=1;   $Apache::londefdef::DT[-1]++;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1754  sub end_dt { Line 1746  sub end_dt {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $data=&item_cleanup;   if ($Apache::londefdef::DT[-1]) {
  push @Apache::londefdef::description,'\item['.$data.']';      my $data=&item_cleanup();
  $Apache::londefdef::DT_redirection=0;      push(@{$Apache::londefdef::description[-1]},'\item['.$data.']');
       $Apache::londefdef::DT[-1]--;
    }
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1775  sub start_dd { Line 1769  sub start_dd {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
     push @Apache::londefdef::description,'\item['.$data.']';   push(@{$Apache::londefdef::description[-1]},'');
     $Apache::londefdef::DT_redirection=0;   $Apache::londefdef::description[-1]->[-1].=' \strut ';
  }   $Apache::londefdef::DD[-1]++;
  $Apache::londefdef::DD_redirection=1;  
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
     }       } 
     return $currentstring;      return $currentstring;
Line 1792  sub end_dd { Line 1785  sub end_dd {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {      }  elsif ($target eq 'tex') {
  $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();   $Apache::londefdef::description[-1]->[-1].=
  $Apache::londefdef::DD_redirection=0;      &Apache::lonxml::endredirection().' \vskip 0mm ';
    $Apache::londefdef::DD[-1]--;
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 2672  sub start_allow { Line 2666  sub start_allow {
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  &Apache::lonnet::clutter($src);   &Apache::lonnet::clutter($src);
     &image_replication($src);      if ($target eq 'tex') { &image_replication($src); }
     my $result;      my $result;
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Removed from v.1.240  
changed lines
  Added in v.1.243

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