--- loncom/interface/loncommon.pm	2006/03/21 21:49:30	1.319
+++ loncom/interface/loncommon.pm	2006/03/24 18:09:27	1.321
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.319 2006/03/21 21:49:30 albertel Exp $
+# $Id: loncommon.pm,v 1.321 2006/03/24 18:09:27 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();
     }
 
@@ -3078,6 +3079,8 @@ Inputs: $title - optional title for the
                   bgcolor        -> override the default page bg color
                   js_ready       -> return a string ready for being used in 
                                     a javascript writeln
+                  html_encode    -> return a string ready for being used in 
+                                    a html attribute
                   force_register -> if is true will turn on the &bodytag()
                                     $forcereg arg
 
@@ -3107,6 +3110,9 @@ sub start_page {
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
     }
+    if ($args->{'html_encode'}) {
+	$result = &html_encode($result);
+    }
     return $result;
 }
 
@@ -3121,6 +3127,8 @@ Returns a complete </body></html> sectio
 Inputs:         $args - additional optional args supported are:
                  js_ready     -> return a string ready for being used in 
                                  a javascript writeln
+                 html_encode  -> return a string ready for being used in 
+                                 a html attribute
 =back
 
 =cut
@@ -3133,12 +3141,21 @@ sub end_page {
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
     }
+    if ($args->{'html_encode'}) {
+	$result = &html_encode($result);
+    }
     return $result;
 }
 
+sub html_encode {
+    my ($result) = @_;
+
+    $result = &HTML::Entities::encode($result,'"');
+    
+    return $result;
+}
 sub js_ready {
     my ($result) = @_;
-    $result = &HTML::Entities::encode($result,'<>&"');
 
     $result =~ s/[\n\r]/ /g;
     $result =~ s/'/\\'/g;