--- loncom/homework/structuretags.pm	2002/08/23 21:17:16	1.105
+++ loncom/homework/structuretags.pm	2002/09/23 17:19:24	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.105 2002/08/23 21:17:16 albertel Exp $
+# $Id: structuretags.pm,v 1.115 2002/09/23 17:19:24 albertel 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 />';
 }
 
@@ -379,27 +379,43 @@ 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);
+      #FIXME this is ugly we should just generate tex in inputtags
+      if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }
+      $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{document} ';
+	      } else {
+		  $result .= '} ';
+	      }
       }
-      $result.=&Apache::lonxml::xmlend();
     }
     if ($target eq 'grade') { 
       &Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -412,22 +428,33 @@ sub end_problem {
   } elsif ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");
     $result = &problem_edit_footer();
-  } elsif ($target eq 'tex') {
-      $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-      if (not $ENV{'request.symb'} =~ m/\.page_/) {
-	  $result .= '\end{document} ';
-      } else {
-	  $result .= '} ';
-      }
-  }
+  } 
   return $result;
 }
 
+#FIXME I am ugly shoot me
+sub html_to_tex {
+  my ($string)=@_;
+  $string =~ s/<table>//;
+  $string =~ s/<\/table>//;
+  $string =~ s/<tr([^>]*)>//g;
+  $string =~ s/<\/tr>//g;
+  $string =~ s/<td([^>]*)>//g;
+  $string =~ s/<\/td>//g;
+  $string =~ s/<b>/\\textbf{/g;
+  $string =~ s/<\/b>/}/g;
+  $string =~ s/<br \/>/\\vskip 0 mm /g;
+  $string =~ s/<input([^>]*)>//g;
+  return $string;
+}
+
 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);
@@ -435,7 +462,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>
@@ -451,7 +481,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;
@@ -460,7 +491,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;';
@@ -507,7 +538,7 @@ sub end_while {
   return "";
 }
 
-# <randomlist> 
+# <randomlist show="1"> 
 #  <tag1>..</tag1>
 #  <tag2>..</tag2>
 #  <tag3>..</tag3>
@@ -516,7 +547,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;
@@ -626,15 +658,18 @@ 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);
+    #FIXME this is ugly we should just generate tex in inputtags
+    if ($target eq 'tex') { $gradestatus=&html_to_tex($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]);
@@ -649,7 +684,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]);
     }
@@ -665,7 +700,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/) {
@@ -682,7 +717,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]);