Cleaned up the source tree and the installation process.

Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-6
   Cosmetic changes.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-7
   Removed useless files, integrated packages.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-8
   Removed useless files, integrated packages.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-9
   Moved the STkLos and Bigloo code to `legacy'.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-10
   Installed Autoconf/Automake machinery.  Fixed a few things.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-11
   Changes related to source-highlighting and to the manual.


git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-10

3 files changed, 35 insertions, 19 deletions

diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
new file mode 100644
index 0000000..33d16ce
--- /dev/null
+++ b/doc/user/Makefile.am
@@ -0,0 +1,22 @@
+BUILT_SOURCES = user.html
+
+skribilo = $(top_srcdir)/src/guile/skribilo.scm
+load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package
+
+%.html: %.skb
+	GUILE_LOAD_PATH=$(load_path) \
+	$(skribilo) --target html -I ../ -o $@ $<
+
+if HAVE_LOUT
+
+BUILT_SOURCES += user.ps
+
+%.lout: %.skb
+	GUILE_LOAD_PATH=$(load_path) \
+	$(skribilo) --target lout -I ../ -o $@ $<
+
+%.ps: %.lout
+	$(LOUT) -c $(<:%.lout=%) -o $@ $<
+
+endif
+
diff --git a/doc/user/start.skb b/doc/user/start.skb
index f3c1e28..d478a7e 100644
--- a/doc/user/start.skb
+++ b/doc/user/start.skb
@@ -14,13 +14,12 @@
 ;*---------------------------------------------------------------------*/
 (chapter :title "Getting Started"
 
-(p [
-In this chapter, the syntax of a Skribe text is presented ,(emph "informally").
-In particular, the Skribe syntax is compared to the HTML syntax. Then,
-it is presented how one can use Skribe to make dynamic text
-(i.e texts which are generated by the system rather than entered-in by hand. 
-Finally, It is also
-presented how Skribe source files can be processed.])
+(p [ In this chapter, the syntax of a Skribe text is presented ,(emph
+"informally").  In particular, the Skribe syntax is compared to the HTML
+syntax. Then, it is presented how one can use Skribe to make dynamic
+text (i.e texts which are generated by the system rather than entered-in
+by hand).  Finally, It is also presented how Skribe source files can be
+processed.])
 
 ;*--- Hello world -----------------------------------------------------*/
 (section :title "Hello World!" [
@@ -148,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 [
@@ -192,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")])]))
diff --git a/doc/user/user.skb b/doc/user/user.skb
index 3710be9..d5ed06b 100644
--- a/doc/user/user.skb
+++ b/doc/user/user.skb
@@ -36,21 +36,16 @@
 ;*---------------------------------------------------------------------*/
 ;*    The document                                                     */
 ;*---------------------------------------------------------------------*/
-(document :title "Skribe User Manual"
+(document :title "Skribilo User Manual"
    :env '((example-counter 0) (example-env ()))
    :author (list (author :name "Erick Gallesio"
 		    :affiliation "Université de Nice - Sophia Antipolis"
-		    :address '("930 route des Colles, BP 145"
-			       "F-06903 Sophia Antipolis, Cedex"
-			       "France")
 		    :email (mailto "eg@essi.fr"))
 		 (author :name "Manuel Serrano"
 		    :affiliation "Inria Sophia-Antipolis"
-		    :address `("2004 route des Lucioles - BP 93"
-			       "F-06902 Sophia Antipolis, Cedex"
-			       "France")
-		    :url (ref :url *serrano-url*)
-		    :email (mailto *serrano-mail*)))
+		    :email (mailto *serrano-mail*))
+		 (author :name "Ludovic Courtès"
+		    :email (mailto *courtes-mail*)))
    
    (linebreak 1)
    (center (frame (bold (font :size 1. [
@@ -120,7 +115,7 @@ as HTML, Info pages, man pages, Postscript, etc.]))))
 (include "bib.skb")
 
 ;;; Computer programs
-(include "prgm.skb")
+;;(include "prgm.skb")
 
 ;;; Standard Library
 (include "lib.skb")