browser: combine versions with same support

diff --git a/browser.plp b/browser.plp
index a3068f5266077661b278b9098c429862804dccb7..49c3ec2307c4cfe5b6d9f80bcd59f5ab2465173a 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -58,17 +58,26 @@ my %CSTATUS = (
        ietf  => 'di-a', # standard
 );
 my @browsers = qw(trident gecko webkit_saf presto);
-unshift @{ $caniuse->{agents}->{gecko}->{versions} }, 2;
+my %versions;
+if (my ($somerow) = values %{ $caniuse->{data} }) {
+       while (my ($browser, $row) = each %{ $somerow->{stats} }) {
+               $versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
+       }
+}
 
 print '<table class="glyphs dimap">';
 print '<col>' x 2;
-printf '<colgroup span="%d">', scalar @{ $caniuse->{agents}->{$_}->{versions} } for @browsers;
+printf '<colgroup span="%d">', scalar @{ $versions{$_} } for @browsers;
 print "\n";
 
 print '<thead><tr>';
 print "<th>$_" for qw(feature status);
-printf '<th colspan="%d">%s', scalar @{ $_->{versions} }, $_->{browser}
-       for map { $caniuse->{agents}->{$_} } @browsers;
+printf '<th colspan="%d">%s',
+       scalar @{ $versions{$_} }, $caniuse->{agents}->{$_}->{browser}
+               for @browsers;
+# preceding row without any colspan to work around gecko bug
+print '<tr>';
+print '<td>' x $_ for 2, map { scalar @{ $versions{$_} } } @browsers;
 print "</thead>\n";
 
 for my $id (keys %{ $caniuse->{data} }) {
@@ -78,12 +87,30 @@ for my $id (keys %{ $caniuse->{data} }) {
        printf '<th title="%s">%s', $row->{description}, $row->{title};
        printf '<td title="%s" class="%s">%s', $caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $_ for $row->{status};
        for my $browser (@browsers) {
-               printf '<td class="%s">%s', $CSTATS{ $data->{$browser}->{$_} }, $_
-                       for @{ $caniuse->{agents}->{$browser}->{versions} };
+               my ($prev, @span);
+               for my $ver (@{ $versions{$browser} }, undef) {
+                       unless (!defined $prev
+                       or $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
+                               printf '<td class="%s" colspan="%d">%s',
+                                       $CSTATS{ $data->{$browser}->{$prev} },
+                                       scalar @span,
+                                       join('‒', $span[0], @span > 1 ? $span[-1] : ());
+                               undef $prev;
+                               @span = ();
+                       }
+                       push @span, $ver;
+                       $prev = $ver;
+               }
        }
 }
 print '</table>';
 
+sub paddedver {
+       # normalised version number comparable as string (cmp)
+       shift =~ /^(\d*)(.*)/;
+       return sprintf('%02d', $1) . $2;
+}
+
 :>
 <hr>