X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=bcd1a887cdb20b2b9a09b27021d83e699e78a81d;hb=127d5b70463179e8683b802bb85ec5561d3214c1;hp=3cfbc54be43acb876d8bce726fc61b442ece0d1b;hpb=17a063860b499a0fcf7b70c6f37b00d3a6ffb0d2;p=plack-app-gruntmaster.git diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm index 3cfbc54..bcd1a88 100644 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@ -9,12 +9,16 @@ use HTML::TreeBuilder; use POSIX qw//; use Data::Dumper qw/Dumper/; +my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1}; + sub ftime ($) { POSIX::strftime '%c', localtime shift } sub literal ($) { + my ($html) = @_; + return unless $html; my $b = HTML::TreeBuilder->new; $b->ignore_unknown(0); - $b->parse(shift // ''); - HTML::Element::Library::super_literal $b->guts->as_HTML; + $b->parse($html); + HTML::Element::Library::super_literal $b->guts->as_HTML(undef, undef, $optional_end_tags); } sub HTML::Element::edit_href { @@ -67,6 +71,7 @@ sub render_article { my ($art, $lang, %args) = @_; $lang //= 'en'; my $title = read_file "a/$art.$lang.title"; + chomp $title; my $meat = read_file "a/$art.$lang"; _render('skel', $lang, title => $title , meat => $meat, %args) } @@ -81,7 +86,7 @@ sub _render { $_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes'); $_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')}); $_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')}); - $tree->as_HTML; + $tree->as_HTML(undef, undef, $optional_end_tags); } sub process_skel {