version 1.4, 2015/12/18 22:07:42
|
version 1.6, 2016/01/08 20:32:42
|
Line 50 my @inline_like_block = ('stringresponse
|
Line 50 my @inline_like_block = ('stringresponse
|
my @responses = ('stringresponse','optionresponse','numericalresponse','formularesponse','mathresponse','organicresponse','reactionresponse','customresponse','externalresponse','essayresponse','radiobuttonresponse','matchresponse','rankresponse','imageresponse','functionplotresponse'); |
my @responses = ('stringresponse','optionresponse','numericalresponse','formularesponse','mathresponse','organicresponse','reactionresponse','customresponse','externalresponse','essayresponse','radiobuttonresponse','matchresponse','rankresponse','imageresponse','functionplotresponse'); |
my @block_html = ('html','head','body','section','h1','h2','h3','h4','h5','h6','div','p','ul','ol','li','table','tbody','tr','td','th','dl','dt','dd','pre','noscript','hr','address','blockquote','object','applet','embed','map','form','fieldset','iframe','center','frameset'); |
my @block_html = ('html','head','body','section','h1','h2','h3','h4','h5','h6','div','p','ul','ol','li','table','tbody','tr','td','th','dl','dt','dd','pre','noscript','hr','address','blockquote','object','applet','embed','map','form','fieldset','iframe','center','frameset'); |
my @no_newline_inside = ('import','parserlib','scriptlib','data','function','label','xlabel','ylabel','tic','text','rectangle','image','title','h1','h2','h3','h4','h5','h6','li','td','p'); |
my @no_newline_inside = ('import','parserlib','scriptlib','data','function','label','xlabel','ylabel','tic','text','rectangle','image','title','h1','h2','h3','h4','h5','h6','li','td','p'); |
my @preserve_elements = ('script','answer','pre'); |
my @preserve_elements = ('script','answer','pre','style'); |
my @accepting_style = ('section','h1','h2','h3','h4','h5','h6','div','p','li','td','th','dt','dd','pre','blockquote'); |
my @accepting_style = ('section','h1','h2','h3','h4','h5','h6','div','p','li','td','th','dt','dd','pre','blockquote'); |
my @latex_math = ('\alpha', '\theta', '\omicron', '\tau', '\beta', '\vartheta', '\pi', '\upsilon', '\gamma', '\gamma', '\varpi', '\phi', '\delta', '\kappa', '\rho', '\varphi', '\epsilon', '\lambda', '\varrho', '\chi', '\varepsilon', '\mu', '\sigma', '\psi', '\zeta', '\nu', '\varsigma', '\omega', '\eta', '\xi', |
my @latex_math = ('\alpha', '\theta', '\omicron', '\tau', '\beta', '\vartheta', '\pi', '\upsilon', '\gamma', '\gamma', '\varpi', '\phi', '\delta', '\kappa', '\rho', '\varphi', '\epsilon', '\lambda', '\varrho', '\chi', '\varepsilon', '\mu', '\sigma', '\psi', '\zeta', '\nu', '\varsigma', '\omega', '\eta', '\xi', |
'\Gamma', '\Lambda', '\Sigma', '\Psi', '\Delta', '\Xi', '\Upsilon', '\Omega', '\Theta', '\Pi', '\Phi', |
'\Gamma', '\Lambda', '\Sigma', '\Psi', '\Delta', '\Xi', '\Upsilon', '\Omega', '\Theta', '\Pi', '\Phi', |
Line 150 sub fix_structure {
|
Line 150 sub fix_structure {
|
# the root element has already been added in pre_xml |
# the root element has already been added in pre_xml |
my $root = $doc->documentElement; |
my $root = $doc->documentElement; |
# inside the root, replace html, problem and library elements by their content |
# inside the root, replace html, problem and library elements by their content |
my @toreplace = ('html','problem','library'); |
my @toreplace = ('html','problem','library','Task'); |
foreach my $name (@toreplace) { |
foreach my $name (@toreplace) { |
my @elements = $root->getElementsByTagName($name); |
my @elements = $root->getElementsByTagName($name); |
foreach my $element (@elements) { |
foreach my $element (@elements) { |
Line 1812 sub remove_useless_notsolved {
|
Line 1812 sub remove_useless_notsolved {
|
sub fix_paragraphs_inside { |
sub fix_paragraphs_inside { |
my ($node, $all_block) = @_; |
my ($node, $all_block) = @_; |
# blocks in which paragrahs will be added: |
# 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','form'); |
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 @fix_p_if_br_or_p = (@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote'); |
if ((string_in_array(\@blocks_with_p, $node->nodeName) && paragraph_needed($node)) || |
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))) { |
(string_in_array(\@fix_p_if_br_or_p, $node->nodeName) && paragraph_inside($node))) { |
Line 2394 sub pretty {
|
Line 2394 sub pretty {
|
my $type = $node->nodeType; |
my $type = $node->nodeType; |
if ($type == XML_ELEMENT_NODE) { |
if ($type == XML_ELEMENT_NODE) { |
my $name = $node->nodeName; |
my $name = $node->nodeName; |
if ((string_in_array($all_block, $name) || string_in_array(\@inline_like_block, $name)) && |
if (string_in_array(\@preserve_elements, $name)) { |
!string_in_array(\@preserve_elements, $name)) { |
# remove newlines at the beginning and the end of preserve elements |
|
if (defined $node->firstChild && ($node->firstChild->nodeType == XML_TEXT_NODE || |
|
$node->firstChild->nodeType == XML_CDATA_SECTION_NODE)) { |
|
my $text = $node->firstChild->nodeValue; |
|
$text =~ s/^\n+//; |
|
if ($text eq '') { |
|
$node->removeChild($node->firstChild); |
|
} else { |
|
$node->firstChild->setData($text); |
|
} |
|
} |
|
if (defined $node->lastChild && ($node->lastChild->nodeType == XML_TEXT_NODE || |
|
$node->lastChild->nodeType == XML_CDATA_SECTION_NODE)) { |
|
my $text = $node->lastChild->nodeValue; |
|
$text =~ s/\n+$//; |
|
if ($text eq '') { |
|
$node->removeChild($node->lastChild); |
|
} else { |
|
$node->lastChild->setData($text); |
|
} |
|
} |
|
} elsif (string_in_array($all_block, $name) || string_in_array(\@inline_like_block, $name)) { |
# make sure there is a newline at the beginning and at the end if there is anything inside |
# make sure there is a newline at the beginning and at the end if there is anything inside |
if (defined $node->firstChild && !string_in_array(\@no_newline_inside, $name)) { |
if (defined $node->firstChild && !string_in_array(\@no_newline_inside, $name)) { |
my $first = $node->firstChild; |
my $first = $node->firstChild; |
Line 2478 sub pretty {
|
Line 2499 sub pretty {
|
if ($text eq '') { |
if ($text eq '') { |
$node->removeChild($node->lastChild); |
$node->removeChild($node->lastChild); |
} else { |
} else { |
$node->lastChild->setData($text); |
|
} |
|
} |
|
} elsif (string_in_array(\@preserve_elements, $name)) { |
|
# collapse newlines at the beginning and the end of scripts |
|
if (defined $node->firstChild && $node->firstChild->nodeType == XML_TEXT_NODE) { |
|
my $text = $node->firstChild->nodeValue; |
|
$text =~ s/^\n( *\n)+/\n/; |
|
if ($text eq '') { |
|
$node->removeChild($node->firstChild); |
|
} else { |
|
$node->firstChild->setData($text); |
|
} |
|
} |
|
if (defined $node->lastChild && $node->lastChild->nodeType == XML_TEXT_NODE) { |
|
my $text = $node->lastChild->nodeValue; |
|
$text =~ s/\n( *\n)+$/\n/; |
|
if ($text eq '') { |
|
$node->removeChild($node->lastChild); |
|
} else { |
|
$node->lastChild->setData($text); |
$node->lastChild->setData($text); |
} |
} |
} |
} |