simplify handling of constraint in the controlled values module

oasis-tcs · Jul 17, 2023 · e213d22 · e213d22
1 parent 50f0981
commit e213d22
Show file tree

Hide file tree

Showing 22 changed files with 182 additions and 150 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 "13 July &pubyear;">
+<!ENTITY pubdate "17 July &pubyear;">
 
 <!ENTITY pubyear "2023">
 <!ENTITY releaseinfo "Standards Track Work Product">

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/modules/values/databaseDiagrams/definitionTypeTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/definitionTypeTag.svg