style: generic naming scheme for support classes

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 656252c34b29bdad403cc26e35010870581d2d49..c1235065f586929e72803c81948c0fab549ee671 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -6,7 +6,7 @@ use warnings;
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
 
-our $VERSION = '1.02';
+our $VERSION = '1.04';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -71,39 +71,39 @@ sub cell {
                $cell = '';
        }
        elsif ($input eq '=') {
-               push @class, 'di-invalid';
+               push @class, 'u-invalid';
                $cell = '';
        }
        else {
                push @class, 'X';
 
                if ($input =~ s/^-//) {
-                       push @class, 'di-rare'; # discouraged
+                       push @class, 'ex'; # discouraged
                }
 
                ($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
                if ($self->{digraph}) {
                        if (defined $mnem) {
-                               push @class, 'di-d'; # digraph
-                               push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+                               push @class, $class =~ /\bXz\b/ ? ('l2', 'u-prop') # unofficial
+                                       : ('l4', 'u-di'); # standard digraph
                        }
                }
                else {
                        my $codepoint = ord(substr $input, 0, 1);
                        if ($codepoint <= 0xFF) {
-                               push @class, 'di-d';  # latin1
+                               push @class, 'l4', 'u-lat1';  # latin1
                        }
                        elsif ($codepoint <= 0xD7FF) {
-                               push @class, 'di-prop';  # bmp
+                               push @class, 'l2', 'u-bmp';  # bmp
                        }
                }
 
                if ($input =~ /[ -~]/) {
-                       push @class, 'di-a'; # ascii
+                       push @class, 'l5', 'u-ascii'; # ascii
                }
                else {
-                       push @class, 'di-b'; # basic unicode
+                       push @class, 'l0'; # basic unicode
                }
        }
 
@@ -142,7 +142,7 @@ sub table {
        for my $cell (@$digraphs) {
                if ($cell =~ s/^\.//) {
                        # dot indicates start of a new row
-                       push @rows, '';
+                       push @rows, '<tr>';
                        if ($cell =~ s/^>//) {
                                # header cell text follows
                                $cell =~ s/_/ /g;  # underscores may be used instead of whitespace (for qw//ability)
@@ -165,7 +165,7 @@ sub table {
 
        return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
                $self->{digraph} || $self->{unicode} >= 0 ? ' dilabel' : '',
-               join '', map {"<tr>$_\n"} @rows;
+               join '', map {"$_\n"} @rows;
 }
 
 sub print {