--- loncom/xml/scripttag.pm	2003/02/07 22:03:21	1.85
+++ loncom/xml/scripttag.pm	2003/05/22 21:05:01	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.85 2003/02/07 22:03:21 albertel Exp $
+# $Id: scripttag.pm,v 1.89 2003/05/22 21:05:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,11 +44,13 @@ 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');
 }
 
@@ -56,6 +58,21 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
     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');
+}
+
 sub start_script {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   @Apache::scripttag::parser_env = @_;
@@ -73,7 +90,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));
@@ -292,7 +311,9 @@ 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);
+
+	&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);
@@ -411,7 +432,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;