--- loncom/xml/scripttag.pm	2010/06/02 21:27:50	1.156
+++ loncom/xml/scripttag.pm	2011/12/09 22:04:55	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.156 2010/06/02 21:27:50 www Exp $
+# $Id: scripttag.pm,v 1.158 2011/12/09 22:04:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,17 +116,16 @@ sub start_script {
 	    my $function_name = 
 		join('_','LONCAPA_scriptvars',$uname,$udom,
 		     $env{'form.counter'},$Apache::lonxml::curdepth);
-	    my $script_var ="<script type=\"text/javascript\">
-// <![CDATA[
-    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
-	    my $listing=&Apache::run::dump($target,$safeeval);
-	    $listing=~s/\\/\\\\/g;
-	    $listing=~s/\'/\\\'/g;
-	    $script_var.=$listing;
-	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />";
-	    &Apache::lonxml::add_script_result($script_var);
+            my $scriptblocklog=$start_page.
+                               &Apache::loncommon::start_scrollbox('500px','480px','480px').
+                               '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>'.
+                               &Apache::loncommon::end_scrollbox().
+                               $end_page;
+            $scriptblocklog=~s/\'/\\'/gs;
+            &Apache::lonxml::add_script_result(
+	             &Apache::loncommon::modal_adhoc_script($function_name,500,500,$scriptblocklog).
+                     "<a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />"
+                                              );
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -627,7 +626,7 @@ sub start_algebra {
 	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
-	    $result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }