r3613: *** empty log message ***

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index a3eff62a1783a7f7b8e22139b623b1b0343fe672..09b1e9e0b7a7506eee9f36ef8d01bac08ba3a019 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;

-;;;; $Id: classes.lisp,v 1.20 2002/12/03 01:13:20 kevin Exp $
+;;;; $Id: classes.lisp,v 1.23 2002/12/13 05:43:38 kevin Exp $

 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.


@@ -30,8 +30,8 @@
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :srl nil)
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :srl nil)

-  (:title "Source Restriction Level")
-  (:print-slots sab srl)
+  (:user-name "Source Restriction Level")
+  (:default-print-slots sab srl)

   (:description "Custom Table: Source Restriction Level"))
 
   
   (:description "Custom Table: Source Restriction Level"))
 
   


@@ -42,16 +42,16 @@
    (supres :type string :initarg :supres :reader supres))
   (:metaclass hyperobject-class)
   (:default-initargs :rank nil :sab nil :tty nil :supres nil)
    (supres :type string :initarg :supres :reader supres))
   (:metaclass hyperobject-class)
   (:default-initargs :rank nil :sab nil :tty nil :supres nil)

-  (:title "Rank")
-  (:print-slots rank sab tty supres))
+  (:user-name "Rank")
+  (:default-print-slots rank sab tty supres))

 
 (defclass udef (umlsclass)
   ((def :type cdata :initarg :def :reader def)
    (sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab))
   (:metaclass hyperobject-class)
   (:default-initargs :def nil :sab nil)
 
 (defclass udef (umlsclass)
   ((def :type cdata :initarg :def :reader def)
    (sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab))
   (:metaclass hyperobject-class)
   (:default-initargs :def nil :sab nil)

-  (:title "Definition")
-  (:print-slots sab def))
+  (:user-name "Definition")
+  (:default-print-slots sab def))

 
 (defclass usat (umlsclass)
   ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
 
 (defclass usat (umlsclass)
   ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab)


@@ -60,8 +60,8 @@
    (atv :type cdata :initarg :atv :reader atv))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :atn nil :atv nil)
    (atv :type cdata :initarg :atv :reader atv))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :atn nil :atv nil)

-  (:title "Simple Attribute")
-  (:print-slots sab code atn atv))
+  (:user-name "Simple Attribute")
+  (:default-print-slots sab code atn atv))

 
 (defclass usab (umlsclass)
   ((vcui :type fixnum :initarg :vcui :reader vcui :print-formatter fmt-cui)
 
 (defclass usab (umlsclass)
   ((vcui :type fixnum :initarg :vcui :reader vcui :print-formatter fmt-cui)


@@ -93,8 +93,8 @@
                     :slc nil :scc nil :srl nil :tfr nil :cfr nil :cxty nil
                     :ttyl nil :atnl nil :lat nil :cenc nil :curver nil
                     :sabin nil)
                     :slc nil :scc nil :srl nil :tfr nil :cfr nil :cxty nil
                     :ttyl nil :atnl nil :lat nil :cenc nil :curver nil
                     :sabin nil)

-  (:title "Source Abbreviation")
-  (:print-slots vcui rcui vsab rsab son sf sver mstart mend imeta
+  (:user-name "Source Abbreviation")
+  (:default-print-slots vcui rcui vsab rsab son sf sver mstart mend imeta

                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin))
 
                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin))
 


@@ -105,8 +105,8 @@
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :tty nil :srl nil)
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :tty nil :srl nil)

-  (:title "Source")
-  (:print-slots sab code tty srl))
+  (:user-name "Source")
+  (:default-print-slots sab code tty srl))

 
 (defclass ucxt (umlsclass)
   ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
 
 (defclass ucxt (umlsclass)
   ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab)


@@ -123,27 +123,28 @@
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
                     :cui2 nil :hcd nil :rela nil :xc nil)
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
                     :cui2 nil :hcd nil :rela nil :xc nil)

-  (:title "Context")
-  (:print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs))
+  (:user-name "Context")
+  (:default-print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs))

 
 (defclass ustr (umlsclass)
   ((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
        :hyperlink find-ustr-sui)
 
 (defclass ustr (umlsclass)
   ((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
        :hyperlink find-ustr-sui)

-   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui)
+   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
+       :hyperlink find-ucon-cui)

    (lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
        :hyperlink find-uterm-lui)
    (cuisui :type integer :initarg :cuisui :reader cuisui )
    (str :type cdata :initarg :str :reader str)
    (lrl :type fixnum :initarg :lrl :reader lrl)
    (stt :type string :initarg :stt :reader stt)
    (lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
        :hyperlink find-uterm-lui)
    (cuisui :type integer :initarg :cuisui :reader cuisui )
    (str :type cdata :initarg :str :reader str)
    (lrl :type fixnum :initarg :lrl :reader lrl)
    (stt :type string :initarg :stt :reader stt)

-   (s#sat :reader s#sat :subobject t)
-   (s#so :reader s#so :subobject t)
-   (s#cxt :reader s#cxt :subobject t))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
+   (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
+   (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))

   (:metaclass hyperobject-class)
   (:default-initargs 
    :sui nil :cui nil :lui nil :cuisui nil :str nil :lrl nil :stt nil)
   (:metaclass hyperobject-class)
   (:default-initargs 
    :sui nil :cui nil :lui nil :cuisui nil :str nil :lrl nil :stt nil)

-  (:title "String")
-  (:print-slots sui stt lrl str))
+  (:user-name "String")
+  (:default-print-slots sui stt lrl str))

 
 (defclass ulo (umlsclass)
   ((isn :type string :initarg :isn :reader isn)
 
 (defclass ulo (umlsclass)
   ((isn :type string :initarg :isn :reader isn)


@@ -154,21 +155,23 @@
    (soui :type string :initarg :soui :reader soui))
   (:metaclass hyperobject-class)
   (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
    (soui :type string :initarg :soui :reader soui))
   (:metaclass hyperobject-class)
   (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)

-  (:title "Locator")
-  (:print-slots isn fr un sna soui sui))
+  (:user-name "Locator")
+  (:default-print-slots isn fr un sna soui sui))

 
 (defclass uterm (umlsclass)
 
 (defclass uterm (umlsclass)

-  ((lui :type fixnum :initarg :lui :reader lui :hyperlink find-uterm-lui)
-   (cui :type fixnum :initarg :cui :reader cui)
+  ((lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
+       :hyperlink find-uterm-lui)
+   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
+       :hyperlink find-ucon-cui)

    (lat :type string :initarg :lat :reader lat)
    (ts :type string  :initarg :ts :reader ts)
    (lrl :type fixnum :initarg :lrl :reader lrl)
    (lat :type string :initarg :lat :reader lat)
    (ts :type string  :initarg :ts :reader ts)
    (lrl :type fixnum :initarg :lrl :reader lrl)

-   (s#str :reader s#str :subobject t)
-   (s#sat :reader s#sat :subobject t))
+   (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui)))

   (:metaclass hyperobject-class)
   (:default-initargs :lui nil :cui nil :lat nil :ts nil :lrl nil)
   (:metaclass hyperobject-class)
   (:default-initargs :lui nil :cui nil :lat nil :ts nil :lrl nil)

-  (:title "Term")
-  (:print-slots lui lat ts lrl))
+  (:user-name "Term")
+  (:default-print-slots lui lat ts lrl))

 
 (defclass usty (umlsclass)
   ((tui :type fixnum :initarg :tui :reader tui :print-formatter fmt-tui
 
 (defclass usty (umlsclass)
   ((tui :type fixnum :initarg :tui :reader tui :print-formatter fmt-tui


@@ -176,8 +179,8 @@
    (sty :type string :initarg :sty :reader sty))
   (:metaclass hyperobject-class)
   (:default-initargs :tui nil :sty nil)
    (sty :type string :initarg :sty :reader sty))
   (:metaclass hyperobject-class)
   (:default-initargs :tui nil :sty nil)

-  (:title "Semantic Type")
-  (:print-slots tui sty))
+  (:user-name "Semantic Type")
+  (:default-print-slots tui sty))

 
 (defclass urel (umlsclass)
   ((rel :type string :initarg :rel :reader rel :hyperlink find-brel-rel)
 
 (defclass urel (umlsclass)
   ((rel :type string :initarg :rel :reader rel :hyperlink find-brel-rel)


@@ -192,8 +195,8 @@
   (:metaclass hyperobject-class)
   (:default-initargs 
    :rel nil :cui1 nil :cui2 nil :pfstr2 nil :rela nil :sab nil :sl nil :mg nil)
   (:metaclass hyperobject-class)
   (:default-initargs 
    :rel nil :cui1 nil :cui2 nil :pfstr2 nil :rela nil :sab nil :sl nil :mg nil)

-  (:title "Relationship")
-  (:print-slots rel rela sab sl mg cui2 pfstr2))
+  (:user-name "Relationship")
+  (:default-print-slots rel rela sab sl mg cui2 pfstr2))

        
 (defclass ucoc (umlsclass)
   ((cui1 :type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)
        
 (defclass ucoc (umlsclass)
   ((cui1 :type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)


@@ -207,8 +210,8 @@
   (:metaclass hyperobject-class)
   (:default-initargs 
    :cui1 nil :cui2 nil :pfstr2 nil :soc nil :cot nil :cof nil :coa nil)
   (:metaclass hyperobject-class)
   (:default-initargs 
    :cui1 nil :cui2 nil :pfstr2 nil :soc nil :cot nil :cof nil :coa nil)

-  (:title "Co-occuring Concept")
-  (:print-slots soc cot cof coa cui2 pfstr2))
+  (:user-name "Co-occuring Concept")
+  (:default-print-slots soc cot cof coa cui2 pfstr2))

 
        
 (defclass uatx (umlsclass)
 
        
 (defclass uatx (umlsclass)


@@ -217,26 +220,26 @@
    (atx :type cdata :initarg :atx :reader atx))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :rel nil :atx nil)
    (atx :type cdata :initarg :atx :reader atx))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :rel nil :atx nil)

-  (:title "Associated Expression")
-  (:print-slots sab rel atx))
+  (:user-name "Associated Expression")
+  (:default-print-slots sab rel atx))

 
 (defclass ucon (umlsclass)
   ((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (pfstr :type cdata :initarg :pfstr :reader pfstr)
    (lrl :type fixnum :initarg :lrl :reader lrl)
 
 (defclass ucon (umlsclass)
   ((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (pfstr :type cdata :initarg :pfstr :reader pfstr)
    (lrl :type fixnum :initarg :lrl :reader lrl)

-   (s#term :reader s#term :subobject t)
-   (s#def :reader s#def :subobject t)
-   (s#lo :reader s#lo :subobject t)
-   (s#rel :reader s#rel :subobject t)
-   (s#coc :reader s#coc :subobject t)
-   (s#sat :reader s#sat :subobject t)
-   (s#atx :reader s#atx :subobject t)
-   (s#sty :reader s#sty :subobject t))
+   (s#term :reader s#term :subobject (find-uterm-cui cui))
+   (s#def :reader s#def :subobject (find-udef-cui cui))
+   (s#lo :reader s#lo :subobject (find-ulo-cui cui))
+   (s#rel :reader s#rel :subobject (find-urel-cui cui))
+   (s#coc :reader s#coc :subobject (find-ucoc-cui cui))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui))
+   (s#atx :reader s#atx :subobject (find-uatx-cui cui))
+   (s#sty :reader s#sty :subobject (find-usty-cui cui)))

   (:metaclass hyperobject-class)
   (:default-initargs :cui nil :pfstr nil :lrl nil)
   (:metaclass hyperobject-class)
   (:default-initargs :cui nil :pfstr nil :lrl nil)

-  (:title "Concept")
-  (:print-slots cui lrl pfstr))
+  (:user-name "Concept")
+  (:default-print-slots cui lrl pfstr))

 
 (defclass uxw (umlsclass)
   ((wd :type string :initarg :wd :reader wd)
 
 (defclass uxw (umlsclass)
   ((wd :type string :initarg :wd :reader wd)


@@ -245,8 +248,8 @@
    (sui :type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui))
   (:metaclass hyperobject-class)
   (:default-initargs :wd nil :cui nil :lui nil :sui nil)
    (sui :type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui))
   (:metaclass hyperobject-class)
   (:default-initargs :wd nil :cui nil :lui nil :sui nil)

-  (:title "XW Index")
-  (:print-slots wd cui lui sui))
+  (:user-name "XW Index")
+  (:default-print-slots wd cui lui sui))

 
 (defclass uxnw (umlsclass)
   ((lat :type string :initarg :lat :reader lat)
 
 (defclass uxnw (umlsclass)
   ((lat :type string :initarg :lat :reader lat)


@@ -254,8 +257,8 @@
    (cuilist :type list :initarg :cuilist :reader uxnw-cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nwd nil :cuilist nil)
    (cuilist :type list :initarg :cuilist :reader uxnw-cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nwd nil :cuilist nil)

-  (:title "XNW Index")
-  (:print-slots lat nwd cuilist))
+  (:user-name "XNW Index")
+  (:default-print-slots lat nwd cuilist))

 
 (defclass uxns (umlsclass)
   ((lat :type string :initarg :lat :reader lat)
 
 (defclass uxns (umlsclass)
   ((lat :type string :initarg :lat :reader lat)


@@ -263,8 +266,8 @@
    (cuilist :type list :initarg :cuilist :reader cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nstr nil :cuilist nil)
    (cuilist :type list :initarg :cuilist :reader cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nstr nil :cuilist nil)

-  (:title "XNS Index")
-  (:print-slots lat nstr cuilist))
+  (:user-name "XNS Index")
+  (:default-print-slots lat nstr cuilist))

 
 
 ;;; LEX objects
 
 
 ;;; LEX objects


@@ -273,20 +276,20 @@
   ((eui :type fixnum :initarg :eui :reader eui :print-formatter fmt-eui
        :hyperlink find-lexterm-eui)
    (wrd :type string :initarg :wrd :reader wrd)
   ((eui :type fixnum :initarg :eui :reader eui :print-formatter fmt-eui
        :hyperlink find-lexterm-eui)
    (wrd :type string :initarg :wrd :reader wrd)

-   (s#abr :reader s#abr :subobject t)
-   (s#agr :reader s#agr :subobject t)
-   (s#cmp :reader s#cmp :subobject t)
-   (s#mod :reader s#mod :subobject t)
-   (s#nom :reader s#nom :subobject t)
-   (s#prn :reader s#prn :subobject t)
-   (s#prp :reader s#prp :subobject t)
-   (s#spl :reader s#spl :subobject t)
-   (s#trm :reader s#trm :subobject t)
-   (s#typ :reader s#typ :subobject t))
+   (s#abr :reader s#abr :subobject (find-labr-eui eui))
+   (s#agr :reader s#agr :subobject (find-lagr-eui eui))
+   (s#cmp :reader s#cmp :subobject (find-lcmp-eui eui))
+   (s#mod :reader s#mod :subobject (find-lmod-eui eui))
+   (s#nom :reader s#nom :subobject (find-lnom-eui eui))
+   (s#prn :reader s#prn :subobject (find-lprn-eui eui))
+   (s#prp :reader s#prp :subobject (find-lprp-eui eui))
+   (s#spl :reader s#spl :subobject (find-lspl-eui eui))
+   (s#trm :reader s#trm :subobject (find-ltrm-eui eui))
+   (s#typ :reader s#typ :subobject (find-ltyp-eui eui)))

   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :wrd nil)
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :wrd nil)

-  (:title "Lexical Term")
-  (:print-slots eui wrd))
+  (:user-name "Lexical Term")
+  (:default-print-slots eui wrd))

 
 
 (defclass labr  (umlsclass)
 
 
 (defclass labr  (umlsclass)


@@ -297,8 +300,8 @@
    (bas2 :type string :initarg :bas2 :reader bas2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
    (bas2 :type string :initarg :bas2 :reader bas2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)

-  (:title "Abbreviations and Acronyms")
-  (:print-slots eui bas abr eui2 bas2))
+  (:user-name "Abbreviations and Acronyms")
+  (:default-print-slots eui bas abr eui2 bas2))

 
 (defclass lagr  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lagr  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -309,8 +312,8 @@
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :str nil :sca nil :agr nil :cit nil :bas nil)
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :str nil :sca nil :agr nil :cit nil :bas nil)

-  (:title "Agreement and Inflection")
-  (:print-slots eui str sca agr cit bas))
+  (:user-name "Agreement and Inflection")
+  (:default-print-slots eui str sca agr cit bas))

 
 (defclass lcmp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lcmp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -319,8 +322,8 @@
    (com :type string :initarg :com :reader com))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :com nil)
    (com :type string :initarg :com :reader com))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :com nil)

-  (:title "Complementation")
-  (:print-slots eui bas sca com))
+  (:user-name "Complementation")
+  (:default-print-slots eui bas sca com))

 
 (defclass lmod  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lmod  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -330,8 +333,8 @@
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)

-  (:title "Modifiers")
-  (:print-slots eui bas sca psnmod fea))
+  (:user-name "Modifiers")
+  (:default-print-slots eui bas sca psnmod fea))

 
 (defclass lnom  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lnom  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -342,8 +345,8 @@
    (sca2 :type string :initarg :sca2 :reader sca2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
    (sca2 :type string :initarg :sca2 :reader sca2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)

-  (:title "Nominalizations")
-  (:print-slots eui bas sca eui2 bas2 sca2))
+  (:user-name "Nominalizations")
+  (:default-print-slots eui bas sca eui2 bas2 sca2))

 
 (defclass lprn  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lprn  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -357,8 +360,8 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :num nil :gnd nil :cas nil
                     :pos nil :qnt nil :fea nil)
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :num nil :gnd nil :cas nil
                     :pos nil :qnt nil :fea nil)

-  (:title "Pronouns")
-  (:print-slots eui bas num gnd cas pos qnt fea))
+  (:user-name "Pronouns")
+  (:default-print-slots eui bas num gnd cas pos qnt fea))

 
 (defclass lprp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass lprp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -368,8 +371,8 @@
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :str nil :sca nil :fea nil)
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :str nil :sca nil :fea nil)

-  (:title "Properties")
-  (:print-slots eui bas str sca fea))
+  (:user-name "Properties")
+  (:default-print-slots eui bas str sca fea))

 
 
 (defclass lspl  (umlsclass)
 
 
 (defclass lspl  (umlsclass)


@@ -378,8 +381,8 @@
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :spv nil :bas nil)
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :spv nil :bas nil)

-  (:title "Spelling Variants")
-  (:print-slots eui spv bas))
+  (:user-name "Spelling Variants")
+  (:default-print-slots eui spv bas))

 
 
 (defclass ltrm  (umlsclass)
 
 
 (defclass ltrm  (umlsclass)


@@ -388,8 +391,8 @@
    (gen :type string :initarg :gen :reader gen))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :gen nil)
    (gen :type string :initarg :gen :reader gen))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :gen nil)

-  (:title "Trade Marks")
-  (:print-slots eui bas gen))
+  (:user-name "Trade Marks")
+  (:default-print-slots eui bas gen))

 
 (defclass ltyp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
 
 (defclass ltyp  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)


@@ -398,16 +401,16 @@
    (typ :type string :initarg :typ :reader typ))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :typ nil)
    (typ :type string :initarg :typ :reader typ))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :typ nil)

-  (:title "Inflection Type")
-  (:print-slots eui bas sca typ))
+  (:user-name "Inflection Type")
+  (:default-print-slots eui bas sca typ))

 
 (defclass lwd (umlsclass)
   ((wrd :type string :initarg :wrd :reader wrd)
    (euilist :type list :initarg :euilist :reader euilist))
   (:metaclass hyperobject-class)
   (:default-initargs :wrd nil :euilist nil)
 
 (defclass lwd (umlsclass)
   ((wrd :type string :initarg :wrd :reader wrd)
    (euilist :type list :initarg :euilist :reader euilist))
   (:metaclass hyperobject-class)
   (:default-initargs :wrd nil :euilist nil)

-  (:title "Lexical Word Index")
-  (:print-slots wrd euilist))
+  (:user-name "Lexical Word Index")
+  (:default-print-slots wrd euilist))

 
 ;;; Semantic NET objects
 
 
 ;;; Semantic NET objects
 


@@ -426,8 +429,8 @@
   (:default-initargs 
    :rt nil :ui nil :styrl nil :stnrtn nil :def nil :ex nil :un nil :rh nil 
    :abr nil :rin nil)
   (:default-initargs 
    :rt nil :ui nil :styrl nil :stnrtn nil :def nil :ex nil :un nil :rh nil 
    :abr nil :rin nil)

-  (:title "Basic information about Semantic Types and Relations")
-  (:print-slots rt ui styrl stnrtn def ex un rh abr rin))
+  (:user-name "Basic information about Semantic Types and Relations")
+  (:default-print-slots rt ui styrl stnrtn def ex un rh abr rin))

 
 (defclass sstr (umlsclass)
   ((styrl :type string :initarg :styrl :reader styrl)
 
 (defclass sstr (umlsclass)
   ((styrl :type string :initarg :styrl :reader styrl)


@@ -436,8 +439,8 @@
    (ls :type string :initarg :ls :reader ls))
   (:metaclass hyperobject-class)
   (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
    (ls :type string :initarg :ls :reader ls))
   (:metaclass hyperobject-class)
   (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)

-  (:title "Structure of the Network")
-  (:print-slots styrl rl styrl2 ls))
+  (:user-name "Structure of the Network")
+  (:default-print-slots styrl rl styrl2 ls))

 
 (defclass sstre1 (umlsclass)
   ((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui)
 
 (defclass sstre1 (umlsclass)
   ((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui)


@@ -445,8 +448,8 @@
    (ui3 :type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui))
   (:metaclass hyperobject-class)
   (:default-initargs :ui nil :ui2 nil :ui3 nil)
    (ui3 :type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui))
   (:metaclass hyperobject-class)
   (:default-initargs :ui nil :ui2 nil :ui3 nil)

-  (:title "Fully Inherited Set of Releatons (TUI's)")
-  (:print-slots ui ui2 ui3))
+  (:user-name "Fully Inherited Set of Releatons (TUI's)")
+  (:default-print-slots ui ui2 ui3))

 
 (defclass sstre2 (umlsclass)
   ((sty :type string :initarg :ui :reader sty)
 
 (defclass sstre2 (umlsclass)
   ((sty :type string :initarg :ui :reader sty)


@@ -454,8 +457,8 @@
    (sty2 :type string :initarg :ui3 :reader sty2))
   (:metaclass hyperobject-class)
   (:default-initargs :sty nil :rl nil :sty2 nil)
    (sty2 :type string :initarg :ui3 :reader sty2))
   (:metaclass hyperobject-class)
   (:default-initargs :sty nil :rl nil :sty2 nil)

-  (:title "Fully Inherited Set of Releatons (strings)")
-  (:print-slots sty rl sty2))
+  (:user-name "Fully Inherited Set of Releatons (strings)")
+  (:default-print-slots sty rl sty2))

 
 ;;; Formatting routines
 
 
 ;;; Formatting routines
 


@@ -528,22 +531,25 @@
       (values (string-equal (lat obj) "ENG") t)
     (values nil nil))))
 
       (values (string-equal (lat obj) "ENG") t)
     (values nil nil))))
 

+(defun english-term-filter (obj)
+  "Retrns NIL if object is a term and not english"
+  (multiple-value-bind (is-english is-term) (english-term-p obj)
+      (or (not is-term) is-english)))

 
 

-(defun print-umlsclass (obj &key (os *standard-output*) (format :text)
-                             (label nil) (file-wrapper t) (english-only nil) (subobjects nil)
-                             (refvars nil))
-  (view obj :os os :format format :label label :subobjects subobjects
+(defun print-umlsclass (obj &key (os *standard-output*) (category :compact-text)
+                       (file-wrapper t) (english-only nil) (subobjects nil)
+                       (refvars nil))
+  (view obj :stream os :category category :subobjects subobjects

        :file-wrapper file-wrapper
        :file-wrapper file-wrapper

-       :english-only-function (if english-only #'english-term-p nil)
+       :filter (if english-only nil #'english-term-filter)

        :refvars refvars))
 
        :refvars refvars))
 

-

 (defmacro define-lookup-display (newfuncname lookup-func)
   "Defines functions for looking up and displaying objects"
 (defmacro define-lookup-display (newfuncname lookup-func)
   "Defines functions for looking up and displaying objects"

-  `(defun ,newfuncname  (keyval &key (os *standard-output*) (format :text) (label nil)
-                               (file-wrapper t) (english-only nil) (subobjects nil))
+  `(defun ,newfuncname  (keyval &key (stream *standard-output*) (category :compact-text)
+                        (file-wrapper t) (english-only nil) (subobjects nil))

      (let ((obj (funcall ,lookup-func keyval)))
      (let ((obj (funcall ,lookup-func keyval)))

-       (print-umlsclass obj :os os :format format :label label 
+       (print-umlsclass obj :stream stream :category category

                        :file-wrapper file-wrapper :english-only english-only
                        :subobjects subobjects)
        obj)))
                        :file-wrapper file-wrapper :english-only english-only
                        :subobjects subobjects)
        obj)))