Issue 65: which objects have IDs

oasis-tcs · Jan 4, 2024 · ef10025 · ef10025
1 parent 246d4b6
commit ef10025
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 34 deletions.
diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/collocateMarker.xml b/dmlex-v1.0/specification/serializations/JSON/objects/collocateMarker.xml
@@ -20,10 +20,6 @@
             <para><literal>"endIndex"</literal>
                 <glossterm>required</glossterm>, number</para>
         </listitem>
-        <listitem>
-            <para><literal>"id"</literal>
-                <glossterm>optional</glossterm>, string</para>
-        </listitem>
         <listitem>
             <para><literal>"lemma"</literal>
                 <glossterm>optional</glossterm>, string</para>
@@ -34,5 +30,13 @@
                     <olink targetptr="core_label">label</olink> object type</para>
         </listitem>
     </itemizedlist>
+
+    <itemizedlist>
+        <title>Members if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>"id"</literal>
+                <glossterm>optional</glossterm>, string. Collocate markers that have an ID can appear as members of relations.</para>
+        </listitem>
+    </itemizedlist>
 
 </section>
diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/entry.xml b/dmlex-v1.0/specification/serializations/JSON/objects/entry.xml
@@ -11,10 +11,6 @@
 
     <itemizedlist>
         <title>Members</title>
-        <listitem>
-            <para><literal>"id"</literal>
-                <glossterm>optional</glossterm>, string</para>
-        </listitem>
         <listitem>
             <para><literal>"headword"</literal>
                 <glossterm>required</glossterm>, string</para>
@@ -50,6 +46,14 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Members if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>"id"</literal>
+                <glossterm>optional</glossterm>, string. Entries that have an ID can be members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Members if implementing the Annotation Module</title>
         <listitem>

diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/member.xml b/dmlex-v1.0/specification/serializations/JSON/objects/member.xml
@@ -14,7 +14,7 @@
         <title>Members</title>
         <listitem>
             <para><literal>"ref"</literal>
-                <glossterm>required</glossterm>, string</para>
+                <glossterm>required</glossterm>, string: the <code>id</code> of an <code>entry</code>, a <code>sense</code> or a <code>collocateMarker</code>.</para>
         </listitem>
         <listitem>
             <para><literal>"role"</literal>

diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/sense.xml b/dmlex-v1.0/specification/serializations/JSON/objects/sense.xml
@@ -11,10 +11,6 @@
 
     <itemizedlist>
         <title>Members</title>
-        <listitem>
-            <para><literal>"id"</literal>
-                <glossterm>optional</glossterm>, string</para>
-        </listitem>
         <listitem>
             <para><literal>"indicator"</literal>
                 <glossterm>optional</glossterm>, string</para>
@@ -36,6 +32,16 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Members if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>"id"</literal>
+                <glossterm>optional</glossterm>, string.
+                Senses that have an ID can be members of relations.
+            </para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Members if implementing the Crosslingual Module</title>
         <listitem>

diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
@@ -19,9 +19,6 @@
 
     <itemizedlist>
         <title>Child nodes</title>
-        <listitem>
-            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one)</para>
-        </listitem>
         <listitem>
             <para><literal>lemma</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
@@ -30,5 +27,12 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Child nodes if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one). Collocate markers that have an ID can appear as members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
 
 </section>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
@@ -18,9 +18,6 @@
 
     <itemizedlist>
         <title>Child nodes</title>
-        <listitem>
-            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one)</para>
-        </listitem>
         <listitem>
             <para><literal>homographNumber</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
@@ -41,6 +38,13 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Child nodes if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one). Entries that have an ID can be members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>

diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
@@ -13,7 +13,7 @@
         <title>Value</title>
         <listitem>
             <para><literal>ref</literal>
-                <glossterm>required</glossterm></para>
+                <glossterm>required</glossterm>: the <code>id</code> of an <code>entry</code>, a <code>sense</code> or a <code>collocateMarker</code></para>
         </listitem>
 	</itemizedlist>
 

diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
@@ -18,9 +18,6 @@
 
     <itemizedlist>
         <title>Child nodes</title>
-        <listitem>
-            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one)</para>
-        </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_label">label</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
@@ -32,6 +29,13 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Child nodes if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>id</literal> <glossterm>optional</glossterm> (zero or one). Senses that have an ID can be members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Child nodes if implementing the Crosslingual Module</title>
         <listitem>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml b/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml
@@ -12,15 +12,18 @@
 
     <itemizedlist>
         <title>Attributes</title>
-        <listitem>
-            <para><literal>@id</literal> <glossterm>optional</glossterm></para>
-        </listitem>
         <listitem>
             <para><literal>@lemma</literal> <glossterm>optional</glossterm></para>
         </listitem>
     </itemizedlist>
 
-
+    <itemizedlist>
+        <title>Attributes if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>@id</literal> <glossterm>optional</glossterm>. Collocate markers that have an ID can appear as members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Child elements</title>
         <listitem>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml
@@ -12,10 +12,14 @@
     <itemizedlist>
         <title>Attributes</title>
         <listitem>
-            <para><literal>@id</literal> <glossterm>optional</glossterm></para>
+            <para><literal>@homographNumber</literal> <glossterm>optional</glossterm></para>
         </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+        <title>Attributes if implementing the Linking Module</title>
         <listitem>
-            <para><literal>@homographNumber</literal> <glossterm>optional</glossterm></para>
+            <para><literal>@id</literal> <glossterm>optional</glossterm>. Entries that have an ID can be members of relations.</para>
         </listitem>
     </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/member.xml b/dmlex-v1.0/specification/serializations/XML/elements/member.xml
@@ -13,7 +13,7 @@
         <title>Attributes</title>
         <listitem>
             <para><literal>@ref</literal>
-                <glossterm>required</glossterm></para>
+                <glossterm>required</glossterm>: the <code>id</code> of an <code>entry</code>, a <code>sense</code> or a <code>collocateMarker</code></para>
         </listitem>
         <listitem>
             <para><literal>@role</literal> <glossterm>optional</glossterm></para>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/sense.xml b/dmlex-v1.0/specification/serializations/XML/elements/sense.xml
@@ -9,11 +9,8 @@
     <title>XML element: <literal>&lt;sense&gt;</literal></title>
     <para>Implements the <olink targetptr="core_sense">sense</olink> object type.</para>
 
-   <itemizedlist>
+    <itemizedlist>
         <title>Child elements</title>
-       <listitem>
-           <para><literal>@id</literal> <glossterm>optional</glossterm></para>
-       </listitem>
        <listitem>
             <para><literal>&lt;indicator&gt;</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
@@ -28,6 +25,13 @@
         </listitem>
     </itemizedlist>
 
+    <itemizedlist>
+        <title>Attributes if implementing the Linking Module</title>
+        <listitem>
+            <para><literal>@id</literal> <glossterm>optional</glossterm>. Senses that have an ID can be members of relations.</para>
+        </listitem>
+    </itemizedlist>
+
     <itemizedlist>
         <title>Child elements if implementing the Crosslingual Module</title>
         <listitem>