--- loncom/homework/structuretags.pm 2003/07/17 13:50:44 1.197 +++ loncom/homework/structuretags.pm 2003/08/04 22:40:03 1.200 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.197 2003/07/17 13:50:44 www Exp $ +# $Id: structuretags.pm,v 1.200 2003/08/04 22:40:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,9 +44,9 @@ BEGIN { sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + if ($target eq 'web') { + return $bodytext; } return ''; } @@ -57,12 +57,12 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - &Apache::lonxml::debug("tex 1"); - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + my $result=''; + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + if ($target eq 'tex') { + return $bodytext.' '; } - return ''; + return $result;; } sub end_tex { @@ -91,6 +91,7 @@ sub page_start { 'onUnload="'.&Apache::lonmenu::unloadevents().'" '; my $background=&Apache::lonxml::get_param('background',$parstack, $safeeval); + if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; } if ($background) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $background; @@ -98,12 +99,15 @@ sub page_start { } else { my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, $safeeval); - if ($bgcolor) { + if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) { $body_tag_start.='bgcolor="'.$bgcolor.'" '; } else { $body_tag_start.='bgcolor="#ffffff"'; } } + if ($ENV{'browser.fontenhance'} eq 'on') { + $body_tag_start.=' style="font-size: x-large;" '; + } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)=