Merge branch 'master' of https://github.com/oasis-tcs/lexidma

dmlex-v1.0/specification/Makefile

@@ -1,4 +1,4 @@
-include Makefile.dep
+-include Makefile.dep
 
 html: dmlex-v1.0-csd02.html
 
@@ -25,12 +25,13 @@ dmlex_uml.svg: dmlex.dot
 dmlex.dot: dmlex.dot.m4 dmlex.dot.content
 	m4 $< > $@
 
-dmlex.dot.content: dmlex.nvh nvh2dot.py
+dmlex.dot.content: schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh nvh2dot.py
 	awk '/<programlisting>/,/<\/programlisting>/' $< | tail -n+2 | head -n-1 | ./nvh2dot.py > $@
 
 Makefile.dep: dmlex.xml $(SOURCE_XML) makedep.sh
 	echo -n "SOURCE_XML=" > $@
 	./makedep.sh >> $@
 
+.PHONY: clean
 clean:
-	rm dmlex-v1.0-csd02.html dmlex-v1.0-csd02.pdf dmlex-v1.0-csd02.fo dmlex-v1.0-csd02.xml Makefile.dep dmlex_uml.svg dmlex_uml.pdf dmlex.dot dmlex.dot.content
+	rm -f dmlex-v1.0-csd02.html dmlex-v1.0-csd02.pdf dmlex-v1.0-csd02.fo dmlex-v1.0-csd02.xml Makefile.dep dmlex_uml.svg dmlex_uml.pdf dmlex.dot dmlex.dot.content

dmlex-v1.0/specification/conformance/conformance.xml

@@ -108,8 +108,8 @@
             conformant to a specific serialization. </para></note>
     <warning><para>Exchange of <firstterm>DMLex Instances</firstterm> data between and among DMLex serializations
             is out of scope of the DMLex Version &version; specification. Although, the
-            serializations are semantically compatible, they don't have to posses compatible
-            addressing and fargemnt identification mechanims, mainly due to the fact that each
+            serializations are semantically compatible, they don't have to possess compatible
+            addressing and fragment identification mechanims, mainly due to the fact that each
             serialization is expected to use its own native id data types, uniqueness scopes, and
             addressing methods.</para></warning>
 </section>

dmlex-v1.0/specification/core/objectTypes/definition.xml

@@ -24,18 +24,18 @@
     <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>UNIQUE</glossterm>. Non-empty string. A statement, in the same
-        language as the headword, that describes and/or explains the meaning of a sense. In DMLex,
-        the term definition encompasses not only formal definitions, but also less formal
-        explanations.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>UNIQUE</glossterm>. Normalised
+        string. A statement, in the same language as the headword, that describes and/or explains
+        the meaning of a sense. In DMLex, the term definition encompasses not only formal
+        definitions, but also less formal explanations.</para>
     </listitem>
     <listitem>
       <para><literal>definitionType</literal>
-        <glossterm>optional</glossterm> (zero or one). If a sense contains multiple definitions,
-        indicates the difference between them, for example that they are intended for different
-        audiences. The <code><olink targetptr="values_definitionTypeTag">definitionTypeTag</olink></code> object type can be used
-        to constrain and/or explain the definition types that occur in the lexicographic
-        resource.</para>
+        <glossterm>optional</glossterm> (zero or one). Normalised string. If a sense contains
+        multiple definitions, indicates the difference between them, for example that they are
+        intended for different audiences. The <code><olink targetptr="values_definitionTypeTag"
+            >definitionTypeTag</olink></code> object type can be used to constrain and/or explain
+        the definition types that occur in the lexicographic resource.</para>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>
@@ -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>
 

dmlex-v1.0/specification/core/objectTypes/entry.xml

@@ -24,12 +24,15 @@
     <title>Properties</title>
     <listitem>
       <para><literal>headword</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). Non-empty string. The entry's
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in
+        combination with other unique properties if present). Normalised string. The entry's
         headword.</para>
     </listitem>
     <listitem>
       <para><literal>homographNumber</literal>
-        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). The entry's homograph number, as a guide to distinguish entries with the same headword.</para>
+        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm> (in
+        combination with other unique properties if present). Number. The entry's homograph number,
+        as a guide to distinguish entries with the same headword.</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_partOfSpeech">partOfSpeech</olink></literal>

dmlex-v1.0/specification/core/objectTypes/example.xml

@@ -25,20 +25,22 @@
     <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Non-empty string. The example itself.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Normalised
+        string. The example itself.</para>
     </listitem>
     <listitem>
       <para><literal>sourceIdentity</literal>
-        <glossterm>optional</glossterm> (zero or one). An abbreviation, a code or some other string
-        of text which identifies the source. The <code><olink targetptr="values_sourceIdentityTag"
-          >sourceIdentityTag</olink></code> object type can be used to explain the meaning of the source
-        identifiers, to constrain which source identifiers are allowed to occur in the lexicographic
-        resource, and to map them onto external inventories and ontologies.</para>
+        <glossterm>optional</glossterm> (zero or one). Normalised string. An abbreviation, a code or
+        some other string of text which identifies the source. The <code><olink
+            targetptr="values_sourceIdentityTag">sourceIdentityTag</olink></code> object type can be
+        used to explain the meaning of the source identifiers, to constrain which source identifiers
+        are allowed to occur in the lexicographic resource, and to map them onto external
+        inventories and ontologies.</para>
     </listitem>
     <listitem>
       <para><literal>sourceElaboration</literal>
-        <glossterm>optional</glossterm> (zero or one). Non-empty string. A free-form statement about
-        the source of the example. If <code>sourceIdentity</code> is present, then
+        <glossterm>optional</glossterm> (zero or one). Normalised string. A free-form statement
+        about the source of the example. If <code>sourceIdentity</code> is present, then
           <code>sourceElaboration</code> can be used for information about where in the source the
         example can be found: page number, chapter and so on. If <code>sourceIdentity</code> is
         absent then <code>sourceElaboration</code> can be used to fully name the source.</para>
@@ -49,8 +51,9 @@
     </listitem>
     <listitem>
       <para><literal>soundFile</literal>
-        <glossterm>optional</glossterm> (zero or one). A pointer to a file, such as a filename or a URI, containing a sound recording of the
-        example.</para>
+        <glossterm>optional</glossterm> (zero or one). An <emphasis>Internationalized Resource
+          Identifier</emphasis> (<link linkend="bib_rfc3987">IRI</link>) pointing to a file which
+        contains a sound recording of the example.</para>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>

dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml

@@ -25,18 +25,20 @@
     <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). Non-empty string. The text of the inflected
-        form.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in
+        combination with other unique properties if present). Normalised string. The text of the
+        inflected form.</para>
     </listitem>
     <listitem>
       <para><literal>tag</literal>
-        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). Non-empty string. An abbreviation, a code or
-        some other string of text which identifies the inflected form, for example <code>pl</code>
-        for plural, <code>gs</code> for genitive singular, <code>com</code> for comparative. The
-            <code><olink targetptr="values_inflectedFormTag">inflectedFormTag</olink></code> object
-        type can be used to explain the meaning of the inflection tags, to constrain which
-        inflection tags are allowed to occur in the lexicographic resource, and to map them onto
-        external inventories and ontologies.</para>
+        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm> (in
+        combination with other unique properties if present). Normalised string. An abbreviation, a
+        code or some other string of text which identifies the inflected form, for example
+          <code>pl</code> for plural, <code>gs</code> for genitive singular, <code>com</code> for
+        comparative. The <code><olink targetptr="values_inflectedFormTag"
+          >inflectedFormTag</olink></code> object type can be used to explain the meaning of the
+        inflection tags, to constrain which inflection tags are allowed to occur in the
+        lexicographic resource, and to map them onto external inventories and ontologies.</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>

dmlex-v1.0/specification/core/objectTypes/label.xml

@@ -38,12 +38,13 @@
     <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Non-empty string. An abbreviation, a code or
-        some other string of text which identifies the label, for example <code>neo</code> for
-        neologism, <code>colloq</code> for colloquial, <code>polit</code> for politics. The
-            <code><olink targetptr="values_labelTag">labelTag</olink></code> object type can be used to explain
-        the meaning of the labels, to constrain which labels are allowed to occur in the
-        lexicographic resource, and to map them onto external inventories and ontologies.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Normalised
+        string. An abbreviation, a code or some other string of text which identifies the label, for
+        example <code>neo</code> for neologism, <code>colloq</code> for colloquial,
+          <code>polit</code> for politics. The <code><olink targetptr="values_labelTag"
+            >labelTag</olink></code> object type can be used to explain the meaning of the labels,
+        to constrain which labels are allowed to occur in the lexicographic resource, and to map
+        them onto external inventories and ontologies.</para>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>

dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml

@@ -23,12 +23,12 @@
     <title>Properties</title>
     <listitem>
       <para><literal>title</literal>
-        <glossterm>optional</glossterm> (zero or one). Non-empty string. A human-readable title of
+        <glossterm>optional</glossterm> (zero or one). Normalised string. A human-readable title of
         the lexicographic resource.</para>
     </listitem>
     <listitem>
       <para><literal>uri</literal>
-        <glossterm>required</glossterm> (zero or one). The URI of the lexicographic resource,
+        <glossterm>optional</glossterm> (zero or one). The URI of the lexicographic resource,
         identifying it on the Web.</para>
     </listitem>
     <listitem>

dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml

@@ -24,13 +24,13 @@
     <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Non-empty string. An abbreviation, a code or
-        some other string of text which identifies the part-of-speech label, for example
-          <code>n</code> for noun, <code>v</code> for verb, <code>adj</code> for adjective. The
-        <code><olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink></code> object type can be used to explain
-        the meaning of the part-of-speech tags, to constrain which part-of-speech tags are allowed
-        to occur in the lexicographic resource, and to map them onto external inventories and
-        ontologies.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Normalised
+        string. An abbreviation, a code or some other string of text which identifies the
+        part-of-speech label, for example <code>n</code> for noun, <code>v</code> for verb,
+          <code>adj</code> for adjective. The <code><olink targetptr="values_partOfSpeechTag"
+            >partOfSpeechTag</olink></code> object type can be used to explain the meaning of the
+        part-of-speech tags, to constrain which part-of-speech tags are allowed to occur in the
+        lexicographic resource, and to map them onto external inventories and ontologies.</para>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>

dmlex-v1.0/specification/core/objectTypes/pronunciation.xml

@@ -36,7 +36,8 @@
         </listitem>
         <listitem>
           <para><literal><olink targetptr="core_transcription">transcription</olink></literal>
-            <glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.</para>
+            <glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.
+            Normalised string.</para>
         </listitem>
       </itemizedlist>
     </listitem>

dmlex-v1.0/specification/core/objectTypes/sense.xml

@@ -29,10 +29,11 @@
     </listitem>
     <listitem>
       <para><literal>indicator</literal>
-        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm>. A short statement, in the same language as
-        the headword, that gives an indication of the meaning of a sense and permits its
-        differentiation from other senses in the entry. Indicators are sometimes used in
-        dictionaries instead of or in addition to definitions.</para>
+        <glossterm>optional</glossterm> (zero or one) and <glossterm>unique</glossterm>. Normalised
+        string. A short statement, in the same language as the headword, that gives an indication of
+        the meaning of a sense and permits its differentiation from other senses in the entry.
+        Indicators are sometimes used in dictionaries instead of or in addition to
+        definitions.</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>

dmlex-v1.0/specification/core/objectTypes/transcription.xml

@@ -24,8 +24,8 @@
     <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
-        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Non-empty string. The actual
-        transcription.</para>
+        <glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm>. Normalised
+        string. The actual transcription.</para>
     </listitem>
     <listitem>
       <para><literal>scheme</literal>
@@ -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>