--- loncom/homework/structuretags.pm 2004/12/10 17:54:54 1.276 +++ loncom/homework/structuretags.pm 2006/01/27 23:36:48 1.332 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.276 2004/12/10 17:54:54 albertel Exp $ +# $Id: structuretags.pm,v 1.332 2006/01/27 23:36:48 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.' '; } @@ -68,6 +68,33 @@ sub end_tex { return ''; } +sub body_tag_start { + my ($target,$background,$bgcolor)=@_; + my $body_tag_start='
'.&Apache::lonmenu::menubuttons(undef,$target,1); + + &Apache::lontexconvert::jsMath_reset(); + if ($env{'environment.texengine'} eq 'jsMath') { + $body_tag_start.=&Apache::lontexconvert::jsMath_header(); + } + return $body_tag_start; +} + sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my %found; @@ -86,36 +113,31 @@ 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') { - $body_tag_start=&Apache::loncommon::bodytag(); - $body_tag_start.=&Apache::lonxml::message_location(); - } elsif (!defined($found{'body'})) { - $body_tag_start=''.&Apache::lonmenu::menubuttons(undef,$target,1); - if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { + } elsif (!defined($found{'body'})) { + my $background=&Apache::lonxml::get_param('background',$parstack, + $safeeval); + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, + $safeeval); + $body_tag_start=&body_tag_start($target,$background,$bgcolor); + if ( ($target eq 'web' || $target eq 'webgrade') + && $env{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); if ($symb eq '' && !$publicuser) { @@ -128,10 +150,14 @@ sub page_start { } my $form_tag_start; if (!defined($found{'form'})) { - $form_tag_start='