--- loncom/homework/structuretags.pm 2002/09/30 15:10:11 1.119 +++ loncom/homework/structuretags.pm 2002/11/03 19:16:19 1.130 @@ -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.130 2002/11/03 19:16:19 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -141,7 +141,7 @@ sub problem_edit_header {
'; } @@ -163,6 +163,13 @@ sub problem_web_to_edit_header { if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } $result.= ' /> Show All Foils
]*)>//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)=@_; @@ -493,7 +483,7 @@ sub end_library { sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; $code .=';return $condition;'; @@ -550,7 +540,7 @@ sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || - $target eq 'tex') { + $target eq 'tex' || $target eq 'analyze') { my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; @@ -640,11 +630,13 @@ sub start_part { if ( $target eq "web" ) { $result=" Part is not open to be viewed. It $accessmsg "; } 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'; + if ($$tagstack[-2] ne 'problem') { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } } } } @@ -661,9 +653,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 ''; @@ -767,7 +758,9 @@ sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq "edit" ) { $result=" |