~ chicken-core (chicken-5) 2995b0c820cb9a28172a18f31e6f2980bb30d8f7

commit 2995b0c820cb9a28172a18f31e6f2980bb30d8f7
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Dec 11 11:24:21 2009 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Fri Dec 11 11:24:21 2009 +0100

    wiki2html tweaks

diff --git a/manual/faq b/manual/faq
index a8b05ace..effaad74 100644
--- a/manual/faq
+++ b/manual/faq
@@ -595,6 +595,7 @@ You can just set the {{CHICKEN_REPOSITORY}} environment variable.
 It should contain the path where you want eggs to be installed:
 
  $ export CHICKEN_REPOSITORY=~/chicken/
+ $ chicken-install -init
  $ chicken-install extensionname
 
 In order to make programs (including csi) see these eggs, you should set this variable when you run them.
@@ -607,9 +608,12 @@ Alternatively, you can call the {{repository-path}} Scheme procedure before load
 
 Note, however, that using {{repository-path}} as above hard-codes the location of your eggs in your source files.  While this might not be an issue in your case, it might be safe to keep this configuration outside of the source code (that is, specifying it as an environment variable) to make it easier to maintain.
 
+The repository needs to be initialized before use. See the documentation for the {{-init}} option
+to {{chicken-install}}, in [[Extensions]].
+
 ==== Can I install chicken eggs as a non-root user?
 
-Yes, just [[FAQ#Extensions#How can I install Chicken eggs to a non-default location?|install them in a directory you can write]].
+Yes, just install them in a directory you can write to by using {{CHICKEN_REPOSITORY}} (see above).
 
 ==== Why does downloading an extension via {{chicken-install}} fail on Windows Vista?
 
diff --git a/scripts/wiki2html.scm b/scripts/wiki2html.scm
index d521cbf3..ebbc03c7 100644
--- a/scripts/wiki2html.scm
+++ b/scripts/wiki2html.scm
@@ -106,7 +106,6 @@
 	 (cond ((eof-object? ln) (return #f))
 	       ((not (string-match (rx +block-element+) ln)) 
 		(cond ((string-null? ln)
-		       (display "<br />\n" out)
 		       (set! *list-continuation* #f))
 		      (else
 		       (pop-all out)
@@ -228,11 +227,15 @@
 		   ((('@ . _) . strs) strs)
 		   (_ strs))))
 	(('procedure strs ...)
-	 `(pre "\n [procedure] " ,@strs))
+	 `(b (p) "[procedure] " ,@strs (br)))
+	(('macro strs ...)
+	 `(b (p) "[syntax] " ,@strs (br)))
+	(('parameter strs ...)
+	 `(b (p) "[parameter] " ,@strs (br)))
 	(('scheme strs ...)
 	 `(pre "\n" ,@strs))
 	(('nowiki content ...)
-	 `(div ,content))
+	 `(div ,@content))
 	(((? symbol? tag) ('@ attr ...) . body)
 	 `(,tag (@ ,@attr) ,@(map walk body)))
 	(((? symbol? tag) . body)