--- loncom/homework/structuretags.pm 2002/09/30 15:10:11 1.119 +++ 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.119 2002/09/30 15:10:11 sakharuk Exp $ +# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -349,7 +349,7 @@ sub start_problem { if(not $duedate=~m/1969/) { $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.'} \\\\\\\\'; @@ -434,21 +434,6 @@ sub end_problem { return $result; } -#FIXME I am ugly shoot me -sub html_to_tex { - my ($string)=@_; - $string =~ s///; - $string =~ s/<\/table>//; - $string =~ s/]*)>//g; - $string =~ s/<\/tr>//g; - $string =~ s/]*)>//g; - $string =~ s/<\/td>//g; - $string =~ s//\\textbf{/g; - $string =~ s/<\/b>/}/g; - $string =~ s/
/\\vskip 0 mm /g; - $string =~ s/]*)>//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 '';