Skip to content

Commit

Permalink
Merge pull request #77 from michmech/master
Browse files Browse the repository at this point in the history
replace "for..." properties with one "for" property
  • Loading branch information
DavidFatDavidF authored Jan 12, 2024
2 parents c880adb + 2c898ac commit 310bfdf
Show file tree
Hide file tree
Showing 45 changed files with 80 additions and 621 deletions.
19 changes: 4 additions & 15 deletions dmlex-v1.0/specification/dmlex.nvh
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,13 @@ values@definitionTypeTag:
values@inflectedFormTag:
values@tag:
values@description: ?
values@forHeadwords: ?
values@forTranslations: ?
values@forLanguage: *
values@forPartOfSpeech: *
values@for: ?
values@sameAs: *
values@labelTag:
values@tag:
values@description: ?
values@typeTag: ?
values@forHeadwords: ?
values@forTranslations: ?
values@forLanguage: *
values@forPartOfSpeech: *
values@for: ?
values@sameAs: *
values@labelTypeTag:
values@tag:
Expand All @@ -129,10 +123,7 @@ values@labelTypeTag:
values@partOfSpeechTag:
values@tag:
values@description: ?
values@forHeadwords: ?
values@forTranslations: ?
values@forLanguage: *
values@forPartOfSpeech: *
values@for: ?
values@sameAs: *
values@sourceIdentityTag:
values@tag:
Expand All @@ -141,9 +132,7 @@ values@sourceIdentityTag:
values@transcriptionSchemeTag:
values@tag:
values@description: ?
values@forHeadwords: ?
values@forTranslations: ?
values@forLanguage: *
values@for: ?
linking@relation:
linking@type:
linking@description: ?
Expand Down
4 changes: 0 additions & 4 deletions dmlex-v1.0/specification/examples/examples/05.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@
- partOfSpeechTag (tag: n-masc, description: masculine noun)
- partOfSpeechTag (tag: n-fem, description: feminine noun)
- inflectedFormTag (tag: sg-gen, description: singular genitive)
- forPartOfSpeech: n-masc
- forPartOfSpeech: n-fem
- inflectedFormTag (tag: pl, description: plural)
- forPartOfSpeech: n-masc
- forPartOfSpeech: n-fem
</programlisting>
</example>
<example>
Expand Down
6 changes: 2 additions & 4 deletions dmlex-v1.0/specification/examples/examples/source/5.json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
}],
"inflectedFormTags": [{
"tag": "sg-gen",
"description": "singular genitive",
"forPartsOfSpeech": ["n-masc", "n-fem"]
"description": "singular genitive"
}, {
"tag": "pl",
"description": "plural",
"forPartsOfSpeech": ["n-masc", "n-fem"]
"description": "plural"
}]
}
</programlisting>
4 changes: 0 additions & 4 deletions dmlex-v1.0/specification/examples/examples/source/5.rdf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
ex:lexicon a dmlex:LexicographicResource;
dmlex:inflectedFormTag [ a dmlex:InflectedFormTag;
dmlex:description "singular genitive";
dmlex:forPartOfSpeech "n-fem",
"n-masc";
dmlex:tag "sg-gen" ],
[ a dmlex:InflectedFormTag;
dmlex:tag "pl";
dmlex:forPartOfSpeech "n-masc",
"n-fem";
dmlex:description "plural" ];
dmlex:partOfSpeechTag [ a dmlex:PartOfSpeechTag;
dmlex:tag "n-fem";
Expand Down
4 changes: 0 additions & 4 deletions dmlex-v1.0/specification/examples/examples/source/5.xml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@
&lt;/partOfSpeechTag&gt;
&lt;inflectedFormTag tag="sg-gen"&gt;
&lt;description&gt;singular genitive&lt;/description&gt;
&lt;forPartOfSpeech tag="n-masc"/&gt;
&lt;forPartOfSpeech tag="n-fem"/&gt;
&lt;/inflectedFormTag&gt;
&lt;inflectedFormTag tag="pl"&gt;
&lt;description&gt;plural&lt;/description&gt;
&lt;forPartOfSpeech tag="n-masc"/&gt;
&lt;forPartOfSpeech tag="n-fem"/&gt;
&lt;/inflectedFormTag&gt;
&lt;/lexicographicResource&gt;
</programlisting>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="Electron" modified="2023-09-03T10:44:32.741Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="S67np6XnAjWp07oC6VTy" version="20.3.0" type="device"><diagram id="R2lEEEUBdFMjLlhIrx00" name="Page-1">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</diagram></mxfile>
<mxfile host="Electron" modified="2024-01-10T17:33:53.060Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="eZew5D8ztlyaPDy1Ibpj" version="20.3.0" type="device"><diagram id="R2lEEEUBdFMjLlhIrx00" name="Page-1">7V1bd6LIFv41eUyWgKA+RjuX7k5memL6MnnpRUupTFA8iJ3Yv/4UBvCytwgBAav2Wb3OSIlQ2fXt+qr2rc603uT1xjNn43vXYs6Z2rBez7QPZ6qqqM0W/0/QsnxrOVd0JWwaebYV3rZu6Nt/WNjYCFsXtsXmWzf6ruv49my7ceBOp2zgb7WZnue+bN82dJ3tt87MEQMN/YHpwNbvtuWP31rbamvdfsvs0Th6s2J03r6ZmNHN4V8yH5uW+7LVxF79a3fqh138wryJOWVTn39zb3rPzDvTr8a+H/yll2fqNf83DO6+GLnuyGHmzJ5fDNwJbx7M+S3XQ3NiO4GgNx7UDR/EX6ddnWk9z3X9t0+T1x5zgtGKhuGtT9d7vo3l4AXPTfGDp2f/pm998pbjG2fae16Ovn68PNca4XN+m84ilHAoHX8ZidxzF1OLBY9pnGndl7Hts/7MHATfvnCY8baxP3H4lcI/zn3PfWY913G91a+13up//BvY4ejdzPPZ60ZT+AfcMHfCfG/JbwnhqmrNcKReNsa+HbaNN8ZdbYWNZjiYo/hhaxnxD6GYMohMbZ+WyAw1pciU9tFE1mwDkdnTocPnB2Zdu97k0RzNgQy5fs6Cj775K2jiYjI9P5yQtECsfIrxTXvKvFCOA9dxzNncXt3+1jK2HevOXLoLP3pQdNUd2q/Menibj4J7+dR0xx82D8cs0Ox+2Jnga9OxR1P+ecCHInhj12Nz3pc7c+6Hd6x+8dY9xcg5eNG34Yisx7IDxlJFx9JIGMvwdQ9c/OaUT1zr9zUb2y9stiF2OsjrtJ23mQ6X0dT0WTfQgzkAUPyX5sFU57AabkHoIZjsu2PXs/8EwHHCgd6E1er6xZ44fLa+Zaa109R1V7y5goftOJHGTt0pA/ALbrI8d/ZoeiPmhw0z1w7ZRe/yf1xqvcaFfqbzvvb4tbK+5v+C2z2/5075/MBhHjyDcbS9sABxXd+dhQ912DB6vhcOSfD5l+v7nIzSYvOA4qaebzSIGBShu5ApbrLRGwAYXz7vhQaXgW+bzloZVvNKsHQx1wOJjDYq/1jmu4OxO5u4XKBDZ7X6GNuWxaZ5xqiTeow2BkXLOCbIpJHxaWVMCjrkZt8cVTz4EXW83dud84WAPR3dvf3S2EGHXh06XvdrsF4oWlI9rhS4qMQhqTikkQeBmTnEqJ5DNACM66o5hFl29LyiKSTWA6IQVW+CoXfYqz1wR4FJxR48sLm78Abs44e600pFCJGQRtrEGtWzRqd61ugITBHpx0N4ijDgDtNi84Fnz3zbnUpFC+lRIR8tGArRQvW0oCD275J5wdi/qzx5XjDSG7XF5wW4axzyQZOIDzKgQT4+aENr09ycsEtyfaVwfWlNxPXVREY2Hm5xXV9tOM/QSqNo11esrblcXxhCj7fQaEPbldCur1gRaPGhtnUw9vwHNV97HNPzlQEcCWsRpdi1SJrHlYIWgyjk6JvV7BSCeb5KppAWAIbInq9YD4hB1DaM0rPY0J7agVXzcTljj/UPpagIGxISCIXf1ZFAMCdYuQQS9UAWAqHou/XQw+i73TBvqfijkNC7k+eP/oP/1OqrC/frz/F9y34Z/fXBPifXWA3IAnWNHYstUBhAi7gYXJGEebmYApUEtF875i/mCMsPOeEgHTs0iR1qwA561ewALdoCs0Mz9fiIzg7QNB2M7d/D/oyxwVgukkiPCulIokUkUQOSQMIkyiUJaLQWmCRaqcdHdJKA5ucwLYfL17f9pVw0kR4X0tGEohFPVM8TMRoq4wll/6by1FlBkTIMChcF3DMuPFsiJsiABfmoIIXPuj6Vm7RGA44MXrkpKeQ5n30ey3TbCQmh8PXD4et8LNNWbsqoZrUOX8cxlaJ+Gq3QUkMzWW9rWbcJ77IKYCFI7HqyFtCaTYXuQGmKNuXFhshZdLhsYIoLscf79/cFsUeZFZvwLkvlK1TJWRiLAnoLpSrXlBcf0hFI9Eriiwr5osxaTTgK9gegnjo5aOlHQ3Ry0OCeUvhCTXkxIR0hNCFIqCzHXlhE5yokGjYxx574hs0mleU4umEzVtZaVuXAuyxsUY5kLaDlR1Pekhx5oSGdb7pJBTmOvk/NTh5l1uPAuyxqOY5kJSDuQI7MkqQYR15kyEcdVIqjhtRRZiUOPHsOxm6JSxxSVuHAhx0Jr+qpZ93W1v9LxBxUhWM/VuCMwKwRi7Z/fNIduyN3ajpX69buOkJ2pcTxPXfuCgNB43/M95fhWJkL3z3biprl4+Utf0RzQnDxb3BxoUeXH143v/ywjK+sy+AEYX559fCHee6je29OlxFzrb97g+Sq8dp2nPXPN642yU4Jv968hOiKPEYrd3KCUONjkSO+O7SmCUSeiEuPOaZv/2Zb/SieL1KYL2sUHa0ge7PjHQWMSww5KiqsY0HOgxRB0fHZ3AeDojvZptrT8x3o0FRIa/iCfQd6+qiYugRF69AqKLLvINYCWsbr0PAnd1B0BmxIF8KgQ2MhsUfBFqDs7FF5ULQODYMCOw/kPKEQr6AETX8UFE1nFa6eZi8M+6Nyf/f5+zf7tjHvD9jdjMqx1oAuyoyJRkEghHsgCd5yMQMqCWjjEz4gOiciROYCfPFA1VerJ4NST63FYaCLQAeJCJeLD3BRQAOjL11wUQY8yMcGVGa1BmyAleIulw3a4rIBFVWNRQENhsIeYJ4XC9IxQQsuFShPci8sdvMklRYCFDnzJFvQtUlrjIJjHVrp4+XrkifZgk5MkWMdWrTsiEUBlx1S50lmgIZ0IcsRrRF5HG+Dmp08Ks+TbMOsB4FDHWIlIO6IjyKQ+izBDICQjzGoLEsNGaPy9Mh2hkKyJ88XVJMlFgWSaCFzemQGaMjHHCkMVTXKiGsjXiL8vJD20SZVaMPZObuTrMUpEuPaUeT2wcQ4I5uSnZ6xuE3FLY5uLG6nj4yuS2JchE5JjMWxFtACrgMtPXInxmXAhnQ+6w60DhF7FLz3z84elSfGdaBJSGBrcawERB4dpGKH9IlxGfAhH4Hsj3skviiLLyo/LaTTEZccKGs6Ph64ATeVwmfH5QWFdIygNChZunpKqD4/Tmns30qeOinEGCdW4LKAm0W5kiKyoEE+OlDgooHSIvbiYjctAvV0yZkWoShI5WZaaRTr6lqr6+kkRigKtGKL7OxaKwKtPhQFrj6kzo3IAg7pApYUJUNQo9QUkmOz+g4KqTw9QlFg2KPAHq+1HhCDKArM296Jyas7nVSEDAnpgzKz60gfledKKEqGAtOnTx6Umb2WBRJ+K3O6RBZwyMcfkVOGzpMq8DypKL7z4HlS8dqmuAOlVj/lgjCXGzeEjLt+8pegYQPwEQwiA1qn0dyEW4ofaM0dfL71oVi0pjlyuT7pPU2lCScSPL1HP9o6ADmOOAyY47Oqb/tLyvBJleHDBzNtho/4fg/kqONkCMm668jj92imX7fUJcdHQQ42Ftrv0aRYvFgWyOnFcqf5ZEGHfFEY2KnHxCEFW66yc0jlmT5KdMSxJI4PnVzna1lA1zkl+2RBiIQ0QtXua8Aalef7KLq45e5jjBNFcFnAHaacGT9ZUCEfLSDnaVKM915c7MR447ZOSWO8DdqnHt/WGavrCcV4G3CfKrSt06CN6loWFOP9bnDIF2RhUIz38Tet2Smk+hhvQ64YbzrFc0MWyNlcu3EZdSeUirAhIYFQlHcdCaT6KG9DpihvOvZzQxYU5f1ucMjHH5F9j6K8C4zyjsN7Dod5G4WHeaeljefZZPL9J/uqn/fG33r/PM04xM5TWDRrFEWtpY6iLuKQBFRg0NLHlynT2OvUH4zZhFEgdbpAai11ILVIRyWguKJzrop0LSSqbi2DqNEeQ2OhIG6FRBWQak2PSgLaAqUJn86JDJHDG1DRpEiDI97YnLtK4I0yA6fRHkMboRi+hEQNINqAFkCpQqZzokM66lCIKiqnijKjpXEQaMISg5J+NERnBqS0oPCh0nkxIR8f6MQHVfNBqUcj4CgwxCUEPfVwCE8IcIso7LkIebEgMhHYC8P+qNzfff7+zb5tzPsDdjc715CIgl1k1McrqBnIIvp4tZVQiSHrK8f8xZzH5YycgemcgVqrkZL6hMo0wuEEHQC0NHu/NzBZZWvpDsS7DI39gvgDk7VAquUaLgq4XJPGI5gXG9It37LUe5aaPdJt7AtijzKdgniX4apeDK9gshIQeUQmJVn9gnnxIR2BqE3ii8r5okzPII6C/e6AUycHVcrsU1wUcE8pvGcwLyZEJoT+j0XT/Pdx0GmYT79vleHvhdbHlo5k3sx6Wq4WSfFgJaVGNsDU2r6J4glZkdKKI0chpUSdrWcdJRQWMBtNEPtmshZItQrBRaGCkZfGvpkXG0LnMKOyoVy5IverBbFHqSWUUFhkKK11QhvYZBUg6lChr/zi4qLu1FENFkSmCvtn72Xw7c9/6l/G5+eHyz/WI/t03oTR7YerXURQCXHhrnaMuStgvNr+j43PG/Uv+NW6/EVwEVHNao/dNQfPo9XrI0RabGgunBWutuKq1u0Bkq7Nie0ET7plzm/m2wNzB2LR3gJ7bLraGntKc5RVdUMPNf9g0Y1oI1z10YoRHUb7LVU5cLQi+EHYUNTRirjOQLtvxTrTyKAzcaWZuOxMukozpGuxriXtRw7qWvH1bd6na7unkmpGxmNMtUaxx5iiutaC+16qTb932WJsD5FqpLVYiRUxigKJ9sSFRowmKmstLap4l4WtIJOsBVJti3FRwG2xLGXp80JDul1yi4rIFBoAVAx5lGlQxbssahmZZCUg7mjBAHJ7OnR4n5l17XoTYevR5wWGfMyRIlOUmKNs5iizGD3a5WifLJgrLlkFiDfaSDVpSSrR54WGdMzRJs9c3b0F7y3aD7UD8TI8Pfs3feuTtxzfONPe83L09ePluRrVA990MyQuyqp2M+wUMVCN1gE3w+4PWg19R73yuRnUK/fz/yaj9u3N309fzrvG8z9XWJV/8jLsnYJ347bRuhTCexlQHEFvFa323+9kSFTVWvoY0B5Dz5MgLoZEFZBqtY9KArqWZHEw5ASGyGt9VDRUzahII1ExtFGmdwHtMfQ5ieFcSNQAYg3oU9rMJK07f1QCCen4guoX1Y8vyvQpoD3O4Gk6dbaQsnQRDlPEkSSJRyEnMqQjDUUBOCCHQr0cChDkiGMgsdzjpl8gaVV19NN1+aXnuv4mhINiaveuxYI7/g8=</diagram></mxfile>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 310bfdf

Please sign in to comment.