Update handling of the now listy Documentable.subkind

TODO

@@ -7,8 +7,6 @@ Definites:
             will allow for disambiguation pages to point to better, more
             contextful docs, and for less redundancy in the docs
             overall.
-        * Update gathering of info on routines so that things defined as
-            both subs and methods will be displayed as such.
         * Emit a warning when formatting is bad. E.g., a routine that
             doesn't have a defining code block, or a page that lacks a
             proper title.

htmlify.p6

@@ -512,7 +512,9 @@ sub write-search-file($dr) {
     });
     my %seen;
     @items.push: $dr.lookup('routine', :by<kind>).grep({!%seen{.name}++}).sort(*.name).map({
-        qq[\{ label: "{ (.subkind // 'Routine').tclc }: {escape .name}", value: "{escape .name}", url: "{ fix-url(.url) }" \}]
+        do for .subkind // 'Routine' -> $subkind {
+            qq[\{ label: "{ $subkind.tclc }: {escape .name}", value: "{escape .name}", url: "{ fix-url(.url) }" \}]
+        }
     });
     @items.push: $dr.lookup('operator', :by<kind>).map({
         qq[\{ label: "$_.human-kind() {escape .name}", value: "{escape .name}", url: "{ fix-url .url }"\}]

lib/Perl6/Documentable.pm

@@ -12,12 +12,17 @@ class Perl6::Documentable {
     # the Documentable that this one was extracted from, if any
     has $.origin;
 
+    my sub english-list (*@l) {
+        @l > 1
+            ?? @l[0..*-2].join(', ') ~ " and @l[*-1]"
+            !! ~@l[0]
+    }
     method human-kind() {   # SCNR
         $.kind eq 'operator'
             ?? "@.subkind[] operator"
             !! $.kind eq 'language'
             ?? 'language documentation'
-            !! $.subkind // $.kind;
+            !! english-list @.subkind // $.kind;
     }
 
     method filename() {