--- loncom/homework/structuretags.pm 2002/10/01 21:04:34 1.121 +++ loncom/homework/structuretags.pm 2002/10/28 14:47:22 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $ +# $Id: structuretags.pm,v 1.129 2002/10/28 14:47:22 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -163,6 +163,13 @@ sub problem_web_to_edit_header { if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } $result.= ' /> Show All Foils
'; + my $numtoanalyze=$ENV{'form.numtoanalyze'}; + if (!$numtoanalyze) { $numtoanalyze=100; } + #DISABLED for now. + #$result.= ' +#
'; + return $result; } sub initialize_storage { @@ -389,9 +396,7 @@ sub end_problem { $status ne 'UNCHECKEDOUT') { # if part is zero, no 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 ( @@ -478,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;'; @@ -535,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; @@ -625,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'; + } } } }