--- loncom/homework/structuretags.pm 2005/10/18 21:46:42 1.306 +++ loncom/homework/structuretags.pm 2005/12/15 23:20:55 1.327 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.306 2005/10/18 21:46:42 albertel Exp $ +# $Id: structuretags.pm,v 1.327 2005/12/15 23:20:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,8 +42,8 @@ BEGIN { } sub start_web { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); if ($target eq 'web') { return $bodytext; } @@ -55,9 +55,9 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); if ($target eq 'tex') { return $bodytext.' '; } @@ -113,13 +113,22 @@ sub page_start { &Apache::lonhtmlcommon::htmlareaheaders(). &Apache::lonhtmlcommon::spellheader(). &Apache::lonxml::fontsettings(); + if ($target eq 'edit') { + $head_tag_start.=&Apache::edit::js_change_detection(); + } } my $body_tag_start; - if (!defined($found{'body'}) && $env{'request.state'} eq 'construct' - && $env{'environment.remote'} eq 'off') { - if ($target eq 'web' || $target eq 'edit') { - $body_tag_start=&Apache::loncommon::bodytag(); - $body_tag_start.=&Apache::lonxml::message_location(); + if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { + if ($env{'environment.remote'} eq 'off') { + if ($target eq 'web' || $target eq 'edit') { + $body_tag_start=&Apache::loncommon::bodytag(); + $body_tag_start.=&Apache::lonxml::message_location(); + } + } else { + if ($target eq 'web' || $target eq 'edit') { + $body_tag_start=&Apache::loncommon::bodytag(undef,undef,undef,1); + $body_tag_start.=&Apache::lonxml::message_location(); + } } } elsif (!defined($found{'body'})) { my $background=&Apache::lonxml::get_param('background',$parstack, @@ -144,7 +153,11 @@ sub page_start { $form_tag_start='