--- loncom/xml/scripttag.pm	2003/12/10 22:11:56	1.105
+++ loncom/xml/scripttag.pm	2004/02/10 18:58:26	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.105 2003/12/10 22:11:56 albertel Exp $
+# $Id: scripttag.pm,v 1.107 2004/02/10 18:58:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,7 +109,7 @@ sub start_script {
     } elsif ( $target eq 'web' || $target eq 'tex' ||
 	      $target eq 'grade' || $target eq 'answer' ||
 	      $target eq 'analyze' ) {
-	my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
+	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
@@ -129,14 +129,16 @@ sub start_script {
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
-	my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
+	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
 	$result=&Apache::edit::tag_start($target,$token,'Script');
 	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+    } elsif ($target eq 'meta') {
+	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("/script",$parser);
+      my $bodytext=&Apache::lonxml::get_all_text_unblanaced("/script",$parser);
       $result.=$bodytext;
     }
   }
@@ -169,7 +171,7 @@ sub start_display {
   } elsif ( $target eq 'web' || $target eq 'tex' ||
 	    $target eq 'grade' || $target eq 'answer' ||
 	      $target eq 'analyze') {
-      my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
       if (!$Apache::lonxml::default_homework_loaded) {
 	  &Apache::lonxml::default_homework_load($safeeval);
       }
@@ -180,12 +182,14 @@ sub start_display {
       }
       $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
-    my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text_unblanced("/display",$parser);
     #$result = 
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
     $result=&Apache::edit::tag_start($target,$token,'Script With Display');
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
+  } elsif ($target eq 'meta') {
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
   }
   return $result;
 }
@@ -202,8 +206,9 @@ sub start_scriptlib {
   my $result ='';
   my $error='';
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || 
-      $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+      $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+      $target eq 'analyze') {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -247,8 +252,9 @@ sub start_parserlib {
   my $bodytext;
   my $result ="";
   my $error='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
-      $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+      $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+      $target eq 'analyze') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);