use EscapeHTML() from PLP v3.23

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 5192c250d9a2a9f0206f6ed74d59d7b87b121a91..5c3bf078c8526631e191a14206121faff33e105b 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -23,14 +23,6 @@ are available as <a href="/digraphs.vim">ex commands</a>.</p>
 <:
 my $di = do 'digraphs.inc.pl';
 
-sub quote {
-       local $_ = shift;
-       s/"/&quot;/g;
-       s/</&lt;/g;
-       s/>/&gt;/g;
-       return $_;
-}
-
 my @chars = (
        [qw{! " % ' ( ) * + , - . /}],
        ['0'..'9'], [qw{: ; < = > ?}],
@@ -44,13 +36,13 @@ print qq'<colgroup span="$_">' for map {scalar @$_} @chars2;
 print "</colgroup><col>\n";
 for my $section (qw{thead tfoot}) {
        print "<$section><tr><th>↳";
-       print '<th>', quote($_) for map {@$_} @chars2;
+       print '<th>', EscapeHTML($_) for map {@$_} @chars2;
        print "<th>&nbsp;\n";
 }
 for my $c1group (@chars) {
        print '<tbody>';
        for my $c1 (@$c1group) {
-               print '<tr><th>', quote($c1);
+               print '<tr><th>', EscapeHTML($c1);
                for my $c2 (map {@$_} @chars2) {
                        my $mnem = $c1 . $c2;
                        if (not defined $di->{$mnem}) {
@@ -58,7 +50,7 @@ for my $c1group (@chars) {
                                next;
                        }
                        if (ref $di->{$mnem} ne 'ARRAY') {
-                               printf '<td class="X Xr" title="%s">', quote($mnem);
+                               printf '<td class="X Xr" title="%s">', EscapeHTML($mnem);
                                next;
                        }
                        my ($codepoint, $name, $prop, $script, $string) = @{ $di->{$mnem} };
@@ -68,13 +60,13 @@ for my $c1group (@chars) {
                        my $desc = $mnem . ($name && " ($name)");
                        my @class = ('X', grep {$_} $prop, $script);
 
-                       $glyph = quote($glyph);
+                       $glyph = EscapeHTML($glyph);
                        $glyph = "<span>$glyph</span>" if $prop eq 'Zs';
 
                        printf "\n".'<td class="%s" title="%s">%s',
-                               join(' ', @class), quote($desc), $glyph;
+                               join(' ', @class), EscapeHTML($desc), $glyph;
                }
-               print "\n<th>", quote($c1), "\n";
+               print "\n<th>", EscapeHTML($c1), "\n";
        }
 }
 print "</table>\n";