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

Diff for /loncom/homework/structuretags.pm between versions 1.344 and 1.346

version 1.344, 2006/04/14 21:09:54 version 1.346, 2006/04/15 01:06:59
Line 70  sub end_tex { Line 70  sub end_tex {
 }  }
   
 sub page_start {  sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
    $extra_head)=@_;
     my %found;      my %found;
     foreach my $taginside (@$tagstack) {      foreach my $taginside (@$tagstack) {
  foreach my $taglookedfor ('html','body','form') {   foreach my $taglookedfor ('html','body','form') {
Line 86  sub page_start { Line 87  sub page_start {
     }      }
   
     my %body_args;      my %body_args;
     my $extra_head;  
     if (defined($found{'html'})) {      if (defined($found{'html'})) {
  $body_args{'skip_phases'}{'head'}=1;   $body_args{'skip_phases'}{'head'}=1;
     } else {      } else {
   
  $extra_head = &Apache::lonhtmlcommon::spellheader();   $extra_head .= &Apache::lonhtmlcommon::spellheader();
   
  my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');   my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
  if ($css_href =~ /\S/) {   if ($css_href =~ /\S/) {
Line 596  sub start_problem { Line 596  sub start_problem {
     my $status;      my $status;
     my $accessmsg;      my $accessmsg;
   
     #should get back a <html> or the neccesary stuff to start XML/MathML  
     my $name= &get_resource_name($parstack,$safeeval);      my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start)=      my ($result,$form_tag_start)=
  &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,   &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
Line 865  sub end_problem { Line 864  sub end_problem {
  $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);   $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.= &Apache::loncommon::end_page({'discussion' => 1});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $endminipage = '';   my $endminipage = '';
  if (not $env{'form.problem_split'}=~/yes/) {   if (not $env{'form.problem_split'}=~/yes/) {
Line 890  sub end_problem { Line 889  sub end_problem {
  }   }
  if ($target eq 'answer' && ($env{'request.state'} eq 'construct')   if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
     && $env{'form.answer_output_mode'} ne 'tex') {      && $env{'form.answer_output_mode'} ne 'tex') {
     $result.=&Apache::lonxml::xmlend().'</html>';      $result.=&Apache::loncommon::end_page({'discussion' => 1});
                         # normally we get it from above, but in CSTR                          # normally we get it from above, but in CSTR
                         # we always show answer mode too.                          # we always show answer mode too.
  }   }
Removed from v.1.344  
changed lines
  Added in v.1.346

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