--- loncom/xml/scripttag.pm	2005/06/05 07:28:31	1.127
+++ loncom/xml/scripttag.pm	2005/12/01 18:46:17	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.127 2005/06/05 07:28:31 albertel Exp $
+# $Id: scripttag.pm,v 1.133 2005/12/01 18:46:17 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);
@@ -122,9 +122,8 @@ sub start_script {
 // <![CDATA[
     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
+	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
-	    $listing=~s/\n/\\n/g;
-	    $listing=~s/\r/\\r/g;
 	    $result.=$listing;
 	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
 // ]]>
@@ -173,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);
@@ -309,12 +308,12 @@ 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,
-						     $safeeval,'linttext',
+						     $safeeval,'linktext',
 						     'width','height');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
@@ -443,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>';
     }
@@ -468,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;
 }
@@ -502,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;
 }
