X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=39878fa91bae69131b19285e8ccac934628d015d;hb=8127923e06a01790d883aefd282db6c0419c484a;hp=5809fb8cc1ec3826f5993aa2598e0067169bcdbd;hpb=7df23480148948394d8ded4d4997abace80f100d;p=kmrcl.git
diff --git a/ml-class.lisp b/ml-class.lisp
index 5809fb8..39878fa 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.14 2002/10/16 16:05:18 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.20 2002/10/17 00:25:05 kevin Exp $
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@ -25,17 +25,17 @@
(declaim (optimize (speed 3) (safety 1)))
(defun ml-class-of (obj)
- #-(or cmu sbcl) (class-of obj)
+ #-(or cmu sbcl scl) (class-of obj)
#+sbcl (sb-pcl:class-of obj)
- #+cmu (pcl:class-of obj))
+ #+(or cmu scl) (pcl:class-of obj))
(defun ml-class-name (obj)
- #-(or cmu sbcl) (class-name obj)
+ #-(or cmu sbcl scl) (class-name obj)
#+sbcl (sb-pcl:class-name obj)
- #+cmu (pcl:class-name obj))
+ #+(or cmu scl) (pcl:class-name obj))
(defclass ml-class (#-(or cmu sbcl) standard-class
- #+cmu pcl::standard-class
+ #+(or cmu scl) pcl::standard-class
#+sbcl sb-pcl::standard-class)
((title :initarg :title :type string :reader ml-std-title
:documentation
@@ -72,7 +72,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(:default-initargs :title nil :fields nil :subobjects-lists nil :ref-fields nil)
(:documentation "Metaclass for Markup Language classes."))
-#+cmu
+#+(or cmu scl)
(defmethod pcl:finalize-inheritance :after ((cl ml-class))
(init-ml-class cl))
@@ -82,7 +82,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(init-ml-class cl))
-#+cmu
+#+(or cmu slc)
(defmethod pcl:validate-superclass ((class ml-class) (superclass pcl::standard-class))
t)
@@ -98,16 +98,6 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(defmethod clos:finalize-inheritance :after ((cl ml-class))
(init-ml-class cl))
-;;#+cmu
-;;(defmethod pcl::class-finalized-p ((cl ml-class))
-;; (and (not (null (slot-value cl 'pcl::wrapper)))
-;; (not (null (slot-value cl 'fmtstr-text)))))
-
-;;#+sbcl
-;;(defmethod sb-pcl::class-finalized-p ((cl ml-class))
-;; (and (not (null (slot-value cl 'sb-pcl::wrapper)))
-;; (not (null (slot-value cl 'fmtstr-text)))))
-
#+lispworks
(defmethod clos:process-a-class-option ((class ml-class)
(name (eql :title))
@@ -195,12 +185,12 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(string-append fmtstr-html-ref-labels " ")
(string-append fmtstr-xml-ref-labels " ")))
- (setq html-str value-fmt)
+ (setq html-str (concatenate 'string "" value-fmt ""))
(setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt ""))
- (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt))
+ (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt ""))
(setq xml-label-str (concatenate 'string " <" namestr-lower ">" value-fmt ""))
- (string-append fmtstr-text "" value-fmt "")
+ (string-append fmtstr-text value-fmt)
(string-append fmtstr-html html-str)
(string-append fmtstr-xml xml-str)
(string-append fmtstr-text-labels namestr-lower " " value-fmt)
@@ -230,7 +220,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(setq xmlvalue-func (append xmlvalue-func (list `(xml-cdata ,@plain-value-func))))
(setq xmlvalue-func (append xmlvalue-func plain-value-func)))
))
-
+
(if value-func
(setq value-func `(lambda (x) (values ,@value-func)))
(setq value-func `(lambda () (values))))
@@ -322,6 +312,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 +325,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 +337,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*)
@@ -401,14 +396,21 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
:obj-data-end-fmtstr "~%"
:obj-data-value-func #'ml-class-value-func))
+
+(defun class-name-of (obj)
+ (string-downcase (ml-class-name (ml-class-of obj))))
+
+(defun htmlformat-list-start-value-func (x nitems)
+ (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 #'text-list-start-value-func
- :list-end-fmtstr "
~%"
+ :list-start-fmtstr "~a~p:
~%"
+ :list-start-value-func #'htmlformat-list-start-value-func
+ :list-end-fmtstr "
~a~p:
~%"
+ :list-start-value-func #'htmlformat-list-start-value-func
+ :list-end-fmtstr "