--- loncom/homework/structuretags.pm	2002/08/26 20:42:36	1.107
+++ loncom/homework/structuretags.pm	2002/10/01 21:04:34	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.107 2002/08/26 20:42:36 sakharuk Exp $
+# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,7 +161,7 @@ sub problem_web_to_edit_header {
              <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
+  $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
              <hr />';
 }
 
@@ -297,7 +297,9 @@ 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= &get_resource_name($parstack,$safeeval);
       if ($status eq 'CAN_ANSWER') {
@@ -345,18 +347,18 @@ sub start_problem {
 	    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';	
+		    $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
 		} else {
-		    $result .= '\begin{document} \noindent \vskip 1 mm';
+		    $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
 		}
 	    } else {
-		$result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+		$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
 	    } 
 	} else {
 	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		$result .= '\begin{document} \noindent \vskip 1 mm';	
+		$result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
 	    } else {
-		$result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+		$result .= '\vskip 1mm \\\\\\\\';
 	    } 
 	}
     }
@@ -387,24 +389,14 @@ sub end_problem {
 	      $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
-      my $gradesatement = &Apache::inputtags::gradestatus($Apache::inputtags::part);
-      if ($target eq 'tex') {
-	  $gradesatement =~ s/<table>//;
-	  $gradesatement =~ s/<\/table>//;
-	  $gradesatement =~ s/<tr([^>]*)>//g;
-	  $gradesatement =~ s/<\/tr>//g;
-	  $gradesatement =~ s/<td([^>]*)>//g;
-	  $gradesatement =~ s/<\/td>//g;
-	  $gradesatement =~ s/<b>/\\textbf{/g;
-	  $gradesatement =~ s/<\/b>/}/g;
-	  $gradesatement =~ s/<br \/>/\\vskip 0 mm /g;
-	  $gradesatement =~ s/<input([^>]*)>//g;
-      }
-      $result.= $gradesatement;
+      my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part);
+      #FIXME this is ugly we should just generate tex in inputtags
+      if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }
+      if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
     }
     if (
-	(($target eq 'web' || $target eq 'tex') && ($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') {
 	  if ($target ne 'tex') {
@@ -421,9 +413,9 @@ sub end_problem {
       } else {
 	      $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 	      if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		  $result .= '\end{document} ';
+		  $result .= '\end{minipage}\end{document} ';
 	      } else {
-		  $result .= '} ';
+		  $result .= '';
 	      }
       }
     }
@@ -442,11 +434,14 @@ sub end_problem {
   return $result;
 }
 
+
 sub start_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my ($result,$head_tag_start,$body_tag_start,$form_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,$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);
@@ -454,7 +449,10 @@ sub start_library {
   } elsif ($target eq 'modified') {
     $result=$token->[4];
     $result.=&Apache::edit::handle_insert();
-  } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) {
+  } 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>
@@ -470,7 +468,8 @@ sub end_library {
   my $result='';
   if ($target eq 'edit') {
     $result=&problem_edit_footer();
-  } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct") {
+  } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+	   $ENV{'request.state'} eq "construct") {
     $result.='</form></body>'.&Apache::lonxml::xmlend();
   }
   return $result;
@@ -479,7 +478,7 @@ sub end_library {
 sub start_block {
   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 $code = @$parstack[$#$parstack];
     $code =~ s/\"//g;
     $code .=';return $condition;';
@@ -526,7 +525,7 @@ sub end_while {
   return "";
 }
 
-# <randomlist> 
+# <randomlist show="1"> 
 #  <tag1>..</tag1>
 #  <tag2>..</tag2>
 #  <tag3>..</tag3>
@@ -535,7 +534,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') {
     my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
     my $b_parser= HTML::TokeParser->new(\$body);
     my $b_tok;
@@ -588,7 +588,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];
       }
@@ -645,15 +645,17 @@ 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::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
@@ -668,7 +670,7 @@ 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]);
     }
@@ -684,7 +686,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/) {
@@ -701,7 +703,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]);
@@ -734,7 +736,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']);