Merge pull request #35 from mjakubicek/master

some structural and technical fixes
oasis-tcs · Aug 16, 2023 · aaea70c · aaea70c
2 parents c567ce4 + 57064af
commit aaea70c
Show file tree

Hide file tree

Showing 74 changed files with 207 additions and 146 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ Please see the [LICENSE file](https://github.com/oasis-tcs/lexidma/blob/master/L
 
 Current working draft versions in this repository:
 
-* [WD01 HTML](https://htmlpreview.github.io/?https://github.com/oasis-tcs/lexidma/blob/master/dmlex-v1.0/specification/dmlex-v1.0-wd01.html)
-* [WD01 PDF](dmlex-v1.0/specification/dmlex-v1.0-wd01.pdf)
+* [WD01 HTML](../../releases/download/dev-latest/dmlex-v1.0-wd01.html)
+* [WD01 PDF](../../releases/download/dev-latest/dmlex-v1.0-wd01.pdf)
 
 ## Contact
 

diff --git a/dmlex-v1.0/specification/Makefile b/dmlex-v1.0/specification/Makefile
@@ -1,15 +1,21 @@
+include Makefile.dep
+
 html: dmlex-v1.0-wd01.html
 
 pdf: dmlex-v1.0-wd01.pdf
 
 dmlex-v1.0-wd01.pdf: dmlex-v1.0-wd01.fo
-	fop -pdf $@ -fo $<
+	fop -c stylesheets/fop.xconf -pdf $@ -fo $<
 
 dmlex-v1.0-wd01.fo: dmlex-v1.0-wd01.xml
 	xsltproc --xinclude -o $@ stylesheets/oasis-specification-fo-a4.xsl $<
 
 dmlex-v1.0-wd01.html: dmlex-v1.0-wd01.xml
 	xsltproc --xinclude -o $@ stylesheets/oasis-specification-html.xsl $<
 
-dmlex-v1.0-wd01.xml: dmlex.xml $(shell xmlstarlet sel -T -t -m //xi:include/@href -v . -n dmlex.xml)
+dmlex-v1.0-wd01.xml: dmlex.xml $(SOURCE_XML)
 	./merge.sh
+
+Makefile.dep: dmlex.xml $(SOURCE_XML) makedep.sh
+	echo -n "SOURCE_XML=" > $@
+	./makedep.sh >> $@
diff --git a/dmlex-v1.0/specification/OASISLogo.jpg b/dmlex-v1.0/specification/OASISLogo.jpg
diff --git a/dmlex-v1.0/specification/conformance/conformance.xml b/dmlex-v1.0/specification/conformance/conformance.xml
@@ -104,8 +104,8 @@
                            <title>
                                Backwards Compatibility</title>
                            <listitem>
-                    <para> &pversion;. </para>
-                </listitem>
+                               <para> N/A (no previous versions) </para>
+                           </listitem>
                        </orderedlist>
                    </listitem>
    </orderedlist>

diff --git a/dmlex-v1.0/specification/core/objectTypes/entry.xml b/dmlex-v1.0/specification/core/objectTypes/entry.xml
@@ -25,7 +25,7 @@
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). An unique identifier of the entry. Entries
-        which have idenfitiers are capable of being involved in relations created with the <olink
+        which have identifiers are capable of being involved in relations created with the <olink
           targetptr="linking">Linking module</olink>.</para>
     </listitem>
     <listitem>
@@ -40,23 +40,23 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_partOfSpeech">partOfSpeech</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more).</para>
+        <glossterm>optional</glossterm> (zero or more).</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_pronunciation">pronunciation</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_inflectedForm">inflectedForm</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_sense">sense</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
   </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/core/objectTypes/example.xml b/dmlex-v1.0/specification/core/objectTypes/example.xml
@@ -45,7 +45,7 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more).</para>
+        <glossterm>optional</glossterm> (zero or more).</para>
     </listitem>
     <listitem>
       <para><literal>soundFile</literal>

diff --git a/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml b/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
@@ -40,11 +40,11 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more).</para>
+        <glossterm>optional</glossterm> (zero or more).</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_pronunciation">pronunciation</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>
@@ -99,7 +99,7 @@
     <listitem>
       <para>The <code>inflectedForm</code> object type is intended to model the <emphasis
           role="strong">inflectional morphology</emphasis> of a headword. To model derivational
-        morphology, for example feminine forms of maculine nouns, the recommended way to do that in
+        morphology, for example feminine forms of masculine nouns, the recommended way to do that in
         DMLex is to create separate entries for the two words, and link them using the <olink
           targetptr="linking">Linking Module</olink>.</para>
     </listitem>

diff --git a/dmlex-v1.0/specification/core/objectTypes/label.xml b/dmlex-v1.0/specification/core/objectTypes/label.xml
@@ -62,7 +62,7 @@
         <olink targetptr="linking">Linking Module</olink>).
         When the label is a child of <olink targetptr="core_inflectedForm">inflectedForm</olink>, then it applies
         only to that inflected form of the headword (in all senses). When the label is a child of
-        <olink targetptr="core_pronunciation">pronunciation</olink>, then it applies only to that pronuciation of the headword
+        <olink targetptr="core_pronunciation">pronunciation</olink>, then it applies only to that pronunciation of the headword
         (in all senses).</para>
     </listitem>
   </itemizedlist>

diff --git a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
@@ -38,7 +38,7 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)
+        <glossterm>optional</glossterm> (zero or more)
       </para>
     </listitem>
   </itemizedlist>
@@ -55,8 +55,8 @@
         which language that is.</para>
     </listitem>
     <listitem>
-      <para>Ideally, a lexicographic resouce should include at least one entry. However, DMLex
-        specifies that <code>entry</code> is optional in <code>lexicographicResouce</code> to allow
+      <para>Ideally, a lexicographic resource should include at least one entry. However, DMLex
+        specifies that <code>entry</code> is optional in <code>lexicographicResource</code> to allow
         for the existence of lexicographic resources which are not yet complete. </para>
     </listitem>
     <listitem>

diff --git a/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml b/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
@@ -34,18 +34,18 @@
         </listitem>
         <listitem>
           <para><literal><olink targetptr="core_transcription">transcription</olink></literal>
-            <glossterm>optional</glossterm> (zero, one or more).</para>
+            <glossterm>optional</glossterm> (zero or more).</para>
         </listitem>
       </itemizedlist>
     </listitem>
     <listitem>
       <para><literal>listingOrder</literal>
-        <glossterm>required</glossterm> (exactly one). Number. The position of this pronuciation object among
-        other pronuciation objects of the same entry. This can be implicit from the serialization.</para>
+        <glossterm>required</glossterm> (exactly one). Number. The position of this pronunciation object among
+        other pronunciation objects of the same entry. This can be implicit from the serialization.</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more).</para>
+        <glossterm>optional</glossterm> (zero or more).</para>
     </listitem>
   </itemizedlist>
 
@@ -74,7 +74,7 @@
     <title>RDF</title>
     <programlisting>
 &lt;entry&gt; dmlex:pronunciation [
-  a dmlex:Pronunicaton ;
+  a dmlex:Pronunciation ;
   dmlex:soundFile &lt;...&gt; ;
   dmlex:transcription ... ;
   dmlex:listingOrder 1 ;

diff --git a/dmlex-v1.0/specification/core/objectTypes/sense.xml b/dmlex-v1.0/specification/core/objectTypes/sense.xml
@@ -25,7 +25,7 @@
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). A unique identifier of the sense. Senses
-        which have idenfitiers can be involved in relations created with the <olink
+        which have identifiers can be involved in relations created with the <olink
           targetptr="linking">Linking module</olink>.</para>
     </listitem>
     <listitem>
@@ -42,15 +42,15 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_definition">definition</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="core_example">example</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more). </para>
+        <glossterm>optional</glossterm> (zero or more). </para>
     </listitem>
   </itemizedlist>
 
@@ -62,7 +62,7 @@
         syntax and pronunciation. A <emphasis role="strong">sense</emphasis> is a container for
         statements about the headword's semantics. DMLex deliberately makes it impossible to include
         morphological information at sense level. It is impossible in DMLex to model an entry where
-        each sense has slightly different morphological properties (eg. a noun has a weak plural in
+        each sense has slightly different morphological properties (e.g. a noun has a weak plural in
         one sense and a strong plural in another). Such phenomena need to be treated as two entries
         (homographs) and can be linked using the Linking Module to make sure they are always shown
         together to human users.</para>

diff --git a/dmlex-v1.0/specification/core/specification.xml b/dmlex-v1.0/specification/core/specification.xml
@@ -8,7 +8,39 @@
 
 <section id="core">
   <title>DMLex Core</title>
-  <para>The DMLex Core provides data types for modelling monolingual dictionaries (called <emphasis>lexicographic resources</emphasis> in DMLex) where headwords, definitions and examples are all in one and the same language. DMLex Core gives you the tools you need to model simple dictionary entries which consist of headwords, part-of-speech labels, senses, definitions and so on.</para>
+  <para>The DMLex Core provides data types for modelling monolingual dictionaries (called <emphasis>lexicographic resources</emphasis> in DMLex) where headwords, definitions and examples are all in one and the same language. DMLex Core gives you the tools you need to model simple dictionary entries which consist of the following data types:</para>
+  <itemizedlist>
+    <listitem>
+			<para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_entry">entry</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_partOfSpeech">partOfSpeech</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_inflectedForm">inflectedForm</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_sense">sense</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_definition">definition</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_label">label</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_pronunciation">pronunciation</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_transcription">transcription</olink></literal></para>
+    </listitem>
+    <listitem>
+			<para><literal><olink targetptr="core_example">example</olink></literal></para>
+    </listitem>
+  </itemizedlist>
   <xi:include href="objectTypes/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="objectTypes/entry.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="objectTypes/partOfSpeech.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

diff --git a/dmlex-v1.0/specification/dmlex.xml b/dmlex-v1.0/specification/dmlex.xml
@@ -447,7 +447,7 @@
   </section>
 
   <section id="serializations" role="normative">
-    <title>DMLEX Recommended Serializations</title>
+    <title>DMLex Recommended Serializations</title>
 
     <!-- serialisations -->
     <xi:include href="serializations/XML/specification.xml"
@@ -626,7 +626,7 @@
   <appendix role="informative" id="coreValidation">
     <title>Machine Readable Validation Artifacts</title>
     <para>CURRENTLY NO VALIDATION ARTIFACTS FORESEEN FOR THE OM.. JUST FOR SERIALIZATIONS</para>
-    <para> MAY LIST CONFORMANT ARTIFACTS FOR SPECIFIC SERILIZATIONS AT A LATER STAGE </para>
+    <para> MAY LIST CONFORMANT ARTIFACTS FOR SPECIFIC SERIALIZATIONS AT A LATER STAGE </para>
     <!--
       <orderedlist>
         <listitem id="CoreSchema">

diff --git a/dmlex-v1.0/specification/docbook/dbgenent.mod b/dmlex-v1.0/specification/docbook/dbgenent.mod
@@ -60,7 +60,7 @@
 <!ENTITY previous-loc "http://docs.oasis-open.org/lexidma/dmlex/v&version;/&pstage;">
 <!ENTITY latest-loc "http://docs.oasis-open.org/lexidma/dmlex/v&version;">
 
-<!ENTITY pubdate "6 August &pubyear;">
+<!ENTITY pubdate "16 August &pubyear;">
 
 <!ENTITY pubyear "2023">
 <!ENTITY releaseinfo "Standards Track Work Product">

diff --git a/dmlex-v1.0/specification/examples/examples/12.xml b/dmlex-v1.0/specification/examples/examples/12.xml
@@ -11,7 +11,7 @@
     <title>Modelling parts and wholes</title>
     <para>We have three entries with one sense each: "glasses", "microscope" and "lens". We want to
         represent the fact that "lens" is a meronym of both "glasses" and "microscope", and
-        simultanously that "glasses" and "microscope" are both holonyms of "lens".</para>
+        simultaneously that "glasses" and "microscope" are both holonyms of "lens".</para>
     <example>
         <title>Pseudocode</title>
         <programlisting>

diff --git a/dmlex-v1.0/specification/makedep.sh b/dmlex-v1.0/specification/makedep.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+DEPS=`xmlstarlet sel -T -t -m //xi:include/@href -v . -n dmlex.xml`
+OLDDEPS=$DEPS
+while true; do
+	NEWDEPS=
+	for DEP in $OLDDEPS; do
+		INCLUDES=`xmlstarlet sel -T -t -m //xi:include/@href -v . -n $DEP`
+		for INCL in $INCLUDES; do
+			NEWDEPS="$NEWDEPS `dirname $DEP`/$INCL"
+		done
+	done
+	[ -z "$NEWDEPS" ] && break;
+	DEPS="$DEPS $NEWDEPS"
+	OLDDEPS="$NEWDEPS"
+done
+echo $DEPS
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml
@@ -17,11 +17,11 @@
     <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="annotation_collocateMarker">collocateMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
   </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml b/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml
@@ -17,7 +17,7 @@
     <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_placeholderMarker">placeholderMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
   </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/example.xml b/dmlex-v1.0/specification/modules/annotation/extensions/example.xml
@@ -17,11 +17,11 @@
     <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="annotation_collocateMarker">collocateMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
   </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml b/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml
@@ -17,11 +17,11 @@
     <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
     <listitem>
       <para><literal><olink targetptr="annotation_collocateMarker">collocateMarker</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more)</para>
+        <glossterm>optional</glossterm> (zero or more)</para>
     </listitem>
   </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml b/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml
@@ -17,7 +17,7 @@
         <title>Additional properties</title>
         <listitem>
             <para><literal><olink targetptr="annotation_placeholderMarker">placeholderMarker</olink></literal>
-                <glossterm>optional</glossterm> (zero, one or more)</para>
+                <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
     </itemizedlist>
 

diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml b/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml
@@ -31,7 +31,7 @@
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). A unique identifier of the marker.
-        Markers which have idenfitiers are capable of being involved in relations created with the
+        Markers which have identifiers are capable of being involved in relations created with the
         <olink targetptr="linking">Linking module</olink>.</para>
     </listitem>
     <listitem>
@@ -45,7 +45,7 @@
     </listitem>
     <listitem>
       <para><literal><olink targetptr="annotation_label">label</olink></literal>
-        <glossterm>optional</glossterm> (zero, one or more).
+        <glossterm>optional</glossterm> (zero or more).
         Can be used to communicate facts about the role or type of the item in the sentence, for example its syntactic role
         (subject, direct object etc.), its semantic role (agent, affected etc) or its semantic type
         (human, institution etc.) The <code><olink targetptr="values_labelTag">labelTag</olink></code> object

diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml b/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml
@@ -10,7 +10,7 @@
   <title><code>headwordMarker</code></title>
   <para>Marks up a substring inside an example, inside an example translation or inside a definition
     which corresponds to the headword (or to a translation of the headword). An application can use
-    the inline markup to highlight the occurence of the headword for human readers through
+    the inline markup to highlight the occurrence of the headword for human readers through
     formatting. Example: <xref linkend="ex21"/>.</para>
 
   <itemizedlist>