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

8 files changed, 462 insertions, 254 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 934389e..7a177fc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,233 +1,420 @@
-#*=====================================================================*/
-#*    serrano/prgm/project/skribe/doc/Makefile                         */
-#*    -------------------------------------------------------------    */
-#*    Author      :  Manuel Serrano                                    */
-#*    Creation    :  Mon Sep  1 10:29:28 2003                          */
-#*    Last change :  Wed Mar 10 11:16:48 2004 (serrano)                */
-#*    Copyright   :  2003-04 Manuel Serrano                            */
-#*    -------------------------------------------------------------    */
-#*    The Makefile to build the Skribe documentation.                  */
-#*=====================================================================*/
-include ../etc/Makefile.config
-include ../etc/$(SYSTEM)/Makefile.skb
-
-#*---------------------------------------------------------------------*/
-#*    Compiler and tools                                               */
-#*---------------------------------------------------------------------*/
-BINDIR		= ../bin
-LIBDIR		= ../lib
-LATEX		= latex
-DVIPS		= dvips
-
-SKRIBEVERBOSE	= -v1
-SKRIBEWARNING	= -w1
-SFLAGS		= $(SKRIBEVERBOSE) $(SKRIBEWARNING) \
-                  -I ../skr \
-                  -I skr \
-                  -P img \
-                  -S .. \
-                  --custom emit-sui=yes \
-                  --eval '(define *skribe-bin* "$(SKRIBE)")' \
-                  --eval '(define *skribebibtex-bin* "$(SKRIBEBIBTEX)")'
-
-#*---------------------------------------------------------------------*/
-#*    Doc skr                                                          */
-#*---------------------------------------------------------------------*/
-_SKR		= manual.skr env.skr api.skr extension.skr
-SKR		= $(_SKR:%=skr/%)
-
-#*---------------------------------------------------------------------*/
-#*    Images                                                           */
-#*---------------------------------------------------------------------*/
-_IMG		= bsd.gif lambda.gif linux.gif
-IMG		= $(_IMG:%=img/%) 
-
-#*---------------------------------------------------------------------*/
-#*    User document                                                    */
-#*---------------------------------------------------------------------*/
-_USERMAIN	= user.skb
-_USEROTHERS	= start.skb syntax.skb \
-                  markup.skb document.skb \
-                  sectioning.skb toc.skb ornament.skb line.skb font.skb \
-		  justify.skb enumeration.skb \
-                  examples.skb colframe.skb figure.skb image.skb table.skb \
-                  footnote.skb char.skb \
-                  links.skb index.skb bib.skb prgm.skb \
-                  engine.skb htmle.skb latexe.skb xmle.skb \
-                  emacs.skb skribec.skb skribe-config.skb \
-                  lib.skb slide.skb package.skb
-_USERSRC	= start1.skb start2.skb start3.skb start4.skb  start5.skb \
-                  api1.skb api2.skb api3.skb api4.skb api5.skb \
-                  api6.skb api7.skb api8.skb api9.skb api10.skb \
-                  api11.skb api12.skb api13.skb api14.skb api15.skb \
-                  api16.skb api17.skb api18.skb api19.skb api20.skb \
-                  links1.skb links2.skb \
-                  index1.skb index2.skb index3.skb \
-                  bib1.sbib bib2.skb bib3.skb bib4.skb bib5.skb bib6.skb \
-                  prgm1.skb prgm2.skb prgm3.skb slides.skb
-
-USERMAIN	= $(_USERMAIN:%=user/%) 
-USEROTHERS	= $(_USEROTHERS:%=user/%) 
-USERSRC		= $(_USERSRC:%=user/src/%) 
-USERSKB		= $(USERMAIN) $(USEROTHERS) $(USERSRC)
-
-#*---------------------------------------------------------------------*/
-#*    User document                                                    */
-#*---------------------------------------------------------------------*/
-_DIRMAIN	= dir.skb
-_DIROTHERS	= 
-_DIRSRC		= 
-
-DIRMAIN		= $(_DIRMAIN:%=dir/%) 
-DIROTHERS	= $(_DIROTHERS:%=dir/%) 
-DIRSRC		= $(_DIRSRC:%=dir/src/%) 
-DIRSKB		= $(DIRMAIN) $(DIROTHERS) $(DIRSRC)
-
-#*---------------------------------------------------------------------*/
-#*    Suffixes                                                         */
-#*---------------------------------------------------------------------*/
-.SUFFIXES:
-.SUFFIXES: .skb .man .html .sui
-
-#*---------------------------------------------------------------------*/
-#*    All                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: user dir
-
-all: user dir
-re: re.html re.dir
-
-#*---------------------------------------------------------------------*/
-#*    pop                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: pop
-
-pop:
-	@ echo doc/Makefile doc/Makefile.dir
-	@ echo $(USERSKB:%=doc/%)
-	@ echo $(DIRSKB:%=doc/%)
-	@ echo $(SKR:%=doc/%)
-	@ echo $(IMG:%=doc/%)
-
-#*---------------------------------------------------------------------*/
-#*    user                                                             */
-#*---------------------------------------------------------------------*/
-.PHONY: user re.html user.html
-
-user: user.html user.sui
-user.html: html/user.html html/img/lambda.gif html/img/bsd.gif html/img/linux.gif
-user.sui: html/user.sui
-
-user.ps: tex/user.dvi
-	(cd tex; $(DVIPS) user.dvi -o user.ps)
-
-user.dvi: tex/user.dvi
-tex/user.dvi: tex/user.tex
-	(cd tex; $(LATEX) user.tex)
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# doc/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/skribilo
+pkglibdir = $(libdir)/skribilo
+pkgincludedir = $(includedir)/skribilo
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/ludo/src/skribilo/missing --run aclocal-1.9
+AMTAR = ${SHELL} /home/ludo/src/skribilo/missing --run tar
+AUTOCONF = ${SHELL} /home/ludo/src/skribilo/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ludo/src/skribilo/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ludo/src/skribilo/missing --run automake-1.9
+AWK = gawk
+CYGPATH_W = echo
+DEFS = -DPACKAGE_NAME=\"skribilo\" -DPACKAGE_TARNAME=\"skribilo\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"skribilo\ 1.2\" -DPACKAGE_BUGREPORT=\"ludovic.courtes@laas.fr\" -DPACKAGE=\"skribilo\" -DVERSION=\"1.2\" 
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+GUILE = /usr/bin/guile
+GUILE_CONFIG = /usr/bin/guile-config
+GUILE_SITE = /usr/share/guile/site
+GUILE_TOOLS = /usr/bin/guile-tools
+HAVE_LOUT_FALSE = #
+HAVE_LOUT_TRUE = 
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LIBOBJS = 
+LIBS = 
+LOUT = /usr/bin/lout
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/ludo/src/skribilo/missing --run makeinfo
+PACKAGE = skribilo
+PACKAGE_BUGREPORT = ludovic.courtes@laas.fr
+PACKAGE_NAME = skribilo
+PACKAGE_STRING = skribilo 1.2
+PACKAGE_TARNAME = skribilo
+PACKAGE_VERSION = 1.2
+PATH_SEPARATOR = :
+SET_MAKE = 
+SHELL = /bin/sh
+SKRIBILO_DOC_DIR = ${prefix}/share/doc/skribilo
+SKRIBILO_EXT_DIR = ${prefix}/share/skribilo/1.2/
+SKRIBILO_SKR_PATH = /usr/share/guile/site/
+STRIP = 
+VERSION = 1.2
+ac_ct_STRIP = 
+am__leading_dot = .
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build_alias = 
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host_alias = 
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/ludo/src/skribilo/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+mkdir_p = mkdir -p --
+oldincludedir = /usr/include
+prefix = /usr/local
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias = 
+SUBDIRS = user
+all: all-recursive
 
-html/user.html html/user.sui: html $(USERSKB) $(SKR) 
-	$(MAKE) re.html
-
-tex/user.tex: tex $(USERSKB) $(SKR) tex/img/lambda.eps tex/img/bsd.eps tex/img/linux.eps
-	$(MAKE) re.tex
-
-# gif
-html/img/lambda.gif: html/img img/lambda.gif
-	cp img/lambda.gif html/img/lambda.gif
-
-html/img/linux.gif: html/img img/linux.gif
-	cp img/linux.gif html/img/linux.gif
-
-html/img/bsd.gif: html/img img/bsd.gif
-	cp img/bsd.gif html/img/bsd.gif
-
-# eps image
-tex/img/lambda.eps: tex/img img/lambda.gif
-	convert img/lambda.gif tex/img/lambda.eps
-
-tex/img/linux.eps: tex/img img/linux.gif
-	convert img/linux.gif tex/img/linux.eps
-
-tex/img/bsd.eps: tex/img img/bsd.gif
-	convert img/bsd.gif tex/img/bsd.eps
-
-re.html: 
-	$(SKRIBE) $(SFLAGS) $(USERMAIN) \
-                  --base html -I user -S user \
-                  -o html/user.html
-
-re.tex: 
-	$(SKRIBE) $(SFLAGS) $(USERMAIN) \
-                  --base tex -I user -S user \
-                  -o tex/user.tex
-
-#*---------------------------------------------------------------------*/
-#*    dir                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: dir re.dir dir.html
-
-dir: dir.html
-dir.html: html/dir.html
-
-html/dir.html: html $(DIRSKB) $(SKR) 
-	$(MAKE) re.dir
-
-re.dir: 
-	$(MAKE) -f Makefile.dir SKRIBE="$(SKRIBE)" BASE=html
-
-#*---------------------------------------------------------------------*/
-#*    Misc                                                             */
-#*---------------------------------------------------------------------*/
-html:
-	mkdir -p html
-
-html/img:
-	mkdir -p html/img
-
-tex:
-	mkdir -p tex
-
-tex/img:
-	mkdir -p tex/img
-
-gethtml:
-	@ echo "html/user.html"
-
-#*---------------------------------------------------------------------*/
-#*    install/uinstall                                                 */
-#*---------------------------------------------------------------------*/
-.PHONY: install uninstall
-
-install: $(DESTDIR)$(INSTALL_DOCDIR) $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr
-	cp -r html/* $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/* \
-            && chmod a+rx $(DESTDIR)$(INSTALL_DOCDIR)/img
-	cp -r skr/* $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc \
-            && chmod a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr/*
-	cp Makefile.dir $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/Makefile.dir
-	cp dir/dir.skb $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/dir.skb
-
-uninstall:
-	$(RM) -rf $(DESTDIR)$(INSTALL_DOCDIR)
-
-$(DESTDIR)$(INSTALL_DOCDIR):
-	mkdir -p $(DESTDIR)$(INSTALL_DOCDIR) && chmod a+rx $(DESTDIR)$(INSTALL_DOCDIR)
-
-
-$(DESTDIR)$(INSTALL_SKRDIR)/doc/skr:
-	mkdir -p $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod -R a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc
-
-#*---------------------------------------------------------------------*/
-#*    Clean                                                            */
-#*---------------------------------------------------------------------*/
-.PHONY: clean
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am
 
-clean:
-	$(RM) -rf html
-	$(RM) -rf tex
-	$(RM) -f  img/bsd.eps img/linux.eps 
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..1b8257b
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = user
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/env.skr b/doc/skr/env.skr
index 09d5146..463b997 100644
--- a/doc/skr/env.skr
+++ b/doc/skr/env.skr
@@ -11,6 +11,7 @@
 
 (define *serrano-url* "http://www.inria.fr/mimosa/Manuel.Serrano")
 (define *serrano-mail* "Manuel.Serrano@sophia.inria.fr")
+(define *courtes-mail* "ludovic.courtes@laas.fr")
 (define *html-url* "http://www.w3.org/TR/html4")
 (define *html-form* "interact/forms.html")
 (define *emacs-url* "http://www.gnu.org/software/emacs")
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/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")