X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/141f0dc206b7f54b29627b91484782643bd08ec6..e155b6dc4a8a43375d222c6a920a59fceb23e128:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index a806258..30aab5e 100644
--- 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.03';
+our $VERSION = '1.04';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -14,7 +14,7 @@ our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
 
 sub new {
 	my ($class) = @_;
-	bless { digraph => 1, unicode => 0 }, $class;
+	bless { unicode => 0, anno => 'di', style => 'di' }, $class;
 }
 
 sub glyph_info {
@@ -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 ($self->{style} = 'di') {
 			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
+					: ('l3', 'u-di'); # standard digraph
 			}
 		}
 		else {
 			my $codepoint = ord(substr $input, 0, 1);
 			if ($codepoint <= 0xFF) {
-				push @class, 'di-d';  # latin1
+				push @class, 'l3', '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, 'l4', 'u-ascii'; # ascii
 		}
 		else {
-			push @class, 'di-b'; # basic unicode
+			push @class, 'l1'; # basic unicode
 		}
 	}
 
@@ -112,7 +112,7 @@ sub cell {
 		@class ? sprintf(' class="%s"', join ' ', @class) : '',
 		$html || '',
 		$cell eq '' ? ('&nbsp;', '') : ($cell,
-			$self->{digraph} && defined $mnem && length $mnem
+			$self->{anno} eq 'di' && defined $mnem && length $mnem
 			? sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem))
 			: $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0
 				? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
@@ -164,7 +164,7 @@ sub table {
 	}
 
 	return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-		$self->{digraph} || $self->{unicode} >= 0 ? ' dilabel' : '',
+		$self->{anno} || $self->{unicode} >= 0 ? ' dilabel' : '',
 		join '', map {"$_\n"} @rows;
 }