[albert-cvs] CVS: albert/spres files.lisp,1.1,1.2 generated.lisp,1.46,1.47

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

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

Modified Files:
	files.lisp generated.lisp 
Log Message:
fixed dodgy filenames for generated files

Index: files.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/files.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** files.lisp	27 Oct 2003 16:39:25 -0000	1.1
--- files.lisp	27 Oct 2003 17:16:45 -0000	1.2
***************
*** 99,110 ****
      (dolist (x obj-list)
        ;; hackish
!       (let ((?outdir (if (typep x '(or sdoc-package sdoc-module))
! 			 (pathname (strcat (namestring ?outdir)
! 					   (get-object-name x) "/"))
! 			 ?outdir)))
  	
- ;;	(when (typep x 'sdoc-package)
- ;;	  (warn "dir is ~a" ?outdir)
- ;;	  )
  	
  	(unless (is-empty? x)
--- 99,108 ----
      (dolist (x obj-list)
        ;; hackish
!       (let ((?outdir (cond ((typep x '(or sdoc-package sdoc-module))
! 			    (pathname (strcat (namestring ?outdir)
! 					      (make-valid-entity (get-object-name x))
! 					      "/")))
! 			   (t ?outdir))))
  	
  	
  	(unless (is-empty? x)

Index: generated.lisp
===================================================================
RCS file: /cvsroot/albert/albert/spres/generated.lisp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** generated.lisp	27 Oct 2003 16:40:01 -0000	1.46
--- generated.lisp	27 Oct 2003 17:16:45 -0000	1.47
***************
*** 389,393 ****
                              +id-word-delim+
                              (make-valid-entity cl-name)))
!                    (fname (strcat cl-name "/" "contentlist"))
                     (?rec-state :refsect1)
                     (?parent obj)
--- 389,394 ----
                              +id-word-delim+
                              (make-valid-entity cl-name)))
!                    (fname
!                     (strcat (make-valid-entity cl-name) "/" "contentlist"))
                     (?rec-state :refsect1)
                     (?parent obj)