[albert-cvs] CVS: albert/spres generated.lisp,1.45,1.46
Status: Alpha
Brought to you by:
stig
Menu
▾
▴
[albert-cvs] CVS: albert/spres generated.lisp,1.45,1.46
|
From: Stig E S. <st...@us...> - 2003-10-27 16:45:32
|
Update of /cvsroot/albert/albert/spres
In directory sc8-pr-cvs1:/tmp/cvs-serv30663/spres
Modified Files:
generated.lisp
Log Message:
changes from other places
Index: generated.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/generated.lisp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** generated.lisp 27 Oct 2003 01:35:34 -0000 1.45
--- generated.lisp 27 Oct 2003 16:40:01 -0000 1.46
***************
*** 133,138 ****
(when-bind (better-dtd (albert-setting '("albert" "docbook" "dtd")))
(setf (db-get-dtd) better-dtd))
- (print-header obj doc :document)
- (put doc "<book>" (eol))
(print-header obj doc :book)
(let* ((content (slot-value obj 'content))
--- 133,136 ----
***************
*** 159,195 ****
(when-verbose
(albert-info "spres> writing class-hierarchy to book."))
! (put doc "<refentry id=\"classHierarchy\">" (eol))
! (put doc
! "<refnamediv>"
! "<refname>"
! (get-word "Class Hierarchy" doc)
! "</refname>"
! "<refpurpose>Clickable index of all classes</refpurpose>"
! "</refnamediv>"
! (eol))
! (put doc "<refsect1><title></title>" (eol))
! (put doc "<programlisting>" (eol))
! (print-class-hierarchy doc ?class-hierarchy 0)
! (put doc "</programlisting>" (eol))
! (put doc "</refsect1>" (eol))
! (put doc "</refentry>" (eol)))
(when
(and indexable-stuff
(albert-setting
'("albert" "presentation" "index" "global-index")))
! (put doc "<refentry id=\"globalIndex\">" (eol))
! (put doc
! "<refnamediv>"
! "<refname>"
! (get-word "Global Index" doc)
! "</refname>"
! "<refpurpose>Clickable index of all symbols</refpurpose>"
! "</refnamediv>"
! (eol))
! (dolist (i content)
! (unless (is-empty? i) (present-object i doc :index)))
! (put doc "</refentry>" (eol)))
! (put doc "</reference>" (eol)))
! (put doc "</book>" (eol)))))
--- 157,209 ----
(when-verbose
(albert-info "spres> writing class-hierarchy to book."))
! (register-separate-document
! (make-file-info :id
! "class-hierarchy"
! :dir
! nil
! :fname
! (make-valid-entity "class-hierarchy")))
! (with-ok-document (doc "class-hierarchy" doc)
! (put doc "<refentry id=\"classHierarchy\">" (eol))
! (put doc
! "<refnamediv>"
! "<refname>"
! (get-word "Class Hierarchy" doc)
! "</refname>"
! "<refpurpose>Clickable index of all classes</refpurpose>"
! "</refnamediv>"
! (eol))
! (put doc "<refsect1><title></title>" (eol))
! (put doc "<programlisting>" (eol))
! (print-class-hierarchy doc ?class-hierarchy 0)
! (put doc "</programlisting>" (eol))
! (put doc "</refsect1>" (eol))
! (put doc "</refentry>" (eol))))
(when
(and indexable-stuff
(albert-setting
'("albert" "presentation" "index" "global-index")))
! (register-separate-document
! (make-file-info :id
! "global-index"
! :dir
! nil
! :fname
! (make-valid-entity "global-index")))
! (with-ok-document (doc "global-index" doc)
! (put doc "<refentry id=\"globalIndex\">" (eol))
! (put doc
! "<refnamediv>"
! "<refname>"
! (get-word "Global Index" doc)
! "</refname>"
! "<refpurpose>Clickable index of all symbols</refpurpose>"
! "</refnamediv>"
! (eol))
! (dolist (i content)
! (unless (is-empty? i)
! (present-object i doc :index)))
! (put doc "</refentry>" (eol))))
! (put doc "</reference>" (eol))))))
***************
*** 368,467 ****
(present-object i doc context))))
(when normal-objs
! (let* ((?rec-state :refsect1)
(?parent obj)
(obj-count (length normal-objs))
(var-objs 'nil))
! (when
! (>= var-count
! (albert-setting
! '("albert" "presentation" "variables" "separatepage")))
! (let ((vars 'nil) (others 'nil))
! (loop for
! i
! in
! normal-objs
! do
! (cond ((typep i 'sdoc-variable) (push i vars))
! ((typep i 'sdoc-method) (push i others))
! (t
! (when-verbose
! (albert-info
! "Non-method/var content ~s in package ~s"
! i
! cl-name))
! (push i others))))
! (setf var-objs (reverse vars) normal-objs (reverse others))))
! (cond
! ((has-spres-flag? :simple-package)
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (present-objs-in-package doc obj var-objs :vars :refsect1))
! (var-objs
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xvariables\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " variables</refname>"
! (eol)
! "<refpurpose>All variables and constants</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc obj var-objs :vars :refsect1)
! (put doc " </refentry>" (eol))
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xcontent\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " full listing</refname>"
! (eol)
! "<refpurpose>"
! "All funcallable objects"
! "</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (put doc " </refentry>" (eol)))
! (t
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xcontent\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " full listing</refname>"
! (eol)
! "<refpurpose>All funcallable objects and all variables</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (present-objs-in-package doc obj var-objs :vars :refsect1)
! (put doc " </refentry>" (eol))))))
(when (has-spres-flag? :simple-package)
(put doc "</refentry>" (eol))
--- 382,511 ----
(present-object i doc context))))
(when normal-objs
! (let* ((cl-name (get-object-name obj))
! (file-id
! (strcat "package"
! +id-word-delim+
! "contentlist"
! +id-word-delim+
! (make-valid-entity cl-name)))
! (fname (strcat cl-name "/" "contentlist"))
! (?rec-state :refsect1)
(?parent obj)
(obj-count (length normal-objs))
(var-objs 'nil))
! (register-separate-document
! (make-file-info :id file-id :dir nil :fname fname))
! (with-ok-document (doc fname doc)
! (when
! (>= var-count
! (albert-setting
! '("albert" "presentation" "variables"
! "separatepage")))
! (let ((vars 'nil) (others 'nil))
! (loop for
! i
! in
! normal-objs
! do
! (cond
! ((typep i 'sdoc-variable)
! (push i vars))
! ((typep i 'sdoc-method)
! (push i others))
! (t
! (when-verbose
! (albert-info
! "Non-method/var content ~s in package ~s"
! i
! cl-name))
! (push i others))))
! (setf var-objs
! (reverse vars)
! normal-objs
! (reverse others))))
! (cond
! ((has-spres-flag? :simple-package)
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (present-objs-in-package doc
! obj
! var-objs
! :vars
! :refsect1))
! (var-objs
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xvariables\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " variables</refname>"
! (eol)
! "<refpurpose>All variables and constants</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc
! obj
! var-objs
! :vars
! :refsect1)
! (put doc " </refentry>" (eol))
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xcontent\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " full listing</refname>"
! (eol)
! "<refpurpose>"
! "All funcallable objects"
! "</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (put doc " </refentry>" (eol)))
! (t
! (put doc
! " <refentry id=\"packageX"
! (make-valid-entity cl-name)
! "Xcontent\">"
! (eol))
! (put doc
! "<refnamediv>"
! (eol)
! "<refname>"
! cl-name
! " full listing</refname>"
! (eol)
! "<refpurpose>All funcallable objects and all variables</refpurpose>"
! "</refnamediv>"
! (eol))
! (present-objs-in-package doc
! obj
! normal-objs
! :general
! :refsect1)
! (present-objs-in-package doc
! obj
! var-objs
! :vars
! :refsect1)
! (put doc " </refentry>" (eol)))))))
(when (has-spres-flag? :simple-package)
(put doc "</refentry>" (eol))
|