--- loncom/xml/scripttag.pm	2005/09/14 18:25:40	1.130
+++ loncom/xml/scripttag.pm	2005/12/15 19:00:36	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.130 2005/09/14 18:25:40 albertel Exp $
+# $Id: scripttag.pm,v 1.134 2005/12/15 19:00:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,
@@ -442,7 +442,7 @@ sub start_standalone {
   my $result='';
   if ($target eq 'web' ) {
     if ( $env{'request.course.id'} ) {
-      my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
+      my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style);
     } else {
       $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
     }
@@ -467,14 +467,14 @@ sub start_comment {
   my $result='';
   if ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
-    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
   } elsif ( $target eq 'modified') {
     $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser);
   } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
 	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') {
     #normally throw away comments
-    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
   }
   return $result;
 }
@@ -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;
 }
@@ -543,6 +545,13 @@ sub start_parse {
 	}
 	@Apache::scripttag::parser_env = @_;
 	$result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval);
+	if ($target eq 'grade' || $target eq 'answer' ||
+	    $target eq 'analyze') {
+	    # grade/answer/analyxe should produce no output but if we
+	    # are redirecting, the redirecter should know what to do
+	    # with the output
+	    if (!$Apache::lonxml::redirection) { $result=''; }
+	}
     }
     return $result;
 }