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

Diff for /loncom/homework/structuretags.pm between versions 1.378 and 1.383

version 1.378, 2007/05/28 22:51:29 version 1.383, 2007/07/17 18:18:54
Line 47  BEGIN { Line 47  BEGIN {
   
 sub start_web {  sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);      if ($target ne 'edit' && $target ne 'modified') {
     if ($target eq 'web' || $target eq 'webgrade') {   my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
  return $bodytext;   if ($target eq 'web' || $target eq 'webgrade') {
       return $bodytext;
    }
       } elsif ($target eq "edit" ) {
    my $bodytext = 
       &Apache::lonxml::get_all_text_unbalanced("/web",$parser);
    my $result = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
    return $result;
       } elsif ( $target eq "modified" ) {
    return $token->[4].&Apache::edit::modifiedfield("/web",$parser);
     }      }
     return '';      return '';
 }  }
Line 61  sub end_web { Line 71  sub end_web {
 sub start_tex {  sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);      if ($target ne 'edit' && $target ne 'modified') {
     if ($target eq 'tex') {   my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
  return $bodytext.' ';   if ($target eq 'tex') {
       return $bodytext.' ';
    }
       } elsif ($target eq "edit" ) {
    my $bodytext = 
       &Apache::lonxml::get_all_text_unbalanced("/tex",$parser);
    my $result = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
    return $result;
       } elsif ( $target eq "modified" ) {
    return $token->[4].&Apache::edit::modifiedfield("/tex",$parser);
     }      }
     return $result;;      return $result;;
 }  }
Line 103  function setSubmittedPart (part) { Line 123  function setSubmittedPart (part) {
   
  $extra_head .= &Apache::lonhtmlcommon::spellheader();   $extra_head .= &Apache::lonhtmlcommon::spellheader();
   
  my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');   $extra_head .= &Apache::londefdef::generate_css_links();
  if ($css_href =~ /\S/) {  
     &Apache::lonxml::extlink($css_href);  
     $extra_head .=   
  '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';  
  }  
  if ($target eq 'edit') {   if ($target eq 'edit') {
     $extra_head.=&Apache::edit::js_change_detection().      $extra_head.=&Apache::edit::js_change_detection().
  "<script type=\"text/javascript\">\n".   "<script type=\"text/javascript\">\n".
Line 884  sub end_problem { Line 900  sub end_problem {
     if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}      if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
     } else {      } else {
  $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';   $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
     }      }
  } else {   } else {
     if (not $env{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
  $frontmatter .= $begin_doc.$toc_line;   $frontmatter .= $begin_doc.$toc_line;
  if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}   if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
     } else {      } else {
  $frontmatter .= '\vskip 1mm \\\\\\\\';   $frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
     }      }
  }   }
  $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;   $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
Line 941  sub end_problem { Line 957  sub end_problem {
     if (not $env{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
  $result .= $endminipage.'\end{document} ';   $result .= $endminipage.'\end{document} ';
     } else {      } else {
  $result .= '';   $result .= $endminipage;
     }      }
  }   }
     }      }
Line 1229  sub end_while { Line 1245  sub end_while {
  $return = 0; $error=1; next;   $return = 0; $error=1; next;
     }      }
     $result.=&Apache::scripttag::xmlparse($bodytext);      $result.=&Apache::scripttag::xmlparse($bodytext);
       if ($target eq 'grade' || $target eq 'answer' ||
    $target eq 'analyze') {
    # grade/answer/analyze should produce no output but if we
    # are redirecting, the redirecter should know what to do
    # with the output
    if (!$Apache::lonxml::redirection) { undef($result); }
       }
     $return = &Apache::run::run($code,$safeeval);      $return = &Apache::run::run($code,$safeeval);
  }   }
  if ($error) {   if ($error) {
Removed from v.1.378  
changed lines
  Added in v.1.383

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