--- loncom/xml/lonxml.pm	2001/05/31 22:38:36	1.83
+++ loncom/xml/lonxml.pm	2001/06/02 19:55:46	1.85
@@ -9,6 +9,7 @@
 # 5/10 Scott Harrison
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
+# 6/2 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
@@ -106,6 +107,17 @@ sub registerurl {
 	  menu=window.open("","LONCAPAmenu");
 	  menu.currentURL=window.location.pathname;
           menu.currentStale=0;
+          menu.clearbut(3,1);
+          menu.switchbutton
+       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
+          menu.switchbutton
+    (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
+          menu.switchbutton
+     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
+          menu.switchbutton
+       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
+          menu.switchbutton
+     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
        }
     }
   
@@ -113,6 +125,13 @@ sub registerurl {
        if (window.location.pathname!="/res/adm/pages/menu.html") {
 	  menu=window.open("","LONCAPAmenu");
           menu.currentStale=1;
+          menu.clearbut(2,1);
+          menu.clearbut(2,3);
+          menu.clearbut(8,1);
+          menu.clearbut(8,2);
+          menu.clearbut(8,3);
+          menu.switchbutton
+            (3,1,'reload.gif','return','location','go(currentURL)');
        }
     }
 // END LON-CAPA Internal
@@ -203,8 +222,8 @@ sub xmlparse {
 				    $safeeval,\%style_for_target,@parstack);
 	 }
        } else {
-	 $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
-			    \@pars, $safeeval, \%style_for_target);
+	 $result = &callsub("start_$token->[1]", $target, $token, \@stack,
+			    \@parstack, \@pars, $safeeval, \%style_for_target);
        }              
      } elsif ($token->[0] eq 'E')  {
        #clear out any tags that didn't end
@@ -225,8 +244,8 @@ sub xmlparse {
 	 }
 
        } else {
-	 $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
-			    \@pars,$safeeval, \%style_for_target);
+	 $result = &callsub("end_$token->[1]", $target, $token, \@stack, 
+			    \@parstack, \@pars,$safeeval, \%style_for_target);
        }
      } else {
        &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
@@ -287,9 +306,9 @@ sub recurse {
 	push (@innerstack,$tokenpat->[1]);
 	push (@innerparstack,&parstring($tokenpat));
 	&increasedepth($tokenpat);
-	$partstring = &callsub("start_$tokenpat->[1]", 
-			       $target, $tokenpat, \@innerparstack,
-			       \@pat, $safeeval, $style_for_target);
+	$partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
+			       \@innerstack, \@innerparstack, \@pat,
+			       $safeeval, $style_for_target);
       } elsif ($tokenpat->[0] eq 'E') {
 	#clear out any tags that didn't end
 	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
@@ -297,9 +316,9 @@ sub recurse {
 	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
 	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
 	}
-	$partstring = &callsub("end_$tokenpat->[1]",
-			       $target, $tokenpat, \@innerparstack,
-			       \@pat, $safeeval, $style_for_target);
+	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
+			       \@innerstack, \@innerparstack, \@pat,
+			       $safeeval, $style_for_target);
       } else {
 	&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
       }
@@ -332,14 +351,15 @@ sub recurse {
 }
 
 sub callsub {
-  my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';
   my $nodefault;
   {
     my $sub1;
     no strict 'refs';
     if ($target eq 'edit' && $token->[0] eq 'S') {
-      $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
+      $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
+						$parstack,$parser,
 						$safeeval,$style);
     }
     my $tag=$token->[1];
@@ -353,8 +373,9 @@ sub callsub {
       #&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
       $sub1="$space\:\:$sub";
       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
-      ($currentstring,$nodefault) = &$sub1($target,$token,$parstack,$parser,
-					   $safeeval,$style);
+      ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
+					   $parstack,$parser,$safeeval,
+					   $style);
     } else {
       #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
       if ($metamode <1) {