--- loncom/xml/scripttag.pm	2002/03/28 22:02:27	1.69
+++ loncom/xml/scripttag.pm	2003/01/13 22:18:34	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.69 2002/03/28 22:02:27 albertel Exp $
+# $Id: scripttag.pm,v 1.84 2003/01/13 22:18:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,17 @@ BEGIN {
   &Apache::lonxml::register('Apache::scripttag',
 			    ('script','scriptlib','parserlib','import',
 			     'window','display','storetc','physnet',
-			     'standalone'));
+			     'standalone','comment',
+			     'LONCAPA_INTERNAL_TURN_STYLE_ON'));
+}
+
+sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
+    $Apache::lonxml::usestyle=1;
+    return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
+    return ('','no');
 }
 
 sub start_script {
@@ -53,30 +63,29 @@ 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[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
     if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield();
     } elsif ( $target eq 'web' || $target eq 'tex' ||
-	      $target eq 'grade' || $target eq 'answer') {
-      &Apache::run::run($bodytext,$safeeval);
-      if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
-	$Apache::lonxml::evaluate--;
-	$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;><pre>";
-	my $listing= &Apache::run::dump($target,$safeeval);
-	$listing =~ s/\n/\\n/g;
-	$listing =~ s/\"/&quot;/g;
-	$listing =~ s/\'/&rsquo;/g;
-	$listing =~ s/</&lt;/g;
-	$listing =~ s/>/&gt;/g;
-	$listing =~ s/&/&amp;/g;
-	$result.=$listing;
-	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
-      }
+	      $target eq 'grade' || $target eq 'answer' ||
+	      $target eq 'analyze' ) {
+	if (!$Apache::lonxml::default_homework_loaded) {
+	    &Apache::lonxml::default_homework_load($safeeval);
+	}
+	&Apache::run::run($bodytext,$safeeval);
+	if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+	    $Apache::lonxml::evaluate--;
+	    $result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'&lt;html&gt;&lt;head&gt;&lt;title&gt;newwindow&lt;/title&gt;&lt;/head&gt;&lt;body bgcolor=&quot;#FFFFFF&quot;&gt;&lt;pre&gt;";
+	    my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
+
+	    $result.=$listing;
+	    $result.= "&lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+	}
     } 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,'',50,4);
+      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     }
   } else {
     if ($target ne "meta") {
@@ -98,7 +107,7 @@ sub end_script {
     return $token->[2];
   } elsif ($target eq 'edit' ) {
     return &Apache::edit::end_table();
-  } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {
+  } elsif ($target eq 'answer') {
     $Apache::lonxml::evaluate++;
   }
   return '';
@@ -108,22 +117,27 @@ sub start_display {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
   my $result;
-  my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+  my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
 
   if ( $target eq "modified" ) {
     $result=$token->[4].&Apache::edit::modifiedfield();
   } elsif ( $target eq 'web' || $target eq 'tex' ||
-	    $target eq 'grade' || $target eq 'answer') {
-    $result=&Apache::run::run($bodytext,$safeeval);
-    if ($target eq 'grade' || $target eq 'answer' ) {
-      $result=''; # grade should produce no output
-    }
+	    $target eq 'grade' || $target eq 'answer' ||
+	      $target eq 'analyze') {
+      if (!$Apache::lonxml::default_homework_loaded) {
+	  &Apache::lonxml::default_homework_load($safeeval);
+      }
+      $result=&Apache::run::run($bodytext,$safeeval);
+      if ($target eq 'grade' || $target eq 'answer' ||
+	  $target eq 'analyze') {
+	  $result=''; # grade should produce no output
+      }
   } elsif ($target eq "edit" ) {
     #$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,'',40,1)
+    $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
   }
   return $result;
 }
@@ -140,7 +154,8 @@ sub start_scriptlib {
   my $result ='';
   my $error='';
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
+  if ($target eq 'web' || $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]);
@@ -161,7 +176,8 @@ sub start_scriptlib {
   if ($target eq "edit" ) {
     $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').
-	&Apache::edit::editline($token->[1],$bodytext,'',40).
+	&Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
+            &Apache::edit::browse(undef,'textnode').
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
@@ -185,7 +201,8 @@ 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') {
+  if ($target eq 'web' || $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]);
@@ -258,7 +275,8 @@ sub start_import {
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+      $target eq 'tex' || $target eq 'analyze' ) {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
@@ -278,6 +296,7 @@ sub start_import {
   } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
+    $result.=&Apache::edit::browse(undef,'textnode');
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
@@ -343,13 +362,49 @@ sub end_physnet {
 
 sub start_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web'  && $ENV{'request.course.id'} ) {
-    my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+  my $result='';
+  if ($target eq 'web' ) {
+    if ( $ENV{'request.course.id'} ) {
+      my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+    } else {
+      $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
+    }
   }
-  return '';
+  return $result;
 }
 
 sub end_standalone {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  if ($target eq 'web' ) {
+    if ( $ENV{'request.course.id'} ) {
+    } else {
+      $result='</td></tr></table>';
+    }
+  }
+  return $result;
+}
+
+sub start_comment {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  if ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
+    $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
+  } elsif ( $target eq 'modified') {
+    $result=$token->[4].&Apache::edit::modifiedfield($token);
+  } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') {
+    #normally throw away comments
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
+  }
+  return $result;
+}
+
+sub end_comment {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
   return '';
 }
 
