--- loncom/xml/lonxml.pm	2008/10/24 18:23:22	1.487
+++ loncom/xml/lonxml.pm	2009/02/18 06:43:55	1.491
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.487 2008/10/24 18:23:22 raeburn Exp $
+# $Id: lonxml.pm,v 1.491 2009/02/18 06:43:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,25 @@
 # to any other parties under any circumstances.
 #
 
+=pod
+
+=head1 NAME
+
+Apache::lonxml
+
+=head1 SYNOPSIS
+
+XML Parsing Module
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES
+
+=cut
+
+
 
 package Apache::lonxml; 
 use vars 
@@ -505,12 +524,10 @@ sub inner_xmlparse {
 	  if (!$Apache::lonxml::usestyle) {
 	      $extras=$Apache::lonxml::style_values;
 	  }
-          if ($token->[1] ne 'translated') {
-	      if ( $#$parstack > -1 ) {
-	          $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
-	      } else {
-	          $result= &Apache::run::evaluate($result,$safeeval,$extras);
-	      }
+	  if ( $#$parstack > -1 ) {
+	      $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
+	  } else {
+	      $result= &Apache::run::evaluate($result,$safeeval,$extras);
           }
       }
       $Apache::lonxml::post_evaluate=1;
@@ -660,6 +677,7 @@ sub setup_globals {
   $Apache::lonxml::request=$request;
   $errorcount=0;
   $warningcount=0;
+  $Apache::lonxml::internal_error=0;
   $Apache::lonxml::default_homework_loaded=0;
   $Apache::lonxml::usestyle=1;
   &init_counter();
@@ -1588,9 +1606,12 @@ FULLPAGE
       my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
       my $textarea_events = &Apache::edit::element_change_detection();
       my $form_events     = &Apache::edit::form_change_detection();
-      my $htmlerror=&verify_html($filecontents);
-      if ($htmlerror) {
-         $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+      my $htmlerror;
+      if ($filetype eq 'html') {
+          $htmlerror=&verify_html($filecontents);
+          if ($htmlerror) {
+              $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+          }
       }
       my $editfooter=(<<ENDFOOTER);
 $initialize
@@ -1830,6 +1851,8 @@ sub error {
 
     $errorcount++;
 
+    $Apache::lonxml::internal_error=1;
+
     if (defined($Apache::inputtags::part)) {
 	if ( @Apache::inputtags::response ) {
 	    push(@errors,