diff --git a/dmlex-v1.0/specification/core/objectTypes/definition.xml b/dmlex-v1.0/specification/core/objectTypes/definition.xml index a88cdce..5a19b52 100644 --- a/dmlex-v1.0/specification/core/objectTypes/definition.xml +++ b/dmlex-v1.0/specification/core/objectTypes/definition.xml @@ -47,7 +47,9 @@ XML -<definition definitionType="...">...</definition> +<definition definitionType="..."> + <text>...</text> +</definition> diff --git a/dmlex-v1.0/specification/core/objectTypes/transcription.xml b/dmlex-v1.0/specification/core/objectTypes/transcription.xml index 9da301b..2c39f70 100644 --- a/dmlex-v1.0/specification/core/objectTypes/transcription.xml +++ b/dmlex-v1.0/specification/core/objectTypes/transcription.xml @@ -47,7 +47,9 @@ XML -<transcription scheme="...">...</transcription> +<transcription scheme="..."> + <text>...</text> +</transcription> diff --git a/dmlex-v1.0/specification/examples/examples/source/0.xml.xml b/dmlex-v1.0/specification/examples/examples/source/0.xml.xml index 72907c7..e875cc0 100644 --- a/dmlex-v1.0/specification/examples/examples/source/0.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/0.xml.xml @@ -4,8 +4,9 @@ <headword>abandon</headword> <partOfSpeech tag="verb"/> <sense id="abandon-verb-1"> - <definition>to suddenly leave a place or a person</definition> - + <definition> + <text>to suddenly leave a place or a person</text> + </definition> <example> <text>I'm sorry I abandoned you like that.</text> </example> @@ -16,7 +17,9 @@ </sense> <sense id="abandon-verb-2"> <label tag="mostly-passive"/> - <definition>to stop supporting an idea</definition> + <definition> + <text>to stop supporting an idea</text> + </definition> <example> <text>That theory has been abandoned.</text> </example> diff --git a/dmlex-v1.0/specification/examples/examples/source/12.xml.xml b/dmlex-v1.0/specification/examples/examples/source/12.xml.xml index 3d36805..389a753 100644 --- a/dmlex-v1.0/specification/examples/examples/source/12.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/12.xml.xml @@ -3,14 +3,16 @@ <entry id="glasses"> <headword>glasses</headword> <sense id="glasses-1"> - <definition>an optical seeing aid</definition> + <definition> + <text>an optical seeing aid</text> + </definition> </sense> </entry> <entry id="microscope"> <headword>microscope</headword> <sense id="microscope-1"> <definition> - equipment for looking at very small things + <text>equipment for looking at very small things</text> </definition> </sense> </entry> @@ -18,7 +20,7 @@ <headword>lens</headword> <sense id="lens-1"> <definition> - curved glass that makes things seem bigger + <text>curved glass that makes things seem bigger</text> </definition> </sense> </entry> diff --git a/dmlex-v1.0/specification/examples/examples/source/13.xml.xml b/dmlex-v1.0/specification/examples/examples/source/13.xml.xml index e771d41..df8cc34 100644 --- a/dmlex-v1.0/specification/examples/examples/source/13.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/13.xml.xml @@ -3,13 +3,17 @@ <entry id="buy"> <headword>buy</headword> <sense id="buy-1"> - <definition>get something by paying money for it</definition> + <definition> + <text>get something by paying money for it</text> + </definition> </sense> </entry> <entry id="sell"> <headword>sell</headword> <sense id="sell-1"> - <definition>exchange something for money</definition> + <definition> + <text>exchange something for money</text> + </definition> </sense> </entry> <relation type="antonyms"> diff --git a/dmlex-v1.0/specification/examples/examples/source/15.xml.xml b/dmlex-v1.0/specification/examples/examples/source/15.xml.xml index ec4285a..858e1d0 100644 --- a/dmlex-v1.0/specification/examples/examples/source/15.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/15.xml.xml @@ -5,9 +5,12 @@ <partOfSpeech tag="n"/> <label tag="europeanSpelling"/> <sense id="colour-1"> - <definition>red, blue, yellow etc.</definition> - <example><text>What is your favourite colour?</text></example> - + <definition> + <text>red, blue, yellow etc.</text> + </definition> + <example> + <text>What is your favourite colour?</text> + </example> </sense> </entry> <entry id="color"> diff --git a/dmlex-v1.0/specification/examples/examples/source/16.xml.xml b/dmlex-v1.0/specification/examples/examples/source/16.xml.xml index 9a57795..6eac67d 100644 --- a/dmlex-v1.0/specification/examples/examples/source/16.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/16.xml.xml @@ -3,25 +3,33 @@ <entry id="colour"> <headword>colour</headword> <sense id="colour-1"> - <definition>red, blue, yellow etc.</definition> + <definition> + <text>red, blue, yellow etc.</text> + </definition> <example> <text>What is your favourite colour?</text> </example> </sense> <sense id="colour-2"> - <definition>not being black and white</definition> + <definition> + <text>not being black and white</text> + </definition> <example> <text>Owning a colour TV meant you were rich.</text> </example> </sense> <sense id="colour-3"> - <definition>a sign of a person's race</definition> + <definition> + <text>a sign of a person's race</text> + </definition> <example> <text>People of all creeds and colours.</text> </example> </sense> <sense id="colour-4"> - <definition>interest or excitement</definition> + <definition> + <text>interest or excitement</text> + </definition> <example> <text>Examples add colour to your writing.</text> </example> diff --git a/dmlex-v1.0/specification/examples/examples/source/17.xml.xml b/dmlex-v1.0/specification/examples/examples/source/17.xml.xml index 1b00a04..14316ab 100644 --- a/dmlex-v1.0/specification/examples/examples/source/17.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/17.xml.xml @@ -19,7 +19,7 @@ <headword>better safe than sorry</headword> <sense id="better-safe-1"> <definition> - you should be careful even if it seems unnecessary + <text>you should be careful even if it seems unnecessary</text> </definition> </sense> </entry> diff --git a/dmlex-v1.0/specification/examples/examples/source/18.xml.xml b/dmlex-v1.0/specification/examples/examples/source/18.xml.xml index 95dfe49..b3cd1ea 100644 --- a/dmlex-v1.0/specification/examples/examples/source/18.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/18.xml.xml @@ -4,7 +4,7 @@ <headword>the Bible</headword> <sense id="the-bible-1"> <definition> - the book considered holy by Christians + <text>the book considered holy by Christians</text> </definition> </sense> </entry> @@ -13,7 +13,7 @@ <sense id="bible-1"/> <sense id="bible-2"> <definition> - a book considered important for a subject + <text>a book considered important for a subject</text> </definition> </sense> </entry> diff --git a/dmlex-v1.0/specification/examples/examples/source/2.xml.xml b/dmlex-v1.0/specification/examples/examples/source/2.xml.xml index 7733fb8..65afdff 100644 --- a/dmlex-v1.0/specification/examples/examples/source/2.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/2.xml.xml @@ -2,7 +2,9 @@ <entry id="aardvark-noun"> <headword>aardvark</headword> <pronunciation> - <transcription>a:rdva:rk</transcription> + <transcription> + <text>a:rdva:rk</text> + </transcription> </pronunciation> </entry> diff --git a/dmlex-v1.0/specification/examples/examples/source/4.xml.xml b/dmlex-v1.0/specification/examples/examples/source/4.xml.xml index 3e7bca2..08afa85 100644 --- a/dmlex-v1.0/specification/examples/examples/source/4.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/4.xml.xml @@ -2,7 +2,9 @@ <entry id="aardvark-noun"> <headword>aardvark</headword> <pronunciation soundFile="aardvark.mp3"> - <transcription>a:rdva:rk</transcription> + <transcription> + <text>a:rdva:rk</text> + </transcription> </pronunciation> </entry> diff --git a/dmlex-v1.0/specification/examples/examples/source/9.xml.xml b/dmlex-v1.0/specification/examples/examples/source/9.xml.xml index 7194058..cf4c789 100644 --- a/dmlex-v1.0/specification/examples/examples/source/9.xml.xml +++ b/dmlex-v1.0/specification/examples/examples/source/9.xml.xml @@ -3,8 +3,12 @@ <headword>Treppenwitz</headword> <partOfSpeech tag="n-masc"/> <sense id="treppenwitz-1"> - <headwordExplanation langCode="en">belated realisation of what one - could have said</headwordExplanation> + <headwordExplanation langCode="en"> + <text> + belated realisation of what one + could have said + </text> + </headwordExplanation> <headwordTranslation langCode="en"> <text>staircase wit</text> </headwordTranslation> diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml index 882dd5b..c23acc4 100644 --- a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml +++ b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml @@ -29,11 +29,13 @@ XML <definition...> + <text> ... <headwordMarker>...</headwordMarker> ... <collocateMarker...>...</collocateMarker> ... + </text> </definition> diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml index 846c7f8..618c8e5 100644 --- a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml +++ b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml @@ -51,7 +51,9 @@ XML -<headwordExplanation langCode="...">...</headwordExplanation> +<headwordExplanation langCode="..."> + <text>...</text> +</headwordExplanation> diff --git a/dmlex-v1.0/specification/serializations/XML/elements/definition.xml b/dmlex-v1.0/specification/serializations/XML/elements/definition.xml index 32da7ce..639c82d 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/definition.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/definition.xml @@ -15,16 +15,16 @@ @definitionType optional - - Text content + Child elements - Required, implements the text property. - If implementing the Annotation Module <definition> can - contain a mixture of plain text, <text> + required (exactly one). If implementing the Annotation Module + <text> can contain a mixture of plain text, + <headwordMarker> elements and <collocateMarker> - elements and whitespace inside it should be preserved. + elements. diff --git a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml index 0bc4196..0dc13ca 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml @@ -30,8 +30,7 @@ required (exactly one). If implementing the Annotation Module <headword> can contain a mixture of plain text and <placeholderMarker> elements and whitespace inside - it should be preserved. + ><placeholderMarker> elements. <partOfSpeech> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/example.xml b/dmlex-v1.0/specification/serializations/XML/elements/example.xml index 6ab5f1b..5463a53 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/example.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/example.xml @@ -31,7 +31,7 @@ <headwordMarker> elements and <collocateMarker> - elements and whitespace inside it should be preserved. + elements. <label> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml index 64121b8..708d30b 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml @@ -31,7 +31,7 @@ <headwordMarker> elements and <collocateMarker> - elements and whitespace inside it should be preserved. + elements. <label> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml index c86eb3b..2f6821c 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml @@ -7,22 +7,23 @@ ]>
XML element: <literal><headwordExplanation></literal> - Implements the headwordExplanation object type from the Crosslingual Module. - + Implements the headwordExplanation + object type from the Crosslingual Module. Attributes - @langCode optional if the ancestor <lexicographicResource> - contains exactly one <translationLanguage>, - required otherwise + @langCode + optional if the ancestor + <lexicographicResource> contains exactly one + <translationLanguage>, required + otherwise - - Text content + Child elements - Required, implements the text property. + <text> + required (exactly one). -
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml index 1010933..7af3515 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml @@ -25,8 +25,7 @@ required (exactly one). If implementing the Annotation Module <text> can contain a mixture of plain text and <placeholderMarker> elements and whitespace inside - it should be preserved. + ><placeholderMarker> elements. <partOfSpeech> optional (zero or more) diff --git a/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml b/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml index 2db0ad1..c45fad3 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml @@ -7,20 +7,20 @@ ]>
XML element: <literal><transcription></literal> - Implements the transcription object type. - + Implements the transcription object + type. Attributes - @scheme optional + @scheme + optional - - Text content + Child elements - Required, implements the text property. + <text> + required (exactly one). -
diff --git a/dmlex-v1.0/specification/serializations/XML/specification.xml b/dmlex-v1.0/specification/serializations/XML/specification.xml index 9fe76ec..78ff0c3 100644 --- a/dmlex-v1.0/specification/serializations/XML/specification.xml +++ b/dmlex-v1.0/specification/serializations/XML/specification.xml @@ -25,45 +25,28 @@ The XML serialization of DMLex shown in this document follows these principles: - The top-level lexicographicResource object is implemented as an XML element. + The top-level lexicographicResource and entry object types + are implemented as XML elements. - All other objects and their properties are implemented as XML attributes of their parents, unless: + All other object types and their properties are implemented as XML attributes of their + parents, unless: - the object has an arity other than (0..1) and (1..1) - + the object has an arity other than (0..1) and (1..1) in + at least one of its parent objects or the object can have child objects - or the object's value is human-readable text, such as a headword or a definition. + or the object's value is human-readable text, such as a headword or a definition + (this applies, among other things, to all properties named text and + description). In such cases the object or property is implemented as a child XML element of its parent. - - - When an object or property has been implemented as a XML element, - and when it has a property called text which contains a literal value - (such as the text of a definition or the text of an example sentence), then: - - - - - If the parent element cannot have any child elements, - then its text property is implemented as its text content. - - - - - If the parent element can have child elements, - then its text property is implemented as as a child element called <text>. - - - -