X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/45a41242594517a044099d34be1868be1ddabe6e..HEAD:/perl.plp

diff --git a/perl.plp b/perl.plp
index 02d0348..596e4d8 100644
--- a/perl.plp
+++ b/perl.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'perl version cheat sheet',
-	version => '1.4',
+	version => '1.6',
 	keywords => [qw'
 		perl version feature features comparison
 		sheet cheat overview summary
@@ -11,6 +11,7 @@ Html({
 	data => ['perl.inc.pl'],
 });
 
+use experimental 'signatures';
 :>
 <h1>Perl release summary</h1>
 
@@ -56,8 +57,9 @@ eval {
 	$info->{$vcore}{versum} //= "official security patches";
 
 	# «We encourage vendors to ship the most recent supported release of Perl
-	# at the time of their code freeze» with debian&ubuntu having 5 years LTS
-	my $vendoreol = ($now - ONE_YEAR * 5)->strftime('%F');
+	# at the time of their code freeze»
+	# assume debian ships after 1 year, and expires after 5 years LTS
+	my $vendoreol = ($now - ONE_YEAR * 6)->strftime('%F');
 	my $vdebian = first {
 		$info->{$_}{release} ge $vendoreol && $info->{$_}{distro}{debian}
 	} @versions;
@@ -85,36 +87,56 @@ for my $vernum (reverse sort keys %{$info}) {
 	say '<dl>';
 	for (@{ $verrow->{new} }) {
 		my ($topic, $desc, $attr) = @{$_};
-		if ($attr) {
-			my $title;
-			if (defined $attr->{experimental}) {
-				$title = 'experimental';
-			}
-			if ($attr->{dropped}) {
-				next unless exists $get{v};
-				$title = sprintf 'removed in %vd', $attr->{dropped};
-			}
-			elsif ($attr->{stable}) {
-				$title .= sprintf ' until %vd', $attr->{stable};
-			}
-			if ($attr->{experimental}) {
-				$title = sprintf '<span title="experimental::%s">%s</span>',
-					$attr->{experimental}, $title;
-				$attr->{name} //= $attr->{experimental};
-			}
-			if ($attr->{feature}) {
-				my $prefix = sprintf '<span title="%s">feature</span>',
-					$attr->{feature};
-				$title = join ', ', $prefix, $title // ();
-				$attr->{name} //= $attr->{feature};
-			}
-			$desc .= sprintf ' <em class="ex">(%s)</em>', $title if $title;
-		}
+		$desc .= featattrs($attr);
 		my $ref = defined $attr->{name} && sprintf ' id="%s"', $attr->{name};
 		say sprintf '<dt%s>%s<dd>%s', $ref, $topic, $desc || '<br/>';
 	}
+	if (my $mods = $verrow->{modules}) {
+		for (@{$mods}) {
+			my ($name, $desc, $attr) = @{$_};
+			my $ref = lc $name =~ s/::/_/gr;
+			$desc .= featattrs($attr);
+			printf '<dt id="%s"><code>use %s</code>', $ref, $name;
+			say '<dd>', $desc;
+		}
+	}
 	say sprintf '<dt>Unicode</dt><dd>v%s', $_ for $verrow->{unicode} || ();
 	say '</dl>';
 	say "</div>\n";
 }
 
+sub featattrs ($attr) {
+	$attr or return '';
+	ref $attr or $attr = {eg => $attr};
+	my $title;
+	if (defined $attr->{experimental}) {
+		$title = 'experimental';
+	}
+	if (defined $attr->{dropped}) {
+		return '' unless exists $get{v};
+		$title = sprintf 'removed in %vd', $_ for $attr->{dropped} || ();
+	}
+	elsif ($attr->{stable}) {
+		$title .= sprintf ' until %vd', $attr->{stable};
+	}
+	if ($attr->{experimental}) {
+		$title = sprintf '<span title="experimental::%s">%s</span>',
+			$attr->{experimental}, $title;
+		$attr->{name} //= $attr->{experimental};
+	}
+	if ($attr->{feature}) {
+		my $prefix = sprintf '<span title="%s">feature</span>',
+			$attr->{feature};
+		$title = join ', ', $prefix, $title // ();
+		$attr->{name} //= $attr->{feature};
+	}
+	$title = $title ? sprintf ' <em class="ex">(%s)</em>', $title : '';
+
+	if (my $eg = $attr->{eg}) {
+		my $pre = Entity($eg);
+		$pre =~ s<\N{ZERO WIDTH SPACE}>{</code><wbr/><code>}g;
+		$pre = " <small>{<code>$pre</code>}</small>";
+		$title = $pre . $title;
+	}
+	return $title;
+}