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

Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

db4
Slava Pestov 2009-03-07 15:24:41 -06:00
parent 2cd0ebb98d 42fc636abc
commit 987a89bc4d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/fuel/help/help.factor
View File

@ -31,6 +31,8 @@ IN: fuel.help
: fuel-parent-topics ( word -- seq ) : fuel-parent-topics ( word -- seq )
help-path [ dup article-title swap 2array ] map ; inline help-path [ dup article-title swap 2array ] map ; inline
SYMBOL: $doc-path
: (fuel-word-element) ( word -- element ) : (fuel-word-element) ( word -- element )
\ article swap dup article-title swap \ article swap dup article-title swap
[ [
@ -46,12 +48,13 @@ IN: fuel.help
] { } make 3array ; ] { } make 3array ;
: fuel-vocab-help-row ( vocab -- element ) : fuel-vocab-help-row ( vocab -- element )
[ vocab-status-string ] [ vocab-name ] [ summary ] tri 3array ; [ vocab-name ] [ summary ] bi 2array ;
: fuel-vocab-help-root-heading ( root -- element ) : fuel-vocab-help-root-heading ( root -- element )
[ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ; [ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
SYMBOL: vocab-list SYMBOL: vocab-list
SYMBOL: describe-words
: fuel-vocab-help-table ( vocabs -- element ) : fuel-vocab-help-table ( vocabs -- element )
[ fuel-vocab-help-row ] map vocab-list prefix ; [ fuel-vocab-help-row ] map vocab-list prefix ;
@ -69,7 +72,7 @@ SYMBOL: vocab-list
all-child-vocabs fuel-vocab-list ; inline all-child-vocabs fuel-vocab-list ; inline
: fuel-vocab-describe-words ( name -- element ) : fuel-vocab-describe-words ( name -- element )
[ describe-words ] with-string-writer \ describe-words swap 2array ; inline [ words. ] with-string-writer \ describe-words swap 2array ; inline
: (fuel-vocab-element) ( name -- element ) : (fuel-vocab-element) ( name -- element )
dup require \ article swap dup >vocab-link dup require \ article swap dup >vocab-link

3
extra/fuel/xref/xref.factor
View File

@ -3,7 +3,8 @@
USING: accessors arrays assocs definitions help.topics io.pathnames USING: accessors arrays assocs definitions help.topics io.pathnames
kernel math math.order memoize namespaces sequences sets sorting kernel math math.order memoize namespaces sequences sets sorting
tools.crossref tools.vocabs vocabs vocabs.parser words ; tools.completion tools.crossref tools.vocabs vocabs vocabs.parser
words ;
IN: fuel.xref IN: fuel.xref

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

@ -335,9 +335,8 @@
(defun fuel-markup--vocab-list (e) (defun fuel-markup--vocab-list (e)
(let ((rows (mapcar '(lambda (elem) (let ((rows (mapcar '(lambda (elem)
(list (car elem) (list (list '$vocab-link (car elem))
(list '$vocab-link (cadr elem)) (cadr elem)))
(caddr elem)))
(cdr e)))) (cdr e))))
(fuel-markup--table (cons '$table rows)))) (fuel-markup--table (cons '$table rows))))