--- loncom/homework/structuretags.pm	2001/05/31 22:37:56	1.39
+++ loncom/homework/structuretags.pm	2001/06/02 03:59:59	1.40
@@ -12,7 +12,7 @@ sub BEGIN {
 }
 
 sub start_web {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
   if ($target eq 'web') {
     return $bodytext;
@@ -24,7 +24,7 @@ sub end_web {
 }
 
 sub start_tex {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
   if ($target eq 'tex') {
     return $bodytext
@@ -36,7 +36,7 @@ sub end_tex {
 }
 
 sub start_problem {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
 #intialize globals
   $Apache::inputtags::part='0';
@@ -48,7 +48,7 @@ sub start_problem {
   my $status;
   my $datemsg;
 
-  my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
+  my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
 
   if ($target eq 'web' || $target eq 'grade') {
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');
@@ -106,10 +106,10 @@ sub start_problem {
 }
 
 sub end_problem {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   my $status=$Apache::inputtags::status['-1'];
-  if ($target eq 'grade' || $target eq'web' ) {
+  if ($target eq 'grade' || $target eq 'web' ) {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
        $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading
@@ -140,7 +140,7 @@ sub end_problem {
 }
 
 sub start_block {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
   if ($target eq 'web' || $target eq 'grade') {
     my $code = @$parstack[$#$parstack];
@@ -162,7 +162,7 @@ sub end_block {
 }
 
 sub start_while {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
   my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;
@@ -179,7 +179,7 @@ sub start_while {
 }
 
 sub end_while {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $code = pop @Apache::structuretags::whileconds;
   my $bodytext = pop @Apache::structuretags::whilebody;
   my $result = &Apache::run::run($code,$safeeval);
@@ -196,7 +196,7 @@ sub end_while {
 #  ... 
 # </randomlist>
 sub start_randomlist {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
   my $b_parser= HTML::TokeParser->new(\$body);
   my $b_tok;
@@ -246,7 +246,7 @@ sub end_randomlist {
 }
 
 sub start_part {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   $Apache::inputtags::part=$id;
   @Apache::inputtags::responselist = ();
@@ -269,7 +269,7 @@ sub start_part {
 }
 
 sub end_part {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");
   my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;
@@ -284,7 +284,7 @@ sub end_part {
 }
 
 sub start_preduedate {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
@@ -299,7 +299,7 @@ sub end_preduedate {
 }
 
 sub start_postanswerdate {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
@@ -313,7 +313,7 @@ sub end_postanswerdate {
 }
 
 sub start_notsolved {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     &Apache::lonxml::debug("not solved has :$gradestatus:");
@@ -330,7 +330,7 @@ sub end_notsolved {
 }
 
 sub start_solved {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {
@@ -345,13 +345,13 @@ sub end_solved {
 }
 
 sub start_startouttext {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my @result=(''.'');
   if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
   return (@result);
 }
 sub end_startouttext {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   my $text='';
 
@@ -368,14 +368,14 @@ sub end_startouttext {
   return $result;
 }
 sub start_endouttext {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
   if ($target eq "modified") { $result='<endouttext />'; }
   return $result;
 }
 sub end_endouttext {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my @result=('','');
   if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
   return (@result);