X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=902c1c134422676cd7f62584237e9ffb95337fd2;hb=30c2e8bd2c7043d845024395e19b3030d039eae2;hp=b720de00351cd7d5dcb936a8c10d47c8529a00a8;hpb=4a7372ef4000eaaa86a987bc9668ccecf7d0489f;p=kmrcl.git diff --git a/ml-class.lisp b/ml-class.lisp index b720de0..902c1c1 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: ml-class.lisp,v 1.17 2002/10/16 21:58:49 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.19 2002/10/16 23:34:33 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -322,6 +322,8 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defparameter *default-textformat* nil) (defparameter *default-htmlformat* nil) (defparameter *default-htmlrefformat* nil) +(defparameter *default-xhtmlformat* nil) +(defparameter *default-xhtmlrefformat* nil) (defparameter *default-xmlformat* nil) (defparameter *default-xmlrefformat* nil) (defparameter *default-ie-xmlrefformat* nil) @@ -333,6 +335,8 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (setq *default-textformat* (make-instance 'textformat)) (setq *default-htmlformat* (make-instance 'htmlformat)) (setq *default-htmlrefformat* (make-instance 'htmlrefformat)) + (setq *default-xhtmlformat* (make-instance 'xhtmlformat)) + (setq *default-xhtmlrefformat* (make-instance 'xhtmlrefformat)) (setq *default-xmlformat* (make-instance 'xmlformat)) (setq *default-xmlrefformat* (make-instance 'xmlrefformat)) (setq *default-ie-xmlrefformat* (make-instance 'ie-xmlrefformat)) @@ -343,7 +347,8 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (:text *default-textformat*) (:html *default-htmlformat*) (:htmlref *default-htmlrefformat*) - (:xml *default-xmlformat*) + (:xhtml *default-xhtmlformat*) + (:xhtmlref *default-xhtmlrefformat*) (:xml *default-xmlformat*) (:xmlref *default-xmlrefformat*) (:ie-xmlref *default-ie-xmlrefformat*) @@ -409,6 +414,27 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (values (ml-class-title x) nitems (class-name-of x))) (defclass htmlformat (textformat) + () + (:default-initargs :file-start-str "~%" + :file-end-str "~%" + :list-start-indent t + :list-start-fmtstr "

~a~p:

~%" + :list-start-value-func #'htmlformat-list-start-value-func + :list-end-fmtstr "

~%" + :list-end-indent t + :list-end-value-func #'identity + :obj-start-indent t + :obj-start-fmtstr "

" + :obj-start-value-func #'identity + :obj-end-indent t + :obj-end-fmtstr "

~%" + :obj-end-value-func #'identity + :obj-data-indent t + :obj-data-fmtstr #'ml-class-fmtstr-html-labels + :obj-data-fmtstr-labels #'ml-class-fmtstr-html-labels + :obj-data-value-func #'ml-class-value-func)) + +(defclass xhtmlformat (textformat) () (:default-initargs :file-start-str "~%" :file-end-str "~%" @@ -470,6 +496,14 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (:documentation "Formatting for a linked reference")) (defclass html-link-ref (link-ref) + () + (:default-initargs :fmtstr #'ml-class-fmtstr-html-ref + :fmtstr-labels #'ml-class-fmtstr-html-ref-labels + :href-head "a href=" + :href-end "a" + :ampersand "&")) + +(defclass xhtml-link-ref (link-ref) () (:default-initargs :fmtstr #'ml-class-fmtstr-html-ref :fmtstr-labels #'ml-class-fmtstr-html-ref-labels @@ -497,6 +531,10 @@ Format is ((field-name field-lookup-func other-link-params) ...)") () (:default-initargs :link-ref (make-instance 'html-link-ref))) +(defclass xhtmlrefformat (xhtmlformat) + () + (:default-initargs :link-ref (make-instance 'xhtml-link-ref))) + (defclass xmlrefformat (xmlformat) () (:default-initargs :link-ref (make-instance 'xml-link-ref)))