browser: assume notes are valid html

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index b2a7867fd7a402b64bfd45971c3abf88bbd526a8..7c494e9403c406c59e6afd4100fbf85130bcfcda 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -236,7 +236,8 @@ sub saytitlecol {
        } $row->{title};
        print '<div class=aside>';
        s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-               Entity($row->{description}), formathtml($row->{notes});  # sic
+               Entity($row->{description}),
+               map { s/\s*\n/\n<br>/g; $_ } $row->{notes};
        printf 'Resources: %s.', join(', ', map {
                sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
        } @$_) for grep { @$_ } $row->{links} // ();
@@ -310,16 +311,6 @@ for my $id (sort {
 say '</tbody>';
 say '</table>';
 
-sub formathtml {
-       my $ref = defined wantarray ? [@_] : \@_;
-       for (@$ref) {
-               s/& (?!\w)/&amp;/gx;
-               s/< \s/&lt;/gx;
-               s/\n\K\n/<br>/g;
-       }
-       return @$ref;
-}
-
 sub paddedver {
        # normalised version number comparable as string (cmp)
        shift =~ /(?:.*-|^)(\d*)(.*)/;
@@ -329,10 +320,11 @@ sub paddedver {
 
 sub showversions {
        my @span = ($_[0], @_>1 ? $_[-1] : ());
+       s/-.*// for $span[0];
        for (@span) {
                s/^\./0./;
                s/x$/.*/;
-               s/-.*//;
+               s/.*-//;
        }
        return join('‒', @span);
 }