Merge pull request #75 from michmech/master

Implementing decisions taken on 20 Dec 2023 Agreed to merge after a short discussion of XML space handling on Jan 5, 2024
oasis-tcs · Jan 5, 2024 · 9e50b2b · 9e50b2b
2 parents a4aea7c + 7d74143
commit 9e50b2b
Show file tree

Hide file tree

Showing 45 changed files with 231 additions and 160 deletions.
diff --git a/dmlex-v1.0/specification/core/objectTypes/label.xml b/dmlex-v1.0/specification/core/objectTypes/label.xml
@@ -76,6 +76,7 @@
 
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

diff --git a/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml b/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
@@ -60,6 +60,7 @@
 
   <example>
     <title>JSON</title>
+    <para>Implemented as a string</para>
     <programlisting>
 "..."
     </programlisting>

diff --git a/dmlex-v1.0/specification/dmlex.xml b/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>

diff --git a/dmlex-v1.0/specification/examples/examples/12.xml b/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)
         - memberType (role: part, type: sense, min: 1, max: 1, hint: navigate)
@@ -59,12 +59,12 @@
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="meronymy"&gt;
-        &lt;member memberID="glasses-1" role="whole"/&gt;
-        &lt;member memberID="lens-1" role="part"/&gt;
+        &lt;member ref="glasses-1" role="whole"/&gt;
+        &lt;member ref="lens-1" role="part"/&gt;
     &lt;/relation&gt;
     &lt;relation type="meronymy"&gt;
-        &lt;member memberID="microscrope-1" role="whole"/&gt;
-        &lt;member memberID="lens-1" role="part"/&gt;
+        &lt;member ref="microscrope-1" role="whole"/&gt;
+        &lt;member ref="lens-1" role="part"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="meronomy"&gt;
         &lt;description&gt;part-whole relationship&lt;/description&gt;
@@ -103,19 +103,19 @@
     "relations": [{
         "type": "meronymy",
         "members": [{
-            "memberID": "glasses-1",
+            "ref": "glasses-1",
             "role": "whole"
         }, {
-            "memberID": "lens-1",
+            "ref": "lens-1",
             "role": "part"
         }]
     }, {
         "type": "meronymy",
         "members": [{
-            "memberID": "microscope-1",
+            "ref": "microscope-1",
             "role": "whole"
         }, {
-            "memberId": "lens-1",
+            "ref": "lens-1",
             "role": "part"
         }]
     }],

diff --git a/dmlex-v1.0/specification/examples/examples/13.xml b/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>
@@ -45,8 +45,8 @@
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="antonyms"&gt;
-        &lt;member memberID="buy-1"/&gt;
-        &lt;member memberID="sell-1"/&gt;
+        &lt;member ref="buy-1"/&gt;
+        &lt;member ref="sell-1"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="antonyms"&gt;
         &lt;memberType type="sense" min="2" max="2" hint="navigate"/&gt;
@@ -77,8 +77,8 @@
     "relations": [{
         "type": "antonyms",
         "members": [
-            {"memberID": "buy-1"},
-            {"memberID": "sell-1"}
+            {"ref": "buy-1"},
+            {"ref": "sell-1"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/14.xml b/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>
@@ -65,9 +65,9 @@
     &lt;/entry&gt;
     &lt;relation type="synonyms"&gt;
         &lt;description&gt;words that mean sea and ocean&lt;/description&gt;
-        &lt;member memberID="die-see-1"/&gt;
-        &lt;member memberID="das-meer-1"/&gt;
-        &lt;member memberID="der-ozean-1"/&gt;
+        &lt;member ref="die-see-1"/&gt;
+        &lt;member ref="das-meer-1"/&gt;
+        &lt;member ref="der-ozean-1"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="synonyms"&gt;
         &lt;description&gt;synonyms and near synonyms&lt;/description&gt;
@@ -112,9 +112,9 @@
         "type": "synonyms",
         "description": "words that mean sea and ocean",
         "members": [
-          {"memberID": "die-see-1"},
-          {"memberID": "das-meer-1"},
-          {"memberID": "der-ozean-1"}
+          {"ref": "die-see-1"},
+          {"ref": "das-meer-1"},
+          {"ref": "der-ozean-1"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/15.xml b/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)
 </programlisting>
@@ -53,8 +53,8 @@
         &lt;label tag="americanSpelling"/&gt;
     &lt;/entry&gt;
     &lt;relation type="variants"&gt;
-        &lt;member memberID="colour"/&gt;
-        &lt;member memberID="color"/&gt;
+        &lt;member ref="colour"/&gt;
+        &lt;member ref="color"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="variants"&gt;
         &lt;description&gt;words which differ only in spelling&lt;/description&gt;
@@ -88,8 +88,8 @@
     "relations": [{
         "type": "variants",
         "members": [
-          {"memberID": "colour"},
-          {"memberID": "color"}
+          {"ref": "colour"},
+          {"ref": "color"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/16.xml b/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)
@@ -64,12 +64,12 @@
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="subsensing"&gt;
-        &lt;member memberID="colour-1" role="super"/&gt;
-        &lt;member memberID="colour-2" role="sub"/&gt;
+        &lt;member ref="colour-1" role="super"/&gt;
+        &lt;member ref="colour-2" role="sub"/&gt;
     &lt;/relation&gt;
     &lt;relation type="subsensing"&gt;
-        &lt;member memberID="colour-1" role="super"/&gt;
-        &lt;member memberID="colour-3" role="sub"/&gt;
+        &lt;member ref="colour-1" role="super"/&gt;
+        &lt;member ref="colour-3" role="sub"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="subsensing" scopeRestriction="sameEntry"&gt;
         &lt;memberType role="super" type="sense" min="1" max="1" hint="none"/&gt;
@@ -108,14 +108,14 @@
     "relations": [{
         "type": "subsensing",
         "members": [
-          {"role": "super", "memberID": "colour-1"},
-          {"role": "sub", "memberID": "colour-2"}
+          {"role": "super", "ref": "colour-1"},
+          {"role": "sub", "ref": "colour-2"}
         ]
     }, {
         "type": "subsensing",
         "members": [
-          {"role": "super", "memberID": "colour-1"},
-          {"role": "sub", "memberID": "colour-3"}
+          {"role": "super", "ref": "colour-1"},
+          {"role": "sub", "ref": "colour-3"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/17.xml b/dmlex-v1.0/specification/examples/examples/17.xml
@@ -25,8 +25,8 @@
         - sense (id: better-safe-1)
             - 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)
         - memberType (role: subentry, type: entry, min: 1, max: 1, hint: embed)
@@ -56,8 +56,8 @@
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="subentrying"&gt;
-        &lt;member memberID="safe-1" role="container"/&gt;
-        &lt;member memberID="better-safe" role="subentry"/&gt;
+        &lt;member ref="safe-1" role="container"/&gt;
+        &lt;member ref="better-safe" role="subentry"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
         &lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
@@ -97,8 +97,8 @@
     "relations": [{
         "type": "subentrying",
         "members": [
-          {"role": "container", "memberID": "safe-1"},
-          {"role": "subentry", "memberID": "better-safe"}
+          {"role": "container", "ref": "safe-1"},
+          {"role": "subentry", "ref": "better-safe"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/18.xml b/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)
         - memberRole (role: subentry, type: entry, min: 1, max: 1, hint: embed)
@@ -53,8 +53,8 @@
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="subentrying"&gt;
-        &lt;member memberID="bible-1" role="container"/&gt;
-        &lt;member memberID="the-bible" role="subentry"/&gt;
+        &lt;member ref="bible-1" role="container"/&gt;
+        &lt;member ref="the-bible" role="subentry"/&gt;
     &lt;/relation&gt;
     &lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
         &lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
@@ -89,8 +89,8 @@
     "relations": [{
         "type": "subentrying",
         "members": [
-          {"role": "container", "memberID": "bible-1"},
-          {"role": "subentry", "memberID": "the-bible"}
+          {"role": "container", "ref": "bible-1"},
+          {"role": "subentry", "ref": "the-bible"}
         ]
     }],
     "relationTypes": [{

diff --git a/dmlex-v1.0/specification/examples/examples/19.xml b/dmlex-v1.0/specification/examples/examples/19.xml
@@ -20,9 +20,7 @@
         <title>XML</title>
         <programlisting>
 &lt;entry id="continue-studies"&gt;
-    &lt;headword&gt;
-        continue &lt;placeholderMarker&gt;your&lt;/placeholderMarker&gt; studies
-    &lt;/headword&gt;
+    &lt;headword&gt;continue &lt;placeholderMarker&gt;your&lt;/placeholderMarker&gt; studies&lt;/headword&gt;
     &lt;sense.../&gt;
 &lt;/entry&gt;
 </programlisting>

diff --git a/dmlex-v1.0/specification/examples/examples/20.xml b/dmlex-v1.0/specification/examples/examples/20.xml
@@ -21,14 +21,10 @@
         <title>XML</title>
         <programlisting>
 &lt;entry id="beat-up"&gt;
-    &lt;headword&gt;
-        beat &lt;placeholderMarker&gt;sb.&lt;/placeholderMarker&gt; up
-    &lt;/headword&gt;
+    &lt;headword&gt;beat &lt;placeholderMarker&gt;sb.&lt;/placeholderMarker&gt; up&lt;/headword&gt;
     &lt;sense id="beat-up-1"&gt;
       &lt;headwordTranslation&gt;
-        &lt;text&gt;
-            &lt;placeholderMarker&gt;jemanden&lt;/placeholderMarker&gt; verprügeln
-        &lt;/text&gt;
+        &lt;text&gt;&lt;placeholderMarker&gt;jemanden&lt;/placeholderMarker&gt; verprügeln&lt;/text&gt;
       &lt;/headwordTranslation&gt;
     &lt;/sense&gt;
 &lt;/entry&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/21.xml b/dmlex-v1.0/specification/examples/examples/21.xml
@@ -21,19 +21,18 @@
     </example>
     <example>
         <title>XML</title>
+        <para>The character <code>\</code> at the end of a line means that the line continues on the next line (with leading whitespace removed).</para>
         <programlisting>
 &lt;entry id="autopsy"&gt;
     &lt;headword&gt;autopsy&lt;/headword&gt;
     &lt;sense id="autopsy-1"&gt;
         &lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
         &lt;example&gt;
-            &lt;text&gt;
-                The coroner performed an &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.
-            &lt;/text&gt;
+            &lt;text&gt;The coroner performed an \
+                &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.&lt;/text&gt;
             &lt;exampleTranslation&gt;
-                &lt;text&gt;
-                    Koroner provedl &lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.
-                &lt;/text&gt;
+                &lt;text&gt;Koroner provedl \
+                    &lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.&lt;/text&gt;
             &lt;/exampleTranslation&gt;
         &lt;/example&gt;
     &lt;/sense&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/22.xml b/dmlex-v1.0/specification/examples/examples/22.xml
@@ -25,21 +25,20 @@
     </example>
     <example>
         <title>XML</title>
+        <para>The character <code>\</code> at the end of a line means that the line continues on the next line (with leading whitespace removed).</para>
         <programlisting>
 &lt;entry id="autopsy"&gt;
     &lt;headword&gt;autopsy&lt;/headword&gt;
     &lt;sense id="autopsy-1"&gt;
         &lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
         &lt;example&gt;
-            &lt;text&gt;
-                The coroner &lt;collocateMarker lemma="perform"&gt;performed&lt;/collocateMarker&gt;
-                an &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.
-            &lt;/text&gt;
+            &lt;text&gt;The coroner \
+                &lt;collocateMarker lemma="perform"&gt;performed&lt;/collocateMarker&gt; \
+                &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.&lt;/text&gt;
             &lt;exampleTranslation&gt;
-                &lt;text&gt;
-                    Koroner &lt;collocateMarker lemma="provést"&gt;provedl&lt;/collocateMarker&gt;
-                    &lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.
-                &lt;/text&gt;
+                &lt;text&gt;Koroner \
+                    &lt;collocateMarker lemma="provést"&gt;provedl&lt;/collocateMarker&gt; \
+                    &lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.&lt;/text&gt;
             &lt;/exampleTranslation&gt;
         &lt;/example&gt;
     &lt;/sense&gt;

diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml b/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>