--- loncom/homework/cleanxml/post_xml.pm 2016/01/14 16:28:06 1.7
+++ loncom/homework/cleanxml/post_xml.pm 2017/01/17 20:29:06 1.12
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Third step to clean a file.
#
-# $Id: post_xml.pm,v 1.7 2016/01/14 16:28:06 damieng Exp $
+# $Id: post_xml.pm,v 1.12 2017/01/17 20:29:06 damieng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,12 +128,16 @@ sub post_xml {
remove_useless_notsolved($root);
+ fix_comments($root);
+
fix_paragraphs_inside($root, \@all_block);
remove_empty_style($root);
fix_empty_lc_elements($root);
+ reduce_empty_p($root);
+
lowercase_attribute_values($root);
replace_numericalresponse_unit_attribute($root);
@@ -426,6 +430,15 @@ sub replace_m {
my $var_key1 = 'dfhg3df54hg65hg4';
my $var_key2 = 'dfhg654d6f5g4h5f';
my $eval = defined $m->getAttribute('eval') && $m->getAttribute('eval') eq 'on';
+ my $display = $m->getAttribute('display');
+ if (defined $display) {
+ if ($display eq '') {
+ $display = undef;
+ }
+ if (lc($display) eq 'jsmath') {
+ $display = 'mathjax';
+ }
+ }
if ($eval) {
# replace variables
foreach my $variable (@variables) {
@@ -463,6 +476,9 @@ sub replace_m {
if ($eval) {
$new_node->setAttribute('eval', 'on');
}
+ if (defined $display) {
+ $new_node->setAttribute('display', $display);
+ }
$new_node->appendChild($doc->createTextNode($new_text));
$m->parentNode->replaceChild($new_node, $m);
next;
@@ -493,7 +509,7 @@ sub replace_m {
# there are math separators inside, even after hiding variables, or there was no math symbol
# hide math parts inside before running tth
- my $math_key1 = '#ghjgdh5hg45gf';
+ my $math_key1 = '#5752398247516385';
my $math_key2 = '#';
my @maths = ();
my @separators = (['$$','$$'], ['\\(','\\)'], ['\\[','\\]'], ['$','$']);
@@ -524,14 +540,30 @@ sub replace_m {
$math =~ s/&/&/g;
$math =~ s/</g;
$math =~ s/>/>/g;
+ my ($mel, $inside);
if ($math =~ /^\$\$(.*)\$\$$/s) {
- $math = '
for multi-line comments without elements. +sub fix_comments { + my ($root) = @_; + my $doc = $root->ownerDocument; + my @comments = $root->getElementsByTagName('comment'); + foreach my $comment (@comments) { + my $first = $comment->firstChild; + if (defined $first) { + if ($first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /\n/ && + !defined $first->nextSibling) { + my $pre = $doc->createElement('pre'); + $comment->removeChild($first); + $comment->appendChild($pre); + $pre->appendChild($first); + } + } + } +} + # adds a paragraph inside if needed and calls fix_paragraph for all paragraphs (including new ones) sub fix_paragraphs_inside { my ($node, $all_block) = @_; # blocks in which paragrahs will be added: - my @blocks_with_p = ('loncapa','library','problem','part','problemtype','window','block','while','postanswerdate','preduedate','solved','notsolved','languageblock','instructorcomment','togglebox','standalone','body','form'); - my @fix_p_if_br_or_p = (@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote'); + my @blocks_with_p = ('loncapa','library','problem','part','problemtype','window','block','while','postanswerdate','preduedate','languageblock','instructorcomment','togglebox','standalone','body','form'); + my @fix_p_if_br_or_p = (@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote','solved','notsolved'); if ((string_in_array(\@blocks_with_p, $node->nodeName) && paragraph_needed($node)) || (string_in_array(\@fix_p_if_br_or_p, $node->nodeName) && paragraph_inside($node))) { # if non-empty, add paragraphs where needed between all br and remove br @@ -1835,6 +1886,18 @@ sub fix_paragraphs_inside { push(@new_children, $doc->createElement('p')); } $p = undef; + # ignore the next node if it is a br (the paragraph default margin will take as much space) + # (ignoring whitespace) + while (defined $next && $next->nodeType == XML_TEXT_NODE && $next->nodeValue =~ /^[ \t\f\n\r]*$/) { + my $next2 = $next->nextSibling; + $node->removeChild($next); + $next = $next2; + } + if (defined $next && $next->nodeType == XML_ELEMENT_NODE && $next->nodeName eq 'br') { + my $next2 = $next->nextSibling; + $node->removeChild($next); + $next = $next2; + } } elsif ($child->nodeType == XML_ELEMENT_NODE && string_in_array(\@inline_like_block, $child->nodeName)) { # inline_like_block: use the paragraph if there is one, otherwise do not create one if (defined $p) { @@ -2011,6 +2074,20 @@ sub fix_paragraph { if (!defined $left || !$left_needs_p) { $replacement->appendChild($middle); } + # ignore the next node if it is a br (the paragraph default margin will take as much space) + my $first_right; + if (defined $right) { + $first_right = $right->firstChild; + # ignore non-nbsp whitespace + while (defined $first_right && $first_right->nodeType == XML_TEXT_NODE && + $first_right->nodeValue =~ /^[ \t\f\n\r]*$/) { + $first_right = $first_right->nextSibling; + } + } + if (defined $first_right && $first_right->nodeType == XML_ELEMENT_NODE && + $first_right->nodeName eq 'br') { + $right->removeChild($first_right); + } } else { fix_paragraphs_inside($n, $all_block); $replacement->appendChild($n); @@ -2247,6 +2324,33 @@ sub fix_empty_lc_elements { } } } + +# remove consecutive empty paragraphs (they will not show anyway) +sub reduce_empty_p { + my ($node) = @_; + my $next; + for (my $child=$node->firstChild; defined $child; $child=$next) { + $next = $child->nextSibling; + while (defined $next && $next->nodeType == XML_TEXT_NODE && $next->nodeValue =~ /^[ \t\f\n\r]*$/) { + $next = $next->nextSibling; + } + if ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName eq 'p' && defined $next && + $next->nodeType == XML_ELEMENT_NODE && $next->nodeName eq 'p') { + my $first = $child->firstChild; + if (!defined $first || (!defined $first->nextSibling && + $first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /^[ \t\f\n\r]*$/)) { + $first = $next->firstChild; + if (!defined $first || (!defined $first->nextSibling && + $first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /^[ \t\f\n\r]*$/)) { + $node->removeChild($child); + } + } + } + if ($child->nodeType == XML_ELEMENT_NODE) { + reduce_empty_p($child); + } + } +} # turn some attribute values into lowercase when they should be sub lowercase_attribute_values {