Merge pull request #109 from michmech/master

Implementing some decisions taken on 5 March 2024
oasis-tcs · Mar 28, 2024 · 132e978 · 132e978
2 parents c69ee5a + 01aca65
commit 132e978
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 4 deletions.
diff --git a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
@@ -28,7 +28,7 @@
     </listitem>
     <listitem>
       <para><literal>uri</literal>
-        <glossterm>required</glossterm> (zero or one). The URI of the lexicographic resource,
+        <glossterm>optional</glossterm> (zero or one). The URI of the lexicographic resource,
         identifying it on the Web.</para>
     </listitem>
     <listitem>

diff --git a/dmlex-v1.0/specification/examples/examples/16.xml b/dmlex-v1.0/specification/examples/examples/16.xml
@@ -26,6 +26,9 @@
         - sense (id: colour-3)
             - definition (text: a sign of a person's race)
             - example (text: People of all creeds and colours.)
+        - sense (id: colour-4)
+            - definition (text: interest or excitement)
+            - example (text: Examples add colour to your writing.)
     - relation (type: subsensing)
         - member (rer: colour-1, role: super)
         - member (ref: colour-2, role: sub)

diff --git a/dmlex-v1.0/specification/examples/examples/source/16.json.xml b/dmlex-v1.0/specification/examples/examples/source/16.json.xml
@@ -20,6 +20,11 @@
             "definitions": [{"text": "a sign of a person's race"}],
             "examples": [{"text": 
                 "People of all creeds and colours."}]
+        }, {
+            "id": "colour-4",
+            "definitions": [{"text": "interest or excitement"}],
+            "examples": [{"text": 
+                "Examples add colour to your writing."}]
         }]
     }],
     "relations": [{

diff --git a/dmlex-v1.0/specification/examples/examples/source/16.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/16.rdf.xml
@@ -31,7 +31,7 @@ ex:lexicon a dmlex:LexicographicResource;
           dmlex:type dmlex:sense;
           dmlex:role "super" ] ].
 ex:colour a dmlex:Entry;
-  dmlex:sense ex:colour-3, ex:colour-2, ex:colour-1;
+  dmlex:sense ex:colour-4, ex:colour-3, ex:colour-2, ex:colour-1;
   dmlex:headword "colour".
 ex:colour-1 a dmlex:Sense;
   dmlex:definition [ dmlex:listingOrder "1"^^xsd:unsignedInt;
@@ -51,4 +51,10 @@ ex:colour-3 a dmlex:Sense;
       dmlex:listingOrder "1"^^xsd:unsignedInt ];
   dmlex:example [ dmlex:listingOrder "1"^^xsd:unsignedInt;
       dmlex:text "People of all creeds and colours." ].
+ex:colour-4 a dmlex:Sense;
+  dmlex:listingOrder "4"^^xsd:unsignedInt;
+  dmlex:definition [ dmlex:text "interest or excitement";
+      dmlex:listingOrder "1"^^xsd:unsignedInt ];
+  dmlex:example [ dmlex:listingOrder "1"^^xsd:unsignedInt;
+      dmlex:text "Examples add colour to your writing." ].
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/16.xml.xml b/dmlex-v1.0/specification/examples/examples/source/16.xml.xml
@@ -20,6 +20,12 @@
                 &lt;text&gt;People of all creeds and colours.&lt;/text&gt;
             &lt;/example&gt;
         &lt;/sense&gt;
+        &lt;sense id="colour-4"&gt;
+            &lt;definition&gt;interest or excitement&lt;/definition&gt;
+            &lt;example&gt;
+                &lt;text&gt;Examples add colour to your writing.&lt;/text&gt;
+            &lt;/example&gt;
+        &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="subsensing"&gt;
         &lt;member ref="colour-1" role="super"/&gt;

diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml
@@ -18,7 +18,7 @@
         </listitem>
         <listitem>
             <para><literal>"uri"</literal>
-                <glossterm>required</glossterm>, string</para>
+                <glossterm>optional</glossterm>, string</para>
         </listitem>
         <listitem>
             <para><literal>"langCode"</literal>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml
@@ -15,7 +15,7 @@
             <para><literal>@title</literal> <glossterm>optional</glossterm></para>
         </listitem>
         <listitem>
-            <para><literal>@uri</literal> <glossterm>required</glossterm></para>
+            <para><literal>@uri</literal> <glossterm>optional</glossterm></para>
         </listitem>
         <listitem>
             <para><literal>@langCode</literal> <glossterm>required</glossterm></para>