diff --git a/images/concept.png b/images/concept.png index 17eeb0a..0dd6ed4 100644 Binary files a/images/concept.png and b/images/concept.png differ diff --git a/models/concept.wsd b/models/concept.wsd index 55a30ad..c68731e 100755 --- a/models/concept.wsd +++ b/models/concept.wsd @@ -10,7 +10,8 @@ class Concept { +domain: <> LocalizedString[0..1] +subject: <> LocalizedString[0..1] +usageInfo: <> LocalizedString[0..1] - +definition: <> Definition[1..*] + +definition: <> Definition[0..*] + +nonverbalrep: <> NonVerbRep[0..*] +notes: <> ParagraphBlock[0..*] +examples: <> ParagraphBlock[0..*] +sources: ConceptSource[0..*] @@ -30,6 +31,12 @@ class Concept { 'Glossary Release "release1' = 1, 'release1_retired' = -1, 'release2' = 2, release2_retired' = -2 etc" +class NonVerbRep { + +image: <> Image[0..1] + +table: <> Table[0..1] + +formula: <> FormulaBlock[0..1] +} + class ConceptSource { +status: ConceptSourceStatus +type: ConceptSourceType @@ -77,6 +84,7 @@ Concept <-- ConceptSource Concept <-- Definition Concept <-- Designation Concept <-- RelatedConcept +Concept <-- NonVerbRep ConceptSource <-- ConceptSourceStatus ConceptSource <-- ConceptSourceType