--- loncom/homework/cleanxml/post_xml.pm 2015/12/15 15:01:01 1.2 +++ loncom/homework/cleanxml/post_xml.pm 2015/12/15 15:33:30 1.3 @@ -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 @@ sub post_xml { 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 @@ sub post_xml { 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 @@ sub fix_attribute_case { # Replaces m by HTML, tm and/or dtm (which will be replaced by 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 @@ sub replace_m { if ($warnings) { print "WARNING: is used in a script, it should be converted by hand\n"; } - $fix_by_hand = 1; } } } @@ -423,7 +417,6 @@ sub replace_m { 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 @@ sub replace_m { $m->parentNode->replaceChild($fragment, $m); } - return $fix_by_hand; } # Returns the HTML equivalent of LaTeX input, using tth