--- loncom/homework/structuretags.pm	2002/08/26 20:29:30	1.106
+++ loncom/homework/structuretags.pm	2002/09/05 03:30:27	1.112
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.106 2002/08/26 20:29:30 sakharuk Exp $
+# $Id: structuretags.pm,v 1.112 2002/09/05 03:30:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -387,32 +387,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;
-      if ($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 .= '} ';
-	  }
-      }
+      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' || $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') {
@@ -450,11 +432,29 @@ sub end_problem {
   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);
@@ -462,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>
@@ -534,7 +537,7 @@ sub end_while {
   return "";
 }
 
-# <randomlist> 
+# <randomlist show="1"> 
 #  <tag1>..</tag1>
 #  <tag2>..</tag2>
 #  <tag3>..</tag3>
@@ -543,7 +546,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;
@@ -653,8 +657,11 @@ 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 '';
 }