r3599: *** empty log message ***

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 6aed28e83188a13431bdc23ceb59d57c4bc76683..e940cc4ab15db2c7c734cd3610a31aa3f32c7fd1 100755 (executable)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,8 +1,8 @@
-uffi.pdf
-uffi.ps
-uffi.tex
-uffi.dvi
-uffi.aux
-uffi.log
-uffi.out
+hyperobject.pdf
+hyperobject.ps
+hyperobject.tex
+hyperobject.dvi
+hyperobject.aux
+hyperobject.log
+hyperobject.out
 html

diff --git a/doc/Makefile b/doc/Makefile
index 782ae8bf8716a3a2b01b7c061006e248150da2c6..2e4a15151e8ba27d031bc3e88f9821ca622fd899 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,12 +5,13 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.1 2002/12/09 09:31:27 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.2 2002/12/10 19:44:10 kevin Exp $
 #
 # This file, part of Hyperobject, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
 # System variable to select catalog file
-SYSTEM=debian
+SYSTEM=fink
+#SYSTEM=debian
 # SYSTEM=redhat
 
 # Nothing to configure beyond this point
@@ -24,6 +25,8 @@ DSSSL_PRINT=dsssl/print/docbook.dsl
 DOCFILE_BASE_DEFAULT=hyperobject
 DOCFILE_EXT_DEFAULT=sgml
 
+JADE=openjade
+
 # Standard docfile processing
 
 ifndef DOCFILE_BASE
@@ -51,7 +54,7 @@ dist: html pdf
 .PHONY: doc
 doc: html pdf
 
-CHECK=nsgmls -s -C ${CATALOG} || exit 1
+CHECK=onsgmls -s -C ${CATALOG} || exit 1
 
 .PHONY: check
 check:
@@ -62,20 +65,20 @@ html: html.tar.gz
 
 html.tar.gz: $(DOCFILES) Makefile
        @$(CHECK)
-       @( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE} > /dev/null; cp book1.html index.html; cd ..; GZIP='-9' tar czf html.tar.gz html)
+       @( rm -rf html ; mkdir html; cd html ; $(JADE) -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE} > /dev/null; cp book1.html index.html; cd ..; GZIP='-9' tar czf html.tar.gz html)
 
 .PHONY: tex
 tex: ${TEXFILE}
 
 ${TEXFILE}: ${DOCFILES}
        @$(CHECK)
-       @jade -t tex -c ${CATALOG} -d ${DSSSL_PRINT} ${DOCFILE} > /dev/null
+       @$(JADE) -t tex -c ${CATALOG} -d ${DSSSL_PRINT} ${DOCFILE} > /dev/null
 
 .PHONY: pdf
 pdf: ${PDFFILE}
 
 ${PDFFILE}: ${DOCFILES}
-       @jade -t tex -c ${CATALOG} -d ${DSSSL_PRINT} ${DOCFILE} > /dev/null
+       @$(JADE) -t tex -c ${CATALOG} -d ${DSSSL_PRINT} ${DOCFILE} > /dev/null
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null

diff --git a/doc/catalog.fink b/doc/catalog.fink
new file mode 100644 (file)
index 0000000..d791797
--- /dev/null
+++ b/doc/catalog.fink
@@ -0,0 +1,2 @@
+CATALOG /sw/share/sgml/catalog
+DOCUMENT hyperobject.sgml

diff --git a/doc/hyperobject.sgml b/doc/hyperobject.sgml
index 0763f7f43b7814b764c6cd802c76088cdecd1b83..af60c108ec3eaa0d1b5bfc0c6bcaa5eaa1120c48 100644 (file)
--- a/doc/hyperobject.sgml
+++ b/doc/hyperobject.sgml
@@ -22,7 +22,7 @@
 <!ENTITY bookinfo SYSTEM "bookinfo.sgml">
 <!ENTITY preface SYSTEM "preface.sgml">
 <!ENTITY intro SYSTEM "intro.sgml">
-<!ENTITY intro SYSTEM "design.sgml">
+<!ENTITY design SYSTEM "design.sgml">
 <!ENTITY ref SYSTEM "ref.sgml">
 ]>
 

diff --git a/doc/intro.sgml b/doc/intro.sgml
index 6a9e666274e9b1aa98435059c18f34371cfd7efd..41642d3338174b1dc204f7a393f74603c75f2fd4 100644 (file)
--- a/doc/intro.sgml
+++ b/doc/intro.sgml
@@ -35,13 +35,12 @@ Other require packages are:</para>
 <listitem><para>&kmrcl; from it's <ulink url="ftp://kmrcl.b9.com"><citetitle>home</citetitle></ulink>.</para></listitem>
 <listitem><para>&uffi; from it's <ulink url="http://uffi.b9.com"><citetitle>home</citetitle></ulink>.</para></listitem>
 <listitem><para>&clsql; from it's <ulink url="ftp://clsql.b9.com"><citetitle>home</citetitle></ulink>.</para></listitem>
-<itemizedlist><para>&asdf; from it's home  <ulink url="http://www.sourceforge.net/projects/cclan"><citetitle>CCLAN</citetitle></ulink> package. You can download
+<listitem><para>&asdf; from it's home  <ulink url="http://www.sourceforge.net/projects/cclan"><citetitle>CCLAN</citetitle></ulink> package. You can download
 the file <filename>asdf.lisp</filename> from the CVS 
-<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/cclan/asdf/asdf.lisp"><citetitle>tree</citetitle></ulink>.
-    </para>
+<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/cclan/asdf/asdf.lisp"><citetitle>tree</citetitle></ulink>.</para></listitem>
 </itemizedlist>
   </sect2>     
-  <sect1>
+  <sect2>
     <title>Loading</title>
     <para>
       After downloading and installing &asdf;, simply
@@ -51,8 +50,8 @@ the file <filename>asdf.lisp</filename> from the CVS
 want to load the &hyperobject; package, use the function
       <computeroutput>(asdf:oos 'asdf:load-op :hyperobject)</computeroutput>.
     </para>
-  </sect1>
-</appendix>
+  </sect2>
+</sect1>
 
     <sect1>
       <title>Design</title>