--- loncom/xml/scripttag.pm	2004/02/24 21:12:48	1.110
+++ loncom/xml/scripttag.pm	2004/08/18 20:48:45	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.110 2004/02/24 21:12:48 albertel Exp $
+# $Id: scripttag.pm,v 1.115 2004/08/18 20:48:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,11 +137,11 @@ sub start_script {
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }
   } else {
-    if ($target ne "meta") {
-      $result = $token->[4];
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-      $result.=$bodytext;
-    }
+      if ($target ne "meta" && $target ne 'tex') {
+	  $result = $token->[4];
+	  $result.=$bodytext;
+      }
   }
   return $result;
 }
@@ -152,7 +152,7 @@ sub end_script {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   my $result='';
   #other script blocks need to survive
-  if ($type ne "loncapa/perl") {
+  if ($type ne "loncapa/perl" && $target ne 'tex') {
     return $token->[2];
   } elsif ($target eq 'edit' ) {
     return &Apache::edit::end_table();
@@ -179,7 +179,10 @@ sub start_display {
       $result=&Apache::run::run($bodytext,$safeeval);
       if ($target eq 'grade' || $target eq 'answer' ||
 	  $target eq 'analyze') {
-	  $result=''; # grade should produce no output
+	  # grade/answer/analyxe should produce no output but if we
+	  # are redirecting, the redirecter should know what to do
+	  # with the output
+	  if (!$Apache::lonxml::redirection) { $result=''; }
       }
       $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
@@ -482,7 +485,15 @@ sub end_comment {
 
 sub xmlparse {
   my ($string) = @_;
-#  &Apache::lonxml::debug("Got $string");
+  &Apache::lonxml::debug("xmlparse recursion starting with $string");
+  # Apache::run::evaluate does an 'eval' on the name of the subroutine
+  # if it detects something that looks like a subroutine, this ends up calling
+  # things without any arguments and since perl is nice enough to pass
+  # along the default arguments when you don't explicitly say no arguments
+  # if you call &xmlparse, it gets &xmlparse passed as it argument.
+  # Same thing soccurs with &chemparse.
+  if ($string eq '&xmlparse') { return '&xmlparse'; }
+  if ($string eq '&chemparse') { return '&chemparse'; }
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;
   my @parser;
@@ -490,6 +501,7 @@ sub xmlparse {
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
 					     $parstack,\@parser,
 					     $safeeval,$style);
+  &Apache::lonxml::debug("xmlparse recursion ending with $result");
   return $result;
 }