help.html: don't strip out vocabs without roots since that gets rid of private vocabs

diff --git a/basis/help/html/html-tests.factor b/basis/help/html/html-tests.factor
index 90ff6c110faefadb101325f9f3dc773942534d3a..b4e6103868b92ce6be55acc90ce44602980095a4 100644 (file)
--- a/basis/help/html/html-tests.factor
+++ b/basis/help/html/html-tests.factor
@@ -1,6 +1,12 @@
-USING: help.html tools.test help.topics kernel ;
+USING: help.html tools.test help.topics kernel sequences vocabs ;
 IN: help.html.tests
 
 [ ] [ "xml" >link help>html drop ] unit-test
 
 [ "article-foobar.html" ] [ "foobar" >link topic>filename ] unit-test
+
+[ t ] [ all-vocabs-really [ vocab-spec? ] all? ] unit-test
+
+[ t ] [ all-vocabs-really [ vocab-name "sequences.private" = ] any? ] unit-test
+
+[ f ] [ all-vocabs-really [ vocab-name "scratchpad" = ] any? ] unit-test

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index e8cc7e04c544fc878e480593842b95c3053a7423..948b52a345bb617d568ee12af1f871052d0cc9d0 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -73,7 +73,8 @@ M: topic url-of topic>filename ;
     dup topic>filename utf8 [ help>html write-xml ] with-file-writer ;
 
 : all-vocabs-really ( -- seq )
-    all-vocabs-recursive >hashtable f over delete-at no-roots remove-redundant-prefixes ;
+    all-vocabs-recursive >hashtable no-roots remove-redundant-prefixes
+    [ vocab-name "scratchpad" = not ] filter ;
 
 : all-topics ( -- topics )
     [