From d039e5131ac15717049378a664e0e782f32506a2 Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Wed, 26 Nov 2003 20:22:00 +0000 Subject: [PATCH] 0.8.6.4: * install.sh: install doc/sbcl-asdf-install.1 * doc/DOCDOC: add note about catalog file * doc/sbcl-html.dsl: remove obsolete file --- doc/DOCDOC | 9 +++-- doc/Makefile | 6 ++- doc/sbcl-html.dsl | 116 ----------------------------------------------------- install.sh | 2 +- version.lisp-expr | 2 +- 5 files changed, 12 insertions(+), 123 deletions(-) delete mode 100644 doc/sbcl-html.dsl diff --git a/doc/DOCDOC b/doc/DOCDOC index 803aa1a..1bb9f5e 100644 --- a/doc/DOCDOC +++ b/doc/DOCDOC @@ -7,7 +7,10 @@ WHN's approach: * Use dselect to install everything plausible-looking which matches the search string 'xsl': docbook-xsl, xsltproc, libxslt1. * (Now things work. This is probably in part because Kevin Rosenberg - already set up a suitable Debian configuration in the CVS files, + already set up a suitable Debian catalog in the CVS files, so if you're on a system where there hasn't been done already -- i.e. - system other than Debian or RedHat as of sbcl-0.8.6.1 -- you might - need to add such a configuration yourself.) + system other than Debian or SuSE as of sbcl-0.8.6.1 -- you might + need to add such a catalog file yourself. The catalog file is used + to translate the URLs in the .xml and .xsl into local files. However, + xsltproc should work fine and download the remote files if a catalog + is no present on your system.) diff --git a/doc/Makefile b/doc/Makefile index 69e7bfc..dcdf6a7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,8 +1,10 @@ +# Makefile for SBCL document generation + DOCFILE_BASE_DEFAULT:=user-manual DOCFILE_EXT_DEFAULT:=xml - -# Standard docfile processing +# Standard docfile processing as copied from UFFI +# Placed into public domain by author Kevin Rosenberg DEBIAN=$(shell expr "`cat /etc/issue`" : '.*Debian.*') SUSE=$(shell expr "`cat /etc/issue`" : '.*SuSE.*') diff --git a/doc/sbcl-html.dsl b/doc/sbcl-html.dsl deleted file mode 100644 index 82ca94d..0000000 --- a/doc/sbcl-html.dsl +++ /dev/null @@ -1,116 +0,0 @@ -]> - - - - - -;;; Essentially all the stuff in the "Programming languages and -;;; constructs" section (pp. 40-41 of _DocBook: The Definitive Guide_) -;;; is to be monospaced. The one exception is "replaceable", which -;;; needs to be distinguishable from the others. -;;; -;;; (In the modular stylesheets as of 1.54, some elements like "type" -;;; were typeset in the same font as running text, which led to -;;; horrible confusion in the SBCL manual.) -(element action ($mono-seq$)) -(element classname ($mono-seq$)) -(element constant ($mono-seq$)) -(element errorcode ($mono-seq$)) -(element errorname ($mono-seq$)) -(element errortype ($mono-seq$)) -(element function ($mono-seq$)) -(element interface ($mono-seq$)) -(element interfacedefinition ($mono-seq$)) -(element literal ($mono-seq$)) -(element msgtext ($mono-seq$)) -(element parameter ($mono-seq$)) -(element property ($mono-seq$)) -(element replaceable ($italic-seq$)) -(element returnvalue ($mono-seq$)) -(element structfield ($mono-seq$)) -(element structname ($mono-seq$)) -(element symbol ($mono-seq$)) -(element token ($mono-seq$)) -(element type ($mono-seq$)) -(element varname ($mono-seq$)) - -;;; Things in the "Operating systems" and "General purpose" -;;; sections (pp. 41-42 and pp. 42-43 -;;; of _DocBook: The Definitive Guide_) are handled on a case -;;; by case basis. -;;; -;;; "Operating systems" section -(element application ($charseq$)) -(element command ($mono-seq$)) -(element envar ($mono-seq$)) -(element filename ($mono-seq$)) -(element medialabel ($mono-seq$)) -;;; (The "msgtext" element is handled in another section.) -(element option ($mono-seq$)) -;;; (The "parameter" element is handled in another section.) -(element prompt ($bold-mono-seq$)) -(element systemitem ($mono-seq$)) -;;; -;;; "General purpose" section -(element database ($charseq$)) -(element email ($mono-seq$)) -;;; (The "filename" element is handled in another section.) -(element hardware ($mono-seq$)) -(element inlinegraphic ($mono-seq$)) -;;; (The "literal" element is handled in another section.) -;;; (The "medialabel" element is handled in another section.) -;;; (The "option" element is handled in another section.) -(element optional ($italic-mono-seq$)) -;;; (The "replaceable" element is handled in another section.) -;;; (The "symbol" element is handled in another section.) -;;; (The "token" element is handled in another section.) -;;; (The "type" element is handled in another section.) - - - -;; The extension to use on generated html files. -(define %html-ext% ".html") - -;; Generate a list of the html files created -(define html-manifest #t) - -;; The filename of the root HTML document (e.g, "index"). -(define %root-filename% "index") - -;; If true, chunks will be written to the 'output-dir' instead of -;; the current directory. -(define use-output-dir #t) -(define %output-dir% "html") - -;; Use ID attributes as name for component HTML files -(define %use-id-as-filename% #t) - - - - - - - diff --git a/install.sh b/install.sh index 2002101..b8827e5 100644 --- a/install.sh +++ b/install.sh @@ -36,7 +36,7 @@ test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \ cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/ cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core -cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ +cp doc/sbcl.1 doc/sbcl-asdf-install.1 $BUILD_ROOT$MAN_DIR/man1/ # installing contrib diff --git a/version.lisp-expr b/version.lisp-expr index d5c02ae..7d641d8 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.6.3" +"0.8.6.4" -- 1.7.10.4