--- loncom/xml/scripttag.pm	2002/11/13 23:15:40	1.82
+++ 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.82 2002/11/13 23:15:40 albertel Exp $
+# $Id: scripttag.pm,v 1.95 2003/06/08 21:03:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,15 +44,37 @@ BEGIN {
 			    ('script','scriptlib','parserlib','import',
 			     'window','display','storetc','physnet',
 			     'standalone','comment',
-			     'LONCAPA_INTERNAL_TURN_STYLE_ON'));
+			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
+			     'LONCAPA_INTERNAL_LONHTTPD_PORT'));
 }
 
 sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
     $Apache::lonxml::usestyle=1;
+    $Apache::lonxml::style_values='';
     return ('','no');
 }
 
 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_LONHTTPD_PORT {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    if ($target eq 'web') {
+	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+	return '<script type="text/javascript">var lonhttpdport=\''.
+	    $lonhttpdPort.'\';</script>';
+    }
+    return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
     return ('','no');
 }
 
@@ -63,7 +85,7 @@ sub start_script {
   my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
   &Apache::lonxml::debug("found type of $type");
   if ($type eq "loncapa/perl") {
-    my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
     if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield();
     } elsif ( $target eq 'web' || $target eq 'tex' ||
@@ -73,7 +95,9 @@ sub start_script {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
 	&Apache::run::run($bodytext,$safeeval);
-	if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+	if (($target eq 'answer') &&
+	    ($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));
@@ -90,7 +114,7 @@ sub start_script {
   } else {
     if ($target ne "meta") {
       $result = $token->[4];
-      my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+      my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
       $result.=$bodytext;
     }
   }
@@ -117,7 +141,7 @@ sub start_display {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
   my $result;
-  my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+  my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
 
   if ( $target eq "modified" ) {
     $result=$token->[4].&Apache::edit::modifiedfield();
@@ -176,7 +200,8 @@ sub start_scriptlib {
   if ($target eq "edit" ) {
     $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').
-	&Apache::edit::editline($token->[1],$bodytext,'',40).
+	&Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
+            &Apache::edit::browse(undef,'textnode').
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
@@ -257,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 {
@@ -291,10 +323,14 @@ sub start_import {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }
     push(@Apache::inputtags::import,$id);
-    &Apache::lonxml::newparser($parser,\$file,$dir);
+    push(@Apache::inputtags::importlist,$id);
+
+	&Apache::lonxml::newparser($parser,\$file,$dir);
+
   } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
+    $result.=&Apache::edit::browse(undef,'textnode');
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
@@ -363,7 +399,7 @@ sub start_standalone {
   my $result='';
   if ($target eq 'web' ) {
     if ( $ENV{'request.course.id'} ) {
-      my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+      my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
     } else {
       $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
     }
@@ -388,14 +424,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[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
   } elsif ( $target eq 'modified') {
     $result=$token->[4].&Apache::edit::modifiedfield($token);
   } 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[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
   }
   return $result;
 }
@@ -409,7 +445,7 @@ sub end_comment {
 
 sub xmlparse {
   my ($string) = @_;
-  &Apache::lonxml::debug("Got $string");
+#  &Apache::lonxml::debug("Got $string");
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;
   my @parser;