--- loncom/xml/lonxml.pm	2005/03/16 15:46:42	1.364
+++ loncom/xml/lonxml.pm	2005/03/31 15:55:47	1.368
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.364 2005/03/16 15:46:42 albertel Exp $
+# $Id: lonxml.pm,v 1.368 2005/03/31 15:55:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -174,7 +174,8 @@ sub xmlend {
     my ($target,$parser)=@_;
     my $mode='xml';
     my $status='OPEN';
-    if ($Apache::lonhomework::parsing_a_problem) {
+    if ($Apache::lonhomework::parsing_a_problem ||
+	$Apache::lonhomework::parsing_a_task ) {
 	$mode='problem';
 	$status=$Apache::inputtags::status[-1]; 
     }
@@ -419,18 +420,17 @@ sub latex_special_symbols {
         $string=~s/([^\\])\#/$1\\\#/g;
     } else {
 	$string=~s/\\/\\ensuremath{\\backslash}/g;
-	$string=~s/([^\\]|^)\%/$1\\\%/g;
-	$string=~s/([^\\]|^)\$/$1\\\$/g;
-	$string=~s/([^\\])\_/$1\\_/g;
-	$string=~s/\$\$/\$\\\$/g;
-	$string=~s/\_\_/\_\\\_/g;
-	$string=~s/\#\#/\#\\\#/g;
+	$string=~s/\\\%|\%/\\\%/g;
+	$string=~s/\\{|{/\\{/g;
+	$string=~s/\\}|}/\\}/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;
+	$string=~s/\\\&|\&/\\\&/g;
+	$string=~s/\\\#|\#/\\\#/g;
         $string=~s/\|/\$\\mid\$/g;
 #single { or } How to escape?
     }
@@ -1056,7 +1056,8 @@ sub get_all_text {
 sub newparser {
   my ($parser,$contentref,$dir) = @_;
   push (@$parser,HTML::LCParser->new($contentref));
-  $$parser['-1']->xml_mode('1');
+  $$parser[-1]->xml_mode(1);
+  $$parser[-1]->marked_sections(1);
   if ( $dir eq '' ) {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
   } else {
@@ -1251,7 +1252,7 @@ $initialize
 $xml_help
 <input type="hidden" name="editmode" value="$lt{'ed'}" />
 $buttons<br />
-<textarea cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
+<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
 <br />$buttons
 <br />
 </form>
@@ -1370,6 +1371,7 @@ ENDNOTFOUND
 	if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
 	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
 						'',%mystyle);
+	    undef($Apache::lonhomework::parsing_a_task);
 	}
     }