--- loncom/homework/structuretags.pm	2002/06/25 15:01:49	1.99
+++ loncom/homework/structuretags.pm	2002/11/10 15:39:37	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.99 2002/06/25 15:01:49 sakharuk Exp $
+# $Id: structuretags.pm,v 1.134 2002/11/10 15:39:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,10 +29,12 @@
 # 6/26/2001 fixed extra web display at end of <web></web> tags
 # 8/17,8/18,8/20 Gerd Kortemeyer
 
+
 package Apache::structuretags; 
 
 use strict;
 use Apache::lonnet;
+use Apache::File();
 
 BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -56,7 +58,7 @@ sub start_tex {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
   if ($target eq 'tex') {
-    return $bodytext
+      return $bodytext.' ';
   }
   return '';
 }
@@ -99,8 +101,84 @@ sub page_start {
       }
     }
     $body_tag_start.='>';
+    if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+	my ($symb)=&Apache::lonxml::whichuser();
+	if ($symb eq '') {
+	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+	    $help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />";
+	    $body_tag_start.=$help;
+	}
+    }
+  }
+  my $form_tag_start;
+  if (!defined($found{'form'})) {
+    $form_tag_start='<form name="lonhomework" method="POST" action="'.
+      $ENV{'request.uri'}.'">';
+  }
+  return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+}
+
+sub get_resource_name {
+  my ($parstack,$safeeval)=@_;
+  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+  if ($name eq '') { 
+    $name=&Apache::lonnet::EXT('resource.title');
+    if ($name eq 'con_lost') { $name = ''; }
+  }
+  $Apache::lonhomework::name=$name;
+  return $name;
+}
+
+sub setup_rndseed {
+  my ($safeeval)=@_;
+  my $rndseed;
+  if ($ENV{'request.state'} eq "construct") {
+    $rndseed=$ENV{'form.rndseed'};
+    if (!$rndseed) {
+      $rndseed=time;
+      $ENV{'form.rndseed'}=$rndseed;
+    }
+    &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
   }
-  return ($result,$head_tag_start,$body_tag_start);
+  return $rndseed;
+}
+
+sub problem_edit_header {
+  return '<input type="hidden" name="submitted" value="edit" />
+       <input type="hidden" name="problemmode" value="Edit" />
+       <input type="submit" name="problemmode" value="Discard Edits and View" />
+       <input type="submit" name="problemmode" value="EditXML" />
+       <input type="submit" name="Undo" value="undo" /> <hr />
+       <input type="submit" name="submit" value="Submit Changes" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p>
+      ';
+}
+
+sub problem_edit_footer {
+  return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />
+    <input type="submit" name="submit" value="Submit Changes and View" />';
+}
+
+sub problem_web_to_edit_header {
+  my ($rndseed)=@_;
+  my $result.='<input type="hidden" name="problemmode" value="View" />
+             <input type="submit" name="problemmode" value="Edit" />
+             <input type="submit" name="problemmode" value="EditXML" />
+             Random Seed:<input type="text" name="rndseed" width="10" value="'.
+	       $rndseed.'" />
+             <input type="submit" name="changerandseed" value="Change" />
+             <input type="submit" name="resetdata" value="Reset Submissions" />
+             <input type="checkbox" name="showallfoils" ';
+  if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
+  $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
+             <hr />';
+  my $numtoanalyze=$ENV{'form.numtoanalyze'};
+  if (!$numtoanalyze) { $numtoanalyze=100; }
+  #DISABLED for now.
+  #$result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
+#             <input type="text" name="numtoanalyze" value="'.
+#		 $numtoanalyze.'" size="5" /> <hr />';
+  return $result;
 }
 
 sub initialize_storage {
@@ -199,7 +277,7 @@ sub start_problem {
   my $accessmsg;
 
   #should get back a <html> or the neccesary stuff to start XML/MathML
-  my ($result,$head_tag_start,$body_tag_start)=
+  my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
 
@@ -215,24 +293,17 @@ sub start_problem {
     }
 
     #handle rand seed in construction space
-    my $rndseed;
-    if ($ENV{'request.state'} eq "construct") {
-      $rndseed=$ENV{'form.rndseed'};
-      if (!$rndseed) {
-	$rndseed=time;
-	$ENV{'form.rndseed'}=$rndseed;
-      }
-      &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
-    }
+    my $rndseed=&setup_rndseed($safeeval);
     ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
     &Apache::run::run($expression,$safeeval);
+    &Apache::lonxml::debug("Got $status");
     if (( $status eq 'CLOSED' ) ||
         ( $status eq 'UNCHECKEDOUT') ||
         ( $status eq 'BANNED')) {
-      my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
+      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
       if ( $target eq "web" ) {
 	$result.= $head_tag_start.'</head>';
         my $msg=$body_tag_start.
@@ -243,33 +314,18 @@ sub start_problem {
             $msg.=&checkout_msg;
         }
 	$result.=$msg.'<br />';
-      }
+      } elsif ($target eq 'tex') {
+	  $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+      } 
     } elsif ($target eq 'web') {
-      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-      if ($name eq '') { 
-	$name=&Apache::lonnet::EXT('resource.title');
-	if ($name eq 'con_lost') { $name = ''; }
-      }
-      $Apache::lonhomework::name=$name;
+      my $name= &get_resource_name($parstack,$safeeval);
       if ($status eq 'CAN_ANSWER') {
 	# create a page header and exit
-	$result.="$head_tag_start<title>$name</title></head>\n
-              $body_tag_start\n
-              <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
+	$result.="$head_tag_start<title>$name</title></head>
+              $body_tag_start \n $form_tag_start".	
 		'<input type="hidden" name="submitted" value="yes" />';
 	if ($ENV{'request.state'} eq "construct") {
-	  $result.=
-	    '<input type="hidden" name="problemmode" value="View" />
-             <input type="submit" name="problemmode" value="Edit" />
-             <input type="submit" name="problemmode" value="EditXML" />
-             Random Seed:<input type="text" name="rndseed" width="10" value="'.
-	       $rndseed.'" />
-             <input type="submit" name="changerandseed" value="Change" />
-             <input type="submit" name="resetdata" value="Reset Submissions" />
-             <input type="checkbox" name="showallfoils" ';
-	  if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
-	  $result.= ' /> Show All Foils
-             <hr />';
+	  $result.= &problem_web_to_edit_header($rndseed);
 	}
 	# if we are viewing someone else preserve that info
 	if (defined $ENV{'form.grade_symb'}) {
@@ -284,27 +340,48 @@ sub start_problem {
 	  "<title>$name</title></head>\n$body_tag_start\n";
       }
     } elsif ($target eq 'tex') {
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ($name eq '') { 
+	    $name=&Apache::lonnet::EXT('resource.title');
+	    if ($name eq 'con_lost') { $name = ''; }
+	}
+	$Apache::lonhomework::name=$name;
 	my $id = $Apache::inputtags::part;
 	my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	$duedate = POSIX::strftime("%c",localtime($duedate));
-	if (not $ENV{'request.symb'} =~ m/\.page_/) {
-	    $result .= '\begin{document} \noindent\fbox{Due date: '.$duedate.'} \\vskip 1 mm';	  
+	my $temp_file;
+	my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+        if (-e $filename) {
+	    $temp_file = Apache::File->new($filename); 
+	} else {
+	    $temp_file = Apache::File->new('>>'.$filename); 
+	}
+	my @due_file_content = <$temp_file>;
+	my $due_file_content = $due_file_content[$#due_file_content];
+        chomp $due_file_content;
+        if ($due_file_content ne $duedate) {	    
+	$temp_file = Apache::File->new('>'.$filename); 
+	    print $temp_file "$duedate\n";	    
+	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		if(not $duedate=~m/1969/) {
+		    $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
+		} else {
+		    $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+		}
+	    } else {
+		$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+	    } 
 	} else {
-	    $result .= '\begin{minipage}{\minipagewidth}\vskip 1mm\fbox{Due date: '.$duedate.'} \\vskip 1 mm';
+	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		$result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
+	    } else {
+		$result .= '\vskip 1mm \\\\\\\\';
+	    } 
 	}
     }
   } elsif ($target eq 'edit') {
-    $result.=$head_tag_start."</head>".$body_tag_start.
-      '<form name="lonhomework" method="POST" action="'.
-	$ENV{'request.uri'}.'">
-       <input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="Discard Edits and View" />
-       <input type="submit" name="problemmode" value="EditXML" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br />
-      ';
+    $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+      &problem_edit_header();
     my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;
   } elsif ($target eq 'modified') {
@@ -321,27 +398,41 @@ sub end_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   my $status=$Apache::inputtags::status['-1'];
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;
-    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && 
+    } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && 
 	      $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
-      $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
+      my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+      if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
     }
     if (
-	($target eq 'web' && ($ENV{'request.state'} ne 'construct')) ||
-	($target eq 'answer')
+	(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+	($target eq 'answer') || ($target eq 'tex')
        ) {
       if ($status eq 'CAN_ANSWER') {
-	$result.="</form></body>\n"; 
+	  if ($target ne 'tex') {
+	      $result.="</form></body>\n";
+	  } 
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
 	       $status eq 'UNCHECKEDOUT' ) {
-	$result.="</body>\n";
+	  if ($target ne 'tex') {
+	      $result.="</body>\n";
+	  }
+      }
+      if ($target ne 'tex') {
+	  $result.=&Apache::lonxml::xmlend();
+      } else {
+	      $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+	      if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		  $result .= '\end{minipage}\end{document} ';
+	      } else {
+		  $result .= '';
+	      }
       }
-      $result.=&Apache::lonxml::xmlend();
     }
     if ($target eq 'grade') { 
       &Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -353,68 +444,84 @@ sub end_problem {
     }
   } elsif ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");
-    $result ='<br /><input type="submit" name="submit" value="Submit Changes and Edit" />';
-    $result.='<input type="submit" name="submit" value="Submit Changes and View" />';
-  } elsif ($target eq 'tex') {
-      $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}';
-      if (not $ENV{'request.symb'} =~ m/\.page_/) {
-	  $result .= '\end{document} ';
-      } else {
-	  $result .= '\end{minipage} ';
-      }
-  }
+    $result = &problem_edit_footer();
+  } 
   return $result;
 }
 
+
 sub start_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my ($result,$head_tag_start,$body_tag_start)=
-    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+  my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+
   if ($target eq 'edit') {
-    $result.=$head_tag_start."</head>".$body_tag_start.
-      '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
-       <input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="View" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-      ';
+    ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+      &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+    $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+      &problem_edit_header();
     my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;
-    return $result;
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     $result=$token->[4];
     $result.=&Apache::edit::handle_insert();
-    return $result;
+  } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+	   $ENV{'request.state'} eq "construct" ) {
+    ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+      &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+    my $name=&get_resource_name($parstack,$safeeval);
+    my $rndseed=&setup_rndseed($safeeval);
+    $result.="$head_tag_start<title>$name</title></head>
+              $body_tag_start \n $form_tag_start".	
+		'<input type="hidden" name="submitted" value="yes" />';
+    $result.=&problem_web_to_edit_header($rndseed);
   }
-  return '';
+  return $result;
 }
 
 sub end_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   if ($target eq 'edit') {
-    $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
+    $result=&problem_edit_footer();
+  } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+	   $ENV{'request.state'} eq "construct") {
+    $result.='</form></body>'.&Apache::lonxml::xmlend();
   }
   return $result;
 }
 
 sub start_block {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
-    my $code = @$parstack[$#$parstack];
-    $code =~ s/\"//g;
-    $code .=';return $condition;';
-    #  print "<br />$code<br />";
-    my $result = &Apache::run::run($code,$safeeval);
-    &Apache::lonxml::debug("block :$code: returned :$result:");
-    if ( ! $result ) { 
-      my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
-      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+    my $result;
+
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || 
+	$target eq 'tex' || $target eq 'analyze') {
+	my $code = @$parstack[$#$parstack];
+	if ($code) {
+	    $code =~ s/\"//g;
+	    $code .=';return $condition;';
+	    $result = &Apache::run::run($code,$safeeval);
+	    &Apache::lonxml::debug("block :$code: returned :$result:");
+	} else {
+	    $result='1';
+	}
+	if ( ! $result ) {
+	    my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]);
+	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+	}
+	$result='';
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result .=&Apache::edit::text_arg('Test Condition:','condition',
+					  $token,40);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'condition');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
-  }
-  return "";
+    return $result;
 }
 
 sub end_block {
@@ -449,7 +556,7 @@ sub end_while {
   return "";
 }
 
-# <randomlist> 
+# <randomlist show="1"> 
 #  <tag1>..</tag1>
 #  <tag2>..</tag2>
 #  <tag3>..</tag3>
@@ -458,7 +565,8 @@ sub end_while {
 sub start_randomlist {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result;
-  if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {
+  if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
+      $target eq 'tex' || $target eq 'analyze') {
     my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
     my $b_parser= HTML::TokeParser->new(\$body);
     my $b_tok;
@@ -511,7 +619,7 @@ sub shuffle {
     if (defined(@$a)) {
       &Apache::response::setrandomnumber();
       for($i=@$a;--$i;) {
-	my $j=int rand($i+1);
+	my $j=int(&Math::Random::random_uniform() * ($i+1));
 	next if $i == $j;
 	@$a[$i,$j] = @$a[$j,$i];
       }
@@ -548,13 +656,28 @@ sub start_part {
       if ( $target eq "web" ) {
 	$result="<br />Part is not open to be viewed. It $accessmsg<br />";
       } elsif ( $target eq 'tex' ) {
-	$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+	$result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
       }
     } else {
       if ($target eq 'tex') {
-	$result='\vskip 0 mm';
+	if ($$tagstack[-2] ne 'problem') {
+	  $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+	}
       }
     }
+  } elsif ($target eq 'edit') {
+      $result.=&Apache::edit::tag_start($target,$token);
+      $result.=&Apache::edit::text_arg('Part ID:','id',$token).
+	  &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
+	      &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+
+  } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						   'id');
+      if ($constructtag) {
+	  $result = &Apache::edit::rebuild_tag($token);
+	  $result.=&Apache::edit::handle_insert();
+      }
   }
   return $result;
 }
@@ -568,17 +691,20 @@ sub end_part {
   if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
     return &Apache::inputtags::grade;
   }
-  if ($target eq 'web') {
-    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+  if ($target eq 'web' || $target eq 'tex' ) {
+    my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+    if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
+    return $gradestatus;
   }
   return '';
 }
 
 sub start_preduedate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
-	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && 
+        $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }
   }
@@ -591,10 +717,12 @@ sub end_preduedate {
 
 sub start_postanswerdate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }
+  } elsif ($target eq 'tex') {
+      return '\vskip 0 mm \noindent';
   }
   return '';
 }
@@ -605,7 +733,7 @@ sub end_postanswerdate {
 
 sub start_notsolved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {
@@ -622,7 +750,7 @@ sub end_notsolved {
 
 sub start_solved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {
       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
@@ -655,7 +783,7 @@ sub end_startouttext {
 <td>".
   &Apache::edit::insertlist($target,$token).
     &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
-      &Apache::edit::editfield($token->[1],$text,"",50,4);
+      &Apache::edit::editfield($token->[1],$text,"",80,4);
   }
   if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -670,7 +798,9 @@ sub start_endouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
-  if ($target eq "modified") { $result='<endouttext />'; }
+  if ($target eq "modified") { 
+     $result='<endouttext />'.
+     &Apache::edit::handle_insertafter('startouttext'); }
   return $result;
 }
 sub end_endouttext {