@@ -38,14 +26,6 @@ my $diinfo = do 'digraphs.inc.pl';
my %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
sort { length $a <=> length $b } keys %$diinfo;
-sub quote {
- local $_ = shift;
- s/"/"/g;
- s//>/g;
- return $_;
-}
-
sub glyph_table {
my ($digraphs) = @_;
@@ -93,6 +73,8 @@ sub glyph_table {
$cell = '';
}
else {
+ push @class, 'X';
+
if ($cell =~ s/^-//) {
push @class, 'di-rare'; # discouraged
}
@@ -106,9 +88,6 @@ sub glyph_table {
push @class, 'di-prop' # unofficial
if $diinfo->{$code}->[2] =~ /\bXz\b/;
}
- elsif (defined $name) {
- push @class, 'X';
- }
if ($cell =~ /[ -~]/) {
push @class, 'di-a'; # ascii
@@ -123,8 +102,8 @@ sub glyph_table {
defined $name ? qq{ title="$name"} : '',
@class ? sprintf(' class="%s"', join ' ', @class) : '',
$colspan > 1 && qq{ colspan="$colspan"},
- $cell eq '' ? ' ' : quote($cell),
- defined $code ? sprintf('
%s', quote($code))
+ $cell eq '' ? ' ' : EscapeHTML($cell),
+ defined $code ? sprintf('
%s', EscapeHTML($code))
: length($cell) == 1 && $cell !~ /[a-z]/
? sprintf('
%04X', 'value', ord $cell)
: '',
@@ -139,7 +118,7 @@ sub glyph_table {
sub print_glyph_tables {
while (@_) {
- printf "
%s
\n\n", shift;
+ printf '
%s
'."\n\n", shift;
while (ref $_[0] and $_ = shift) {
print glyph_table($_);
}
@@ -296,12 +275,3 @@ $verbose ? (
-
-
-