--- loncom/xml/lonxml.pm	2003/05/29 18:42:22	1.260
+++ loncom/xml/lonxml.pm	2003/06/20 14:45:48	1.265
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.260 2003/05/29 18:42:22 albertel Exp $
+# $Id: lonxml.pm,v 1.265 2003/06/20 14:45:48 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,7 +386,7 @@ sub fontsettings() {
     if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
 	$headerstring.=
 	    '<meta Content-Type="text/html; charset=x-mac-roman">';
-    } elsif (!$ENV{'browser.mathml'}) {
+    } elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) {
 	$headerstring.=
 	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
     }
@@ -501,7 +501,7 @@ sub inner_xmlparse {
   my $dontpop=0;
   while ( $#$pars > -1 ) {
     while ($token = $$pars['-1']->get_token) {
-      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+      if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) {
 	if ($metamode<1) {
 	    my $text=$token->[1];
 	    if ($token->[0] eq 'C' && $target eq 'tex') {
@@ -510,8 +510,13 @@ sub inner_xmlparse {
 	    }
 	    $result.=$text;
 	}
+      } elsif (($token->[0] eq 'D')) {
+	if ($metamode<1 && $target eq 'web') {
+	    my $text=$token->[1];
+	    $result.=$text;
+	}
       } elsif ($token->[0] eq 'PI') {
-	if ($metamode<1) {
+	if ($metamode<1 && $target eq 'web') {
 	  $result=$token->[2];
 	}
       } elsif ($token->[0] eq 'S') {
@@ -1134,13 +1139,7 @@ sub inserteditinfo {
       my ($result,$filecontents)=@_;
       $filecontents = &HTML::Entities::encode($filecontents);
 #      my $editheader='<a href="#editsection">Edit below</a><hr />';
-      my $xml_help = '<table><tr><td>'.
-	  &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
-					      undef,undef,600)
-	      .'</td><td>'.
-          &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
-					      undef,undef,600)
-	      .'</td></tr></table>';
+      my $xml_help = Apache::loncommon::helpLatexCheatsheet();
       my $titledisplay=&display_title();
       my $buttons=(<<BUTTONS);
 <input type="submit" name="attemptclean" 
@@ -1244,6 +1243,10 @@ ENDNOTFOUND
 	    if ($ENV{'form.attemptclean'}) {
 		$filecontents=&htmlclean($filecontents,1);
 	    }
+#
+# we are in construction space, see if edit mode forced
+            &Apache::loncommon::get_unprocessed_cgi
+                          ($ENV{'QUERY_STRING'},['editmode']);
 	}
 	if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
 	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
@@ -1320,8 +1323,11 @@ sub error {
 
 sub warning {
   $warningcount++;
-  if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
-    print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
+  
+  if ($ENV{'form.grade_target'} ne 'tex') {
+      if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
+        print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
+      }
   }
 }
 
@@ -1430,6 +1436,7 @@ sub description {
 # calls to lonnet functions for this setup.
 # - looks for form.grade_ parameters
 sub whichuser {
+  my ($passedsymb)=@_;
   my ($symb,$courseid,$domain,$name,$publicuser);
   if (defined($ENV{'form.grade_symb'})) {
     my $tmp_courseid=$ENV{'form.grade_courseid'};
@@ -1441,7 +1448,11 @@ sub whichuser {
       $name=$ENV{'form.grade_username'};
     }
   } else {
-      $symb=&Apache::lonnet::symbread();
+      if (!$passedsymb) {
+          $symb=&Apache::lonnet::symbread();
+      } else {
+          $symb=$passedsymb;
+      }
       $courseid=$ENV{'request.course.id'};
       $domain=$ENV{'user.domain'};
       $name=$ENV{'user.name'};