version 1.6, 2016/01/08 20:32:42
|
version 1.9, 2016/01/21 22:09:38
|
Line 41 use Cwd 'abs_path';
|
Line 41 use Cwd 'abs_path';
|
use XML::LibXML; |
use XML::LibXML; |
use HTML::TokeParser; # used to parse sty files |
use HTML::TokeParser; # used to parse sty files |
use Tie::IxHash; # for ordered hashes |
use Tie::IxHash; # for ordered hashes |
|
use tth; |
|
use Apache::html_to_xml; |
|
|
no warnings 'recursion'; # yes, fix_paragraph is using heavy recursion, I know |
no warnings 'recursion'; # yes, fix_paragraph is using heavy recursion, I know |
|
|
Line 126 sub post_xml {
|
Line 128 sub post_xml {
|
|
|
remove_useless_notsolved($root); |
remove_useless_notsolved($root); |
|
|
|
fix_comments($root); |
|
|
fix_paragraphs_inside($root, \@all_block); |
fix_paragraphs_inside($root, \@all_block); |
|
|
remove_empty_style($root); |
remove_empty_style($root); |
Line 552 sub replace_m {
|
Line 556 sub replace_m {
|
# Returns the HTML equivalent of LaTeX input, using tth |
# Returns the HTML equivalent of LaTeX input, using tth |
sub tth { |
sub tth { |
my ($text) = @_; |
my ($text) = @_; |
my ($fh, $tmp_path) = tempfile(); |
my $output = &tth::tth($text); |
binmode($fh, ':utf8'); |
my $errorstring = &tth::ttherror(); |
print $fh $text; |
if ($errorstring) { |
close $fh; |
die $errorstring; |
my $output = `tth -r -w2 -u -y0 < $tmp_path 2>/dev/null`; |
} |
# hopefully the temp file will not be removed before this point (otherwise we should use unlink_on_destroy 0) |
# hopefully the temp file will not be removed before this point (otherwise we should use unlink_on_destroy 0) |
$output =~ s/^\s*|\s*$//; |
$output =~ s/^\s*|\s*$//; |
$output =~ s/<div class="p"><!----><\/div>/<br\/>/; # why is tth using such ugly markup for \newline ? |
$output =~ s/<div class="p"><!----><\/div>/<br\/>/; # why is tth using such ugly markup for \newline ? |
Line 567 sub tth {
|
Line 571 sub tth {
|
sub html_to_dom { |
sub html_to_dom { |
my ($text) = @_; |
my ($text) = @_; |
$text = '<root>'.$text.'</root>'; |
$text = '<root>'.$text.'</root>'; |
my $textref = html_to_xml::html_to_xml(\$text); |
my $textref = Apache::html_to_xml::html_to_xml(\$text); |
utf8::upgrade($$textref); # otherwise the XML parser fails when the HTML parser turns into a character |
utf8::upgrade($$textref); # otherwise the XML parser fails when the HTML parser turns into a character |
my $dom_doc = XML::LibXML->load_xml(string => $textref); |
my $dom_doc = XML::LibXML->load_xml(string => $textref); |
my $root = $dom_doc->documentElement; |
my $root = $dom_doc->documentElement; |
Line 1808 sub remove_useless_notsolved {
|
Line 1812 sub remove_useless_notsolved {
|
} |
} |
} |
} |
|
|
|
# Use <pre> 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) |
# adds a paragraph inside if needed and calls fix_paragraph for all paragraphs (including new ones) |
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','body','form'); |
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'); |
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)) || |
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))) { |
# if non-empty, add paragraphs where needed between all br and remove br |
# if non-empty, add paragraphs where needed between all br and remove br |