--- loncom/xml/scripttag.pm	2001/01/10 14:12:03	1.30
+++ loncom/xml/scripttag.pm	2001/03/27 16:56:56	1.35
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
-
+# 2/21 Guy
 
 package Apache::scripttag; 
 
@@ -10,8 +10,7 @@ use Apache::lonnet;
 sub BEGIN {
   &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
 						 'parserlib','import',
-                                                 'window','meta'));
-                                                 'footnote','display'));
+                                                 'window','display'));
 }
 
 sub start_script {
@@ -29,7 +28,7 @@ sub start_script {
       &Apache::run::run($bodytext,$safeeval);
     } elsif ($target eq "edit" ) {
       &Apache::run::run($bodytext,$safeeval);
-      $result="<br> &lt;$token->[1]&gt; output: <br>$bodytext<br>Source:<br>";
+      $result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
       $result.=&editfield($token->[1],$bodytext);
     }
   } else {
@@ -67,7 +66,7 @@ sub start_display {
   }
   if ($target eq "edit" ) {
     $result = 
-      "<br> &lt;$token->[1]&gt; output: <br>$bodytext<br>Source:<br>";
+      "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     $result.=&editfield($token->[1],$bodytext);
   }
   return $result;
@@ -91,7 +90,7 @@ sub start_scriptlib {
     return "";
   }
   &Apache::run::run($script,$safeeval);
-  #&Apache::lonxml::debug("ran $bodytext:<br>".&Apache::lonnet::getfile($bodytext)."<br>");
+  #&Apache::lonxml::debug("ran $bodytext:<br />".&Apache::lonnet::getfile($bodytext)."<br />");
 
   if ($target eq "edit" ) {
     $result.=&editfield($token->[1],$bodytext);
@@ -130,9 +129,9 @@ sub end_parserlib {
 sub start_window {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
-   if ($target eq 'web') {
-     $Apache::lonxml::redirection = 0;
-   } elsif ($target eq 'tex') {
+  if ($target eq 'web') {
+    &Apache::lonxml::startredirection;
+  }  elsif ($target eq 'tex') {
        $result = '\footnote{';
    }
   return $result;  
@@ -141,23 +140,21 @@ sub start_window {
 sub end_window {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
-   if ($target eq 'web') {
-     $Apache::lonxml::outputstack =~ s/\"/\&quot\;/g;
-     $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $Apache::lonxml::outputstack </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
-   $Apache::lonxml::outputstack = "";
-   $Apache::lonxml::redirection = 1;
+  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>";
   } elsif ($target eq 'tex') {
-          $result = '}';
+      $result = '}';
   } else {
-        $result = '';
+      $result = '';
   }
   return $result; 
 }
 
 sub start_import {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $bodytext=&Apache::lonxml::get_all_text("/import",$$parser[$#$parser]); 
-#  my $bodytext=$$parser[$#$parser]->get_text("/import");
+  my $bodytext=$$parser[$#$parser]->get_text("/import");
   my $result ="";
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
@@ -175,7 +172,7 @@ sub start_import {
 
   if ($target eq "edit" ) {
     $result.=&editfield($token->[1],$bodytext);
-    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br></br>"
+    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br />"
   }
   return '';
 }
@@ -198,12 +195,6 @@ sub start_meta {
 sub end_meta {
 }
 
-
-
-
-
-
-
 sub editfield {
   my ($tag,$data)=@_;
   
@@ -213,7 +204,7 @@ sub editfield {
 	if (length($_) > $maxlength) { $maxlength = length ($_); }
       } split ("\n", $data);
 	  
-  return "<br></br>\n&lt;$tag&gt;<br></br>\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br></br>\n&lt;/$tag&gt;<br></br>\n";
+  return "<br />\n&lt;$tag&gt;<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br />\n&lt;/$tag&gt;<br />\n";
 }
 
 sub getfilenothere {
