From bc26e655d48aa244c44d5500962324a42b69e97c Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 12 Feb 2015 00:17:04 +0100
Subject: [PATCH] unicode: prepend unicode 6.0 support level

Distinguish more recent characters as .l2 in all modes.
In html mode, further distinguish latin1 (i.e. HTML version 3.2) subset
from HTML4 entities.
---
 Shiar_Sheet/FormatChar.pm | 17 ++++++++++-------
 unicode.plp               |  7 ++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 35f6076..8b00318 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -109,31 +109,34 @@ sub cell {
 
 		if ($self->{style} eq 'di') {
 			if ($class =~ /\bu-di\b/) {
-				push @class, ('l3', 'u-di'); # standard digraph
+				push @class, ('l4', 'u-di'); # standard digraph
 			}
 			elsif ($class =~ /\bu-prop\b/) {
-				push @class, ('l2', 'u-prop'); # unofficial
+				push @class, ('l3', 'u-prop'); # unofficial
 			}
 		}
 		elsif ($self->{style} eq 'html') {
 			if (defined $entity) {
-				push @class, ('l3', 'u-html');
+				push @class, ($codepoint <= 0xFF ? 'l4' : 'l3', 'u-html');
 			}
 		}
 		else {
 			if ($codepoint <= 0xFF) {
-				push @class, 'l3', 'u-lat1';  # latin1
+				push @class, 'l4', 'u-lat1';  # latin1
 			}
 			elsif ($codepoint <= 0xD7FF) {
-				push @class, 'l2', 'u-bmp';  # bmp
+				push @class, 'l3', 'u-bmp';  # bmp
 			}
 		}
 
 		if ($input =~ /[ -~]/) {
-			push @class, 'l4', 'u-ascii'; # ascii
+			push @class, 'l5', 'u-ascii'; # ascii
+		}
+		elsif ($input =~ /^\p{in=6.0}+$/) {
+			push @class, 'l2'; # in unicode 6.0
 		}
 		else {
-			push @class, 'l1'; # basic unicode
+			push @class, 'l1'; # any unicode
 		}
 	}}
 
diff --git a/unicode.plp b/unicode.plp
index 095b206..b14deff 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -163,9 +163,10 @@ $glyphs->print(map {
 
 <div class="legend">
 	<table class="glyphs"><tr>
-	<td class="X l4">ascii
-	<td class="X l3"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
-	<td class="X l2"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'BMP' :>
+	<td class="X l5">ascii
+	<td class="X l4"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
+	<td class="X l3"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'HTML4' :>
+	<td class="X l2">unicode ≤6.0
 	<td class="X l1">other unicode
 	<td class="X ex">discouraged
 	</table>
-- 
2.30.0