--- loncom/interface/loncommon.pm	2006/03/23 23:43:13	1.320
+++ loncom/interface/loncommon.pm	2006/03/27 19:38:53	1.323
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.320 2006/03/23 23:43:13 albertel Exp $
+# $Id: loncommon.pm,v 1.323 2006/03/27 19:38:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2801,7 +2801,8 @@ form, .inline { display: inline; }
 style="margin-top: 0px;$addstyle" $addentries>
 END
     &Apache::lontexconvert::jsMath_reset();
-    if ($env{'environment.texengine'} eq 'jsMath') {
+    if ($env{'environment.texengine'} eq 'jsMath' ||
+	$env{'form.texengine'}        eq 'jsMath' ) {
 	$bodytag.=&Apache::lontexconvert::jsMath_header();
     }
 
@@ -3149,15 +3150,17 @@ sub end_page {
 sub html_encode {
     my ($result) = @_;
 
-    $result = &HTML::Entities::encode($result,'"');
+    $result = &HTML::Entities::encode($result,'<>&"');
     
     return $result;
 }
 sub js_ready {
     my ($result) = @_;
 
-    $result =~ s/[\n\r]/ /g;
-    $result =~ s/'/\\'/g;	
+    $result =~ s/[\n\r]/ /xmsg;
+    $result =~ s/\\/\\\\/xmsg;
+    $result =~ s/'/\\'/xmsg;
+    $result =~ s{</script>}{</scrip'+'t>}xmsg;
     
     return $result;
 }