X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f73ec42018bd7c627db8742c92636074033f19e4..0f98e302b76baf1f7a9db14bc24fa8398243046e:/browser.plp?ds=sidebyside

diff --git a/browser.plp b/browser.plp
index a101d74..83a9678 100644
--- a/browser.plp
+++ b/browser.plp
@@ -237,16 +237,16 @@ print '<thead>', $header;
 print "\n<tr>";
 for my $browser (@browsers) {
 	for (@{ $versions{$browser} }) {
-		my $lastver = $_->[-1];
-		my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$lastver};
-		my $future = defined $release;
+		my $lastver = first {
+			!defined $caniuse->{agents}->{$browser}->{verrelease}->{$_} # stable
+		} reverse @{$_};
 		printf('<td title="%s"%s>%s',
 			join(' ',
 				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct),
-				$future ? 'development' : (),
-				'version ' . join(', ', @{$_}),
+				'version ' . showversions(@{$_}, undef),
+				$_->[-1] eq $lastver ? () : '(development)',
 			),
-			$future && ' class="ex"',
+			!defined $lastver && ' class="ex"',
 			showversions($lastver),
 		);
 	}
@@ -419,7 +419,7 @@ sub saybrowsercols {
 				),
 				scalar @span,
 				$title,
-				showversions($span[0]->[0], @span > 1 ? ($span[-1]->[-1]) : ()),
+				showversions($span[0]->[0], @span > 1 ? $span[-1]->[-1] : ()),
 			);
 			undef $prev;
 			@span = ();
@@ -457,13 +457,10 @@ sub paddedver {
 }
 
 sub showversions {
-	my @span = ($_[0], @_>1 ? $_[-1] : ());
-	s/-.*// for $span[0];
-	for (@span) {
-		s/^\./0./;
-		s/x$/.*/;
-		s/.*-//;
-	}
+	# title to describe minumum version and optional maximum for multiple cells
+	my @span = (map { split /-/ } grep { defined } @_);
+	return $span[0] if @_ <= 1;
+	splice @span, 1, -1;
 	return join('‒', @span);
 }