--- loncom/xml/scripttag.pm	2005/09/15 18:30:11	1.131
+++ loncom/xml/scripttag.pm	2006/03/24 21:45:51	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.131 2005/09/15 18:30:11 albertel Exp $
+# $Id: scripttag.pm,v 1.136 2006/03/24 21:45:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,14 +118,22 @@ sub start_script {
 	    $Apache::lonxml::evaluate--;
 	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
 	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+	    my $start_page =
+		&Apache::loncommon::start_page('Script Vars', undef,
+					       {'only_body' => 1,
+						'bgcolor'   => '#FFFFFF',
+						'js_ready'  => 1,});
+	    my $end_page =
+		&Apache::loncommon::end_page({'js_ready' => 1,});
+
 	    $result.="<script type=\"text/javascript\">
 // <![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>";
+    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('$start_page<pre>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
 	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
 	    $result.=$listing;
-	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
+	    $result.= "</pre>$end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
@@ -334,7 +342,23 @@ sub end_window {
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-    $result = "<script type=\"text/javascript\"> function LONCAPA_newwindow_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=$width,height=$height,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>newwindow</title></head><body bgcolor=\"#FFFFFF\"> $output </body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+
+    my $start_page =
+	&Apache::loncommon::start_page($linktext, undef,
+				       {'only_body' => 1,
+					'bgcolor'   => '#FFFFFF',
+					'js_ready'  => 1,});
+    my $end_page =
+	&Apache::loncommon::end_page({'js_ready' => 1,});
+    $result = "<script type=\"text/javascript\">
+//<!--
+ function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
+newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
+newWindow.document.writeln('$start_page $output $end_page');
+newWindow.document.close();}
+//-->
+</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
@@ -350,8 +374,8 @@ sub start_import {
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-      $target eq 'tex' || $target eq 'analyze' ) {
+  if ($target eq 'web' ||  $target eq 'webgrade' || $target eq 'grade' 
+      || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
@@ -442,7 +466,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 +491,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 +525,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 +569,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;
 }
