X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2876b76b7b654f43dd1668c4a963a049450ed66c..c8048ca84b6f9040ffd2b769269232f603ecbe4d:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ee0c310..ef0445d 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -8,7 +8,7 @@ use utf8;
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
 
-our $VERSION = '1.06';
+our $VERSION = '1.07';
 
 our $uc = do 'unicode-char.inc.pl';
 
@@ -31,15 +31,15 @@ sub glyph_html {
 	my ($self, $char) = @_;
 	my $codepoint = ord $char;
 	my $info = $self->glyph_info($codepoint);
-	my ($class, $name, $mnem, $html, $string) = @$info;
+	my ($class, $name, $mnem, $entity, $string) = @$info;
 
 	my $cell = EscapeHTML($string || $char);
-	my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
+	my $title = sprintf 'U+%04X%s', $codepoint, !!$name && " ($name)";
 
-	$cell = "<span>$cell</span>" if $class =~ /\bZs\b/;
+	$cell = "<span>$cell</span>" if $class and $class =~ /\bZs\b/;
 	$cell = '&nbsp;' if $cell eq '';
 
-	return ($cell, EscapeHTML($title), "X $class", $mnem, $html);
+	return ($cell, EscapeHTML($title), !!$class && "X $class", $mnem, $entity);
 }
 
 sub glyphs_html {
@@ -109,7 +109,7 @@ sub cell {
 		}
 
 		if ($self->{style} eq 'di') {
-			if ($mnem =~ /…/) {
+			if ($mnem and $mnem =~ /…/) {
 				# incomplete representation, usually partial
 			}
 			elsif ($class =~ /\bu-di\b/) {
@@ -181,10 +181,12 @@ sub cell {
 		}
 	}
 
-	return sprintf('<td%s%s%s>%s%s',
-		defined $title  ? qq{ title="$title"}  : '',
-		@class ? sprintf(' class="%s"', join ' ', @class) : '',
-		$html || '',
+	return sprintf('<%s>%s%s',
+		join(' ', 'td',
+			defined $title  ? qq{ title="$title"}  : (),
+			@class ? sprintf('class="%s"', join ' ', @class) : (),
+			$html || (),
+		),
 		$cell eq '' ? '&nbsp;' : $cell,
 		$anno,
 	);
@@ -225,9 +227,17 @@ sub table {
 			$colspan++;
 			next;
 		}
+		elsif ($cell eq '>-') {
+			$rows[-1] .= '<th>';
+			next;
+		}
+		elsif ($cell =~ m/^</) {
+			$rows[-1] .= '<td>'.$cell;
+			next;
+		}
 
 		$rows[-1] .= $self->cell($cell,
-			$colspan > 1 && qq{ colspan="$colspan"},
+			$colspan > 1 && qq{colspan="$colspan"},
 		);
 
 		$colspan = 1;