--- loncom/xml/scripttag.pm	2005/02/24 01:21:50	1.123
+++ loncom/xml/scripttag.pm	2005/06/06 01:29:45	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.123 2005/02/24 01:21:50 albertel Exp $
+# $Id: scripttag.pm,v 1.128 2005/06/06 01:29:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@ package Apache::scripttag;
 use strict;
 use Apache::lonnet;
 use Apache::style;
-use AlgParser;
 
 #Globals
 # this used to pass around the standard callsub arguments to a tag func
@@ -114,21 +113,20 @@ sub start_script {
 	}
 	&Apache::run::run($bodytext,$safeeval);
 	if (($target eq 'answer') &&
-	    ($ENV{'form.answer_output_mode'} ne 'tex') &&
+	    ($env{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
 	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
 	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
 	    $result.="<script type=\"text/javascript\">
-// <!--
+// <![CDATA[
     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;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/\'/\\\'/g;
-	    $listing=~s/\n/\\n/g;
-	    $listing=~s/\r/\\r/g;
 	    $result.=$listing;
-	    $result.= "</pre></body></html>');newWindow.document.close();}
-// -->
+	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
+// ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
     } elsif ($target eq "edit" ) {
@@ -443,7 +441,7 @@ sub start_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   if ($target eq 'web' ) {
-    if ( $ENV{'request.course.id'} ) {
+    if ( $env{'request.course.id'} ) {
       my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
     } else {
       $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
@@ -456,7 +454,7 @@ sub end_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   if ($target eq 'web' ) {
-    if ( $ENV{'request.course.id'} ) {
+    if ( $env{'request.course.id'} ) {
     } else {
       $result='</td></tr></table>';
     }
@@ -564,7 +562,8 @@ sub start_algebra {
 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser);
 	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
-	    $result=&Apache::lontexconvert::algebra($inside,$target);
+	    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }
