added XML schema and JSON schema, examples fixed accordingly

oasis-tcs · Apr 10, 2024 · 88937b3 · 88937b3
1 parent d4ec388
commit 88937b3
Show file tree

Hide file tree

Showing 19 changed files with 3,059 additions and 45 deletions.
diff --git a/dmlex-v1.0/specification/Makefile b/dmlex-v1.0/specification/Makefile
@@ -25,7 +25,7 @@ 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

diff --git a/dmlex-v1.0/specification/dmlex.xml b/dmlex-v1.0/specification/dmlex.xml
@@ -96,21 +96,25 @@
     </copyright>
     <legalnotice role="additional">
       <title>Additional artifacts</title>
-      <!-- probably will have references to UML diagrams
-      <para>This prose specification is one component of a Work Product that also includes:</para>
+      <para>This prose specification is one component of a Work Product that also includes declarative validation artifacts accessible from <ulink url="&this-loc;/schemas/">&this-loc;/schemas/</ulink>:</para>
 
       <itemizedlist spacing="compact">
         <listitem>
-          <para> Declarative validation artifacts accessible from <ulink url="&this-loc;/schemas/"
-              >&this-loc;/schemas/</ulink>
-          </para>
-
-
-
+			<para><ulink url="&this-loc;/schemas/XML/dmlex.xsd">XML schema</ulink></para>
         </listitem>
-      </itemizedlist>-->
-      <para>[All normative machine readable artifacts provided have to be listed here as parts of
-        the multipart product bfeore csd03 progression]</para>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/XML/dmlex_no-crosslingual.xsd">XML schema excluding the cross-lingual module</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/JSON/dmlex.json">JSON schema</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/JSON/dmlex_no-crosslingual.json">JSON schema excluding the cross-lingual module</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh">NVH schema (informative)</ulink></para>
+        </listitem>
+      </itemizedlist>
     </legalnotice>
     <legalnotice role="related">
       <title>Related Work</title>
@@ -792,9 +796,25 @@
     </section>
   </appendix>
   <appendix role="informative" id="Validation">
-    <title>Machine Readable Validation Artifacts</title>
-    <para>[This appendix will list all validation artifact references before progression to
-      csd03]</para>
+	<title>Machine Readable Validation Artifacts</title>
+	  <itemizedlist spacing="compact">
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/XML/dmlex.xsd">XML schema</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/XML/dmlex_no-crosslingual.xsd">XML schema excluding the cross-lingual module</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/JSON/dmlex.json">JSON schema</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/JSON/dmlex_no-crosslingual.json">JSON schema excluding the cross-lingual module</ulink></para>
+        </listitem>
+        <listitem>
+			<para><ulink url="&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh">NVH schema (informative)</ulink></para>
+        </listitem>
+      </itemizedlist>
+
     <!--
       <orderedlist>
         <listitem id="CoreSchema">
@@ -899,7 +919,7 @@
     <para>This description uses the <ulink url="https://www.namevaluehierarchy.org/schema.html">NVH schema notation style</ulink> and the convention that all object types and their properties are prefixed by either <literal>core@</literal> or <literal>MODULENAME@</literal> strings. Their arity is denoted by a <literal>*</literal> (zero or more), <literal>+</literal> (one or more), <literal>?</literal> (zero or one) or <literal>N+</literal> (<literal>N</literal> or more). If no arity is given, it indicates the arity of 1, i.e. being required and occurring exactly once.
     </para>
     <programlisting>
-      <xi:include href="dmlex.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+      <xi:include href="schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     </programlisting>
   </appendix>
 

diff --git a/dmlex-v1.0/specification/examples/examples/source/0.xml.xml b/dmlex-v1.0/specification/examples/examples/source/0.xml.xml
@@ -1,6 +1,5 @@
 <programlisting>
-&lt;lexicographicResource uri="http://example.com" langCode="en"&gt;
-    &lt;title&gt;Example Dictionary&lt;/title&gt;
+&lt;lexicographicResource title="Example Dictionary" uri="http://example.com" langCode="en"&gt;
     &lt;entry id="abandon-verb"&gt;
         &lt;headword&gt;abandon&lt;/headword&gt;
             &lt;partOfSpeech tag="verb"/&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/10.xml.xml b/dmlex-v1.0/specification/examples/examples/source/10.xml.xml
@@ -1,6 +1,5 @@
 <programlisting>
-&lt;lexicographicResource uri="http://example.com" langCode="ga"&gt;
-    &lt;title&gt;My Irish-Multilingual Dictionary&lt;/title&gt;
+&lt;lexicographicResource title="My Irish-Multilingual Dictionary" uri="http://example.com" langCode="ga"&gt;
     &lt;translationLanguage langCode="en"/&gt;
     &lt;translationLanguage langCode="de"/&gt;
     &lt;translationLanguage langCode="cs"/&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/14.xml.xml b/dmlex-v1.0/specification/examples/examples/source/14.xml.xml
@@ -1,6 +1,5 @@
 <programlisting>
 &lt;lexicographicResource uri="http://example.com" langCode="de"&gt;
-    &lt;translationLanguage langCode="en"/&gt;
     &lt;entry id="die-see"&gt;
         &lt;headword&gt;See&lt;/headword&gt;
         &lt;partOfSpeech tag="n-fem"/&gt;
@@ -22,6 +21,7 @@
             &lt;headwordTranslation&gt;&lt;text&gt;ocean&lt;/text&gt;&lt;/headwordTranslation&gt;
         &lt;/sense&gt;
     &lt;/entry&gt;
+    &lt;translationLanguage langCode="en"/&gt;
     &lt;relation type="synonyms"&gt;
         &lt;description&gt;words that mean sea and ocean&lt;/description&gt;
         &lt;member ref="die-see-1"/&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/20.xml.xml b/dmlex-v1.0/specification/examples/examples/source/20.xml.xml
@@ -3,7 +3,7 @@
     &lt;headword&gt;beat &lt;placeholderMarker&gt;sb.&lt;/placeholderMarker&gt; up&lt;/headword
 &gt;
     &lt;sense id="beat-up-1"&gt;
-      &lt;headwordTranslation&gt;
+      &lt;headwordTranslation langCode="de"&gt;
         &lt;text&gt;&lt;placeholderMarker&gt;jemanden&lt;/placeholderMarker&gt; verprügeln&lt;/
 text&gt;
       &lt;/headwordTranslation&gt;

diff --git a/dmlex-v1.0/specification/examples/examples/source/21.xml.xml b/dmlex-v1.0/specification/examples/examples/source/21.xml.xml
@@ -2,15 +2,15 @@
 &lt;entry id="autopsy"&gt;
     &lt;headword&gt;autopsy&lt;/headword&gt;
     &lt;sense id="autopsy-1"&gt;
-        &lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
         &lt;example&gt;
             &lt;text&gt;The coroner performed an &lt;headwordMarker&gt;autopsy&lt;/headwo
 rdMarker&gt;.&lt;/text&gt;
-            &lt;exampleTranslation&gt;
+            &lt;exampleTranslation langCode="cs"&gt;
                 &lt;text&gt;Koroner provedl &lt;headwordMarker&gt;pitvu&lt;/headwordMarke
 r&gt;.&lt;/text&gt;
             &lt;/exampleTranslation&gt;
         &lt;/example&gt;
+        &lt;headwordTranslation langCode="cs"&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
     &lt;/sense&gt;
 &lt;/entry&gt;
 

diff --git a/dmlex-v1.0/specification/examples/examples/source/24.xml.xml b/dmlex-v1.0/specification/examples/examples/source/24.xml.xml
@@ -24,19 +24,19 @@ ion&gt;
             &lt;/etymon&gt;
         &lt;/etymology&gt;
     &lt;/entry&gt;
+    &lt;etymonLanguage langCode="dum"&gt;
+        &lt;displayName&gt;Middle Dutch&lt;/displayName&gt;
+    &lt;/etymonLanguage&gt;
+    &lt;etymonLanguage langCode="gem-pro"&gt;
+        &lt;displayName&gt;Proto-Germanic&lt;/displayName&gt;
+    &lt;/etymonLanguage&gt;
     &lt;etymonType type="derivation"&gt;
         &lt;description&gt;A historical form of the word&lt;/description&gt;
     &lt;/etymonType&gt;
     &lt;etymonType type="doublet"&gt;
         &lt;description&gt;Two words derived from the same etymological root&lt;/de
 scription&gt;
     &lt;/etymonType&gt;
-    &lt;etymonLanguage langCode="dum"&gt;
-        &lt;displayName&gt;Middle Dutch&lt;/displayName&gt;
-    &lt;/etymonLanguage&gt;
-    &lt;etymonLanguage langCode="gem-pro"&gt;
-        &lt;displayName&gt;Proto-Germanic&lt;/displayName&gt;
-    &lt;/etymonLanguage&gt;
 &lt;/lexicographicResource&gt;
 
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/5.xml.xml b/dmlex-v1.0/specification/examples/examples/source/5.xml.xml
@@ -10,17 +10,17 @@
             &lt;text&gt;folúsghlantóirí&lt;/text&gt;
         &lt;/inflectedForm&gt;
     &lt;/entry&gt;
-    &lt;partOfSpeechTag tag="n-masc"&gt;
-        &lt;description&gt;masculine noun&lt;/description&gt;
-    &lt;/partOfSpeechTag&gt;
-    &lt;partOfSpeechTag tag="n-fem"&gt;
-        &lt;description&gt;feminine noun&lt;/description&gt;
-    &lt;/partOfSpeechTag&gt;
     &lt;inflectedFormTag tag="sg-gen"&gt;
         &lt;description&gt;singular genitive&lt;/description&gt;
     &lt;/inflectedFormTag&gt;
     &lt;inflectedFormTag tag="pl"&gt;
         &lt;description&gt;plural&lt;/description&gt;
     &lt;/inflectedFormTag&gt;
+    &lt;partOfSpeechTag tag="n-masc"&gt;
+        &lt;description&gt;masculine noun&lt;/description&gt;
+    &lt;/partOfSpeechTag&gt;
+    &lt;partOfSpeechTag tag="n-fem"&gt;
+        &lt;description&gt;feminine noun&lt;/description&gt;
+    &lt;/partOfSpeechTag&gt;
 &lt;/lexicographicResource&gt;
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/7.xml.xml b/dmlex-v1.0/specification/examples/examples/source/7.xml.xml
@@ -1,6 +1,5 @@
 <programlisting>
-&lt;lexicographicResource uri="http://example.com" langCode="de"&gt;
-    &lt;title&gt;My German-English Dictionary&lt;/title&gt;
+&lt;lexicographicResource title="My German-English Dictionary" uri="http://example.com" langCode="de"&gt;
     &lt;translationLanguage langCode="en"/&gt;
 &lt;/lexicographicResource&gt;
 </programlisting>
diff --git a/dmlex-v1.0/specification/examples/examples/source/8.xml.xml b/dmlex-v1.0/specification/examples/examples/source/8.xml.xml
@@ -3,22 +3,22 @@
     &lt;headword&gt;doctor&lt;/headword&gt;
     &lt;sense id="doctor-n-1"&gt;
         &lt;indicator&gt;medical doctor&lt;/indicator&gt;
-        &lt;headwordTranslation&gt;
+        &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;Arzt&lt;/text&gt;
             &lt;partOfSpeech tag="n-masc"/&gt;
         &lt;/headwordTranslation&gt;
-        &lt;headwordTranslation&gt;
+        &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;Ärztin&lt;/text&gt;
             &lt;partOfSpeech tag="n-fem"/&gt;
         &lt;/headwordTranslation&gt;
     &lt;/sense&gt;
     &lt;sense id="doctor-n-2"&gt;
         &lt;indicator&gt;academic title&lt;/indicator&gt;
-        &lt;headwordTranslation&gt;
+        &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;Doktor&lt;/text&gt;
             &lt;partOfSpeech tag="n-masc"/&gt;
         &lt;/headwordTranslation&gt;
-        &lt;headwordTranslation&gt;
+        &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;Doktorin&lt;/text&gt;
             &lt;partOfSpeech tag="n-fem"/&gt;
         &lt;/headwordTranslation&gt;

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,9 +3,9 @@
     &lt;headword&gt;Treppenwitz&lt;/headword&gt;
     &lt;partOfSpeech tag="n-masc"/&gt;
     &lt;sense id="treppenwitz-1"&gt;
-        &lt;headwordExplanation&gt;belated realisation of what one could have sa
-id&lt;/headwordExplanation&gt;
-        &lt;headwordTranslation&gt;
+        &lt;headwordExplanation langCode="en"&gt;belated realisation of what one
+ could have said&lt;/headwordExplanation&gt;
+        &lt;headwordTranslation langCode="en"&gt;
             &lt;text&gt;staircase wit&lt;/text&gt;
         &lt;/headwordTranslation&gt;
     &lt;/sense&gt;