--- loncom/homework/structuretags.pm	2002/09/26 20:45:00	1.118
+++ 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.118 2002/09/26 20:45:00 albertel Exp $
+# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -347,16 +347,16 @@ 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 \begin{minipage}{\textwidth}';	
+		    $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
 		} else {
-		    $result .= '\begin{document} \noindent \vskip 1 mm \begin{minipage}{\textwidth}';
+		    $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
 		}
 	    } else {
 		$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
 	    } 
 	} else {
 	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		$result .= '\begin{document} \noindent \vskip 1 mm\begin{minipage}{\textwidth}';	
+		$result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
 	    } else {
 		$result .= '\vskip 1mm \\\\\\\\';
 	    } 
@@ -392,7 +392,7 @@ sub end_problem {
       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 ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
     }
     if (
 	(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
@@ -434,21 +434,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)=@_;
@@ -661,9 +646,8 @@ 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;
   }
   return '';