--- loncom/xml/lonxml.pm	2003/04/07 22:28:08	1.247
+++ loncom/xml/lonxml.pm	2003/05/03 21:09:03	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.247 2003/04/07 22:28:08 albertel Exp $
+# $Id: lonxml.pm,v 1.251 2003/05/03 21:09:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -380,8 +380,11 @@ sub printtokenheader {
 sub fontsettings() {
     my $headerstring='';
     if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
-         $headerstring.=
-             '<meta Content-Type="text/html; charset=x-mac-roman">';
+	$headerstring.=
+	    '<meta Content-Type="text/html; charset=x-mac-roman">';
+    } elsif (!$ENV{'browser.mathml'}) {
+	$headerstring.=
+	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
     }
     return $headerstring;
 }
@@ -557,9 +560,10 @@ sub inner_xmlparse {
 	}
       }
       if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
-	if ($target eq 'tex') {
-	    $result=&latex_special_symbols($result,$stack,$parstack);
-	}
+	  #Style file definitions should be correct
+	  if ($target eq 'tex' && ($Apache::lonxml::usestyle)) {
+	      $result=&latex_special_symbols($result,$stack,$parstack);
+	  }
       }
 
       # Encode any high ASCII characters
@@ -718,6 +722,7 @@ sub init_safespace {
   $safeeval->permit("sort");
   $safeeval->deny(":base_io");
   $safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
+  $safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart');
   $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
   
   $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
@@ -799,6 +804,7 @@ sub init_safespace {
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
   $safeinit .= ';$external::randomseed='.$rndseed.';';
+  &Apache::lonxml::debug("Setting rndseed to $rndseed");
   &Apache::run::run($safeinit,$safeeval);
 }