0.7.2.5:

	merged coreythomas "doc build" patch sbcl-devel 2002-03-29

diff --git a/.cvsignore b/.cvsignore
index 3dc13ee..cd87c38 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ ChangeLog
 customize-backend-subfeatures.lisp
 customize-target-features.lisp
 local-target-features.lisp-expr
+

diff --git a/NEWS b/NEWS
index 44747a5..10e21bc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1065,6 +1065,8 @@ changes in sbcl-0.7.2 relative to sbcl-0.7.1:
     Froyd porting CMU CL code)
   * The fasl file format has changed again, to allow the compiler's
     INFO database to support symbol macros.
+  * The user manual (in doc/) is formatted into HTML more nicely.
+    (thanks to coreythomas)
 
 planned incompatible changes in 0.7.x:
 * When the profiling interface settles down, maybe in 0.7.x, maybe

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 43e9737..1936cc1 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,2 +1 @@
-*.htm
-cmucl
+html

diff --git a/doc/make-doc.sh b/doc/make-doc.sh
index eead940..01f1ea5 100644 (file)
--- a/doc/make-doc.sh
+++ b/doc/make-doc.sh
@@ -18,14 +18,8 @@ else
     exit 1
 fi
 
-# Since Jade has strange ideas about the name of the top level output
-# file, use a symlink as a workaround to provide a reasonable entry
-# point.
-#
-# (KLUDGE: Why does the output always come out in book1.htm? According
-# to the docs of OpenJade 1.3, it should be coming out in
-# user-manual.htm by default, I think. And it should respect the -o
-# option. But experimentally that seems not to be. -- WHN 2002-01-15)
-rm -f book1.htm
+# Our hacked sbcl-html.dsl directs HTML output to html/. Make a clean slate.
+rm -rf html
+mkdir html
+
 $JADE -t sgml -ihtml -d sbcl-html.dsl\#html user-manual.sgml
-ln -sf book1.htm user-manual.html

diff --git a/doc/sbcl-html.dsl b/doc/sbcl-html.dsl
index 52dd375..d192349 100644 (file)
--- a/doc/sbcl-html.dsl
+++ b/doc/sbcl-html.dsl
@@ -101,6 +101,25 @@ what it would be. (WHN 2001-10-15)
 ;;; (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)
+
 </style-specification-body>
 </style-specification>
 

diff --git a/version.lisp-expr b/version.lisp-expr
index 6359058..d60704c 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; for internal versions, especially for internal versions off the
 ;;; main CVS branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
 
-"0.7.2.4"
+"0.7.2.5"