Merge pull request #146 from jmccrae/master

Change DefinitionType to DefinitionTypeTag
oasis-tcs · Sep 5, 2024 · 655e754 · 655e754
2 parents 8bdea24 + e17dd56
commit 655e754
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/dmlex-v1.0/specification/schemas/RDF/dmlex-core.ttl b/dmlex-v1.0/specification/schemas/RDF/dmlex-core.ttl
@@ -247,7 +247,7 @@ dmlex:Definition a owl:Class ;
 dmlex:definitionType a owl:ObjectProperty ;
   rdfs:label "Definition Type"@en ;
   rdfs:domain dmlex:Definition ;
-  rdfs:range dmlex:DefinitionType .
+  rdfs:range dmlex:DefinitionTypeTag .
 
 dmlex:Label a owl:Class ;
   rdfs:comment "Represents a restriction on its parent such as temporal (old-fashioned, neologism), regional (dialect), register (formal, colloquial), domain (medicine, politics) or grammar (singular-only)."@en ;

diff --git a/dmlex-v1.0/specification/schemas/RDF/dmlex.shacl b/dmlex-v1.0/specification/schemas/RDF/dmlex.shacl
@@ -176,7 +176,7 @@
       sh:path dmlex:definitionType  ;
       sh:minCount 0 ;
       sh:maxCount 1 ;
-      sh:class dmlex:DefinitionType  ] ;
+      sh:class dmlex:DefinitionTypeTag  ] ;
     sh:property [
       sh:path dmlex:headwordMarker  ;
       sh:class dmlex:HeadwordMarker  ] ;

diff --git a/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl b/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl
@@ -247,7 +247,7 @@ dmlex:Definition a owl:Class ;
 dmlex:definitionType a owl:ObjectProperty ;
   rdfs:label "Definition Type"@en ;
   rdfs:domain dmlex:Definition ;
-  rdfs:range dmlex:DefinitionType .
+  rdfs:range dmlex:DefinitionTypeTag .
 
 dmlex:Label a owl:Class ;
   rdfs:comment "Represents a restriction on its parent such as temporal (old-fashioned, neologism), regional (dialect), register (formal, colloquial), domain (medicine, politics) or grammar (singular-only)."@en ;

diff --git a/dmlex-v1.0/specification/serializations/RDF/elements/Definition.xml b/dmlex-v1.0/specification/serializations/RDF/elements/Definition.xml
@@ -20,7 +20,7 @@
         <para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
     </listitem>
     <listitem>
-        <para><literal>dmlex:definitionType</literal> OPTIONAL (at most 1) reference to <olink targetptr="rdf_DefinitionType">DefinitionType</olink></para>
+        <para><literal>dmlex:definitionType</literal> OPTIONAL (at most 1) reference to <olink targetptr="rdf_DefinitionTypeTag">DefinitionTypeTag</olink></para>
     </listitem>
     <listitem>
         <para><literal>dmlex:headwordMarker</literal> OPTIONAL reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
@@ -31,4 +31,4 @@
     </itemizedlist>
 
 
-</section>
+</section>
diff --git a/dmlex-v1.0/specification/serializations/RDF/gen_docbook_from_rdf.py b/dmlex-v1.0/specification/serializations/RDF/gen_docbook_from_rdf.py
@@ -26,7 +26,7 @@ def describe_property(g, property, file, restrictions):
 
 def parse_rdf():
     g = rdflib.Graph()
-    g.parse("ontology/dmlex.ttl", format="turtle")
+    g.parse("../../schemas/RDF/dmlex.ttl", format="turtle")
 
     props = defaultdict(list)
     # First scan for domains