From 8e0448d1a0b2590453935e457d9f7de4a6d32502 Mon Sep 17 00:00:00 2001
From: Ludovic Court`es
Date: Fri, 1 Sep 2006 15:58:59 +0000
Subject: Turned `doc/skr' into `doc/modules', `skribe-load' into
 `use-modules'.

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-54
---
 doc/user/Makefile.am |  3 ++-
 doc/user/user.skb    | 18 ++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'doc/user')

diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 3428ad5..f3c6620 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -12,7 +12,8 @@ BUILT_SOURCES = doc-config.scm
 html_DATA = user.html
 
 skribilo = $(top_srcdir)/src/skribilo
-load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package
+load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package:$(top_builddir)/src/guile:$(top_srcdir)/doc/modules
+
 
 %.html: %.skb
 	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
diff --git a/doc/user/user.skb b/doc/user/user.skb
index 13fae63..5cfe209 100644
--- a/doc/user/user.skb
+++ b/doc/user/user.skb
@@ -1,6 +1,7 @@
 ;;; user.skb  --  The Skribilo user manual.
 ;;;
 ;;; Copyright 2001, 2002, 2003, 2004  Manuel Serrano
+;;; Copyright 2005, 2006  Ludovic Courtès <ludovic.courtes@laas.fr>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -21,10 +22,11 @@
 ;*---------------------------------------------------------------------*/
 ;*    The Skribe documentation style                                   */
 ;*---------------------------------------------------------------------*/
-(skribe-load "web-book.skr")
-(skribe-load "skr/env.skr")
-(skribe-load "skr/manual.skr")
-(skribe-load "skr/api.skr")
+(use-modules (skribilo package web-book)
+             (skribilo documentation env)
+             (skribilo documentation manual)
+             (skribilo documentation api))
+
 
 ;*---------------------------------------------------------------------*/
 ;*    Packages							       */
@@ -51,14 +53,6 @@
 (let ((le (find-engine 'lout)))
    (engine-custom-set! le 'document-type 'doc))
 
-;*---------------------------------------------------------------------*/
-;*    The various indexes                                              */
-;*---------------------------------------------------------------------*/
-(define *markup-index* (make-index "markup"))
-(define *custom-index* (make-index "custom"))
-(define *function-index* (make-index "function"))
-(define *package-index* (make-index "package"))
-
 
 ;*---------------------------------------------------------------------*/
 ;*    The document                                                     */
-- 
cgit v1.2.3