--- loncom/homework/structuretags.pm 2002/01/11 16:32:29 1.75 +++ loncom/homework/structuretags.pm 2002/03/01 00:23:04 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.75 2002/01/11 16:32:29 matthew Exp $ +# $Id: structuretags.pm,v 1.83 2002/03/01 00:23:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,7 +34,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); # &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) } @@ -67,24 +67,39 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start='[4]; $result.=&Apache::edit::handle_insert(); + } elsif ($target eq 'tex') { + $result .= '\begin{document}\noindent\textbf{Problem.}\newline'; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -285,8 +310,7 @@ sub end_problem { my $result=''; my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { @@ -316,6 +340,8 @@ sub end_problem { } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; + } elsif ($target eq 'tex') { + $result .= '\end{document}'; } return $result; } @@ -581,11 +607,11 @@ sub end_startouttext { $result.=&Apache::edit::start_table($token)."Text Block Delete:". &Apache::edit::deletelist($target,$token) - ." + ." ". &Apache::edit::insertlist($target,$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::editfield($token->[1],$text,"",50,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);