--- loncom/xml/lonxml.pm	2004/03/09 20:37:58	1.309
+++ loncom/xml/lonxml.pm	2004/03/23 00:47:48	1.313
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.309 2004/03/09 20:37:58 albertel Exp $
+# $Id: lonxml.pm,v 1.313 2004/03/23 00:47:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -401,23 +401,25 @@ sub latex_special_symbols {
     my ($string,$where)=@_;
     if ($where eq 'header') {
 	$string =~ s/(\\|_|\^)/ /g;
-	$string =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+	$string =~ s/(\$|%|\{|\})/\\$1/g;
 	$string =~ s/_/ /g;
+	$string=&Apache::lonprintout::character_chart($string);
+	# any & or # leftover should be safe to just escape
+        $string=~s/([^\\])\&/$1\\\&/g;
+        $string=~s/([^\\])\#/$1\\\#/g;
     } else {
-	$string=~s/\\ /\\char92 /g;
-	$string=~s/\^/\\\^\\strut /g;
-	$string=~s/\~/\\char126 /g;
-	#fixup & if it doesn't look like
-        # { or α
-	$string=~s/(&(?!((\#[0-9]+)|([a-z][a-z0-9]*));))/\\$1/gi;
-        $string=~s/([^&\\])\#/$1\\#/g;
-	$string=~s/\#\#/\#\\#/g;
-	$string=~s/(\$|_|{|})/\\$1/g;
-	$string=~s/\\char92 /\\texttt{\\char92}/g;
-	$string=~s/(>|<)/\$$1\$/g; #more or less
-	if ($string=~m/\d%/) {$string =~ s/(\d)%/$1\\%/g;} #percent after digit
-	if ($string=~m/\s%/) {$string =~ s/(\s)%/$1\\%/g;} #percent after space
-	if ($string eq '%.') {$string = '\%.';} #percent at the end of statement
+	$string=~s/\\/\\ensuremath{\\backslash}/g;
+	$string=~s/([^\\]|^)\%/$1\\\%/g;
+	$string=~s/([^\\]|^)(\$|_)/$1\\$2/g;
+	$string=~s/\$\$/\$\\\$/g;
+	$string=~s/\#\#/\#\\\#/g;
+        $string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g;
+	$string=~s/(>|<)/\\ensuremath\{$1\}/g; #more or less
+	$string=&Apache::lonprintout::character_chart($string);
+	# any & or # leftover should be safe to just escape
+        $string=~s/([^\\]|^)\&/$1\\\&/g;
+        $string=~s/([^\\]|^)\#/$1\\\#/g;
+#single { or } How to escape?
     }
     return $string;
 }
@@ -751,6 +753,7 @@ sub init_safespace {
   $safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed');
   $safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');
   $safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
+  $safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
 
 #need to inspect this class of ops
 # $safeeval->deny(":base_orig");