steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

modern-harvey2
Björn Lindqvist 2017-06-26 15:57:58 +02:00
parent eb62e1fe4e
commit 21500f2b2f
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/help/handbook/handbook.factor
View File

@ -362,7 +362,7 @@ ARTICLE: "handbook-tools-reference" "Developer tools"
ARTICLE: "handbook-library-reference" "Libraries" 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" } "." "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" ARTICLE: "handbook" "Factor handbook"
{ $heading "Getting started" } { $heading "Getting started" }
@ -388,7 +388,6 @@ ARTICLE: "handbook" "Factor handbook"
"primitive-index" "primitive-index"
"error-index" "error-index"
"class-index" "class-index"
} } ;
;
ABOUT: "handbook" ABOUT: "handbook"

4
basis/help/help-docs.factor
View File

@ -525,3 +525,7 @@ HELP: ABOUT:
HELP: vocab-help HELP: vocab-help
{ $values { "vocab-spec" "a vocabulary specifier" } { "help" "a help article" } } { $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: } "." } ; { $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." } ;

4
basis/help/help.factor
View File

@ -41,8 +41,8 @@ M: class word-help* drop f ;
all-words [ word-help ] filter append ; all-words [ word-help ] filter append ;
: orphan-articles ( -- seq ) : orphan-articles ( -- seq )
articles get keys articles get keys [ article-parent ] reject
[ article-parent ] reject ; { "help.home" "handbook" } diff ;
: xref-help ( -- ) : xref-help ( -- )
all-articles [ xref-article ] each ; all-articles [ xref-article ] each ;

9
misc/fuel/fuel-markup.el
View File

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