[LON-CAPA-cvs] cvs: loncom /homework/cleanxml post_xml.pm

[damieng]

damieng		Tue Dec 15 15:33:30 2015 EDT

  Modified files:              
    /loncom/homework/cleanxml	post_xml.pm 
  Log:
  no longer block conversion when a file should be fixed by hand
  
Index: loncom/homework/cleanxml/post_xml.pm
diff -u loncom/homework/cleanxml/post_xml.pm:1.2 loncom/homework/cleanxml/post_xml.pm:1.3
--- loncom/homework/cleanxml/post_xml.pm:1.2	Tue Dec 15 15:01:01 2015
+++ loncom/homework/cleanxml/post_xml.pm	Tue Dec 15 15:33:30 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Third step to clean a file.
 #
-# $Id: post_xml.pm,v 1.2 2015/12/15 15:01:01 damieng Exp $
+# $Id: post_xml.pm,v 1.3 2015/12/15 15:33:30 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,7 +94,7 @@
   
   fix_attribute_case($root);
   
-  my $fix_by_hand = replace_m($root);
+  replace_m($root);
   
   my @all_block = (@block_elements, @block_html);
   add_sty_blocks($file_path, $res_dir, $root, \@all_block); # must come before the subs using @all_block
@@ -142,9 +142,6 @@
 
   replace_tm_dtm($root);
   
-  if ($fix_by_hand) {
-    die "The file has been converted but it should be fixed by hand.";
-  }
   return $dom_doc->toString(); # byte string !
 }
 
@@ -355,11 +352,9 @@
 # Replaces m by HTML, tm and/or dtm (which will be replaced by <m> later, but they are useful
 #   to know if the element is a block element or not).
 # m might contain non-math LaTeX, while tm and dtm may only contain math.
-# Returns 1 if the file should be fixed by hand, 0 otherwise.
 sub replace_m {
   my ($root) = @_;
   my $doc = $root->ownerDocument;
-  my $fix_by_hand = 0;
   # search for variable declarations
   my @variables = ();
   my @scripts = $root->getElementsByTagName('script');
@@ -408,7 +403,6 @@
           if ($warnings) {
             print "WARNING: <m> is used in a script, it should be converted by hand\n";
           }
-          $fix_by_hand = 1;
         }
       }
     }
@@ -423,7 +417,6 @@
       if ($warnings) {
         print "WARNING: m value is not simple text\n";
       }
-      $fix_by_hand = 1;
       next;
     }
     my $text = $m->firstChild->nodeValue;
@@ -554,7 +547,6 @@
     $m->parentNode->replaceChild($fragment, $m);
     
   }
-  return $fix_by_hand;
 }
 
 # Returns the HTML equivalent of LaTeX input, using tth