digits: split up table method to display rows

Separate into tabletag + row loop for later customisation.

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ef0445d01d968f127be31ebc2f821affb0fed564..0a8a50a0876560bfa954c16d1a16b5d9160005e3 100644 (file)
--- 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.07';
+our $VERSION = '1.08';
 
 our $uc = do 'unicode-char.inc.pl';
 
@@ -183,7 +183,7 @@ sub cell {
 
        return sprintf('<%s>%s%s',
                join(' ', 'td',
-                       defined $title  ? qq{ title="$title"}  : (),
+                       defined $title ? qq{title="$title"}  : (),
                        @class ? sprintf('class="%s"', join ' ', @class) : (),
                        $html || (),
                ),
@@ -192,33 +192,20 @@ sub cell {
        );
 }
 
-sub table {
-       my ($self, $digraphs) = @_;
-
-       my @rows;
-
-       my @colheads;
-       while ($digraphs->[0] !~ /^\./) {
-               my $cell = shift @$digraphs or last;
-               push @colheads, sprintf(
-                       '<%s%s>%s',
-                       $cell =~ s/^-// ? 'td' : 'th',
-                       $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
-                       $cell eq '_' ? '&nbsp;' : $cell
-               );
-       }
-       push @rows, sprintf '<thead><tr>%s<tbody>', join '', @colheads if @colheads;
+sub row {
+       my ($self, $cells) = @_;
+       my @html;
 
        my $colspan = 1;
-       for my $cell (@$digraphs) {
+       for my $cell (@{$cells}) {
                if ($cell =~ s/^\.//) {
                        # dot indicates start of a new row
-                       push @rows, '<tr>';
+                       push @html, '<tr>';
                        if ($cell =~ s/^>//) {
                                # header cell text follows
                                $cell =~ s/_/ /g;  # underscores may be used instead of whitespace (for qw//ability)
                                my $class = $cell =~ s/^-// && ' class="ex"';
-                               $rows[-1] .= "<th$class>".($cell || '&nbsp;');
+                               $html[-1] .= "<th$class>".($cell || '&nbsp;');
                        }
                        next;
                }
@@ -228,24 +215,50 @@ sub table {
                        next;
                }
                elsif ($cell eq '>-') {
-                       $rows[-1] .= '<th>';
+                       $html[-1] .= '<th>';
                        next;
                }
                elsif ($cell =~ m/^</) {
-                       $rows[-1] .= '<td>'.$cell;
+                       $html[-1] .= '<td>'.$cell;
                        next;
                }
 
-               $rows[-1] .= $self->cell($cell,
+               $html[-1] .= $self->cell($cell,
                        $colspan > 1 && qq{colspan="$colspan"},
                );
 
                $colspan = 1;
        }
 
-       return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-               @{ $self->{anno} } ? ' dilabel' : '',
-               join '', map {"$_\n"} @rows;
+       return @html;
+}
+
+sub tabletag {
+       my ($self) = @_;
+       my $class = 'glyphs';
+       $class .= ' dilabel' if @{ $self->{anno} };
+       return sprintf '<table class="%s">', $class;
+}
+
+sub table {
+       my ($self, $digraphs) = @_;
+
+       my @rows;
+
+       my @colheads;
+       while ($digraphs->[0] !~ /^\./) {
+               my $cell = shift @$digraphs or last;
+               push @colheads, sprintf(
+                       '<%s%s>%s',
+                       $cell =~ s/^-// ? 'td' : 'th',
+                       $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
+                       $cell eq '_' ? '&nbsp;' : $cell
+               );
+       }
+       push @rows, sprintf '<thead><tr>%s<tbody>', join '', @colheads if @colheads;
+       push @rows, $self->row($digraphs);
+
+       return join '', map {"$_\n"} $self->tabletag, @rows, '</table>';
 }
 
 sub print {

diff --git a/digits.plp b/digits.plp
index 10625a5cda0e3cc07f5b5563f5f5b4291d342584..cfaa6eda42fbd3f8b1c916fe427a8e3f7134ed84 100644 (file)
--- a/digits.plp
+++ b/digits.plp
@@ -24,7 +24,8 @@ in various <a href="/writing">writing systems</a>.</p>
 <div>
 
 <:
-use Shiar_Sheet::FormatChar;
+use List::Util qw( pairs );
+use Shiar_Sheet::FormatChar 1.08;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 unless (exists $get{v}) {
        $glyphs->{unicode}--;
@@ -38,10 +39,13 @@ $_ = qq{<a href="/latin">$_</a>} for $scriptname->{latn} || ();
 my @table = do "writing-digits.inc.pl";
 die "Table data not found: $_\n" for $@ || $! || ();
 
-print $glyphs->table([map {
-       ref $_ eq 'ARRAY' ? @{$_} : map { ".>$_" }
-               $scriptname->{"digits_$_"} || $scriptname->{$_} || $_
-} @table]);
+say $glyphs->tabletag;
+for my $row (pairs @table) {
+       my ($id, $cols) = @{$row};
+       my $title = $scriptname->{"digits_$id"} || $scriptname->{$id} || $id;
+       print $glyphs->row([ ".>$title", @{$cols} ]);
+}
+say '</table>';
 
 :></div>