--- loncom/xml/scripttag.pm	2007/08/30 22:56:43	1.143
+++ loncom/xml/scripttag.pm	2008/12/02 00:22:39	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.143 2007/08/30 22:56:43 albertel Exp $
+# $Id: scripttag.pm,v 1.150 2008/12/02 00:22:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,8 @@ package Apache::scripttag;
 
 use strict;
 use Apache::lonnet;
-use Apache::style;
+use Apache::lonlocal;
+use Apache::style();
 
 #Globals
 # this used to pass around the standard callsub arguments to a tag func
@@ -43,8 +44,7 @@ BEGIN {
 			     'window','display','storetc','physnet',
 			     'standalone','comment','num','parse','algebra',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
-			     'LONCAPA_INTERNAL_TURN_STYLE_OFF',
-			     'LONCAPA_INTERNAL_LONHTTPD_PORT'));
+			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
 }
 
 sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
@@ -80,29 +80,6 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
     return ('','no');
 }
 
-=pod 
-
-=item start_LONCAPA_INTERNAL_LONHTTPD_PORT
-
-emits a pice of javascript that says a global js variable to the
-current lonhttp port, currently used by the remote control to find out
-where to load images from
-
-=cut
-
-sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'webgrade') {
-	return '<script type="text/javascript">var lonhttpdport=\''.
-	    &Apache::loncommon::lonhttpd_port().'\';</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 = @_;
@@ -136,16 +113,19 @@ sub start_script {
 
 	    $uname =~s/\W//g;
 	    $udom  =~s/\W//g;
+	    my $function_name = 
+		join('_','LONCAPA_scriptvars',$uname,$udom,
+		     $env{'form.counter'},$Apache::lonxml::curdepth);
 	    my $script_var ="<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('$start_page<pre>";
+    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:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />";
 	    &Apache::lonxml::add_script_result($script_var);
 	}
     } elsif ($target eq "edit" ) {
@@ -159,7 +139,7 @@ sub start_script {
     }
   } else {
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-      if ($target ne "meta" && $target ne 'tex') {
+      if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
 	  $result = $token->[4];
 	  $result.=$bodytext;
       }
@@ -242,7 +222,7 @@ sub start_scriptlib {
     my $script=&Apache::lonnet::getfile($location);
     if ($script == -1) {
       if ($target eq 'edit') {
-        $error='</tr><tr><td>Errors</td><td colspan="2"><b> Unable to find <i>'.$location.'</i></b></td>'."\n";
+        $error='</tr><tr><td>'.&mt('Errors').'</td><td colspan="2"><b>'.&mt(' Unable to find [_1]','<span class="LC_filename">'.$location.'</span>').'</b></td>'."\n";
       } else {
 	&Apache::lonxml::error("<b> Unable to find <i>$location</i> for scriptlib</b>");
 	return "";
@@ -329,11 +309,13 @@ sub start_window {
 	$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
 	$result.=&Apache::edit::text_arg('Height:','height',$token,5);
 	$result.=&Apache::edit::text_arg('Width:','width',$token,5);
+	$result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'linktext',
-						     'width','height');
+						     'width','height',
+						     'mimetype');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
     return $result;  
@@ -353,19 +335,26 @@ sub end_window {
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
+    my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
+	          || 'text/html';
 
-    my $start_page =
-	&Apache::loncommon::start_page($linktext, undef,
-				       {'only_body' => 1,
-					'bgcolor'   => '#FFFFFF',
-					'js_ready'  => 1,});
-    my $end_page =
-	&Apache::loncommon::end_page({'js_ready' => 1,});
+    my ($start_page,$end_page);
+    if ($mimetype eq 'text/html') {
+	$start_page =
+	    &Apache::loncommon::start_page($linktext, undef,
+					   {'only_body' => 1,
+					    'bgcolor'   => '#FFFFFF',
+					    'js_ready'  => 1,});
+	$end_page =
+	    &Apache::loncommon::end_page({'js_ready' => 1,});
+    }
     $result = "<script type=\"text/javascript\">
 //<!--
  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');
+newWindow.close();
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
-newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
+newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
 newWindow.document.writeln('$start_page $output $end_page');
 newWindow.document.close();}
 //-->
@@ -404,7 +393,7 @@ sub start_import {
     push(@Apache::inputtags::import,$id);
     push(@Apache::inputtags::importlist,$id);
 
-	&Apache::lonxml::newparser($parser,\$file,$dir);
+    &Apache::lonxml::newparser($parser,\$file,$dir);
 
   } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);
@@ -608,7 +597,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,$target,$style);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -623,3 +612,33 @@ sub end_algebra {
 
 1;
 __END__
+
+=pod
+
+=head1 NAME
+
+Apache::scripttag.pm
+
+=head1 SYNOPSIS
+
+implements <script>, <scriptlib>, <parserlib>,
+and <import>
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item start_LONCAPA_INTERNAL_LONHTTPD_PORT()
+
+emits a pice of javascript that says a global js variable to the
+current lonhttp port, currently used by the remote control to find out
+where to load images from
+
+=back
+
+=cut
+