r4924: *** empty log message ***

diff --git a/classes.lisp b/classes.lisp
index 4a4867d4abf417f6dc8758e448bfff85c0fd21e9..9210e6fcf0720f3640c49fc19d74cd09c840a43f 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.32 2003/05/06 09:05:43 kevin Exp $
+;;;; $Id: classes.lisp,v 1.33 2003/05/14 05:37:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -224,7 +224,7 @@
    (lui :value-type fixnum :initform nil :initarg :lui :reader lui :print-formatter fmt-lui)
    (sui :value-type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui))
   (:metaclass hyperobject-class)
-  (:user-name "XW Index")
+  (:user-name "XW Index" "XW Indices")
   (:default-print-slots wd cui lui sui))
 
 (defclass uxw-noneng (umlsclass)
@@ -235,7 +235,7 @@
    (sui :value-type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui)
    (lrl :value-type fixnum :initform nil :initarg :lrl :reader lrl))
   (:metaclass hyperobject-class)
-  (:user-name "XW Non-English Index")
+  (:user-name "XW Non-English Index" "XW Non-English Indices")
   (:default-print-slots wd cui lui sui))
 
 (defclass uxnw (umlsclass)
@@ -243,7 +243,7 @@
    (nwd :value-type string :initarg :nwd :reader nwd)
    (cuilist :value-type list :initarg :cuilist :reader uxnw-cuilist))
   (:metaclass hyperobject-class)
-  (:user-name "XNW Index")
+  (:user-name "XNW Index" "XNW Indices")
   (:default-print-slots lat nwd cuilist))
 
 (defclass uxns (umlsclass)
@@ -251,7 +251,7 @@
    (nstr :value-type string :initarg :nstr :reader nstr)
    (cuilist :value-type list :initarg :cuilist :reader cuilist))
   (:metaclass hyperobject-class)
-  (:user-name "XNS Index")
+  (:user-name "XNS Index" "XNS Indices")
   (:default-print-slots lat nstr cuilist))
 
 
@@ -283,7 +283,7 @@
    (eui2 :value-type integer :initarg :eui2 :reader eui2 :print-formatter fmt-eui)
    (bas2 :value-type string :initarg :bas2 :reader bas2))
   (:metaclass hyperobject-class)
-  (:user-name "Abbreviations and Acronyms")
+  (:user-name "Abbreviations and Acronym")
   (:default-print-slots eui bas abr eui2 bas2))
 
 (defclass lagr  (umlsclass)
@@ -313,7 +313,7 @@
    (psnmod :value-type string :initarg :psnmod :reader psnmod)
    (fea :value-type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
-  (:user-name "Modifiers")
+  (:user-name "Modifier")
   (:default-print-slots eui bas sca psnmod fea))
 
 (defclass lnom  (umlsclass)
@@ -324,7 +324,7 @@
    (bas2 :value-type string :initarg :bas2 :reader bas2)
    (sca2 :value-type string :initarg :sca2 :reader sca2))
   (:metaclass hyperobject-class)
-  (:user-name "Nominalizations")
+  (:user-name "Nominalization")
   (:default-print-slots eui bas sca eui2 bas2 sca2))
 
 (defclass lprn  (umlsclass)
@@ -337,7 +337,7 @@
    (qnt :value-type string :initarg :qnt :reader qnt)
    (fea :value-type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
-  (:user-name "Pronouns")
+  (:user-name "Pronoun")
   (:default-print-slots eui bas num gnd cas pos qnt fea))
 
 (defclass lprp  (umlsclass)
@@ -347,7 +347,7 @@
    (sca :value-type string :initarg :sca :reader sca)
    (fea :value-type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
-  (:user-name "Properties")
+  (:user-name "Property" "Properties")
   (:default-print-slots eui bas str sca fea))
 
 
@@ -356,7 +356,7 @@
    (spv :value-type string :initarg :spv :reader spv)
    (bas :value-type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
-  (:user-name "Spelling Variants")
+  (:user-name "Spelling Variant")
   (:default-print-slots eui spv bas))
 
 
@@ -365,7 +365,7 @@
    (bas :value-type string :initarg :bas :reader bas)
    (gen :value-type string :initarg :gen :reader gen))
   (:metaclass hyperobject-class)
-  (:user-name "Trade Marks")
+  (:user-name "Trade Mark")
   (:default-print-slots eui bas gen))
 
 (defclass ltyp  (umlsclass)
@@ -381,7 +381,7 @@
   ((wrd :value-type string :initarg :wrd :reader wrd)
    (euilist :value-type list :initarg :euilist :reader euilist))
   (:metaclass hyperobject-class)
-  (:user-name "Lexical Word Index")
+  (:user-name "Lexical Word Index" "Lexical Word Indices")
   (:default-print-slots wrd euilist))
 
 ;;; Semantic NET objects
@@ -398,7 +398,7 @@
    (abr :value-type string :initarg :abr :reader abr)
    (rin :value-type string :initarg :rin :reader rin))
   (:metaclass hyperobject-class)
-  (:user-name "Basic information about Semantic Types and Relations")
+  (:user-name "Basic information about Semantic Types and Relation")
   (:default-print-slots rt ui styrl stnrtn def ex un rh abr rin))
 
 (defclass sstr (umlsclass)
@@ -415,7 +415,8 @@
    (ui2 :value-type integer :initarg :ui2 :reader ui2 :print-formatter fmt-tui)
    (ui3 :value-type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui))
   (:metaclass hyperobject-class)
-  (:user-name "Fully Inherited Set of Releatons (TUI's)")
+  (:user-name "Fully Inherited Set of Relation (TUIs)"
+             "Fully Inherited Set of Relations (TUIs)")
   (:default-print-slots ui ui2 ui3))
 
 (defclass sstre2 (umlsclass)
@@ -423,6 +424,7 @@
    (rl :value-type string :initarg :ui2 :reader rl)
    (sty2 :value-type string :initarg :ui3 :reader sty2))
   (:metaclass hyperobject-class)
-  (:user-name "Fully Inherited Set of Releatons (strings)")
+  (:user-name "Fully Inherited Set of Relation (strings)"
+             "Fully Inherited Set of Relations (strings)")
   (:default-print-slots sty rl sty2))
 

diff --git a/composite.lisp b/composite.lisp
index c28cc954fd1928c1d143d9492407fa6e31d8bf7e..d967c99130bdbea196b14e2cca9ea2f2ae4da2b1 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.21 2003/05/06 02:14:59 kevin Exp $
+;;;; $Id: composite.lisp,v 1.22 2003/05/14 05:37:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -70,28 +70,28 @@
   ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
-  (:user-name "Frequency class")
+  (:user-name "Frequency class" "Frequency classes")
   (:default-print-slots freq)
   (:description "Base class containing frequency slot, used for multi-inherited objects"))
 
 (defclass ucon_freq (ucon freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "Concept and Count")
+  (:user-name "Concept and Count" "Concepts and Counts")
   (:default-print-slots cui freq pfstr)
   (:description "Composite object of ucon/freq"))
 
 (defclass ustr_freq (ustr freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "String and Count")
+  (:user-name "String and Count" "Strings and Counts")
   (:default-print-slots sui freq stt lrl str)
   (:description "Composite object of ustr/freq"))
 
 (defclass usty_freq (usty freq)
   ((freq :value-type fixnum :initarg :freq :accessor freq))
   (:metaclass hyperobject-class)
-  (:user-name "Semantic Type and Count")
+  (:user-name "Semantic Type and Count" "Semantic Types and Counts")
   (:default-print-slots tui freq sty)
   (:description "Composite object of usty/freq"))
 
@@ -111,7 +111,7 @@
 (defclass usrl_freq (usrl freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "Source and Count")
+  (:user-name "Source and Count" "Sources and Counts")
   (:default-print-slots sab freq srl)
   (:description "Composite object of usrl/freq"))