From f553cb65b157b6df9563cefa593902d59301461b Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Tue, 1 Nov 2005 16:19:34 +0000
Subject: Changes related to source-highlighting and to the manual.

* src/guile/skribilo/engine/lout.scm (lout-make-doc-cover-sheet): Fixed
  the definition of MULTI-COLUMN? (fixes a bug when producing
  multi-column documents).
  (lout-definitions): `@SkribeLeaders' renamed to `@SkribiloLeaders'.

* doc/skr/api.skr (api-search-definition): Fixed calls to `format'.

* doc/skr/manual.skr (keyword): Use `write' instead of `keyword->string'.

* doc/user/start.skb: Cosmetic changes.

* src/guile/skribilo/coloring/lisp.scm: First stab at its adaptation.

* src/guile/skribilo/coloring/xml.scm: Rewritten "by hand".

* src/guile/skribilo/evaluator.scm (skribe-include): Removed debugging
  statements.

* src/guile/skribilo/lib.scm (new): Added a trick such that users of this
  macro don't have to use `(oop goops)' and `(skribilo types)'.
  (date): New procedure.

* src/guile/skribilo/module.scm (*skribe-core-modules*): Renamed to
  `%skribe-core-modules'.
  (%skribe-core-modules): Removed `(oop goops)'.  Added `(skribilo
  source)', `(skribilo coloring lisp)' and `(skribilo coloring xml)'.

* src/guile/skribilo/skribe/api.scm (footnote): Fixed.

* src/guile/skribilo/source.scm: Cosmetic changes.

* src/guile/skribilo/types.scm: Export `language-extractor' and
  `language-fontifier'.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-11
---
 doc/skr/api.skr    | 7 ++++---
 doc/skr/manual.skr | 4 +++-
 doc/user/start.skb | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/skr/api.skr b/doc/skr/api.skr
index a27c3a4..504dd5a 100644
--- a/doc/skr/api.skr
+++ b/doc/skr/api.skr
@@ -62,14 +62,15 @@
    (let ((f (find-file/path file *skribe-source-path*)))
       (if (not (string? f))
 	  (skribe-error 'api-search-definition
-			(format "Can't find source file `~a' in path" file)
+			(format #t "can't find source file `~a' in path" file)
 			*skribe-source-path*)
 	  (with-input-from-file f
 	     (lambda ()
 		(let loop ((exp (read)))
 		   (if (eof-object? exp)
-		       (skribe-error 'api-search-definition 
-				     (format "Can't find `~a' definition" id)
+		       (skribe-error 'api-search-definition
+				     (format #t
+					     "can't find `~a' definition" id)
 				     file)
 		       (or (pred id exp) (loop (read))))))))))
 
diff --git a/doc/skr/manual.skr b/doc/skr/manual.skr
index 1982237..30b2fcd 100644
--- a/doc/skr/manual.skr
+++ b/doc/skr/manual.skr
@@ -123,7 +123,9 @@
       (markup '&source-key)
       (body (cond
 	       ((keyword? arg)
-		(keyword->string arg))
+		(with-output-to-string
+		  (lambda ()
+		    (write arg))))
 	       ((symbol? arg)
 		(string-append ":" (symbol->string arg)))
 	       (else
diff --git a/doc/user/start.skb b/doc/user/start.skb
index d437b3a..d478a7e 100644
--- a/doc/user/start.skb
+++ b/doc/user/start.skb
@@ -147,7 +147,8 @@ often need to generate some repetitive text. Skribe programming skills
 can be used to ease the construction of such documents as illustrated below.
 ,(disp 
 (itemize
- (map (lambda (x) (item [The square of ,(bold x) is ,(bold (* x x))]))
+ (map (lambda (x)
+	(item [The square of ,(bold x) is ,(bold (* x x))]))
       '(1 2 3 4 5 6 7 8 9))))
 This text has been generated with the following piece of code
 ,(prgm :language skribe [
@@ -191,6 +192,5 @@ In order to compile to various formats one must type in:])
 ,(disp :verb #t [
 $ skribe file.skb -o file.html ,(char 35) ,(it "This produces an HTML file.")
 $ skribe file.skb -o file.tex  ,(char 35) ,(it "This produces a TeX file.")
-$ skribe file.skb -o file.man  ,(char 35) ,(it "This produces a man page.")
 $ skribe file.skb -o file.info ,(char 35) ,(it "This produces an info page.")
 $ skribe file.skb -o file.mgp  ,(char 35) ,(it "This produces a MagicPoint document")])]))
-- 
cgit v1.2.3