[albert-cvs] CVS: albert/spres base.lisp,1.11,1.12 generated.lisp,1.47,1.48 tools.lisp,1.18,1.19

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

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

Modified Files:
	base.lisp generated.lisp tools.lisp 
Log Message:
tweaking

Index: base.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/base.lisp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** base.lisp	27 Oct 2003 16:44:45 -0000	1.11
--- base.lisp	27 Oct 2003 17:40:09 -0000	1.12
***************
*** 214,217 ****
--- 214,236 ----
  in WHERE (and WHERE's content). Recursive.  Returns a list of objects."))
  
+ (defgeneric put (destination &rest args)
+   (:documentation "Puts the ARGS sequentially to the destination which should
+ be an output-stream of some kind, or a document."))
+ 
+ (defgeneric put-t (destination type &rest args)
+   (:documentation "Puts the ARGS sequentially to the destination inside a tag
+ of type TYPE.  The destination should be an output-stream of some kind,
+ or a document."))
+ 
+ (defgeneric present-book-header (doc actual-stream)
+   (:documentation "Presents a document-header (book) for a document DOC to
+ the output-stream ACTUAL-STREAM."))
+ 
+ 
+ (defgeneric present-book-footer (doc actual-stream)
+   (:documentation "Presents a document-footer (book) for a document DOC to
+ the output-stream ACTUAL-STREAM."))
+ 
+ 
  
  ;;; === end generics

Index: generated.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/generated.lisp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** generated.lisp	27 Oct 2003 17:16:45 -0000	1.47
--- generated.lisp	27 Oct 2003 17:40:09 -0000	1.48
***************
*** 252,260 ****
             (eol))
        (tree-put doc
!                 `(:refmeta ,nil (:refentrytitle ,nil ,title) (:manvolnum nil 3)
!                   (:refmiscinfo nil "Project name")))
        (tree-put doc
!                 `(:refnamediv ,nil (:refname ,nil ,title)
!                   (:refpurpose ,nil ,(if purpose purpose ""))))
        (unless no-desc
          (tree-put doc
--- 252,263 ----
             (eol))
        (tree-put doc
!                 `(:refmeta ,nil
!                            (:refentrytitle ,nil ,title)
!                            (:manvolnum nil 3)
!                            (:refmiscinfo nil "Project name")))
        (tree-put doc
!                 `(:refnamediv ,nil
!                               (:refname ,nil ,title)
!                               (:refpurpose ,nil ,(if purpose purpose ""))))
        (unless no-desc
          (tree-put doc
***************
*** 277,283 ****
            (tree-put doc
                      `(:simpara ,nil
!                       ,(list-to-sep-string export-list
!                                            :and-word
!                                            (get-word "and" doc))))))
          (put doc "</refsect1>" (eol)))
        (when inherit-list
--- 280,284 ----
            (tree-put doc
                      `(:simpara ,nil
!                                ,(list-to-sep-string export-list :and-word (get-word "and" doc))))))
          (put doc "</refsect1>" (eol)))
        (when inherit-list
***************
*** 302,308 ****
            (tree-put doc
                      `(:simpara ,nil
!                       ,(list-to-sep-string inherit-list
!                                            :and-word
!                                            (get-word "and" doc))))))
          (put doc "</refsect1>" (eol)))
        (unless (has-spres-flag? :simple-package)
--- 303,307 ----
            (tree-put doc
                      `(:simpara ,nil
!                                ,(list-to-sep-string inherit-list :and-word (get-word "and" doc))))))
          (put doc "</refsect1>" (eol)))
        (unless (has-spres-flag? :simple-package)
***************
*** 904,913 ****
        (tree-put doc
                  `(:programlisting ,nil
!                   ,(get-variable-signature doc
!                                            obj
!                                            :linked
!                                            nil
!                                            :style
!                                            :intuitive)))
        (when formal-pres
          (put doc "   <variablelist>" (eol) "    <title></title>" (eol))
--- 903,907 ----
        (tree-put doc
                  `(:programlisting ,nil
!                                   ,(get-variable-signature doc obj :linked nil :style :intuitive)))
        (when formal-pres
          (put doc "   <variablelist>" (eol) "    <title></title>" (eol))
***************
*** 1129,1134 ****
               (cond
                ((and (eq ?list-style :clever-sort))
!                (print-content-list-clever-sort-of-content-presenter obj doc
!                 content-list))
                (t
                 (warn "Fell through ~s and obj is ~s"
--- 1123,1129 ----
               (cond
                ((and (eq ?list-style :clever-sort))
!                (print-content-list-clever-sort-of-content-presenter obj
!                                                                     doc
!                                                                     content-list))
                (t
                 (warn "Fell through ~s and obj is ~s"

Index: tools.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/tools.lisp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tools.lisp	27 Oct 2003 16:42:43 -0000	1.18
--- tools.lisp	27 Oct 2003 17:40:09 -0000	1.19
***************
*** 77,85 ****
        (dolist (x the-info)
  	(put doc "<" field ">" (car (slot-value x 'value)) "</" field ">" (eol))))))
-   
- 
  
  
- 		   
  (defun make-valid-entity (word &key (allow nil))
    "translates the word into something eatable as entity and id in
--- 77,82 ----