--- loncom/homework/structuretags.pm	2005/06/28 19:56:10	1.296
+++ loncom/homework/structuretags.pm	2005/07/05 18:59:03	1.297
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.296 2005/06/28 19:56:10 albertel Exp $
+# $Id: structuretags.pm,v 1.297 2005/07/05 18:59:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,11 +88,10 @@ sub body_tag_start {
 	$body_tag_start.=' style="font-size: x-large;" ';
     }
     $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
+    
+    &Apache::lontexconvert::jsMath_reset();
     if ($env{'environment.texengine'} eq 'jsMath') {
-	$body_tag_start.='<script type="text/javascript">
-                     function NoFontMessage () {}
-                   </script>'."\n".
-		       '<script src="/adm/jsMath/jsMath.js"></script>'."\n";
+	$body_tag_start.=&Apache::lontexconvert::jsMath_header();
     }
     return $body_tag_start;
 }
@@ -119,8 +118,10 @@ sub page_start {
     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();
+	if ($target eq 'web') {
+	    $body_tag_start=&Apache::loncommon::bodytag();
+	    $body_tag_start.=&Apache::lonxml::message_location();
+	}
     } elsif (!defined($found{'body'})) {
 	my $background=&Apache::lonxml::get_param('background',$parstack,
 						  $safeeval);