X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9b380c329515a7f49a133d590bd5fce994438d80..6c08f60465c441baff92074c3122fcb62457658c:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index d7e5e01..0920030 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -31,12 +31,13 @@ use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
 if (exists $get{di}) {
-	$glyphs->{digraph} = defined $get{di} ? ! !$get{di} : 1;
-	$glyphs->{unicode} = 1;
+	$glyphs->{anno} = [ (!defined $get{di} || $get{di}) && 'di', 'hex' ];
 }
 if (exists $get{q}) {
-	$glyphs->{unicode} = -1;
-	$glyphs->{digraph}--;
+	$glyphs->{anno} = [];
+}
+if (exists $get{html}) {
+	$glyphs->{anno} = ['html', 'xml'];
 }
 
 our $verbose = exists $get{v};
@@ -136,8 +137,8 @@ $glyphs->print(map {
 <div class="legend">
 	<table class="glyphs"><tr>
 	<td class="X l4">ascii
-	<td class="X l3"><:= $glyphs->{digraph} ? 'digraph' : 'latin1' :>
-	<td class="X l2"><:= $glyphs->{digraph} ? 'proposed' : 'BMP' :>
+	<td class="X l3"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
+	<td class="X l2"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'BMP' :>
 	<td class="X l1">other unicode
 	<td class="X ex">discouraged
 	</table>