source: encode vim output before link parsing

[sheet.git] / source.plp

diff --git a/source.plp b/source.plp
index f476ee8d3a2a41259cf67d00651cfe0d2a31c2ed..469f49e7250344926b12592ab535e7d154cf1077 100644 (file)
--- a/source.plp
+++ b/source.plp
@@ -68,6 +68,7 @@ else {
        }
        -r $source or die "Requested file not found\n";
 
+       require Encode;
        if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
                delete $Text::VimColor::SYNTAX_TYPE{Underlined};
                my %TYPETAG = (
@@ -83,23 +84,24 @@ else {
                my $parsed = $hl->marked;
                print "<pre>\n";
                foreach (@$parsed) {
-                       my $tag = $_->[0] && ($TYPETAG{ $_->[0] } || 'span');
+                       my ($type, $contents) = @{$_};
+                       $contents = Encode::decode_utf8($contents);
+                       my $tag = $type && ($TYPETAG{$type} || 'span');
                        my $arg = '';
-                       print "<$tag$arg class=\"sy-\l$_->[0]\">" if $tag;
-                       if (!$_->[0] || $_->[0] eq 'Constant'
-                       and $_->[1] =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
+                       print "<$tag$arg class=\"sy-\l$type\">" if $tag;
+                       if (!$type || $type eq 'Constant'
+                       and $contents =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
                                printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
                        }
-                       if (!$_->[0] and $_->[1] =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
+                       if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
                                printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
                        }
-                       print Text::VimColor::_xml_escape($_->[1]);
+                       print Text::VimColor::_xml_escape($contents);
                        print "</$tag>" if $tag;
                }
                print "</pre>\n";
        }
        else {
-               require Encode;
                print "<pre>\n";
                print EscapeHTML(Encode::decode_utf8(ReadFile($source)));
                print "</pre>\n";