--- loncom/xml/lonxml.pm	2002/09/13 20:46:09	1.196
+++ loncom/xml/lonxml.pm	2002/10/14 20:44:16	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.196 2002/09/13 20:46:09 www Exp $
+# $Id: lonxml.pm,v 1.202 2002/10/14 20:44:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,6 +99,8 @@ use Apache::edit();
 use Apache::lonnet();
 use Apache::File();
 use Apache::loncommon();
+use Apache::lonfeedback();
+use Apache::lonmsg();
 
 #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler
@@ -232,7 +234,7 @@ sub xmlend {
           }
           if ($discussiononly) {
 	      $discussion.=(<<ENDDISCUSS);
-<form action="/adm/feedback" method="post">
+<form action="/adm/feedback" method="post" name="mailform">
 <input type="submit" name="discuss" value="Post Discussion" />
 <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
 <input type="hidden" name="symb" value="$symb" />
@@ -243,6 +245,7 @@ course faculty</font><br />
 <textarea name=comment cols=60 rows=10 wrap=hard></textarea>
 </form>
 ENDDISCUSS
+             $discussion.=&Apache::lonfeedback::generate_preview_button();
           }
        }
     }
@@ -363,6 +366,7 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
+    
     if ($target eq 'edit') {
         $result .="<script>\n".
             "if (typeof menu != 'undefined') {menu.currentURL=null;}\n".
@@ -379,6 +383,10 @@ sub registerurl {
     $Apache::lonxml::registered=1;
     my $nothing='';
     if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+    my $newmail='';
+    if (&Apache::lonmsg::newmail()) { 
+       $newmail='menu.setstatus("you have","messages");';
+    }
     my $timesync='menu.syncclock(1000*'.time.');';
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
         my $hwkadd='';
@@ -408,6 +416,7 @@ ENDPARM
 	  menu=window.open("$nothing","LONCAPAmenu","",false);
           menu.clearTimeout(menu.menucltim);
           $timesync
+          $newmail
 	  menu.currentURL=window.location.pathname;
           menu.reloadURL=window.location.pathname;
           menu.currentStale=0;
@@ -575,8 +584,12 @@ sub latex_special_symbols {
     $current_token=~s/\\/\\char92 /g;
     $current_token=~s/\^/\\char94 /g;
     $current_token=~s/\~/\\char126 /g;
-    $current_token=~s/(&[^a-z#])/\\$1/g;
-    $current_token=~s/([^&]\#)/\\$1/g;
+    $current_token=~s/(&[^a-z\#])/\\$1/g;
+    if ($current_token=~/ \#\w/) {
+	$current_token=~s/ \#(\w)/ \\#$1/;
+    } else {
+	$current_token=~s/([^&])(\#)/$1\\$2/g;
+    }
     $current_token=~s/(\$|_|{|})/\\$1/g;
     $current_token=~s/\\char92 /\\texttt{\\char92}/g;
     $current_token=~s/>/\$>\$/g; #more
@@ -1312,7 +1325,7 @@ ENDNOTFOUND
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
     $|=1;
-    print("DEBUG:".&HTML::Entities::encode($_[0])."<br />\n");
+    print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
   }
 }