--- loncom/xml/scripttag.pm	2005/06/27 21:01:58	1.129
+++ loncom/xml/scripttag.pm	2005/09/29 19:15:47	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.129 2005/06/27 21:01:58 raeburn Exp $
+# $Id: scripttag.pm,v 1.132 2005/09/29 19:15:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,8 +105,8 @@ sub start_script {
     if ( $target eq "modified" ) {
 	$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser);
     } elsif ( $target eq 'web' || $target eq 'tex' ||
-	      $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze' ) {
+	      $target eq 'grade' || $target eq 'webgrade' ||
+	      $target eq 'answer' || $target eq 'analyze' ) {
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
@@ -172,8 +172,8 @@ sub start_display {
   if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
   } elsif ( $target eq 'web' || $target eq 'tex' ||
-	    $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze') {
+	    $target eq 'grade' || $target eq 'webgrade' ||
+	    $target eq 'answer' || $target eq 'analyze') {
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
       if (!$Apache::lonxml::default_homework_loaded) {
 	  &Apache::lonxml::default_homework_load($safeeval);
@@ -308,8 +308,8 @@ sub start_window {
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
-	$result.=&Apache::edit::text_arg('Height:','width',$token,5);
-	$result.=&Apache::edit::text_arg('Width:','height',$token,5);
+	$result.=&Apache::edit::text_arg('Height:','height',$token,5);
+	$result.=&Apache::edit::text_arg('Width:','width',$token,5);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -501,9 +501,11 @@ sub xmlparse {
     @Apache::scripttag::parser_env;
   my @parser;
   &Apache::lonxml::newparser(\@parser,\$string);
+  &Apache::lonxml::startredirection();
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
 					     $parstack,\@parser,
 					     $safeeval,$style);
+  $result.=&Apache::lonxml::endredirection();
   &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result");
   return $result;
 }