--- loncom/xml/lonxml.pm	2010/08/07 19:23:56	1.512
+++ loncom/xml/lonxml.pm	2010/09/29 15:56:03	1.517
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.512 2010/08/07 19:23:56 raeburn Exp $
+# $Id: lonxml.pm,v 1.517 2010/09/29 15:56:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1434,17 +1434,25 @@ SIMPLECONTENT
 
 sub verify_html {
     my ($filecontents)=@_;
-    if ($filecontents!~/(?:\<|\&lt\;)(?:html|xml)[^\<]*(?:\>|\&gt\;)/is) {
-       return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;xml&gt;');
-    }
-    if ($filecontents!~/(?:\<|\&lt\;)\/(?:html|xml)(?:\>|\&gt\;)/is) {
-       return &mt('File does not have [_1] or [_2] ending tag','&lt;html&gt;','&lt;xml&gt;');
-    }
-    if ($filecontents!~/(?:\<|\&lt\;)(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
-       return &mt('File does not have [_1] or [_2] starting tag','&lt;body&gt;','&lt;frameset&gt;');
-    }
-    if ($filecontents!~/(?:\<|\&lt\;)\/(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
-       return &mt('File does not have [_1] or [_2] ending tag','&lt;body&gt;','&lt;frameset&gt;');
+    my ($is_html,$is_xml);
+    if ($filecontents =~/(?:\<|\&lt\;)\?xml[^\<]*\?(?:\>|\&gt\;)/is) {
+        $is_xml = 1;
+    } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\&gt\;)/is) {
+        $is_html = 1;
+    }
+    unless ($is_xml || $is_html) {
+        return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;?xml ?&gt;');
+    }
+    if ($is_html) {
+        if ($filecontents!~/(?:\<|\&lt\;)\/html(?:\>|\&gt\;)/is) {
+            return &mt('File does not have [_1] ending tag','&lt;html&gt;');
+        }
+        if ($filecontents!~/(?:\<|\&lt\;)(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
+            return &mt('File does not have [_1] or [_2] starting tag','&lt;body&gt;','&lt;frameset&gt;');
+        }
+        if ($filecontents!~/(?:\<|\&lt\;)\/(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
+            return &mt('File does not have [_1] or [_2] ending tag','&lt;body&gt;','&lt;frameset&gt;');
+        }
     }
     return '';
 }
@@ -1492,27 +1500,27 @@ sub inserteditinfo {
       my $dragmath_button;
       my ($add_to_onload, $add_to_onresize);
       $initialize=&Apache::lonhtmlcommon::spellheader();
-      if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) { 
+      if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
 	  my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
           my %textarea_args = (
                                 fullpage => 'true',
                                 dragmath => 'math',
                               );
-          $initialize .= 
-              &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args).
-	      (<<FULLPAGE);
+          $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); 
+      }
+      $initialize .= (<<FULLPAGE);
 <script type="text/javascript">
+// <![CDATA[
     function initDocument() {
 	resize_textarea('$textarea_id','LC_aftertextarea');
     }
+// ]]>
 </script>
 FULLPAGE
+      if ($filetype eq 'html') {
+          $dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
+          $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
       }
-      if ($filetype eq 'html' || $filetype eq 'tex') {
-              $dragmath_button = '<div id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</div>';
-              $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
-      }
-
       $add_to_onload = 'initDocument();';
       $add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
 
@@ -1537,7 +1545,7 @@ FULLPAGE
               $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
           }
           if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-              $textareaclass = 'class="LC_richDetectHtml"';
+              $textareaclass = 'class="LC_richDefaultOff"';
           }
       }
       my $editfooter=(<<ENDFOOTER);
@@ -1554,15 +1562,14 @@ $initialize
     <div class="LC_edit_problem_discards">
       <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
       <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
-      $spelllink $htmlerror
+      $htmlerror $dragmath_button
     </div>
     <div class="LC_edit_problem_saves">
       <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
       <input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
     </div>
   </div>
-$dragmath_button
-  <textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea>
+  <textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
   <div id="LC_aftertextarea">
     <br />
     $titledisplay
@@ -1714,9 +1721,6 @@ ENDNOTFOUND
                 $result = &Apache::lontexconvert::converted(\$filecontents,
                               $env{'form.texengine'});
                 if ($env{'form.return_only_error_and_warning_counts'}) {
-                    if (&verify_html('<html><body>'.$result.'</body></html>')) {
-                        $errorcount++;
-                    }
                     $result = "$errorcount:$warningcount";
                 }
             } else {