<text> everywhere

implements decison on issue oasis-tcs#72. Also fixes issue oasis-tcs#118.
michmech · Apr 16, 2024 · 3cdfeae · 3cdfeae
1 parent 690b8de
commit 3cdfeae
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 79 deletions.
diff --git a/dmlex-v1.0/specification/core/objectTypes/definition.xml b/dmlex-v1.0/specification/core/objectTypes/definition.xml
@@ -47,7 +47,9 @@
   <example>
     <title>XML</title>
     <programlisting>
-&lt;definition definitionType="..."&gt;...&lt;/definition&gt;
+&lt;definition definitionType="..."&gt;
+  &lt;text>...&lt;/text>
+&lt;/definition&gt;
     </programlisting>
   </example>
 

diff --git a/dmlex-v1.0/specification/core/objectTypes/transcription.xml b/dmlex-v1.0/specification/core/objectTypes/transcription.xml
@@ -47,7 +47,9 @@
   <example>
     <title>XML</title>
     <programlisting>
-&lt;transcription scheme="..."&gt;...&lt;/transcription&gt;
+&lt;transcription scheme="..."&gt;
+  &lt;text>...&lt;/text>
+&lt;/transcription&gt;
     </programlisting>
   </example>
 

diff --git 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 @@
         &lt;headword&gt;abandon&lt;/headword&gt;
             &lt;partOfSpeech tag="verb"/&gt;
         &lt;sense id="abandon-verb-1"&gt;
-            &lt;definition&gt;to suddenly leave a place or a person&lt;/definition&gt;
-
+            &lt;definition&gt;
+                &lt;text>to suddenly leave a place or a person&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;I'm sorry I abandoned you like that.&lt;/text&gt;
             &lt;/example&gt;
@@ -16,7 +17,9 @@
         &lt;/sense&gt;
         &lt;sense id="abandon-verb-2"&gt;
             &lt;label tag="mostly-passive"/&gt;
-            &lt;definition&gt;to stop supporting an idea&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>to stop supporting an idea&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;That theory has been abandoned.&lt;/text&gt;
             &lt;/example&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/12.xml.xml b/dmlex-v1.0/specification/examples/examples/source/12.xml.xml
@@ -3,22 +3,24 @@
     &lt;entry id="glasses"&gt;
         &lt;headword&gt;glasses&lt;/headword&gt;
         &lt;sense id="glasses-1"&gt;
-            &lt;definition&gt;an optical seeing aid&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>an optical seeing aid&lt;/text>
+            &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;entry id="microscope"&gt;
         &lt;headword&gt;microscope&lt;/headword&gt;
         &lt;sense id="microscope-1"&gt;
             &lt;definition&gt;
-                equipment for looking at very small things
+                &lt;text>equipment for looking at very small things&lt;/text>
             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;entry id="lens"&gt;
         &lt;headword&gt;lens&lt;/headword&gt;
         &lt;sense id="lens-1"&gt;
             &lt;definition&gt;
-                    curved glass that makes things seem bigger
+                    &lt;text>curved glass that makes things seem bigger&lt;/text>
             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;

diff --git 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 @@
     &lt;entry id="buy"&gt;
         &lt;headword&gt;buy&lt;/headword&gt;
         &lt;sense id="buy-1"&gt;
-            &lt;definition&gt;get something by paying money for it&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>get something by paying money for it&lt;/text>
+             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;entry id="sell"&gt;
         &lt;headword&gt;sell&lt;/headword&gt;
         &lt;sense id="sell-1"&gt;
-            &lt;definition&gt;exchange something for money&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>exchange something for money&lt;/text>
+             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;relation type="antonyms"&gt;

diff --git 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 @@
         &lt;partOfSpeech tag="n"/&gt;
         &lt;label tag="europeanSpelling"/&gt;
         &lt;sense id="colour-1"&gt;
-            &lt;definition&gt;red, blue, yellow etc.&lt;/definition&gt;
-            &lt;example&gt;&lt;text&gt;What is your favourite colour?&lt;/text&gt;&lt;/example&gt;
-
+            &lt;definition&gt;
+                &lt;text>red, blue, yellow etc.&lt;/text>
+            &lt;/definition&gt;
+            &lt;example&gt;
+                &lt;text&gt;What is your favourite colour?&lt;/text&gt;
+            &lt;/example&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
     &lt;entry id="color"&gt;

diff --git 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 @@
     &lt;entry id="colour"&gt;
         &lt;headword&gt;colour&lt;/headword&gt;
         &lt;sense id="colour-1"&gt;
-            &lt;definition&gt;red, blue, yellow etc.&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>red, blue, yellow etc.&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;What is your favourite colour?&lt;/text&gt;
             &lt;/example&gt;
         &lt;/sense&gt;
         &lt;sense id="colour-2"&gt;
-            &lt;definition&gt;not being black and white&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>not being black and white&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;Owning a colour TV meant you were rich.&lt;/text&gt;
             &lt;/example&gt;
         &lt;/sense&gt;
         &lt;sense id="colour-3"&gt;
-            &lt;definition&gt;a sign of a person's race&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>a sign of a person's race&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;People of all creeds and colours.&lt;/text&gt;
             &lt;/example&gt;
         &lt;/sense&gt;
         &lt;sense id="colour-4"&gt;
-            &lt;definition&gt;interest or excitement&lt;/definition&gt;
+            &lt;definition&gt;
+                &lt;text>interest or excitement&lt;/text>
+            &lt;/definition&gt;
             &lt;example&gt;
                 &lt;text&gt;Examples add colour to your writing.&lt;/text&gt;
             &lt;/example&gt;

diff --git 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 @@
         &lt;headword&gt;better safe than sorry&lt;/headword&gt;
         &lt;sense id="better-safe-1"&gt;
             &lt;definition&gt;
-                you should be careful even if it seems unnecessary
+                &lt;text>you should be careful even if it seems unnecessary&lt;/text>
             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;

diff --git 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 @@
         &lt;headword&gt;the Bible&lt;/headword&gt;
         &lt;sense id="the-bible-1"&gt;
             &lt;definition&gt;
-                the book considered holy by Christians
+                &lt;text>the book considered holy by Christians&lt;/text>
             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
@@ -13,7 +13,7 @@
         &lt;sense id="bible-1"/&gt;
         &lt;sense id="bible-2"&gt;
             &lt;definition&gt;
-                a book considered important for a subject
+                &lt;text>a book considered important for a subject&lt;/text>
             &lt;/definition&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;

diff --git 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 @@
 &lt;entry id="aardvark-noun"&gt;
     &lt;headword&gt;aardvark&lt;/headword&gt;
     &lt;pronunciation&gt;
-        &lt;transcription&gt;a:rdva:rk&lt;/transcription&gt;
+        &lt;transcription&gt;
+            &lt;text>a:rdva:rk&lt;/text>
+        &lt;/transcription&gt;
     &lt;/pronunciation&gt;
 &lt;/entry&gt;
 </programlisting>
diff --git 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 @@
 &lt;entry id="aardvark-noun"&gt;
     &lt;headword&gt;aardvark&lt;/headword&gt;
     &lt;pronunciation soundFile="aardvark.mp3"&gt;
-        &lt;transcription&gt;a:rdva:rk&lt;/transcription&gt;
+        &lt;transcription&gt;
+            &lt;text>a:rdva:rk&lt;/text>
+        &lt;/transcription&gt;
     &lt;/pronunciation&gt;
 &lt;/entry&gt;
 </programlisting>
diff --git 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 @@
     &lt;headword&gt;Treppenwitz&lt;/headword&gt;
     &lt;partOfSpeech tag="n-masc"/&gt;
     &lt;sense id="treppenwitz-1"&gt;
-        &lt;headwordExplanation langCode="en"&gt;belated realisation of what one
- could have said&lt;/headwordExplanation&gt;
+        &lt;headwordExplanation langCode="en"&gt;
+            &lt;text>
+                belated realisation of what one
+                could have said
+            &lt;/text>
+         &lt;/headwordExplanation&gt;
         &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;staircase wit&lt;/text&gt;
         &lt;/headwordTranslation&gt;

diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml
@@ -29,11 +29,13 @@
     <title>XML</title>
     <programlisting>
 &lt;definition...&gt;
+  &lt;text>
     ...
     &lt;headwordMarker&gt;...&lt;/headwordMarker&gt;
     ...
     &lt;collocateMarker...&gt;...&lt;/collocateMarker&gt;
     ...
+  &lt;/text>
 &lt;/definition&gt;
     </programlisting>
   </example>

diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml
@@ -51,7 +51,9 @@
     <example>
         <title>XML</title>
         <programlisting>
-&lt;headwordExplanation langCode="..."&gt;...&lt;/headwordExplanation&gt;
+&lt;headwordExplanation langCode="..."&gt;
+  &lt;text>...&lt;/text>
+&lt;/headwordExplanation&gt;
         </programlisting>
     </example>
 

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/definition.xml b/dmlex-v1.0/specification/serializations/XML/elements/definition.xml
@@ -15,16 +15,16 @@
             <para><literal>@definitionType</literal> <glossterm>optional</glossterm></para>
         </listitem>
     </itemizedlist>
-
     <itemizedlist>
-        <title>Text content</title>
+        <title>Child elements</title>
         <listitem>
-            <para><glossterm>Required</glossterm>, implements the <literal>text</literal> property.
-                If implementing the Annotation Module <literal>&lt;definition&gt;</literal> can
-                contain a mixture of plain text, <literal><olink targetptr="xml_headwordMarker"
+            <para><literal>&lt;text&gt;</literal>
+                <glossterm>required</glossterm> (exactly one). If implementing the Annotation Module
+                    <literal>&lt;text&gt;</literal> can contain a mixture of plain text,
+                        <literal><olink targetptr="xml_headwordMarker"
                         >&lt;headwordMarker&gt;</olink></literal> elements and <literal><olink
                         targetptr="xml_collocateMarker">&lt;collocateMarker&gt;</olink></literal>
-                elements and whitespace inside it should be <emphasis>preserved</emphasis>. </para>
+                elements.</para>
         </listitem>
     </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml
@@ -30,8 +30,7 @@
                 <glossterm>required</glossterm> (exactly one). If implementing the Annotation Module
                     <literal>&lt;headword&gt;</literal> can contain a mixture of plain text and
                         <literal><olink targetptr="xml_placeholderMarker"
-                        >&lt;placeholderMarker&gt;</olink></literal> elements and whitespace inside
-                it should be <emphasis>preserved</emphasis>.</para>
+                        >&lt;placeholderMarker&gt;</olink></literal> elements.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="xml_partOfSpeech">&lt;partOfSpeech&gt;</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/example.xml b/dmlex-v1.0/specification/serializations/XML/elements/example.xml
@@ -31,7 +31,7 @@
                         <literal><olink targetptr="xml_headwordMarker"
                         >&lt;headwordMarker&gt;</olink></literal> elements and <literal><olink
                         targetptr="xml_collocateMarker">&lt;collocateMarker&gt;</olink></literal>
-                elements and whitespace inside it should be <emphasis>preserved</emphasis>.</para>
+                elements.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="xml_label">&lt;label&gt;</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml
@@ -31,7 +31,7 @@
                         <literal><olink targetptr="xml_headwordMarker"
                         >&lt;headwordMarker&gt;</olink></literal> elements and <literal><olink
                         targetptr="xml_collocateMarker">&lt;collocateMarker&gt;</olink></literal>
-                elements and whitespace inside it should be <emphasis>preserved</emphasis>.</para>
+                elements.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="xml_label">&lt;label&gt;</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml
@@ -7,22 +7,23 @@
                          ]>
 <section id="xml_headwordExplanation">
     <title>XML element: <literal>&lt;headwordExplanation&gt;</literal></title>
-    <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink> object type from the Crosslingual Module.</para>
-
+    <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink>
+        object type from the Crosslingual Module.</para>
     <itemizedlist>
         <title>Attributes</title>
         <listitem>
-            <para><literal>@langCode</literal> <glossterm>optional</glossterm> if the ancestor <literal>&lt;lexicographicResource&gt;</literal>
-                contains exactly one <literal>&lt;translationLanguage&gt;</literal>,
-                <glossterm>required</glossterm> otherwise</para>
+            <para><literal>@langCode</literal>
+                <glossterm>optional</glossterm> if the ancestor
+                    <literal>&lt;lexicographicResource&gt;</literal> contains exactly one
+                    <literal>&lt;translationLanguage&gt;</literal>, <glossterm>required</glossterm>
+                otherwise</para>
         </listitem>
     </itemizedlist>
-
     <itemizedlist>
-        <title>Text content</title>
+        <title>Child elements</title>
         <listitem>
-            <para><glossterm>Required</glossterm>, implements the <literal>text</literal> property.</para>
+            <para><literal>&lt;text&gt;</literal>
+                <glossterm>required</glossterm> (exactly one).</para>
         </listitem>
     </itemizedlist>
-
 </section>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml
@@ -25,8 +25,7 @@
                 <glossterm>required</glossterm> (exactly one). If implementing the Annotation Module
                     <literal>&lt;text&gt;</literal> can contain a mixture of plain text and
                         <literal><olink targetptr="xml_placeholderMarker"
-                        >&lt;placeholderMarker&gt;</olink></literal> elements and whitespace inside
-                it should be <emphasis>preserved</emphasis>.</para>
+                        >&lt;placeholderMarker&gt;</olink></literal> elements.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="xml_partOfSpeech">&lt;partOfSpeech&gt;</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>

diff --git a/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml b/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml
@@ -7,20 +7,20 @@
                          ]>
 <section id="xml_transcription">
     <title>XML element: <literal>&lt;transcription&gt;</literal></title>
-    <para>Implements the <olink targetptr="core_transcription">transcription</olink> object type.</para>
-
+    <para>Implements the <olink targetptr="core_transcription">transcription</olink> object
+        type.</para>
     <itemizedlist>
         <title>Attributes</title>
         <listitem>
-            <para><literal>@scheme</literal> <glossterm>optional</glossterm></para>
+            <para><literal>@scheme</literal>
+                <glossterm>optional</glossterm></para>
         </listitem>
     </itemizedlist>
-
     <itemizedlist>
-        <title>Text content</title>
+        <title>Child elements</title>
         <listitem>
-            <para><glossterm>Required</glossterm>, implements the <literal>text</literal> property.</para>
+            <para><literal>&lt;text&gt;</literal>
+                <glossterm>required</glossterm> (exactly one).</para>
         </listitem>
     </itemizedlist>
-
 </section>