diff --git a/dmlex-v1.0/specification/docbook/dbgenent.mod b/dmlex-v1.0/specification/docbook/dbgenent.mod index 84fe31e..4d2077f 100644 --- a/dmlex-v1.0/specification/docbook/dbgenent.mod +++ b/dmlex-v1.0/specification/docbook/dbgenent.mod @@ -60,7 +60,7 @@ - + diff --git a/dmlex-v1.0/specification/examples/examples/05.xml b/dmlex-v1.0/specification/examples/examples/05.xml index 2ac11ae..003d697 100644 --- 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 @@ -53,14 +53,14 @@ </partOfSpeechTag> <inflectedFormTag tag="sg-gen"> <description>singular genitive</description> - <partOfSpeechConstraint tag="n-masc"/> - <partOfSpeechConstraint tag="n-fem"/> + <forPartOfSpeech tag="n-masc"/> + <forPartOfSpeech tag="n-fem"/> </tag> <tag value="pl"> <description>plural</description> <target value="inflectedTag"/> - <partOfSpeechConstraint tag="n-masc"/> - <partOfSpeechConstraint tag="n-fem"/> + <forPartOfSpeech tag="n-masc"/> + <forPartOfSpeech tag="n-fem"/> </tag> </lexicographicResource> @@ -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"] }] } diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/definitionTypeTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/definitionTypeTag.svg index 6e70d70..86e0027 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/definitionTypeTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/definitionTypeTag.svg @@ -1,3 +1,3 @@ -definitionTypeTagsPKidFKlexicographicResourceIDtagdescriptionsameAsPKidFKdefinitionTypeTagID··· \ No newline at end of file +definitionTypeTagsPKtagFKlexicographicResourceIDdescriptionsameAsPKidFKdefinitionTypeTag··· \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/diagrams.drawio b/dmlex-v1.0/specification/modules/values/databaseDiagrams/diagrams.drawio index 1da62b5..6a2d358 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/diagrams.drawio +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/diagrams.drawio @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/inflectedFormTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/inflectedFormTag.svg index 6ea53f5..ae6f50e 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/inflectedFormTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/inflectedFormTag.svg @@ -1,3 +1,3 @@ -inflectedFormTagsPKidFKlexicographicResourceIDtagdescriptionlocationConstrainttranslationLanguageConstraintspartOfSpeechConstraintssameAsPKidFKinflectedFormTagID··· \ No newline at end of file +inflectedFormTagsPKtagFKlexicographicResourceIDdescriptionforHeadwordsforTranslationsforLanguagesforPartsOfSpeechsameAsPKidFKinflectedFormTag··· \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTag.svg index e6c0870..45da300 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTag.svg @@ -1,3 +1,3 @@ -labelTagsPKidFKlexicographicResourceIDtagdescriptiontypeTaglocationConstrainttranslationLanguageConstraintspartOfSpeechConstraintssameAsPKidFKlabelTagID··· \ No newline at end of file +labelTagsPKtagFKlexicographicResourceIDdescriptiontypeTagforHeadwordsforTranslationsforCollocatesforLanguagesforPartsOfSpeechsameAsPKidFKlabelTag···labelTypeTagsPKtag... \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTypeTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTypeTag.svg index 3130a70..49e3830 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTypeTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/labelTypeTag.svg @@ -1,3 +1,3 @@ -labelTypeTagsPKidFKlexicographicResourceIDtagdescription \ No newline at end of file +labelTypeTagsPKtagFKlexicographicResourceIDdescription \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/partOfSpeechTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/partOfSpeechTag.svg index 6880d8d..12be44e 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/partOfSpeechTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/partOfSpeechTag.svg @@ -1,3 +1,3 @@ -partOfSpeechTagsPKidFKlexicographicResourceIDtagdescriptionlocationConstrainttranslationLanguageConstraintssameAsPKidFKpartOfSpeechTagID··· \ No newline at end of file +partOfSpeechTagsPKtagFKlexicographicResourceIDdescriptionforHeadwordsforTranslationsforEtymologyforLanguagessameAsPKidFKpartOfSpeechTag··· \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/sameAs.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/sameAs.svg index 13e48a8..5d054eb 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/sameAs.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/sameAs.svg @@ -1,3 +1,3 @@ -sameAsPKidFKdefinitionTypeTagIDFKinflectedFormTagIDFKlabelTagIDFKpartOfSpeechTagIDFKsourceIdentityTagIDuri \ No newline at end of file +sameAsPKidFKdefinitionTypeTagFKinflectedFormTagFKlabelTagFKpartOfSpeechTagFKsourceIdentityTaguri \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/sourceIdentityTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/sourceIdentityTag.svg index a7eb694..5438260 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/sourceIdentityTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/sourceIdentityTag.svg @@ -1,3 +1,3 @@ -sourceIdentityTagsPKidFKlexicographicResourceIDtagdescriptionsameAsPKidFKsourceIdentityTagID··· \ No newline at end of file +sourceIdentityTagsPKtagFKlexicographicResourceIDdescriptionsameAsPKidFKsourceIdentityTag··· \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/databaseDiagrams/transcriptionSchemeTag.svg b/dmlex-v1.0/specification/modules/values/databaseDiagrams/transcriptionSchemeTag.svg index 27359cb..752244e 100644 --- a/dmlex-v1.0/specification/modules/values/databaseDiagrams/transcriptionSchemeTag.svg +++ b/dmlex-v1.0/specification/modules/values/databaseDiagrams/transcriptionSchemeTag.svg @@ -1,3 +1,3 @@ -transcriptionSchemeTagsPKidFKlexicographicResourceIDtagdescriptionsideConstrainttranslationLanguageConstraints \ No newline at end of file +transcriptionSchemeTagsPKtagFKlexicographicResourceIDdescriptionforHeadwordsforTranslationsforLanguages \ No newline at end of file diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml index af85051..1706a9b 100644 --- a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml +++ b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml @@ -37,31 +37,32 @@ - locationConstraint - optional (zero or one). If present, indicates whether this tag is - intended to be used on the headword side or on the translation side of the lexicographic - resource. One of: + forHeadwords + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the headword + side of the lexicographic resource: as inflectedForm of entry. + + + forTranslations + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the translation side of the lexicographic resource: + as headwordTranslation of headwordTranslation. + + + + forLanguage + optional (zero, one or more). If present, says that: - headword This tag is supposed to be used only on the headword - side of the lexicographic resource: as inflectedForm of entry. - - - translation This tag is supposed to be used only on the translation side of the lexicographic resource: - as inflectedForm of headwordTranslation. + If this tag is + being used inside a headwordTranslation object, + then it is intended to be used only inside a headwordTranslation object labelled with this language. - - translationLanguageConstraint - optional (zero, one or more). If present, says that if this tag is - being used inside a headwordTranslation object, - then it is intended to be used only inside a headwordTranslation object labelled with this language. - - - partOfSpeechConstraint + forPartOfSpeech optional (zero, one or more). If present, says that: @@ -70,7 +71,7 @@ speech. - If this tag is used as a inflectedForm of a entry, then + If this tag is used as a inflectedForm of an entry, then the entry must have this part of speech. @@ -84,10 +85,10 @@ XML -<inflectedFormTag tag="..." locationConstraint="..."> +<inflectedFormTag tag="..." forHeadwords="true" forTranslations="true"> <description>...</description> - <translationLanguageConstraint langCode="..."/> - <partOfSpeechConstraint tag="..."/> + <forLanguage langCode="..."/> + <forPartOfSpeech tag="..."/> <sameAs.../> </tag> @@ -99,9 +100,10 @@ { "tag": "...", "description": "...", - "locationConstraint": "...", - "translationLanguageConstraint": ["..."] - "partOfSpeechConstraints": ["..."], + "forHeadwords": true, + "forTranslations": true, + "forLanguages": ["..."] + "forPartsOfSpeech": ["..."], "sameAs": [...] } @@ -114,9 +116,10 @@ a dmlex:InflectedFormTag ; dmlex:tag "..." ; dmlex:description "..." ; - dmlex:locationConstraint "..." ; - dmlex:translationLanguageConstraint "..." . - dmlex:partOfSpeechConstraint "..." ; + dmlex:forHeadwods "..." ; + dmlex:forTranslations "..." ; + dmlex:forLanguage "..." . + dmlex:forPartOfSpeech "..." ; dmlex:sameAs ... ] . @@ -124,8 +127,8 @@ Relational database - The partOfSpeechConstraints column is a comma-delimited list of part-of-speech labels. - The translationLanguageConstraints column is a comma-delimited list of language codes. + The forPartsOfSpeech column is a comma-delimited list of part-of-speech labels. + The forLanguages column is a comma-delimited list of language codes. diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml index 76d0388..ea65f8b 100644 --- a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml +++ b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml @@ -46,35 +46,33 @@ - locationConstraint - optional (zero or one). If present, indicates whether this tag is intended to be used on the - headword side or on the translation side of the lexicographic resource. One of: - - - headword This tag is supposed to be used on the headword side of the lexicographic resource: - anywhere except inside a headwordTranslation object - or a collocateMarker object. - - - translation This tag is supposed to be used on the translation side of the lexicographic resource: - inside a headwordTranslation object only. - - - collocate This tag is supposed to be used on the collocates annotated inside examples: - inside a collocateMarker object only. - - + forHeadwords + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the headword + side of the lexicographic resource: as inflectedForm of entry. + + + forTranslations + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the translation side of the lexicographic resource: + as headwordTranslation of headwordTranslation. - translationLanguageConstraint + forCollocates + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the collocates annotated inside examples: + inside a collocateMarker object. + + + + forLanguage optional (zero, one or more). If present, says that if this tag is being used inside a headwordTranslation object, then it is intended to be used only inside a headwordTranslation object labelled with this language. - - partOfSpeechConstraint + forPartOfSpeech optional (zero, one or more). If present, says that: @@ -97,10 +95,10 @@ XML -<labelTag tag="..." typeTag="..." locationConstraint="..."> +<labelTag tag="..." typeTag="..." forHeadwords="true" forTranslations="true" forCollocates="true"> <description>...</description> - <translationLanguageConstraint langCode="..."/> - <partOfSpeechConstraint value="..."/> + <forLanguage langCode="..."/> + <forPartOfSpeech tag="..."/> <sameAs.../> </tag> @@ -113,9 +111,11 @@ "tag": "...", "description": "...", "typeTag": "...", - "locationConstraint": "...", - "translationLanguageConstraint": ["..."] - "partOfSpeechConstraints": ["..."], + "forHeadwords": true, + "forTranslations": true, + "forCollocates": true, + "forLanguages": ["..."] + "forPartsOfSpeech": ["..."], "sameAs": [...] } @@ -129,9 +129,11 @@ dmlex:tag "..." ; dmlex:description "..." ; dmlex:typeTag "..." ; - dmlex:locationConstraint "..." ; - dmlex:translationLanguageConstraint "..." . - dmlex:partOfSpeechConstraint "..." ; + dmlex:forHeadwords "..." ; + dmlex:forTranslations "..." ; + dmlex:forCollocates "..." ; + dmlex:forLanguage "..." . + dmlex:forPartOfSpeech "..." ; dmlex:sameAs ... ] . diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml index 1eb1540..7f6fb3c 100644 --- a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml +++ b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml @@ -37,31 +37,40 @@ - locationConstraint - optional (zero or one). If present, indicates whether this tag is - intended to be used on the headword side or on the translation side of the lexicographic - resource. One of: + forHeadwords + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the headword + side of the lexicographic resource: as partOfSpeech of entry. + + + forTranslations + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the translation side of the lexicographic resource: + as partOfSpeech of headwordTranslation. + + + forEtymology + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used in etymolgy: + as partOfSpeech of etymon. + + + + forLanguage + optional (zero, one or more). If present, says that: - headword This tag is supposed to be used only on the headword - side of the lexicographic resource: as partOfSpeech of entry. - - - translation This tag is supposed to be used only on the translation side of the lexicographic resource: - as partOfSpeech of headwordTranslation. + If this tag is + being used inside a headwordTranslation object, + then it is intended to be used only inside a headwordTranslation object labelled with this language. - etymology This tag is supposed to be used only to describe etymolgy: - as partOfSpeech of etymon. + If this tag is + being used inside a etymon object, + then it is intended to be used only inside an etymon object labelled with this language. - - translationLanguageConstraint - optional (zero, one or more). If present, says that if this tag is - being used inside a headwordTranslation object, - then it is intended to be used only inside a headwordTranslation object labelled with this language. - @@ -73,9 +82,9 @@ XML -<partOfSpeechTag tag="..." locationConstraint="..."> +<partOfSpeechTag tag="..." forHeadwords="true" forTranslations="true" forEtymology="true"> <description>...</description> - <translationLanguageConstraint langCode="..."/> + <forLanguage langCode="..."/> <sameAs.../> </tag> @@ -87,8 +96,10 @@ { "tag": "...", "description": "...", - "locationConstraint": "...", - "translationLanguageConstraint": ["..."] + "forHeadwords": true, + "forTranslations": true, + "forEtymology": true, + "forLanguages": ["..."] "sameAs": [...] } @@ -101,8 +112,10 @@ a dmlex:PartOfSpeechTag ; dmlex:tag "..." ; dmlex:description "..." ; - dmlex:locationConstraint "..." ; - dmlex:translationLanguageConstraint "..." . + dmlex:forHeadwods "..." ; + dmlex:forTranslations "..." ; + dmlex:forEtymology "..." ; + dmlex:forLanguage "..." . dmlex:sameAs ... ] . @@ -110,7 +123,7 @@ Relational database - The translationLanguageConstraints column is a comma-delimited list of language codes. + The forLanguages column is a comma-delimited list of language codes. diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml index 45b58ff..c97da1a 100644 --- a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml +++ b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml @@ -35,32 +35,25 @@ - locationConstraint - optional (zero or one). If present, indicates whether this tag is intended to be used on the - headword side or on the translation side of the lexicographic resource. One of: - - - headword This tag is supposed to be used on the headword side of the lexicographic resource: - anywhere except inside a headwordTranslation object. - - - translation This tag is supposed to be used on the translation side of the lexicographic resource: - inside a headwordTranslation object only. - - + forHeadwords + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the headword + side of the lexicographic resource: inside a pronunciation of entry. - translationLanguageConstraint + forTranslations + optional (zero ore one). Boolean. If present, indicates whether this tag is + intended to be used on the translation side of the lexicographic resource: + inside a pronunciation of headwordTranslation. + + + + forLanguage optional (zero, one or more). If present, says that if this tag is being used inside a headwordTranslation object, then it is intended to be used only inside a headwordTranslation object labelled with this language. - - @@ -75,9 +68,9 @@ XML -<transcriptionSchemeTag tag="..." locationConstraint="..."> +<transcriptionSchemeTag tag="..." forHeadwords="true" forTranslations="true"> <description>...</description> - <translationLanguageConstraint langCode="..."/> + <forLanguage langCode="..."/> </tag> @@ -88,8 +81,9 @@ { "tag": "...", "description": "...", - "locationConstraint": "...", - "translationLanguageConstraint": ["..."] + "forHeadwords": true, + "forTranslations": true, + "forLanguages": ["..."] } @@ -101,15 +95,16 @@ a dmlex:PartOfSpeechTag ; dmlex:tag "..." ; dmlex:description "..." ; - dmlex:locationConstraint "..." ; - dmlex:translationLanguageConstraint "..." . + dmlex:forHeadwords "..." ; + dmlex:forTranslations "..." ; + dmlex:forLanguage "..." . Relational database - The translationLanguageConstraints column is a comma-delimited list of language codes. + The forLanguages column is a comma-delimited list of language codes. diff --git a/dmlex-v1.0/specification/serializations/XML/elements/translationLanguageConstraint.xml b/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml similarity index 77% rename from dmlex-v1.0/specification/serializations/XML/elements/translationLanguageConstraint.xml rename to dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml index d58c374..05bcb01 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/translationLanguageConstraint.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml @@ -5,11 +5,12 @@ %xinclude; ]> -
- Element: <literal><translationLanguageConstraint></literal> - Implements the translationLanguageConstraint property of the +
+ Element: <literal><forLanguage></literal> + Implements the forLanguage property of the partOfSpeechTag, - inflectedFormTag + inflectedFormTag, + transcriptionSchemeTag and labelTag object types from the Controlled Values Module. diff --git a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechConstraint.xml b/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml similarity index 80% rename from dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechConstraint.xml rename to dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml index 99da89b..76f3171 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechConstraint.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml @@ -5,9 +5,9 @@ %xinclude; ]> -
- Element: <literal><partOfSpeechConstraint></literal> - Implements the partOfSpeechConstraint property of the +
+ Element: <literal><forPartOfSpeech></literal> + Implements the forPartOfSpeech property of the inflectedFormTag and and labelTag object types from the Controlled Values Module. diff --git a/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml index 410a325..b901910 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml @@ -15,7 +15,10 @@ @tag required - @locationConstraint optional + @forHeadwords optional, true or false + + + @forTranslations optional, true or false @@ -25,10 +28,10 @@ <description> optional (zero or one) - <translationLanguageConstraint> optional (zero or more) + <forLanguage> optional (zero or more) - <partOfSpeechConstraint> optional (zero or more) + <forPartOfSpeech> optional (zero or more) <sameAs> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml index 161b6bd..ebb7250 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml @@ -18,7 +18,13 @@ @typeTag optional - @locationConstraint optional + @forHeadwords optional, true or false + + + @forTranslations optional, true or false + + + @forCollocates optional, true or false @@ -28,10 +34,10 @@ <description> optional (zero or one) - <translationLanguageConstraint> optional (zero or more) + <forLanguage> optional (zero or more) - <partOfSpeechConstraint> optional (zero or more) + <forPartOfSpeech> optional (zero or more) <sameAs> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml index 1a32447..497876d 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml @@ -15,7 +15,13 @@ @tag required - @locationConstraint optional + @forHeadwords optional, true or false + + + @forTranslations optional, true or false + + + @forEtymology optional, true or false @@ -25,7 +31,7 @@ <description> optional (zero or one) - <translationLanguageConstraint> optional (zero or more) + <forLanguage> optional (zero or more) <sameAs> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml index c92c196..d2c82f9 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml @@ -15,7 +15,10 @@ @tag required - @locationConstraint optional + @forHeadwords optional, true or false + + + @forTranslations optional, true or false @@ -25,7 +28,7 @@ <description> optional (zero or one) - <translationLanguageConstraint> optional (zero or more) + <forLanguage> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/specification.xml b/dmlex-v1.0/specification/serializations/XML/specification.xml index 4e87198..f65d7dc 100644 --- a/dmlex-v1.0/specification/serializations/XML/specification.xml +++ b/dmlex-v1.0/specification/serializations/XML/specification.xml @@ -58,8 +58,8 @@ - - + +