help: fix to make the orphan articles index page render in fuel-help

diff --git a/basis/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor
index 4f2cfc6967e875af6bef2320847b79bf52c73c0a..eb930bdd38c6fddffc01a0665ac33a4a8b4ae0c0 100644 (file)
--- a/basis/help/handbook/handbook.factor
+++ b/basis/help/handbook/handbook.factor
@@ -362,7 +362,7 @@ ARTICLE: "handbook-tools-reference" "Developer tools"
 
 ARTICLE: "handbook-library-reference" "Libraries"
 "This index lists articles from loaded vocabularies which are not subsections of any other article. To explore more vocabularies, see " { $link "vocab-index" } "."
-{ $index [ orphan-articles { "help.home" "handbook" } diff ] } ;
+{ $index [ orphan-articles ] } ;
 
 ARTICLE: "handbook" "Factor handbook"
 { $heading "Getting started" }
@@ -388,7 +388,6 @@ ARTICLE: "handbook" "Factor handbook"
   "primitive-index"
   "error-index"
   "class-index"
-}
-;
+} ;
 
 ABOUT: "handbook"

diff --git a/basis/help/help-docs.factor b/basis/help/help-docs.factor
index 84b1e8d684f0a86cec1cff298de3891edeb9e35e..aacfcaec628534a5cde2f6c8641a451843031511 100644 (file)
--- a/basis/help/help-docs.factor
+++ b/basis/help/help-docs.factor
@@ -525,3 +525,7 @@ HELP: ABOUT:
 HELP: vocab-help
 { $values { "vocab-spec" "a vocabulary specifier" } { "help" "a help article" } }
 { $description "Outputs the main help article for a vocabulary. The main help article can be set with " { $link POSTPONE: ABOUT: } "." } ;
+
+HELP: orphan-articles
+{ $values { "seq" "vocab names" } }
+{ $description "Retrieves all vocabs without parents, except for 'help.home' and 'handbook' which are special." } ;

diff --git a/basis/help/help.factor b/basis/help/help.factor
index aefae775ffd997309b03b9ed0a86995e63c83f29..c81dd921da69193cec49b23fe5f0d91f005d4418 100644 (file)
--- a/basis/help/help.factor
+++ b/basis/help/help.factor
@@ -41,8 +41,8 @@ M: class word-help* drop f ;
     all-words [ word-help ] filter append ;
 
 : orphan-articles ( -- seq )
-    articles get keys
-    [ article-parent ] reject ;
+    articles get keys [ article-parent ] reject
+    { "help.home" "handbook" } diff ;
 
 : xref-help ( -- )
     all-articles [ xref-article ] each ;

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index df72299c393bf34f8022a9d33780ea70bea26ffb..f210f075773a38fa2b2547fcb519f01f9ac990f5 100644 (file)
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -337,10 +337,11 @@
 (defun fuel-markup--index (e)
   (let* ((q (fuel-markup--index-quotation (cadr e)))
          (cmd `(:fuel* ((,q fuel-index)) "fuel"
-                       ("builtins" "help" "help.topics" "classes"
-                        "classes.builtin" "classes.tuple"
-                        "classes.singleton" "classes.union"
-                        "classes.intersection" "classes.predicate")))
+                       ("assocs" "builtins" "classes" "classes.builtin"
+                        "classes.intersection" "classes.predicate"
+                        "classes.singleton"  "classes.tuple" "classes.union"
+                        "help" "help.topics" "namespaces" "sequences"
+                        "vocabs" "words")))
          (subs (fuel-eval--retort-result (fuel-eval--send/wait cmd 200))))
     (when subs
       (let ((start (point))