--- loncom/xml/lonxml.pm	2001/05/04 15:29:32	1.68
+++ loncom/xml/lonxml.pm	2001/05/04 19:18:43	1.71
@@ -16,6 +16,7 @@ use Safe;
 use Safe::Hole;
 use Opcode;
 use Apache::Constants qw(:common);
+use Apache::lontexconvert;
 
 
 sub xmlbegin {
@@ -37,18 +38,46 @@ sub xmlend {
     return '</html>';
 }
 
+sub fontsettings() {
+    my $headerstring='';
+    if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
+         $headerstring.=
+             '<meta Content-Type="text/html; charset=x-mac-roman">';
+    }
+    return $headerstring;
+}
+
 sub registerurl {
   return (<<ENDSCRIPT);
 <script language="JavaScript">
-    if (window.location.pathname!="/res/adm/pages/menu.html") {
-	menu=window.open("","LONCAPAmenu");
-	menu.currentURL=window.location.pathname;
-        menu.currentStale=0;
+// BEGIN LON-CAPA Internal
+    function LONCAPAreg() {
+       if (window.location.pathname!="/res/adm/pages/menu.html") {
+	  menu=window.open("","LONCAPAmenu");
+	  menu.currentURL=window.location.pathname;
+          menu.currentStale=0;
+       }
+    }
+  
+    function LONCAPAstale() {
+       if (window.location.pathname!="/res/adm/pages/menu.html") {
+	  menu=window.open("","LONCAPAmenu");
+          menu.currentStale=1;
+       }
     }
+// END LON-CAPA Internal
 </script>
 ENDSCRIPT
 }
 
+sub loadevents() {
+    return 'LONCAPAreg();';
+}
+
+sub unloadevents() {
+    return 'LONCAPAstale();';
+}
+
 sub register {
   my $space;
   my @taglist;