--- loncom/homework/structuretags.pm 2001/07/13 14:02:35 1.47 +++ loncom/homework/structuretags.pm 2001/08/03 22:12:07 1.51 @@ -8,7 +8,7 @@ use strict; use Apache::lonnet; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); + &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')) } @@ -38,12 +38,36 @@ sub end_tex { return ''; } +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=''; + return ($result,$head_tag_start,$body_tag_start); +} + sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); if ($Apache::lonhomework::type eq '') { @@ -56,12 +80,9 @@ sub start_problem { my $datemsg; #should get back a or the neccesary stuff to start XML/MathML - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start=''; if ($target eq 'web' || $target eq 'grade') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); push (@Apache::inputtags::status,$status); @@ -106,6 +127,7 @@ sub start_problem {