From 02f38fa2c971c7300bd1e352d1a242e4f8e6543c Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 3 Nov 2002 20:10:48 +0000
Subject: [PATCH] r3287: *** empty log message ***

---
 debian/changelog |   6 +
 kmrcl.asd        |   3 +-
 ml-class.lisp    | 739 -----------------------------------------------
 package.lisp     |   9 +-
 4 files changed, 8 insertions(+), 749 deletions(-)
 delete mode 100644 ml-class.lisp

diff --git a/debian/changelog b/debian/changelog
index 41d3ba0..431a0c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-kmrcl (1.19-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun,  3 Nov 2002 13:08:44 -0700
+
 cl-kmrcl (1.18-1) unstable; urgency=low
 
   * New upstream
diff --git a/kmrcl.asd b/kmrcl.asd
index d6db7c5..9a6606d 100644
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: kmrcl.asd,v 1.18 2002/11/02 18:00:45 kevin Exp $
+;;;; $Id: kmrcl.asd,v 1.19 2002/11/03 20:10:48 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -37,7 +37,6 @@
      #+allegro (:file "attrib-class" :depends-on ("package"))
      (:file "web-utils" :depends-on ("package"))
      (:file "xml-utils" :depends-on ("package"))
-     #+(or allegro lispworks cmu sbcl scl) (:file "ml-class" :depends-on ("strings" "genutils"))
      #+(or allegro aserve) (:file "web-utils-aserve" :depends-on ("strings" "genutils")))
 
     #+(and common-lisp-controller (or cmu lispworks mcl)) :depends-on
diff --git a/ml-class.lisp b/ml-class.lisp
deleted file mode 100644
index 9b5f085..0000000
--- a/ml-class.lisp
+++ /dev/null
@@ -1,739 +0,0 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          ml-class.lisp
-;;;; Purpose:       Markup Language Metaclass
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
-;;;;
-;;;; This metaclass as functions to classes to allow display
-;;;; in Text, HTML, and XML formats. This includes hyperlinking
-;;;; capability and sub-objects.
-;;;;
-;;;; $Id: ml-class.lisp,v 1.21 2002/10/18 07:28:57 kevin Exp $
-;;;;
-;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; KMRCL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
- 
-(in-package :kmrcl)
-
-(declaim (optimize (speed 3) (safety 1)))
-
-(defun ml-class-of (obj)
-  #-(or cmu sbcl) (class-of obj)
-  #+sbcl (sb-pcl:class-of obj)
-  #+cmu (pcl:class-of obj))
-
-(defun ml-class-name (obj)
-  #-(or cmu sbcl) (class-name obj)
-  #+sbcl (sb-pcl:class-name obj)
-  #+cmu (pcl:class-name obj))
-
-(defclass ml-class (#-(or cmu sbcl) standard-class
-		      #+cmu pcl::standard-class
-		      #+sbcl sb-pcl::standard-class)
-  ((title :initarg :title :type string :reader ml-std-title
-	  :documentation 
-"Print Title for class")
-   (fields :initarg :fields :reader ml-std-fields
-	   :documentation
-"List of field lists for printing. Format is 
-   ((fieldname type optional-formatter) ... )")
-   (subobjects-lists 
-    :initarg :subobjects-lists :reader ml-std-subobjects-lists
-    :documentation 
-"List of fields that contain a list of subobjects objects.")
-   (ref-fields 
-    :initarg :ref-fields :type list :reader ml-std-ref-field
-    :documentation 
-    "List of fields that can be referred to by browsers. 
-Format is ((field-name field-lookup-func other-link-params) ...)")
-   
-   ;;; The remainder of these fields are calculated one time
-   ;;; in finalize-inheritence.
-   (value-func :initform nil :type function :reader ml-std-value-func)
-   (xmlvalue-func :initform nil :type function :reader ml-std-xmlvalue-func)
-   (fmtstr-text :initform nil :type string :reader ml-std-fmtstr-text)
-   (fmtstr-html :initform nil :type string :reader ml-std-fmtstr-html)
-   (fmtstr-xml :initform nil :type string :reader ml-std-fmtstr-xml)
-   (fmtstr-text-labels :initform nil :type string :reader ml-std-fmtstr-text-labels)
-   (fmtstr-html-labels :initform nil :type string :reader ml-std-fmtstr-html-labels)
-   (fmtstr-xml-labels :initform nil :type string :reader ml-std-fmtstr-xml-labels)
-   (fmtstr-html-ref :initform nil :type string :reader ml-std-fmtstr-html-ref)
-   (fmtstr-xml-ref :initform nil :type string :reader ml-std-fmtstr-xml-ref)
-   (fmtstr-html-ref-labels :initform nil :type string :reader ml-std-fmtstr-html-ref-labels)
-   (fmtstr-xml-ref-labels :initform nil :type string :reader ml-std-fmtstr-xml-ref-labels)
-   )
-  (:default-initargs :title nil :fields nil :subobjects-lists nil :ref-fields nil)
-  (:documentation "Metaclass for Markup Language classes."))
-
-#+cmu
-(defmethod pcl:finalize-inheritance :after ((cl ml-class))
-  (init-ml-class cl))
-
-#+scl
-(defmethod clos:finalize-inheritance :after ((cl ml-class))
-  (init-ml-class cl))
-
-
-#+sbcl
-(defmethod sb-pcl:finalize-inheritance :after ((cl ml-class))
-  (init-ml-class cl))
-
-
-#+cmu
-(defmethod pcl:validate-superclass ((class ml-class) (superclass pcl::standard-class))
-  t)
-
-#+scl
-(defmethod clos:validate-superclass ((class ml-class) (superclass standard-class))
-  t)
-
-#+sbcl
-(defmethod sb-pcl:validate-superclass ((class ml-class) (superclass sb-pcl::standard-class))
-  t)
-
-#+allegro
-(defmethod mop:finalize-inheritance :after ((cl ml-class))
-  (init-ml-class cl))
-
-#+lispworks
-(defmethod clos:finalize-inheritance :after ((cl ml-class))
-  (init-ml-class cl))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class ml-class)
-					(name (eql :title))
-					value)
-  (unless value
-    (error "ml-class title must have a value"))
-  (if (null (cdr value))
-      (list name (car value))
-    (list name `',value)))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class ml-class)
-					(name (eql :fields))
-					value)
-  (unless value
-    (error "ml-class fields must have a value"))
-  (list name `',value))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class ml-class)
-					(name (eql :ref-fields))
-					value)
-  (unless value
-    (error "ml-class ref-fields must have a value"))
-  (list name `',value))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class ml-class)
-					(name (eql :subobjects-lists))
-					value)
-  (unless value
-    (error "ml-class subobjects-lists must have a value"))
-  (list name `',value))
-
-;;;; Class initialization function
-      
-(defun init-ml-class (cl)
-    (let ((fmtstr-text "")
-	  (fmtstr-html "")
-	  (fmtstr-xml "")
-	  (fmtstr-text-labels "")
-	  (fmtstr-html-labels "")
-	  (fmtstr-xml-labels "")
-	  (fmtstr-html-ref "")
-	  (fmtstr-xml-ref "")
-	  (fmtstr-html-ref-labels "")
-	  (fmtstr-xml-ref-labels "")
-	  (first-field t)
-	  (value-func '())
-	  (xmlvalue-func '())
-	  (classname (class-name cl))
-	  (package (symbol-package (ml-class-name cl)))
-	  (ref-fields (slot-value cl 'ref-fields)))
-      (declare (ignore classname))
-      (dolist (f (slot-value cl 'fields))
-	(let ((name (car f))
-	      (namestr (symbol-name (car f)))
-	      (namestr-lower (string-downcase (symbol-name (car f))))
-	      (type (cadr f))
-	      (formatter (caddr f))
-	      (value-fmt "~a")
-	      (plain-value-func nil)
-	      html-str xml-str html-label-str xml-label-str)
-	  
-	  (when (or (eql type :integer) (eql type :fixnum))
-	    (setq value-fmt "~d"))
-	  
-	  (when (eql type :commainteger)
-	    (setq value-fmt "~:d"))
-	  
-	  (when (eql type :boolean)
-	    (setq value-fmt "~a"))
-	    
-	  (if first-field
-	      (setq first-field nil)
-	    (progn
-	      (string-append fmtstr-text " ")
-	      (string-append fmtstr-html " ")
-	      (string-append fmtstr-xml " ")
-	      (string-append fmtstr-text-labels " ")
-	      (string-append fmtstr-html-labels " ")
-	      (string-append fmtstr-xml-labels " ")
-	      (string-append fmtstr-html-ref " ")
-	      (string-append fmtstr-xml-ref " ")
-	      (string-append fmtstr-html-ref-labels " ")
-	      (string-append fmtstr-xml-ref-labels " ")))
-	  
-	  (setq html-str (concatenate 'string "<span class=\"" namestr-lower "\">" value-fmt "</span>"))
-	  (setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "</" namestr-lower ">"))
-	  (setq html-label-str (concatenate 'string "<span class=\"label\">" namestr-lower "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>"))
-	  (setq xml-label-str (concatenate 'string "<label>" namestr-lower "</label> <" namestr-lower ">" value-fmt "</" namestr-lower ">"))
-	  
-	  (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)
-	  (string-append fmtstr-html-labels html-label-str)
-	  (string-append fmtstr-xml-labels xml-label-str)
-	  
-	  (if (find name ref-fields :key #'car)
-	    (progn
-	      (string-append fmtstr-html-ref "<~~a>" value-fmt "</~~a>")
-	      (string-append fmtstr-xml-ref "<~~a>" value-fmt "</~~a>")
-	      (string-append fmtstr-html-ref-labels "<span class=\"label\">" namestr-lower "</span> <~~a>" value-fmt "</~~a>")
-	      (string-append fmtstr-xml-ref-labels "<label>" namestr-lower "</label> <~~a>" value-fmt "</~~a>"))
-	    (progn
-	      (string-append fmtstr-html-ref html-str)
-	      (string-append fmtstr-xml-ref xml-str)
-	      (string-append fmtstr-html-ref-labels html-label-str)
-	      (string-append fmtstr-xml-ref-labels xml-label-str)))
-	  
-	  (if formatter
-	      (setq plain-value-func 
-		(list `(,formatter (,(intern namestr package) x))))
-	    (setq plain-value-func 
-	      (list `(,(intern namestr package) x))))
-	  (setq value-func (append value-func plain-value-func))
-	  
-	  (if (eql type :cdata)
-	      (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))))
-      (setq value-func (compile nil (eval value-func)))
-      
-      (if xmlvalue-func
-	  (setq xmlvalue-func `(lambda (x) (values ,@xmlvalue-func)))
-	(setq xmlvalue-func `(lambda () (values))))
-      (setq xmlvalue-func (compile nil (eval xmlvalue-func)))
-
-      (setf (slot-value cl 'fmtstr-text) fmtstr-text)
-      (setf (slot-value cl 'fmtstr-html) fmtstr-html)
-      (setf (slot-value cl 'fmtstr-xml) fmtstr-xml)
-      (setf (slot-value cl 'fmtstr-text-labels) fmtstr-text-labels)
-      (setf (slot-value cl 'fmtstr-html-labels) fmtstr-html-labels)
-      (setf (slot-value cl 'fmtstr-xml-labels) fmtstr-xml-labels)
-      (setf (slot-value cl 'fmtstr-html-ref) fmtstr-html-ref)
-      (setf (slot-value cl 'fmtstr-xml-ref) fmtstr-xml-ref)
-      (setf (slot-value cl 'fmtstr-html-ref-labels) fmtstr-html-ref-labels)
-      (setf (slot-value cl 'fmtstr-xml-ref-labels) fmtstr-xml-ref-labels)
-      (setf (slot-value cl 'value-func) value-func)
-      (setf (slot-value cl 'xmlvalue-func) xmlvalue-func))
-    (values))
-
-
-(defun ml-class-fmtstr-text (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-text))
-
-(defun ml-class-fmtstr-html (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-html))
-
-(defun ml-class-fmtstr-xml (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-xml))
-
-(defun ml-class-fmtstr-text-labels (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-text-labels))
-
-(defun ml-class-fmtstr-html-labels (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-html-labels))
-
-(defun ml-class-fmtstr-xml-labels (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-xml-labels))
-
-(defun ml-class-value-func (obj)
-  (slot-value (ml-class-of obj) 'value-func))
-
-(defun ml-class-xmlvalue-func (obj)
-  (slot-value (ml-class-of obj) 'xmlvalue-func))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-(defun ml-class-title (obj)
-  (awhen (slot-value (ml-class-of obj) 'title)
-	    (if (consp it)
-		(car it)
-	      it))))
-
-(defun ml-class-subobjects-lists (obj)
-  (slot-value (ml-class-of obj) 'subobjects-lists))
-
-(defun ml-class-ref-fields (obj)
-  (slot-value (ml-class-of obj) 'ref-fields))
-
-(defun ml-class-fields (obj)
-  (slot-value (ml-class-of obj) 'fields))
-
-(defun ml-class-fmtstr-html-ref (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-html-ref))
-
-(defun ml-class-fmtstr-xml-ref (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-xml-ref))
-
-(defun ml-class-fmtstr-html-ref-labels (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-html-ref-labels))
-
-(defun ml-class-fmtstr-xml-ref-labels (obj)
-  (slot-value (ml-class-of obj) 'fmtstr-xml-ref-labels))
-
-;;; Class name functions
-
-(defgeneric ml-class-stdname (x))
-(defmethod ml-class-stdname ((name string))
-  (string-downcase (subseq name 1)))
-  
-(defmethod ml-class-stdname ((cl standard-object))
-  (string-downcase (subseq (ml-class-name (ml-class-of cl)) 1)))
-  
-;;;; Generic Print functions
-
-(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)
-(defparameter *default-nullformat* nil)
-(defparameter *default-init-format?* nil)
-
-(defun make-format-instance (fmt)
-  (unless *default-init-format?*
-    (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))
-    (setq *default-nullformat* (make-instance 'nullformat))
-    (setq *default-init-format?* t))
-  
-  (case fmt
-      (:text *default-textformat*)
-      (:html *default-htmlformat*)
-      (:htmlref *default-htmlrefformat*)
-      (:xhtml  *default-xhtmlformat*)
-      (:xhtmlref *default-xhtmlrefformat*)
-      (:xml  *default-xmlformat*)
-      (:xmlref *default-xmlrefformat*)
-      (:ie-xmlref *default-ie-xmlrefformat*)
-      (:null *default-nullformat*)
-      (otherwise *default-textformat*)))
-    
-;;;; Output format classes for print ml-classes
-
-(defclass dataformat ()
-  ((file-start-str :type string :initarg :file-start-str :reader file-start-str)
-   (file-end-str :type string :initarg :file-end-str :reader file-end-str)
-   (list-start-fmtstr :type string :initarg :list-start-fmtstr :reader list-start-fmtstr)
-   (list-start-value-func :type function :initarg :list-start-value-func :reader list-start-value-func)
-   (list-start-indent :initarg :list-start-indent :reader list-start-indent)
-   (list-end-fmtstr :type string :initarg :list-end-fmtstr :reader list-end-fmtstr)
-   (list-end-value-func :type function :initarg :list-end-value-func :reader list-end-value-func)
-   (list-end-indent :initarg :list-end-indent :reader list-end-indent)
-   (obj-start-fmtstr :type string :initarg :obj-start-fmtstr :reader obj-start-fmtstr)
-   (obj-start-value-func :initarg :obj-start-value-func :reader obj-start-value-func)
-   (obj-start-indent :initarg :obj-start-indent :reader obj-start-indent)
-   (obj-end-fmtstr :type string :initarg :obj-end-fmtstr :reader obj-end-fmtstr)
-   (obj-end-value-func :initarg :obj-end-value-func :reader obj-end-value-func)
-   (obj-end-indent :initarg :obj-end-indent :reader obj-end-indent)
-   (obj-data-indent :initarg :obj-data-indent :reader obj-data-indent)
-   (obj-data-fmtstr :initarg :obj-data-fmtstr :reader  obj-data-fmtstr)
-   (obj-data-fmtstr-labels :initarg :obj-data-fmtstr-labels :reader  obj-data-fmtstr-labels)
-   (obj-data-end-fmtstr :initarg :obj-data-end-fmtstr :reader obj-data-end-fmtstr)
-   (obj-data-value-func :initarg :obj-data-value-func :reader obj-data-value-func)
-   (link-ref :initarg :link-ref :reader link-ref))
-  (:default-initargs :file-start-str nil :file-end-str nil :list-start-fmtstr nil :list-start-value-func nil
-		     :list-start-indent nil :list-end-fmtstr nil :list-end-value-func nil :list-end-indent nil
-		     :obj-start-fmtstr nil :obj-start-value-func nil :obj-start-indent nil
-		     :obj-end-fmtstr nil :obj-end-value-func nil :obj-end-indent nil
-		     :obj-data-indent nil :obj-data-fmtstr nil :obj-data-fmtstr-labels nil :obj-data-end-fmtstr nil
-		     :obj-data-value-func nil :link-ref nil)
-  (:documentation "Parent for all dataformat objects"))
-
-(defclass binaryformat (dataformat)
-  ())
-
-(defclass nullformat (dataformat)
-  ())
-
-(defun text-list-start-value-func (obj nitems)
-  (values (ml-class-title obj) nitems))
-
-(defclass textformat (dataformat) 
-  ()	
-  (:default-initargs :list-start-fmtstr "~a~P:~%"
-    :list-start-value-func #'text-list-start-value-func
-    :list-start-indent t
-    :obj-data-indent t
-    :obj-data-fmtstr #'ml-class-fmtstr-text
-    :obj-data-fmtstr-labels #'ml-class-fmtstr-text-labels
-    :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 "<html><body>~%"
-    :file-end-str "</body><html>~%"
-    :list-start-indent t
-    :list-start-fmtstr "<p><b>~a~p:</b></p><div class=\"~A\"><ul>~%"
-    :list-start-value-func #'htmlformat-list-start-value-func
-    :list-end-fmtstr "</ul></div>~%"
-    :list-end-indent t
-    :list-end-value-func #'identity
-    :obj-start-indent t
-    :obj-start-fmtstr "<li>"
-    :obj-start-value-func #'identity
-    :obj-end-indent  t
-    :obj-end-fmtstr  "</li>~%"
-    :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 "<html><body>~%"
-    :file-end-str "</body><html>~%"
-    :list-start-indent t
-    :list-start-fmtstr "<p><b>~a~p:</b></p><div class=\"~A\"><ul>~%"
-    :list-start-value-func #'htmlformat-list-start-value-func
-    :list-end-fmtstr "</ul></div>~%"
-    :list-end-indent t
-    :list-end-value-func #'identity
-    :obj-start-indent t
-    :obj-start-fmtstr "<li>"
-    :obj-start-value-func #'identity
-    :obj-end-indent  t
-    :obj-end-fmtstr  "</li>~%"
-    :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-xmlvalue-func))
-
-
-(defun xmlformat-list-end-value-func (x)
-  (format nil "~alist" (class-name-of x)))
-
-(defun xmlformat-list-start-value-func (x nitems) 
-  (values (format nil "~alist" (class-name-of x)) (ml-class-title x) nitems))
-
-(defclass xmlformat (textformat) 
-  ()
-  (:default-initargs :file-start-str "" ; (std-xml-header)
-    :list-start-indent  t
-    :list-start-fmtstr "<~a><title>~a~p:</title> ~%"
-    :list-start-value-func #'xmlformat-list-start-value-func
-    :list-end-indent  t
-    :list-end-fmtstr "</~a>~%"
-    :list-end-value-func #'xmlformat-list-end-value-func
-    :obj-start-fmtstr "<~a>"
-    :obj-start-value-func #'class-name-of
-    :obj-start-indent t
-    :obj-end-fmtstr "</~a>~%"
-    :obj-end-value-func #'class-name-of
-    :obj-end-indent nil
-    :obj-data-indent nil
-    :obj-data-fmtstr #'ml-class-fmtstr-xml
-    :obj-data-fmtstr-labels #'ml-class-fmtstr-xml-labels
-    :obj-data-value-func #'ml-class-xmlvalue-func))
-
-(defclass link-ref ()
-  ((fmtstr :type function :initarg :fmtstr :accessor fmtstr)
-   (fmtstr-labels :type function :initarg :fmtstr-labels :accessor fmtstr-labels)
-   (page-name :type string :initarg :page-name :accessor page-name)
-   (href-head :type string :initarg :href-head :accessor href-head)
-   (href-end :type string :initarg :href-end :accessor href-end)
-   (ampersand :type string :initarg :ampersand :accessor ampersand))
-  (:default-initargs :fmtstr nil 
-    :fmtstr-labels nil 
-    :page-name "disp-func1" 
-    :href-head nil :href-end nil :ampersand nil)
-  (: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
-    :href-head "a href=" 
-    :href-end "a" 
-    :ampersand "&amp;"))
-
-(defclass xml-link-ref (link-ref)
-  ()
-  (:default-initargs :fmtstr #'ml-class-fmtstr-xml-ref 
-		     :fmtstr-labels #'ml-class-fmtstr-xml-ref-labels
-		     :href-head "xmllink xlink:type=\"simple\" xlink:href=" 
-		     :href-end "xmllink" 
-		     :ampersand "&amp;")
-  (:documentation "Mozilla's and W3's idea of a link with XML"))
-
-(defclass ie-xml-link-ref (xml-link-ref)
-  ()
-  (:default-initargs :href-head "html:a href=" 
-		     :href-end "html:a" )
-  (:documentation "Internet Explorer's idea of a link with XML"))
-
-
-(defclass htmlrefformat (htmlformat)
-  ()
-  (: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)))
-
-(defclass ie-xmlrefformat (xmlformat)
-  ()
-  (:default-initargs :link-ref (make-instance 'ie-xml-link-ref)))
-
-
-;;; File Start and Ends
-
-(defgeneric fmt-file-start (fmt s))
-(defmethod fmt-file-start ((fmt dataformat) (s stream)))
-
-(defmethod fmt-file-start ((fmt textformat) (s stream))
-  (aif (file-start-str fmt)
-      (format s it)))
-
-(defgeneric fmt-file-end (fmt s))
-(defmethod fmt-file-end ((fmt textformat) (s stream))
-  (aif (file-end-str fmt)
-	  (format s it)))
-
-;;; List Start and Ends
-
-(defgeneric fmt-list-start (obj fmt s &optional indent num-items))
-(defmethod fmt-list-start (x (fmt textformat) (s stream) &optional (indent 0) (num-items 1))
-  (if (list-start-indent fmt)
-      (indent-spaces indent s))
-  (aif (list-start-fmtstr fmt)
-	  (apply #'format s it
-		 (multiple-value-list
-		  (funcall (list-start-value-func fmt) x num-items)))))
-
-(defgeneric fmt-list-end (obj fmt s &optional indent num-items))
-(defmethod fmt-list-end (x (fmt textformat) (s stream) &optional (indent 0) (num-items 1))
-  (declare (ignore num-items))
-  (if (list-end-indent fmt)
-      (indent-spaces indent s))
-  (aif (list-end-fmtstr fmt)
-	  (apply #'format s it
-		 (multiple-value-list
-		  (funcall (list-end-value-func fmt) x)))))
-
-;;; Object Start and Ends
-
-(defgeneric fmt-obj-start (obj fmt s &optional indent))
-(defmethod fmt-obj-start (x (fmt textformat) (s stream) &optional (indent 0))
-  (if (obj-start-indent fmt)
-      (indent-spaces indent s))
-  (aif (obj-start-fmtstr fmt)
-	  (apply #'format s it
-		 (multiple-value-list
-		  (funcall (obj-start-value-func fmt) x)))))
-
-(defgeneric fmt-obj-end (obj fmt s &optional indent))
-(defmethod fmt-obj-end (x (fmt textformat) (s stream) &optional (indent 0))
-  (if (obj-end-indent fmt)
-      (indent-spaces indent s))
-  (aif (obj-end-fmtstr fmt)
-	  (apply #'format s it
-		 (multiple-value-list
-		  (funcall (obj-end-value-func fmt) x)))))
-  
-;;; Object Data 
-
-(defgeneric make-link-start (obj ref fieldname fieldfunc fieldvalue refvars))
-(defmethod make-link-start (obj (ref link-ref) fieldname fieldfunc fieldvalue refvars)
-  (declare (ignore obj fieldname))
-  (format nil "~a\"~a?func=~a~akey=~a~a\"" 
-	  (href-head ref) (make-url (page-name ref)) fieldfunc 
-	  (ampersand ref) fieldvalue
-	  (if refvars
-	      (let ((varstr ""))
-		(dolist (var refvars)
-		  (string-append varstr (format nil "~a~a=~a" 
-						(ampersand ref) (car var) (cadr var))))
-		varstr)
-	    "")))
-
-(defgeneric make-link-end (obj ref fieldname)) 
-(defmethod make-link-end (obj (ref link-ref) fieldname)
-  (declare (ignore obj fieldname))
-  (format nil "~a" (href-end ref))
-  )
-
-(defgeneric fmt-obj-data (obj fmt s &optional indent label refvars))
-(defmethod fmt-obj-data (x (fmt textformat) s
-			 &optional (indent 0) (label nil) (refvars nil))
-  (if (obj-data-indent fmt)
-      (indent-spaces indent s))
-  (if (link-ref fmt)
-      (fmt-obj-data-with-ref x fmt s label refvars)
-    (fmt-obj-data-plain x fmt s label))
-  (aif (obj-data-end-fmtstr fmt)
-       (format s it)))
-
-(defgeneric fmt-obj-data-plain (obj fmt s label))
-(defmethod fmt-obj-data-plain (x (fmt textformat) s label)
-  (if label
-      (apply #'format s
-	     (funcall (obj-data-fmtstr-labels fmt) x)
-	     (multiple-value-list 
-	      (funcall (funcall (obj-data-value-func fmt) x) x)))
-    (apply #'format s (funcall (obj-data-fmtstr fmt) x)
-	   (multiple-value-list
-	    (funcall (funcall (obj-data-value-func fmt) x) x)))))
-
-(defgeneric fmt-obj-data-with-ref (obj fmt s label refvars))
-(defmethod fmt-obj-data-with-ref (x (fmt textformat) s label refvars)
-  (let ((refstr (make-ref-data-str x fmt label))
-	(refvalues nil)
-	(field-values 
-	 (multiple-value-list
-	  (funcall (funcall (obj-data-value-func fmt) x) x))))
-    
-    ;; make list of reference link fields for printing to refstr template
-    (dolist (field (ml-class-ref-fields x))
-      (let ((link-start 
-	     (make-link-start x (link-ref fmt) (car field) (cadr field)
-			      (nth (position (car field) (ml-class-fields x) :key #'car) field-values)  
-			      (append (caddr field) refvars)))
-	    (link-end (make-link-end x (link-ref fmt) (car field))))
-	(push link-start refvalues)
-	(push link-end refvalues)))
-    (setq refvalues (nreverse refvalues))
-    
-    (apply #'format s refstr refvalues)))
-
-(defgeneric obj-data (obj))
-(defmethod obj-data (x)
-  "Returns the objects data as a string. Used by common-graphics outline function"
-  (let ((fmt (make-format-instance :text)))
-    (apply #'format nil (funcall (obj-data-fmtstr fmt) x)
-	   (multiple-value-list 
-	    (funcall (funcall (obj-data-value-func fmt) x) x)))))
-
-(defgeneric make-ref-data-str (obj fmt &optional label))
-(defmethod make-ref-data-str (x (fmt textformat) &optional (label nil))
-  "Return fmt string for that contains ~a slots for reference link start and end"
-  (unless (link-ref fmt)
-    (error "fmt does not contain a link-ref"))
-  (let ((refstr 
-	 (if label
-	     (apply #'format nil (funcall (fmtstr-labels (link-ref fmt)) x)
-		    (multiple-value-list
-		      (funcall (funcall (obj-data-value-func fmt) x) x)))
-	   (apply #'format nil (funcall (fmtstr (link-ref fmt)) x)
-		  (multiple-value-list (funcall (funcall (obj-data-value-func fmt) x) x))))))
-    refstr))
-  
-;;; Display method for objects
-
-
-(defgeneric load-all-subobjects (objs))
-(defmethod load-all-subobjects (objs)
-  "Load all subobjects if they have not already been loaded."
-  (when objs
-    (let ((objlist (mklist objs)))
-      (dolist (obj objlist)
-        (awhen (ml-class-subobjects-lists obj)  ;; access list of functions
-          (dolist (child-obj it)   ;; for each child function
-            (awhen (funcall (car child-obj) obj)
-              (load-all-subobjects it))))))
-    objs))
-
-(defgeneric output-ml-class (objs fmt strm &optional label english-only-function indent subobjects refvars))
-(defmethod output-ml-class (objs (fmt dataformat) (strm stream) 
-			    &optional (label nil) (english-only-function nil)
-				      (indent 0) (subobjects nil) (refvars nil))
-  "Display a single or list of ml-class instances and their subobjects"
-  (when objs
-    (setq objs (mklist objs))
-    (let ((nobjs (length objs)))
-      (fmt-list-start (car objs) fmt strm indent nobjs)
-      (dolist (obj objs)
-        (unless (and english-only-function
-		  (multiple-value-bind (eng term) (funcall english-only-function obj)
-		    (and term (not eng))))
-          (fmt-obj-start obj fmt strm indent)
-          (fmt-obj-data obj fmt strm (1+ indent) label refvars)
-          (if subobjects
-              (awhen (ml-class-subobjects-lists obj)  ;; access list of functions
-                        (dolist (child-obj it)   ;; for each child function
-                          (awhen (funcall (car child-obj) obj) ;; access set of child objects
-                                    (output-ml-class it fmt strm label 
-                                                     english-only-function
-                                                     (1+ indent) subobjects refvars)))))
-          (fmt-obj-end obj fmt strm indent)))
-      (fmt-list-end (car objs) fmt strm indent nobjs))
-    t))
-
-(defun display-ml-class (objs &key (os *standard-output*) (format :text)
-				(label nil) (english-only-function nil) (subobjects nil)
-				(file-wrapper t) (refvars nil))
-  "EXPORTED Function: displays a ml-class. Simplies call to output-ml-class"
-  (let ((fmt (make-format-instance format)))
-    (if file-wrapper
-	(fmt-file-start fmt os))
-    (when objs
-      (output-ml-class objs fmt os label english-only-function 0 subobjects refvars))
-    (if file-wrapper
-	(fmt-file-end fmt os)))
-  objs)
diff --git a/package.lisp b/package.lisp
index b8c5582..7341fe5 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.10 2002/11/02 18:00:45 kevin Exp $
+;;;; $Id: package.lisp,v 1.11 2002/11/03 20:10:48 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -133,13 +133,6 @@
 	  #:positions-xml-tag-contents
 	  #:xml-tag-contents
 	  #:encode-query
-
-	  ;; From ml-class.lisp
-	  #:ml-class
-	  #:ml-class-title
-	  #:load-all-subobjects
-	  #:display-ml-class
-	  #:xml-cdata
 	  ))
 
 
-- 
2.34.1