--- loncom/xml/scripttag.pm	2002/04/25 17:25:36	1.71
+++ loncom/xml/scripttag.pm	2002/09/23 17:25:24	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.71 2002/04/25 17:25:36 matthew Exp $
+# $Id: scripttag.pm,v 1.77 2002/09/23 17:25:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,7 @@ BEGIN {
   &Apache::lonxml::register('Apache::scripttag',
 			    ('script','scriptlib','parserlib','import',
 			     'window','display','storetc','physnet',
-			     'standalone'));
+			     'standalone','comment'));
 }
 
 sub start_script {
@@ -63,6 +63,7 @@ sub start_script {
 	$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= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
+	
 	$result.=$listing;
 	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
       }
@@ -70,7 +71,7 @@ sub start_script {
       #&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") {
@@ -92,7 +93,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 '';
@@ -117,7 +118,7 @@ sub start_display {
     #  "<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;
 }
@@ -252,11 +253,10 @@ 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') {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
-    &Apache::lonnet::logthis("$location,$Apache::lonxml::pwd['-1'],$bodytext");
     my $file=&Apache::lonnet::getfile($location);
     if ($file == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
@@ -338,13 +338,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') {
+    #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 '';
 }
 
