From 6a711861c63539c6f7c8aea8e5def6fde004c940 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Sat, 7 Mar 2009 13:55:22 +0100
Subject: [PATCH 1/2] FUEL: Compilation fixes.
---
extra/fuel/help/help.factor | 7 +++++--
extra/fuel/xref/xref.factor | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor
index 64d77566b5..c3b0fb168d 100644
--- a/extra/fuel/help/help.factor
+++ b/extra/fuel/help/help.factor
@@ -31,6 +31,8 @@ IN: fuel.help
: fuel-parent-topics ( word -- seq )
help-path [ dup article-title swap 2array ] map ; inline
+SYMBOL: $doc-path
+
: (fuel-word-element) ( word -- element )
\ article swap dup article-title swap
[
@@ -46,12 +48,13 @@ IN: fuel.help
] { } make 3array ;
: fuel-vocab-help-row ( vocab -- element )
- [ vocab-status-string ] [ vocab-name ] [ summary ] tri 3array ;
+ [ drop "" ] [ vocab-name ] [ summary ] tri 3array ;
: fuel-vocab-help-root-heading ( root -- element )
[ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
SYMBOL: vocab-list
+SYMBOL: describe-words
: fuel-vocab-help-table ( vocabs -- element )
[ fuel-vocab-help-row ] map vocab-list prefix ;
@@ -69,7 +72,7 @@ SYMBOL: vocab-list
all-child-vocabs fuel-vocab-list ; inline
: 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 )
dup require \ article swap dup >vocab-link
diff --git a/extra/fuel/xref/xref.factor b/extra/fuel/xref/xref.factor
index 5f5e28d1d2..ec06b9892e 100644
--- a/extra/fuel/xref/xref.factor
+++ b/extra/fuel/xref/xref.factor
@@ -3,7 +3,8 @@
USING: accessors arrays assocs definitions help.topics io.pathnames
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
From 42fc636abcf8b38e9e1d46c34010867093e86e0a Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Sat, 7 Mar 2009 14:21:23 +0100
Subject: [PATCH 2/2] FUEL: fix vocabulary list tables.
---
extra/fuel/help/help.factor | 2 +-
misc/fuel/fuel-markup.el | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor
index c3b0fb168d..6196b356ba 100644
--- a/extra/fuel/help/help.factor
+++ b/extra/fuel/help/help.factor
@@ -48,7 +48,7 @@ SYMBOL: $doc-path
] { } make 3array ;
: fuel-vocab-help-row ( vocab -- element )
- [ drop "" ] [ vocab-name ] [ summary ] tri 3array ;
+ [ vocab-name ] [ summary ] bi 2array ;
: fuel-vocab-help-root-heading ( root -- element )
[ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 3a00b70ab1..80fe8e830b 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -335,9 +335,8 @@
(defun fuel-markup--vocab-list (e)
(let ((rows (mapcar '(lambda (elem)
- (list (car elem)
- (list '$vocab-link (cadr elem))
- (caddr elem)))
+ (list (list '$vocab-link (car elem))
+ (cadr elem)))
(cdr e))))
(fuel-markup--table (cons '$table rows))))