Merge branch 'master' into examples-61

Author: jmccrae

dmlex-v1.0/specification/core/objectTypes/label.xml

@@ -76,6 +76,7 @@
 
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml

@@ -60,6 +60,7 @@
 
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

dmlex-v1.0/specification/dmlex.xml

@@ -742,7 +742,7 @@
             <ulink url="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
               >https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html</ulink>
           </citetitle> OASIS Standard V1.1, 07 October 2005.</bibliomixed>
-        <bibliomixed id="XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
+        <bibliomixed id="bib_XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
             <citetitle> refers to the two part standard comprising <link linkend="XMLSchema1">[XML
               Schema Structures]</link> and <link linkend="XMLSchema2">[XML Schema Datatypes]</link>
           </citetitle> (Second Editions) W3C Recommendations 28 October 2004.</bibliomixed>

dmlex-v1.0/specification/examples/examples/12.xml

@@ -26,11 +26,11 @@
         - sense (id: lens-1)
             - definition (text: curved glass that makes things seem bigger)
     - relation (type: meronymy)
-        - member (memberID: glasses-1, role: whole)
-        - member (memberID: lens-1, role: part)
+        - member (ref: glasses-1, role: whole)
+        - member (ref: lens-1, role: part)
     - relation (type: meronymy)
-        - member (memberID: microscrope-1, role: whole)
-        - member (memberID: lens-1, role: part)
+        - member (ref: microscrope-1, role: whole)
+        - member (ref: lens-1, role: part)
     - relationType (type: meronomy, description: part-whole relationship)
         - memberType (role: whole, type: sense, min: 1, max: 1, 
 			hint: navigate)

dmlex-v1.0/specification/examples/examples/13.xml

@@ -22,8 +22,8 @@
         - sense (id: sell-1)
             - definition (text: exchange something for money)
     - relation (type: antonyms)
-        - member (memberID: buy-1)
-        - member (memberID: sell-1)
+        - member (ref: buy-1)
+        - member (ref: sell-1)
     - relationType: (type: antonyms)
         - memberType (type: sense, min: 2, max: 2, hint: navigate)
 </programlisting>

dmlex-v1.0/specification/examples/examples/14.xml

@@ -30,9 +30,9 @@
         - sense (id: der-ozean-1)
             - headwordTranslation (text: ocean)
     - relation (type: synonyms, description: words that mean sea and ocean)
-        - member (memberID: die-see-1)
-        - member (memberID: das-meer-1)
-        - member (memberID: der-ozean-1)
+        - member (ref: die-see-1)
+        - member (ref: das-meer-1)
+        - member (ref: der-ozean-1)
     - relationType (type: synonyms, description: synonyms and near synonyms)
         memberType (type: sense, min: 2, hint: navigate)
 </programlisting>

dmlex-v1.0/specification/examples/examples/15.xml

@@ -28,8 +28,8 @@
         - partOfSpeech (tag: n)
         - label (tag: americanSpelling)
     - relation (type: variants)
-        - member (memberID: colour)
-        - member (memberID: color)
+        - member (ref: colour)
+        - member (ref: color)
     - relationType (type: variants, description: words which differ 
 			only in spelling)
         - memberType (type: entry, min: 2, hint: navigate)
@@ -45,7 +45,6 @@
     </example>
     <example>
         <title>RDF</title>
-        <xi:include href="source/15.rdf.xml"/>
     </example>
     <example>
         <title>Suggested rendering for human users</title>

dmlex-v1.0/specification/examples/examples/16.xml

@@ -30,11 +30,11 @@
             - definition (text: interest or excitement)
             - example (text: Examples add colour to your writing.)
     - relation (type: subsensing)
-        - member (memberID: colour-1, role: super)
-        - member (memberID: colour-2, role: sub)
+        - member (rer: colour-1, role: super)
+        - member (ref: colour-2, role: sub)
     - relation (type: subsensing)
-        - member (memberID: colour-1, role: super)
-        - member (memberID: colour-3, role: sub)
+        - member (ref: colour-1, role: super)
+        - member (ref: colour-3, role: sub)
     - relationType (type: subsensing, scopeRestriction: sameEntry)
         - memberType (role: super, type: sense, min: 1, max: 1, hint: none)
         - memberRole (role: sub, type: sense, min: 1, max: 1, hint: embed)

dmlex-v1.0/specification/examples/examples/17.xml

@@ -26,8 +26,8 @@
             - definition (text: you should be careful even if it seems 
 				unnecessary)
     - relation (type: subentrying)
-        member (memberID: safe-1, role: container)
-        member (memberID: better-safe, role: subentry)
+        member (ref: safe-1, role: container)
+        member (ref: better-safe, role: subentry)
     - relationType (type: subentrying, scopeRestriction: sameResource)
         - memberType (role: container, type: sense, min: 1, max: 1, 
 			hint: navigate)

dmlex-v1.0/specification/examples/examples/18.xml

@@ -24,8 +24,8 @@
         - sense (id: bible-2)
             - definition (text: a book considered important for a subject)
     - relation (type: subentrying)
-        - member (memberID: bible-1, role: container)
-        - member (memberID: the-bible, role: subentry)
+        - member (ref: bible-1, role: container)
+        - member (ref: the-bible, role: subentry)
     - relationType (type: subentrying, scopeRestcriction: sameResource)
         - memberType (role: container, type: sense, min: 1, max: 1, 
 			hint: navigate)

dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml

@@ -60,10 +60,7 @@
   <example>
     <title>XML</title>
     <programlisting>
-&lt;itemMarker id="..." lemma="..."&gt;
-    ...
-    &lt;label tag="..."/&gt;
-&lt;/itemMarker&gt;
+&lt;collocateMarker id="..." lemma="..."&gt;...&lt;label tag="..."/&gt;&lt;/collocateMarker&gt;
     </programlisting>
   </example>
 

dmlex-v1.0/specification/modules/etymology/extensions/entry.xml

@@ -46,15 +46,16 @@
       <programlisting>
 {
   ...,
-  "etymology": {...}
+  "etymologies": [...]
 }
       </programlisting>
   </example>
 
   <example>
       <title>RDF</title>
       <programlisting>
-&lt;#entry&gt; dmlex:etymology ... .
+&lt;#entry&gt; dmlex:etymology ... ;
+  dmlex:etymonType ... .
       </programlisting>
   </example>
 

dmlex-v1.0/specification/modules/etymology/extensions/lexicographicResource.xml

@@ -30,6 +30,7 @@
         <programlisting>
 &lt;lexicographicResource&gt; 
   &lt;etymonLanguage&gt;...&lt;etymonLanguage/&gt;
+  &lt;etymonType&gt;...&lt;etymonType/&gt;
   ...
 &lt;/lexicographicResource&gt;
         </programlisting>
@@ -40,6 +41,7 @@
         <programlisting>
 {
   "etymonLanguages": [...],
+  "etymonTypes": [...],
   ...
 }
         </programlisting>

dmlex-v1.0/specification/modules/linking/objectTypes/member.xml

@@ -21,9 +21,10 @@
   <itemizedlist>
     <title>Properties</title>
     <listitem>
-      <para><literal>memberID</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). Reference to an object, such as an entry or a
-        sense.</para>
+      <para><literal>ref</literal>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in
+        combination with other unique properties if present). Reference to an object, such as an
+        entry or a sense.</para>
     </listitem>
     <listitem>
       <para><literal>role</literal>
@@ -44,7 +45,7 @@
     </listitem>
     <listitem>
       <para><literal>obverseListingOrder</literal>
-        <glossterm>required</glossterm> (exactly one). Number. The position of this relation among
+        <glossterm>optional</glossterm> (at most one). Number. The position of this relation among
         other relations this member is involved in. When an object - such as an entry or a sense -
         is a member of several relations (for example: when a sense is a member of a synonymy
         relation and also of an antonymy relation) then, when showing the object (the entry or the
@@ -56,15 +57,15 @@
   <example>
     <title>XML</title>
     <programlisting>
-&lt;member memberID="..." role="..." obverseListingOrder="..."/&gt;
+&lt;member ref="..." role="..." obverseListingOrder="..."/&gt;
 </programlisting>
   </example>
 
   <example>
     <title>JSON</title>
     <programlisting>
 {
-    "memberID": "...",
+    "ref": "...",
     "role": "...",
     "obverseListingOrder": "..."
 }
@@ -75,7 +76,7 @@
       <programlisting>
 &lt;#relation&gt; dmlex:member [
   a dmlex:Member ;
-  dmlex:memberID "..." ;
+  dmlex:ref "..." ;
   dmlex:role "..." ;
   dmlex:listingOrder 0 ;
   dmlex:obverseListingOrder 0 ] .

dmlex-v1.0/specification/modules/linking/objectTypes/memberType.xml

@@ -23,8 +23,8 @@
     <title>Properties</title>
     <listitem>
       <para><literal>role</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. String. If the value is empty, then members
-        having this role do not need to have a <code>role</code> property.</para>
+        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm>.
+        String.</para>
     </listitem>
     <listitem>
       <para><literal>description</literal>

dmlex-v1.0/specification/modules/values/objectTypes/sameAs.xml

@@ -49,6 +49,7 @@
 
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

dmlex-v1.0/specification/modules/xlingual/objectTypes/translationLanguage.xml

@@ -45,6 +45,7 @@
   </example>
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

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>

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>

dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml

@@ -91,9 +91,10 @@
     <itemizedlist>
         <title>Members if implementing the Etymology Module</title>
         <listitem>
-            <para><literal>"etymonLanguage"</literal>
+            <para><literal>"etymonLanguages"</literal>
                 <glossterm>optional</glossterm>, array of zero or more <literal><olink
-                    targetptr="json_etymonLanguage">etymonLanguage</olink></literal> instances</para>
+                        targetptr="json_etymonLanguage">etymonLanguage</olink></literal>
+                instances</para>
         </listitem>
         <listitem>
             <para><literal>"etymonTypes"</literal>

dmlex-v1.0/specification/serializations/JSON/objects/member.xml

@@ -13,16 +13,16 @@
     <itemizedlist>
         <title>Members</title>
         <listitem>
-            <para><literal>"memberID"</literal>
-                <glossterm>required</glossterm>, string</para>
+            <para><literal>"ref"</literal>
+                <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>
                 <glossterm>optional</glossterm>, string</para>
         </listitem>
         <listitem>
             <para><literal>"obverseListingOrder"</literal>
-                <glossterm>required</glossterm>, number</para>
+                <glossterm>optional</glossterm>, number</para>
         </listitem>
     </itemizedlist>
 

dmlex-v1.0/specification/serializations/JSON/objects/memberType.xml

@@ -14,7 +14,7 @@
         <title>Members</title>
         <listitem>
             <para><literal>"role"</literal>
-                <glossterm>required</glossterm>, string</para>
+                <glossterm>optional</glossterm>, string</para>
         </listitem>
         <listitem>
             <para><literal>"type"</literal>

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>

dmlex-v1.0/specification/serializations/JSON/specification.xml

@@ -55,6 +55,15 @@
             </itemizedlist>
           </listitem>
         </itemizedlist>
+        <para>The names of objects are:</para>
+        <itemizedlist>
+          <listitem>
+            <para>plural if the value is an array, for example <code>labels</code>, <code>partsOfSpeech</code></para>
+          </listitem>
+          <listitem>
+            <para>singular if the value is anything else, for example <code>headword</code>, <code>indicator</code></para>
+          </listitem>
+        </itemizedlist>
       </listitem>
     </itemizedlist>
   </section>