update; termref: #7

glossarist · Apr 27, 2020 · e2ebc20 · e2ebc20
1 parent e369d24
commit e2ebc20
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/images/concept.png b/images/concept.png
diff --git a/images/designation.png b/images/designation.png
diff --git a/models/concept.wsd b/models/concept.wsd
@@ -14,6 +14,7 @@ class Concept {
   +notes: <<BasicDocument>> ParagraphBlock[0..*]
   +examples: <<BasicDocument>> ParagraphBlock[0..*]
   +sources: ConceptSource[0..*]
+  +related: RelatedConcept[0..*]
 }
 
 'Review Indicator	<empty field> or 'Under Review in Source Document'
@@ -54,15 +55,32 @@ enum ConceptSourceStatus {
   unspecified
 }
 
+class RelatedConcept {
+  +type: RelatedConceptType
+  +content: <<BasicDocument>> LocalizedString
+}
+
+enum RelatedConceptType {
+  deprecates
+  supersedes
+  narrower
+  broader
+  equivalent
+  compare
+  contrast
+  see
+}
+
 '******* CLASS RELATIONS **********************************************
 Concept <-- ConceptSource
-Concept <-- ConceptLabel
-Concept <-- ConceptSource
 Concept <-- Definition
 Concept <-- Designation
+Concept <-- RelatedConcept
 
 ConceptSource <-- ConceptSourceStatus
 ConceptSource <-- ConceptSourceType
 
+RelatedConcept <-- RelatedConceptType
+
 @enduml
 
diff --git a/models/designation.wsd b/models/designation.wsd
@@ -15,7 +15,6 @@ class ExpressionDesignation {
   +script: Iso15924Code[0..1]
   +pronunciation: <<BasicDocument>> LocalizedString[0..*]
   +grammarInfo: GrammarInfo[0..1]
-  +pronunciation: <<BasicDocument>> LocalizedString[0..*]
 }
 
 class SymbolDesignation {
@@ -54,9 +53,13 @@ enum NormativeStatus {
 }
 
 class GrammarInfo {
-  +gender: DesignationGender[0..1]
+  +gender: DesignationGender[0..*]
   +isPreposition: Boolean[0..1]
   +isParticiple: Boolean[0..1]
+  +isAdjective: Boolean[0..1]
+  +isVerb: Boolean[0..1]
+  +isAdverb: Boolean[0..1]
+  +isNoun: Boolean[0..1]
 }
 
 enum GrammarGender {
@@ -66,47 +69,26 @@ enum GrammarGender {
   common
 }
 
-class GrammarNoun {
-}
-
-class GrammarAdjective {
-}
-
-class GrammarVerb {
-}
-
-class GrammarAdverb {
-}
-
 enum Iso639ThreeCharCode {
 }
 enum Iso3166Code {
 }
 enum Iso15924Code {
 }
 
-Designation <|-- ExpressionDesignation
+Designation <|-left- ExpressionDesignation
 Designation <|-- SymbolDesignation
 Designation <-- NormativeStatus
-Designation <-- Iso3166Code
 
 ExpressionDesignation <|-- PrefixDesignation
 ExpressionDesignation <|-- SuffixDesignation
 ExpressionDesignation <|-- AbbreviationDesignation
 ExpressionDesignation <|-- AcronymDesignation
-ExpressionDesignation <-- Iso639ThreeCharCode
-ExpressionDesignation <-- Iso15924Code
 ExpressionDesignation <-- GrammarInfo
 
 SymbolDesignation <|-- LetterSymbolDesignation
 SymbolDesignation <|-- GraphicalSymbolDesignation
-LetterSymbolDesignation <-- Iso15924Code
-LetterSymbolDesignation <-- Iso639ThreeCharCode
 
-GrammarInfo <|-- GrammarNoun
-GrammarInfo <|-- GrammarAdjective
-GrammarInfo <|-- GrammarVerb
-GrammarInfo <|-- GrammarAdverb
 GrammarInfo <-- GrammarGender
 
 @enduml