--- loncom/homework/structuretags.pm	2002/10/01 20:44:44	1.120
+++ loncom/homework/structuretags.pm	2002/10/14 14:37:37	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.120 2002/10/01 20:44:44 sakharuk Exp $
+# $Id: structuretags.pm,v 1.124 2002/10/14 14:37:37 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -389,9 +389,7 @@ sub end_problem {
 	      $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
-      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); }
+      my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
       if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
     }
     if (
@@ -434,21 +432,6 @@ 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)=@_;
@@ -640,11 +623,11 @@ 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';
+	$result='\end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
       }
     }
   }
@@ -661,9 +644,7 @@ sub end_part {
     return &Apache::inputtags::grade;
   }
   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); }
+    my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
     if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
     return $gradestatus;
   }