Support disjoint unions; improve modelling somewhat

[Vocab] / DTD

diff --git a/DTD b/DTD
index 5e9b6fd43d9229d345129f27e0b58b512440eb6f..f35a9ec64025d2c1c1b30cff170ddad55b3cccd5 100644 (file)
--- a/DTD
+++ b/DTD
@@ -56,7 +56,9 @@ SPDX-License-Identifier: CC0-1.0
 >
 
 <!-- Skos -->
+<!ELEMENT broader (resource)>
 <!ELEMENT inScheme (resource)>
+<!ELEMENT narrower (resource)>
 
 <!-- Shacl -->
 <!ELEMENT declare (prefix,namespace)>
@@ -161,7 +163,7 @@ SPDX-License-Identifier: CC0-1.0
 <!ELEMENT Restriction (onProperty,(((minQualifiedCardinality|maxQualifiedCardinality|qualifiedCardinality),(onClass|onDataRange))|allValuesFrom|cardinality|hasValue|hasSelf|minCardinality|maxCardinality|someValuesFrom))>
 
 <!-- Declarations -->
-<!ELEMENT Class (%annotations;,((equivalentClass*,subClassOf*,superClassOf*,disjointWith*,hasKey*)|complementOf|disjointUnionOf|intersectionOf|oneOf|unionOf))>
+<!ELEMENT Class (%annotations;,((equivalentClass*,disjointUnionOf*,subClassOf*,superClassOf*,disjointWith*,hasKey*)|complementOf|intersectionOf|oneOf|unionOf))>
 <!ATTLIST Class
        name CDATA #IMPLIED
        status (plumbing|unstable|testing|stable|archaic) #IMPLIED
@@ -194,7 +196,7 @@ SPDX-License-Identifier: CC0-1.0
        name CDATA #IMPLIED
        status (plumbing|unstable|testing|stable|archaic) #IMPLIED
 >
-<!ELEMENT NamedIndividual (%annotations;,type*,sameAs*,differentFrom*,inScheme*)>
+<!ELEMENT NamedIndividual (%annotations;,type*,sameAs*,differentFrom*,inScheme*,broader*,narrower*)>
 <!ATTLIST NamedIndividual
        name CDATA #IMPLIED
        status (plumbing|unstable|testing|stable|archaic) #IMPLIED