--- loncom/xml/scripttag.pm	2003/05/23 16:26:28	1.90
+++ loncom/xml/scripttag.pm	2003/06/08 21:03:19	1.95
@@ -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.95 2003/06/08 21:03:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,6 +55,11 @@ 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');
 }
 
@@ -277,8 +282,15 @@ 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,'<>&"\'');
+    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 = "<a href=\"javascript: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=&quot;#FFFFFF&quot;> $output </body></html>\');newWindow.document.close();void(0);\">$linktext</a>";
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
