;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.56 2003/06/17 17:50:45 kevin Exp $
+;;;; $Id: views.lisp,v 1.57 2003/06/20 08:35:21 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
`(typecase ,v
(string
(write-string ,v ,s))
- #+allegro
(fixnum
- (excl::print-fixnum ,s 10 ,v))
+ (write-fixnum ,v ,s))
(symbol
(write-string (symbol-name ,v) ,s))
(t
(setf (list-start-printer view)
(compile nil
(eval '(lambda (obj nitems indent strm)
+ (declare (ignore indent))
(write-user-name-maybe-plural obj nitems strm)
(write-char #\: strm)
(write-char #\Newline strm)))))
(setf (indenter view) #'indent-spaces))
(defun html-list-start-func (obj nitems indent strm)
- (write-string "<div class=\"ho-username\">" strm)
+ (write-string "<div class=\"ho-username\" :style=\"margin-left:" strm)
+ (write-fixnum (+ indent indent) strm)
+ (write-string "em;\">" strm)
(write-user-name-maybe-plural obj nitems strm)
(write-string "</div>" strm)
(write-char #\newline strm)
(defun initialize-html-view (view)
(initialize-text-view view)
- (setf (indenter view) #'indent-html-spaces)
+ (setf (indenter view) #'indent-spaces)
(setf (file-start-str view) (format nil "<html><body>~%"))
(setf (file-end-str view) (format nil "</body><html>~%"))
(setf (list-start-indent view) t)
(setf (obj-data-indent view) nil))
(defun xhtml-list-start-func (obj nitems indent strm)
- (write-string "<div class=\"ho-username\">" strm)
- (indent-html-spaces indent strm)
+ (write-string "<div class=\"ho-username\" :style=\"margin-left:" strm)
+ (write-fixnum (+ indent indent) strm)
+ (write-string "em;\">" strm)
(write-user-name-maybe-plural obj nitems strm)
(write-string "</div>" strm)
+ (write-string "<div :style=\"margin-left:" strm)
+ (write-fixnum (+ indent indent) strm)
+ (write-string "em;\">" strm)
(write-char #\newline strm))
+(defun html-obj-start (obj indent strm)
+ (declare (ignore obj indent))
+ (write-string "<div style=\"margin-left:2em;" strm))
+
(defun initialize-xhtml-view (view)
(initialize-text-view view)
- (setf (indenter view) #'indent-html-spaces)
+ (setf (indenter view) #'indent-spaces)
(setf (file-start-str view) (format nil "<html><body>~%"))
(setf (file-end-str view) (format nil "</body><html>~%"))
(setf (list-start-indent view) nil)
(setf (list-start-printer view) #'xhtml-list-start-func)
- (setf (list-end-printer view) (format nil "~%"))
+ (setf (list-end-printer view) (format nil "</div>~%"))
(setf (list-end-indent view) nil)
(setf (obj-start-indent view) nil)
- (setf (obj-start-printer view) nil)
+ (setf (obj-start-printer view) #'html-obj-start)
(setf (obj-end-printer view) (format nil "</div>~%"))
- (setf (obj-data-start-printer view) "<div>")
- (setf (obj-data-end-printer view) nil)
- (setf (obj-end-indent view) nil)
- (setf (obj-data-indent view) t))
+ (setf (obj-data-indent view) nil))
(defun xmlformat-list-end-func (x strm)
(write-string "</" strm)
(write-char #\newline strm))
(defun xmlformat-list-start-func (x nitems indent strm)
+ (declare (ignore indent))
(write-char #\< strm)
(write-string (class-name-of x) strm)
(write-string "list><title>" strm)
(awhen (obj-start-printer view)
(if (stringp it)
(write-string it strm)
- (funcall it obj strm))))
+ (funcall it obj indent strm))))
(defun fmt-obj-end (obj view strm indent)
(when (obj-end-indent view)
(awhen (subobj-start-printer view)
(if (stringp it)
(write-string it strm)
- (funcall it obj strm))))
+ (funcall it obj indent strm))))
(defun fmt-subobj-end (obj view strm indent)
(when (subobj-end-indent view)