From 81e708884c8e3e567db81ef557e8c67dcbe9368e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Mon, 4 Feb 2008 12:04:31 +0100
Subject: doc: Small style fixes.
---
doc/user/Makefile.am | 2 +-
doc/user/skribilo-config.skb | 12 +++++------
doc/user/user.skb | 51 +++++++++++++++++++++++++++-----------------
3 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 04d6324..15c4463 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -87,7 +87,7 @@ endif HAVE_LOUT
if HAVE_PS2PDF
.ps.pdf:
- $(PS2PDF) $(@:%.pdf=%.ps)
+ $(PS2PDF) -sPAPERSIZE=a4 -dPDFSETTINGS=/prepress $(@:%.pdf=%.ps)
endif
diff --git a/doc/user/skribilo-config.skb b/doc/user/skribilo-config.skb
index 1016a50..ae3dd22 100644
--- a/doc/user/skribilo-config.skb
+++ b/doc/user/skribilo-config.skb
@@ -1,6 +1,6 @@
;;; skribilo-config.skb -- The `skribilo-config' tool
;;;
-;;; Copyright 2007 Ludovic Court�s <ludo@gnu.org>
+;;; Copyright 2007, 2008 Ludovic Court�s <ludo@gnu.org>
;;; Copyright 2004 Manuel Serrano
;;;
;;;
@@ -37,7 +37,7 @@ program that gives information about the current configuration.])
;; Description
(section :title "Description" :number #f
- [The ,(code "skribilo-config") program gives information about the
+ (p [The ,(code "skribilo-config") program gives information about the
Skribilo configuration, such as the module installation path, version
number, etc. The full list of supported options and their meaning is
the following:]
@@ -50,14 +50,14 @@ the following:]
(let loop ((line (read-line port))
(lines '()))
(if (eof-object? line)
- (reverse! lines)
+ (tt (string-concatenate-reverse lines))
(begin
(loop (read-line port)
- (cons* line "\n" lines)))))))
+ (cons* line "\n" lines))))))))
- [Note that the same information can be obtained through the
+ (p [Note that the same information can be obtained through the
programming interface exposed by the ,(code [(skribilo config)]) module
-(,(numref :text [see Section] :ident "config-module")).]))
+(,(numref :text [see Section] :ident "config-module")).])))
;;; Local Variables:
diff --git a/doc/user/user.skb b/doc/user/user.skb
index 48d3933..2d5ca48 100644
--- a/doc/user/user.skb
+++ b/doc/user/user.skb
@@ -37,11 +37,12 @@
(skribilo reader))
(if %have-ploticus? (set! %ploticus-program %ploticus-path))
-
+
;; Modules needed, e.g., to get the output of "skribilo-config --help".
(use-modules (ice-9 popen)
(ice-9 rdelim)
- (ice-9 pretty-print))
+ (ice-9 pretty-print)
+ (srfi srfi-13))
;*---------------------------------------------------------------------*/
@@ -173,6 +174,9 @@ as HTML, PostScript, Info pages, etc.])))))
;;; Pie charts
(if %have-ploticus? (include "pie.skb"))
+;;; Slides
+(include "slide.skb")
+
;;; Packages
(include "package.skb")
@@ -185,9 +189,6 @@ as HTML, PostScript, Info pages, etc.])))))
;;; Compiler
(include "compiler.skb")
-;;; Slides
-(include "slide.skb")
-
;;; skribilo-config
(include "skribilo-config.skb")
@@ -198,20 +199,32 @@ as HTML, PostScript, Info pages, etc.])))))
(include "examples.skb")
;;; table of contents
-(if (not (engine-format? "latex"))
- (begin
- (chapter :title "Table of contents"
- (toc :chapter #t :section #t :subsection #t))
- (chapter :title "Index" :number #f :ident "Index"
- (mark "global index")
- (the-index :column (if (engine-format? "latex") 2 3)
- *markup-index* *custom-index* *function-index* *package-index*
- (default-index))))
- (chapter :title "Index" :ident "Index"
- (mark "global index")
- (the-index :column (if (engine-format? "latex") 2 3)
- *markup-index* *custom-index* *function-index* *package-index*
- (default-index)))))
+(resolve (lambda (n e env)
+ (cond ((and (not (engine-format? "latex" e))
+ (not (engine-format? "lout" e)))
+ (list
+ (and (not (engine-format? "html" e))
+ (chapter :title "Table of Contents"
+ (toc :chapter #t :section #t :subsection #t)))
+ (chapter :title "Index" :number #f :ident "Index"
+ (mark "global index")
+ (the-index :column (if (engine-format? "latex") 2 3)
+ *markup-index* *custom-index*
+ *function-index* *package-index*
+ (default-index)))))
+
+ ((not (engine-format? "lout" e))
+ (chapter :title "Index" :ident "Index"
+ (mark "global index")
+ (the-index :column (if (engine-format? "latex") 2 3)
+ *markup-index* *custom-index*
+ *function-index* *package-index*
+ (default-index))))
+
+ (else
+ ;; FIXME: We don't have a clean `the-index' in Lout.
+ (skribe-warning 0 "index not available for this engine" e)
+ #f)))))
;; Local Variables:
;; coding: latin-1
--
cgit v1.2.3