r5339: *** empty log message ***

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index 85b49a64676a06259c94fdd794714c2d2c9999c6..b106046d2b732387a6c248d5b25f0ffac2940756 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:       Kevin M. Rosenberg
 ;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.15 2003/06/24 08:49:09 kevin Exp $
+;;;; $Id: class-support.lisp,v 1.17 2003/07/19 20:32:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
@@ -122,10 +122,10 @@
       (or (not is-term) is-english)))
 
 (defun print-umlsclass (obj &key (stream *standard-output*)
-                       (category :compact-text)
+                       (vid :compact-text)
                        (file-wrapper nil) (english-only t) (subobjects nil)
                        (refvars nil) (link-printer nil))
-  (view obj :stream stream :category category :subobjects subobjects
+  (view obj :stream stream :vid vid :subobjects subobjects
        :file-wrapper file-wrapper
        :filter (if english-only nil #'english-term-filter)
        :link-printer link-printer
@@ -133,10 +133,10 @@
 
 (defmacro define-lookup-display (newfuncname lookup-func)
   "Defines functions for looking up and displaying objects"
-  `(defun ,newfuncname  (keyval &key (stream *standard-output*) (category :compact-text)
+  `(defun ,newfuncname  (keyval &key (stream *standard-output*) (vid :compact-text)
                         (file-wrapper t) (english-only nil) (subobjects nil))
      (let ((obj (funcall ,lookup-func keyval)))
-       (print-umlsclass obj :stream stream :category category
+       (print-umlsclass obj :stream stream :vid vid
                        :file-wrapper file-wrapper :english-only english-only
                        :subobjects subobjects)
        obj)))
@@ -163,6 +163,9 @@
 (defun remove-non-english-terms (uterms)
   (remove-if-not #'english-term-p uterms))
 
+(defun remove-english-terms (uterms)
+  (remove-if #'english-term-p uterms))
+
 
 #+(or scl cmu)
 (dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))