[albert-cvs] CVS: albert/spres/rules basic.lisp,1.10,1.11

[Stig E S. <st...@us...>]

Update of /cvsroot/albert/albert/spres/rules
In directory sc8-pr-cvs1:/tmp/cvs-serv31277/spres/rules

Modified Files:
	basic.lisp 
Log Message:
made someone else handle output of <book></book> and entities than the sdoc-toplevel, should be done when full document is written

Index: basic.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/rules/basic.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** basic.lisp	26 Oct 2003 21:39:09 -0000	1.10
--- basic.lisp	27 Oct 2003 16:41:44 -0000	1.11
***************
*** 148,154 ****
      (setf (db-get-dtd) better-dtd))
    
!   (print-header obj doc :document)
    
!   (put doc "<book>" (eol))
    (print-header obj doc :book)
    
--- 148,154 ----
      (setf (db-get-dtd) better-dtd))
    
!   ;;(print-header obj doc :document)
    
!   ;;(put doc "<book>" (eol))
    (print-header obj doc :book)
    
***************
*** 181,198 ****
  	(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)))
  
        
--- 181,203 ----
  	(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))
! 	  ))
  
        
***************
*** 200,221 ****
  		 (albert-setting '("albert" "presentation" "index" "global-index")))
  	;; time to do an 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))))
  
  #||
--- 205,233 ----
  		 (albert-setting '("albert" "presentation" "index" "global-index")))
  	;; time to do an 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))
! 	  )) ;; end glob index
        
        (put doc "</reference>" (eol))
        )
  
!   ;;(put doc "</book>" (eol))
!   ))
  
  #||