From 096c7e7a47ffc41b6bf5c309120f334cfdad7972 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 15 Sep 2009 14:48:56 -0700 Subject: [PATCH] help.html: don't strip out vocabs without roots since that gets rid of private vocabs --- basis/help/html/html-tests.factor | 8 +++++++- basis/help/html/html.factor | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/basis/help/html/html-tests.factor b/basis/help/html/html-tests.factor index 90ff6c110f..b4e6103868 100644 --- 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 e8cc7e04c5..948b52a345 100644 --- 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 ) [