Merge pull request #30 from michmech/master

various updates
oasis-tcs · Jul 24, 2023 · 99a7cd2 · 99a7cd2
2 parents 5910267 + 0082ac5
commit 99a7cd2
Show file tree

Hide file tree

Showing 105 changed files with 1,593 additions and 1,401 deletions.
diff --git a/dmlex-v1.0/specification/docbook/dbgenent.mod b/dmlex-v1.0/specification/docbook/dbgenent.mod
@@ -60,7 +60,7 @@
 <!ENTITY previous-loc "http://docs.oasis-open.org/lexidma/dmlex/v&version;/&pstage;">
 <!ENTITY latest-loc "http://docs.oasis-open.org/lexidma/dmlex/v&version;">
 
-<!ENTITY pubdate "27 March &pubyear;">
+<!ENTITY pubdate "17 July &pubyear;">
 
 <!ENTITY pubyear "2023">
 <!ENTITY releaseinfo "Standards Track Work Product">

diff --git a/dmlex-v1.0/specification/examples/examples.xml b/dmlex-v1.0/specification/examples/examples.xml
@@ -35,4 +35,5 @@
   <xi:include href="examples/20.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="examples/21.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="examples/22.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="examples/23.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>
diff --git a/dmlex-v1.0/specification/examples/examples/05.xml b/dmlex-v1.0/specification/examples/examples/05.xml
@@ -23,11 +23,11 @@
     - partOfSpeechTag (tag: n-masc, description: masculine noun)
     - partOfSpeechTag (tag: n-fem, description: feminine noun)
     - inflectedFormTag (tag: sg-gen, description: singular genitive)
-        - partOfSpeechConstraint: n-masc
-        - partOfSpeechConstraint: n-fem
+        - forPartOfSpeech: n-masc
+        - forPartOfSpeech: n-fem
     - inflectedFormTag (tag: pl, description: plural)
-        - partOfSpeechConstraint: n-masc
-        - partOfSpeechConstraint: n-fem
+        - forPartOfSpeech: n-masc
+        - forPartOfSpeech: n-fem
 </programlisting>
     </example>
     <example>
@@ -53,14 +53,14 @@
     &lt;/partOfSpeechTag&gt;
     &lt;inflectedFormTag tag="sg-gen"&gt;
         &lt;description&gt;singular genitive&lt;/description&gt;
-        &lt;partOfSpeechConstraint tag="n-masc"/&gt;
-        &lt;partOfSpeechConstraint tag="n-fem"/&gt;
+        &lt;forPartOfSpeech tag="n-masc"/&gt;
+        &lt;forPartOfSpeech tag="n-fem"/&gt;
     &lt;/tag&gt;
     &lt;tag value="pl"&gt;
         &lt;description&gt;plural&lt;/description&gt;
         &lt;target value="inflectedTag"/&gt;
-        &lt;partOfSpeechConstraint tag="n-masc"/&gt;
-        &lt;partOfSpeechConstraint tag="n-fem"/&gt;
+        &lt;forPartOfSpeech tag="n-masc"/&gt;
+        &lt;forPartOfSpeech tag="n-fem"/&gt;
     &lt;/tag&gt;
 &lt;/lexicographicResource&gt;
 </programlisting>
@@ -93,11 +93,11 @@
     "inflectedFormTags": [{
         "tag": "sg-gen",
         "description": "singular genitive"
-        "partOfSpeechConstraints": ["n-masc", "n-fem"]
+        "forPartsOfSpeech": ["n-masc", "n-fem"]
     }, {
         "tag": "pl",
         "description": "plural",
-        "partOfSpeechConstraints": ["n-masc", "n-fem"]
+        "forPartsOfSpeech": ["n-masc", "n-fem"]
     }]
 }
 </programlisting>

diff --git a/dmlex-v1.0/specification/examples/examples/22.xml b/dmlex-v1.0/specification/examples/examples/22.xml
@@ -8,7 +8,7 @@
 
 <section id="ex22">
 
-    <title>Using <code>itemMarker</code></title>
+    <title>Using <code>collocateMarker</code></title>
     <example>
         <title>Pseudocode</title>
         <programlisting>
@@ -17,10 +17,10 @@
         - headwordTranslation (text: pitva)
         - example (text: The coroner performed an autopsy.)
             - headwordMarker: "autopsy"
-            - itemMarker: "performed" (lemma: perform)
+            - collocateMarker: "performed" (lemma: perform)
             - exampleTranslation (text: Koroner provedl pitvu.)
                 - headwordMarker: "pitvu"
-                - itemMarker: "provedl" (lemma: provést)
+                - collocateMarker: "provedl" (lemma: provést)
 </programlisting>
     </example>
     <example>
@@ -32,12 +32,12 @@
         &lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
         &lt;example&gt;
             &lt;text&gt;
-                The coroner &lt;itemMarker lemma="perform"&gt;performed&lt;/itemMarker&gt;
+                The coroner &lt;collocateMarker lemma="perform"&gt;performed&lt;/collocateMarker&gt;
                 an &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.
             &lt;/text&gt;
             &lt;exampleTranslation&gt;
                 &lt;text&gt;
-                    Koroner &lt;itemMarker lemma="provést"&gt;provedl&lt;/itemMarker&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;
@@ -60,15 +60,15 @@
       "headwordMarkers": [
         {"startIndex": 25, "endIndex": 32}
       ],
-      "itemMarkers": [
+      "collocateMarkers": [
         {"startIndex": 12, "endIndex": 21, "lemma": "perform"}
       ],
       "exampleTranslations": [{
         "text": "Koroner provedl pitvu.",
         "headwordMarkers": [
           {"startIndex": 16, "endIndex": 21}
         ],
-        "itemMarkers": [
+        "collocateMarkers": [
           {"startIndex": 8, "endIndex": 15, "lemma": "provést"}
         ],
       }]

diff --git a/dmlex-v1.0/specification/examples/examples/23.xml b/dmlex-v1.0/specification/examples/examples/23.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                         "http://www.docbook.org/xml/4.5/docbookx.dtd" [
+                         <!ENTITY % xinclude SYSTEM "../../docbook/xinclude.mod" >
+                         %xinclude;
+                         <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >
+]>
+
+<section id="ex23">
+
+    <title>Modelling etymology</title>
+    <example>
+        <title>Pseudocode</title>
+        <programlisting>
+- entry (id: cat-n, headword: cat)
+    - sense ...
+    - etymology
+        - origin
+            - etymon (language: enm, text: catte)
+        - origin
+            - etymon (language: ang, text: catt, translation: male cat)
+            - etymon (language: ang, text: catte, translation: female cat)
+        - origin
+            - etymon (language: gem-x-proto, text: kattuz, reconstructed: true)
+</programlisting>
+    </example>
+    <example>
+        <title>XML</title>
+        <programlisting>
+&lt;entry id="cat-n"&gt;
+    &lt;headword&gt;cat&lt;/headword&gt;
+    &lt;sense&gt;...&lt;/sense>
+    &lt;etymology>
+        &lt;origin>
+            &lt;etymon language="enm">
+                &lt;text>catte&lt;/text>
+            &lt;/etymon>
+        &lt;/origin>
+        &lt;origin>
+            &lt;etymon language="ang">
+                &lt;text>catt&lt;/text>
+                &lt;translation>male cat&lt;/translation>
+            &lt;/etymon>
+            &lt;etymon language="ang">
+                &lt;text>catte&lt;/text>
+                &lt;translation>female cat&lt;/translation>
+            &lt;/etymon>
+        &lt;/origin>
+        &lt;origin>
+            &lt;etymon language="gem-x-proto" reconstructed="true">
+                &lt;text>kattuz&lt;/text>
+            &lt;/etymon>
+        &lt;/origin>
+    &lt;/etymology>
+&lt;/entry&gt;
+</programlisting>
+    </example>
+    <example>
+        <title>JSON</title>
+        <programlisting>
+{
+  "id": "cat-n",
+  "headword": "cat",
+  "senses": [...],
+  "etymology": {
+    "origins" [{
+      "etymons": [
+        {"language": "enm", "text": "catte"}
+      ]
+    }, {
+      "etymons": [
+        {"language": "ang", "text": "catt", "translation": "male cat"},
+        {"language": "ang", "text": "catte", "translation": "female cat"}
+      ]
+    }, {
+      "etymons": [
+        {"language": "gem-x-proto", "text": "kattuz", "reconstructed": true}
+      ]
+    }]
+  }
+}
+</programlisting>
+    </example>
+</section>
diff --git a/dmlex-v1.0/specification/modules/annotation/databaseDiagrams/collocateMarker.svg b/dmlex-v1.0/specification/modules/annotation/databaseDiagrams/collocateMarker.svg