--- loncom/xml/scripttag.pm	2003/05/23 16:26:28	1.90
+++ loncom/xml/scripttag.pm	2003/10/03 17:15:01	1.101
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.90 2003/05/23 16:26:28 albertel Exp $
+# $Id: scripttag.pm,v 1.101 2003/10/03 17:15:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,7 @@ BEGIN {
 			     'window','display','storetc','physnet',
 			     'standalone','comment',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
+			     'LONCAPA_INTERNAL_TURN_STYLE_OFF',
 			     'LONCAPA_INTERNAL_LONHTTPD_PORT'));
 }
 
@@ -55,6 +56,29 @@ sub start_LONCAPA_INTERNAL_TURN_STYLE_ON
 }
 
 sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+    if (defined($end)) {
+	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
+    }
+    return ('','no');
+}
+
+sub start_LONCAPA_INTERNAL_TURN_STYLE_OFF {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    $Apache::lonxml::usestyle=0;
+    my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+    if (!$end) {
+	$Apache::lonxml::style_values=$$parstack[-1];
+	$Apache::lonxml::style_end_values=$$parstack[-1];
+    } else {
+	$Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+	$Apache::lonxml::style_end_values='';
+    }
+    return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF {
     return ('','no');
 }
 
@@ -94,11 +118,13 @@ sub start_script {
 	    ($ENV{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    $result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'&lt;html&gt;&lt;head&gt;&lt;title&gt;newwindow&lt;/title&gt;&lt;/head&gt;&lt;body bgcolor=&quot;#FFFFFF&quot;&gt;&lt;pre&gt;";
-	    my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
-
+	    $result.="<script type=\"text/javascript\"> function LONCAPA_scriptvars_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=200,scrollbars=1');newWindow.document.open('text/html','replace');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/\n/\\n/g;
+	    $listing=~s/\r/\\r/g;
 	    $result.=$listing;
-	    $result.= "&lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+	    $result.= "</pre></body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_scriptvars_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -151,6 +177,7 @@ sub start_display {
 	  $target eq 'analyze') {
 	  $result=''; # grade should produce no output
       }
+      $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
     #$result = 
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
@@ -277,8 +304,16 @@ sub end_window {
   my $result;
   if ($target eq 'web') {
     my $output=&Apache::lonxml::endredirection;
-    $output =~ s/\"/\&quot\;/g;
-    $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $output </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
+    $output =~ s/[\n\r]/ /g;
+#    $output = &HTML::Entities::encode($output,'<>&"\'');
+    $output =~ s/\'/\\\'/g;
+    my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
+    if (!$linktext) { $linktext='<sup>*</sup>'; }
+    my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
+    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>";
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
