Merge pull request #121 from jmccrae/fixes-on-113

Fixes for #113
oasis-tcs · Apr 18, 2024 · d9396cb · d9396cb
2 parents 1bf8137 + e5c0505
commit d9396cb
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 20 deletions.
diff --git a/dmlex-v1.0/specification/examples/examples/source/0.xml.xml b/dmlex-v1.0/specification/examples/examples/source/0.xml.xml
@@ -1,5 +1,6 @@
 <programlisting>
-&lt;lexicographicResource title="Example Dictionary" uri="http://example.com" langCode="en"&gt;
+&lt;lexicographicResource title="Example Dictionary" 
+    uri="http://example.com" langCode="en"&gt;
     &lt;entry id="abandon-verb"&gt;
         &lt;headword&gt;abandon&lt;/headword&gt;
             &lt;partOfSpeech tag="verb"/&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/10.xml.xml b/dmlex-v1.0/specification/examples/examples/source/10.xml.xml
@@ -1,5 +1,6 @@
 <programlisting>
-&lt;lexicographicResource title="My Irish-Multilingual Dictionary" uri="http://example.com" langCode="ga"&gt;
+&lt;lexicographicResource title="My Irish-Multilingual Dictionary" 
+    uri="http://example.com" langCode="ga"&gt;
     &lt;translationLanguage langCode="en"/&gt;
     &lt;translationLanguage langCode="de"/&gt;
     &lt;translationLanguage langCode="cs"/&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/20.json.xml b/dmlex-v1.0/specification/examples/examples/source/20.json.xml
@@ -9,6 +9,7 @@
     "id": "beat-up-1",
     "headwordTranslations": [{
       "text": "jemanden verprügeln",
+      "langCode": "de",
       "placeholderMarkers": [
           {"startIndex": 0, "endIndex": 8}
       ]

diff --git a/dmlex-v1.0/specification/examples/examples/source/20.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/20.rdf.xml
@@ -5,6 +5,7 @@ ex:beat-up-1 a dmlex:Sense;
           dmlex:startIndex "0"^^xsd:unsignedInt;
           dmlex:endIndex "8"^^xsd:unsignedInt ];
       dmlex:listingOrder "1"^^xsd:unsignedInt;
+      dmlex:langCode "de";
       dmlex:text "jemanden verprügeln" ];
   dmlex:listingOrder "1"^^xsd:unsignedInt.
 ex:beat-up a dmlex:Entry;

diff --git a/dmlex-v1.0/specification/examples/examples/source/21.json.xml b/dmlex-v1.0/specification/examples/examples/source/21.json.xml
@@ -4,14 +4,18 @@
   "headword": "autopsy",
   "senses": [{
     "id": "autopsy-1",
-    "headwordTranslations": [{"text": "pitva"}],
+    "headwordTranslations": [{
+        "text": "pitva",
+        "langCode": "cs"
+    }],
     "examples": [{
       "text": "The coroner performed an autopsy.",
       "headwordMarkers": [
         {"startIndex": 25, "endIndex": 32}
       ],
       "exampleTranslations": [{
         "text": "Koroner provedl pitvu.",
+        "langCode": "cs",
         "headwordMarkers": [
           {"startIndex": 16, "endIndex": 21}
         ]

diff --git a/dmlex-v1.0/specification/examples/examples/source/21.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/21.rdf.xml
@@ -4,6 +4,7 @@ ex:autopsy-1 a dmlex:Sense;
   dmlex:example [ a dmlex:Example;
       dmlex:exampleTranslation [ a dmlex:ExampleTranslation;
           dmlex:text "Koroner provedl pitvu.";
+          dmlex:langCode "cs";
           dmlex:headwordMarker [ 
               dmlex:endIndex "21"^^xsd:unsignedInt;
               dmlex:startIndex "16"^^xsd:unsignedInt ];
@@ -15,6 +16,7 @@ ex:autopsy-1 a dmlex:Sense;
           dmlex:startIndex "25"^^xsd:unsignedInt ] ];
   dmlex:headwordTranslation [ a dmlex:HeadwordTranslation;
       dmlex:listingOrder "1"^^xsd:unsignedInt;
+      dmlex:langCode "cs";
       dmlex:text "pitva" ].
 ex:autopsy a dmlex:Entry;
   dmlex:sense ex:autopsy-1;

diff --git a/dmlex-v1.0/specification/examples/examples/source/21.xml.xml b/dmlex-v1.0/specification/examples/examples/source/21.xml.xml
@@ -10,7 +10,8 @@ rdMarker&gt;.&lt;/text&gt;
 r&gt;.&lt;/text&gt;
             &lt;/exampleTranslation&gt;
         &lt;/example&gt;
-        &lt;headwordTranslation langCode="cs"&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
+        &lt;headwordTranslation langCode="cs"&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTra
+nslation&gt;
     &lt;/sense&gt;
 &lt;/entry&gt;
 

diff --git a/dmlex-v1.0/specification/examples/examples/source/5.json.xml b/dmlex-v1.0/specification/examples/examples/source/5.json.xml
@@ -24,10 +24,12 @@
     }],
     "inflectedFormTags": [{
         "tag": "sg-gen",
-        "description": "singular genitive"
+        "description": "singular genitive",
+        "for": "n-masc n-fem"
     }, {
         "tag": "pl",
-        "description": "plural"
+        "description": "plural",
+        "for": "n-masc n-fem"
     }]
 }
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/5.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/5.rdf.xml
@@ -2,9 +2,11 @@
 ex:lexicon a dmlex:LexicographicResource;
   dmlex:inflectedFormTag [ a dmlex:InflectedFormTag;
       dmlex:description "singular genitive";
+      dmlex:for "n-masc n-fem" ;
       dmlex:tag "sg-gen" ],
     [ a dmlex:InflectedFormTag;
       dmlex:tag "pl";
+      dmlex:for "n-masc n-fem" ;
       dmlex:description "plural" ];
   dmlex:partOfSpeechTag [ a dmlex:PartOfSpeechTag;
       dmlex:tag "n-fem";

diff --git a/dmlex-v1.0/specification/examples/examples/source/5.xml.xml b/dmlex-v1.0/specification/examples/examples/source/5.xml.xml
@@ -10,10 +10,10 @@
             &lt;text&gt;folúsghlantóirí&lt;/text&gt;
         &lt;/inflectedForm&gt;
     &lt;/entry&gt;
-    &lt;inflectedFormTag tag="sg-gen"&gt;
+    &lt;inflectedFormTag tag="sg-gen" for="n-masc n-fem"&gt;
         &lt;description&gt;singular genitive&lt;/description&gt;
     &lt;/inflectedFormTag&gt;
-    &lt;inflectedFormTag tag="pl"&gt;
+    &lt;inflectedFormTag tag="pl" for="n-masc n-fem"&gt;
         &lt;description&gt;plural&lt;/description&gt;
     &lt;/inflectedFormTag&gt;
     &lt;partOfSpeechTag tag="n-masc"&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/7.xml.xml b/dmlex-v1.0/specification/examples/examples/source/7.xml.xml
@@ -1,5 +1,6 @@
 <programlisting>
-&lt;lexicographicResource title="My German-English Dictionary" uri="http://example.com" langCode="de"&gt;
+&lt;lexicographicResource title="My German-English Dictionary" 
+    uri="http://example.com" langCode="de"&gt;
     &lt;translationLanguage langCode="en"/&gt;
 &lt;/lexicographicResource&gt;
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/8.json.xml b/dmlex-v1.0/specification/examples/examples/source/8.json.xml
@@ -7,20 +7,24 @@
         "indicator": "medical doctor",
         "headwordTranslations": [{
             "text": "Arzt",
-            "partsOfSpeech": ["n-masc"]
+            "partsOfSpeech": ["n-masc"],
+            "langCode": "de"
         }, {
             "text": "Ärztin",
-            "partsOfSpeech": ["n-fem"]
+            "partsOfSpeech": ["n-fem"],
+            "langCode": "de"
         }]
     }, {
         "id": "doctor-n-2",
         "indicator": "academic title",
         "headwordTranslations": [{
             "text": "Doktor",
-            "partsOfSpeech": ["n-masc"]
+            "partsOfSpeech": ["n-masc"],
+            "langCode": "de"
         }, {
             "text": "Doktorin",
-            "partsOfSpeech": ["n-fem"]
+            "partsOfSpeech": ["n-fem"],
+            "langCode": "de"
         }]
     }]
 }

diff --git a/dmlex-v1.0/specification/examples/examples/source/8.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/8.rdf.xml
@@ -7,11 +7,13 @@ ex:doctor-n-1 a dmlex:Sense;
   dmlex:headwordTranslation [ a dmlex:HeadwordTranslation;
       dmlex:text "Ärztin";
       dmlex:listingOrder "2"^^xsd:unsignedInt;
+      dmlex:langCode "de"
       dmlex:partOfSpeech [ 
           dmlex:tag "n-fem";
           dmlex:listingOrder "1"^^xsd:unsignedInt ] ],
     [ a dmlex:HeadwordTranslation;
       dmlex:listingOrder "1"^^xsd:unsignedInt;
+      dmlex:langCode "de";
       dmlex:text "Arzt";
       dmlex:partOfSpeech [ 
           dmlex:listingOrder "1"^^xsd:unsignedInt;
@@ -23,12 +25,14 @@ ex:doctor-n-2 a dmlex:Sense;
       dmlex:partOfSpeech [ 
           dmlex:listingOrder "1"^^xsd:unsignedInt;
           dmlex:tag "n-masc" ];
+      dmlex:langCode "de";
       dmlex:text "Doktor";
       dmlex:listingOrder "1"^^xsd:unsignedInt ],
     [ a dmlex:HeadwordTranslation;
       dmlex:partOfSpeech [ 
           dmlex:listingOrder "1"^^xsd:unsignedInt;
           dmlex:tag "n-fem" ];
+      dmlex:langCode "de";
       dmlex:listingOrder "2"^^xsd:unsignedInt;
       dmlex:text "Doktorin" ];
   dmlex:listingOrder "2"^^xsd:unsignedInt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/8.xml.xml b/dmlex-v1.0/specification/examples/examples/source/8.xml.xml
@@ -3,22 +3,22 @@
     &lt;headword&gt;doctor&lt;/headword&gt;
     &lt;sense id="doctor-n-1"&gt;
         &lt;indicator&gt;medical doctor&lt;/indicator&gt;
-        &lt;headwordTranslation langCode="en"&gt;
+        &lt;headwordTranslation langCode="de"&gt;
             &lt;text&gt;Arzt&lt;/text&gt;
             &lt;partOfSpeech tag="n-masc"/&gt;
         &lt;/headwordTranslation&gt;
-        &lt;headwordTranslation langCode="en"&gt;
+        &lt;headwordTranslation langCode="de"&gt;
             &lt;text&gt;Ärztin&lt;/text&gt;
             &lt;partOfSpeech tag="n-fem"/&gt;
         &lt;/headwordTranslation&gt;
     &lt;/sense&gt;
     &lt;sense id="doctor-n-2"&gt;
         &lt;indicator&gt;academic title&lt;/indicator&gt;
-        &lt;headwordTranslation langCode="en"&gt;
+        &lt;headwordTranslation langCode="de"&gt;
             &lt;text&gt;Doktor&lt;/text&gt;
             &lt;partOfSpeech tag="n-masc"/&gt;
         &lt;/headwordTranslation&gt;
-        &lt;headwordTranslation langCode="en"&gt;
+        &lt;headwordTranslation langCode="de"&gt;
             &lt;text&gt;Doktorin&lt;/text&gt;
             &lt;partOfSpeech tag="n-fem"/&gt;
         &lt;/headwordTranslation&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/9.json.xml b/dmlex-v1.0/specification/examples/examples/source/9.json.xml
@@ -6,10 +6,12 @@
     "senses": [{
         "id": "treppenwitz-1",
         "headwordExplanations": [{
-            "text": "belated realisation of what one could have said"
+            "text": "belated realisation of what one could have said",
+            "langCode": "en"
         }],
         "headwordTranslations": [{
-            "text": "staircase wit"
+            "text": "staircase wit",
+            "langCode": "en"
         }]
     }]
 }

diff --git a/dmlex-v1.0/specification/examples/examples/source/9.rdf.xml b/dmlex-v1.0/specification/examples/examples/source/9.rdf.xml
@@ -7,9 +7,11 @@ ex:treppenwitz a dmlex:Entry;
   dmlex:headword "Treppenwitz".
 ex:treppenwitz-1 a dmlex:Sense;
   dmlex:headwordExplanation [ a dmlex:HeadwordExplanation;
-      dmlex:text "belated realisation of what one could have said" ];
+      dmlex:text "belated realisation of what one could have said";
+      dmlex:langCode "en" ];
   dmlex:headwordTranslation [ a dmlex:HeadwordTranslation;
       dmlex:text "staircase wit";
+      dmlex:langCode "en";
       dmlex:listingOrder "1"^^xsd:unsignedInt ];
   dmlex:listingOrder "1"^^xsd:unsignedInt.
 </programlisting>