--- loncom/xml/scripttag.pm	2003/06/18 21:04:42	1.99
+++ loncom/xml/scripttag.pm	2003/10/30 20:57:28	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.99 2003/06/18 21:04:42 albertel Exp $
+# $Id: scripttag.pm,v 1.104 2003/10/30 20:57:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,7 @@ BEGIN {
 			     'window','display','storetc','physnet',
 			     'standalone','comment',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
+			     'LONCAPA_INTERNAL_TURN_STYLE_OFF',
 			     'LONCAPA_INTERNAL_LONHTTPD_PORT'));
 }
 
@@ -63,6 +64,24 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
     return ('','no');
 }
 
+sub start_LONCAPA_INTERNAL_TURN_STYLE_OFF {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    $Apache::lonxml::usestyle=0;
+    my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+    if (!$end) {
+	$Apache::lonxml::style_values=$$parstack[-1];
+	$Apache::lonxml::style_end_values=$$parstack[-1];
+    } else {
+	$Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+	$Apache::lonxml::style_end_values='';
+    }
+    return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF {
+    return ('','no');
+}
+
 sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'web') {
@@ -85,12 +104,12 @@ sub start_script {
   my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
   &Apache::lonxml::debug("found type of $type");
   if ($type eq "loncapa/perl") {
-    my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
     if ( $target eq "modified" ) {
-      $result=$token->[4].&Apache::edit::modifiedfield();
+	$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser);
     } 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);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
@@ -99,7 +118,7 @@ sub start_script {
 	    ($ENV{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    $result.="<script type=\"text/javascript\"> function LONCAPA_scriptvars_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=200,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
+	    $result.="<script type=\"text/javascript\"> function LONCAPA_scriptvars_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.document.open('text/html','replace');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/\n/\\n/g;
@@ -110,8 +129,9 @@ sub start_script {
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
-      $result=&Apache::edit::tag_start($target,$token,'Script');
-      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+	my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
+	$result=&Apache::edit::tag_start($target,$token,'Script');
+	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     }
   } else {
     if ($target ne "meta") {
@@ -143,13 +163,13 @@ sub start_display {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
   my $result;
-  my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
 
   if ( $target eq "modified" ) {
-    $result=$token->[4].&Apache::edit::modifiedfield();
+      $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
   } 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);
       if (!$Apache::lonxml::default_homework_loaded) {
 	  &Apache::lonxml::default_homework_load($safeeval);
       }
@@ -158,7 +178,9 @@ sub start_display {
 	  $target eq 'analyze') {
 	  $result=''; # grade should produce no output
       }
+      $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
+    my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
     #$result = 
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
@@ -208,9 +230,7 @@ sub start_scriptlib {
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
-    $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser);
   }
   return $result;
 }
@@ -254,9 +274,7 @@ sub start_parserlib {
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
-    $bodytext=$$parser[$#$parser]->get_text("/parserlib");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser);
   }
   return $result;
 }
@@ -338,9 +356,7 @@ sub start_import {
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
   } elsif ($target eq 'modified') {
-    $bodytext=$$parser[$#$parser]->get_text("/import");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;
@@ -430,7 +446,7 @@ sub start_comment {
     my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
   } elsif ( $target eq 'modified') {
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
+    $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser);
   } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
 	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') {
     #normally throw away comments
