From 887a10eca7040bb8825293d6e19fb5a937f6df8f Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Wed, 14 Aug 2024 11:14:43 +0200
Subject: [PATCH 1/9] fix typo claiming NVH node names to be normative

---
 dmlex-v1.0/specification/serializations/NVH/specification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmlex-v1.0/specification/serializations/NVH/specification.xml b/dmlex-v1.0/specification/serializations/NVH/specification.xml
index 5e41f3f8..d50e6b2f 100644
--- a/dmlex-v1.0/specification/serializations/NVH/specification.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/specification.xml
@@ -32,7 +32,7 @@
 	</itemizedlist>
 	<para>See <ulink url="https://namevaluehierarchy.org">namevaluehierarchy.org</ulink> for details about the NVH file format and processing libraries.</para>
   </section>
-  <section id="NVHNodes" role="normative">
+  <section id="NVHNodes" role="informative">
     <title>DMLex NVH serialization nodes</title>
   
   <xi:include href="nodes/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

From b382a5f062860558a2b11710ed6f7b34e6aa309f Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Wed, 14 Aug 2024 11:30:01 +0200
Subject: [PATCH 2/9] fixed several typos and broken links in RDB serialization

---
 .../serializations/RDB/tables/collocateMarkers.xml            | 4 ++--
 .../serializations/RDB/tables/headwordMarkers.xml             | 4 ++--
 .../serializations/RDB/tables/placeholderMarkers.xml          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/collocateMarkers.xml b/dmlex-v1.0/specification/serializations/RDB/tables/collocateMarkers.xml
index 308fbacf..1feeb0e5 100644
--- a/dmlex-v1.0/specification/serializations/RDB/tables/collocateMarkers.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/tables/collocateMarkers.xml
@@ -7,8 +7,8 @@
                          ]>
 <section id="rdb_collocateMarkers">
     <title>Database table: <literal>collocateMarkers</literal></title>
-    <para>Implements the <olink targetptr="annonation_collocateMarker">collocateMarker</olink> object type
-        from the Annotationm Module.</para>
+    <para>Implements the <olink targetptr="annotation_collocateMarker">collocateMarker</olink> object type
+        from the Annotation Module.</para>
 
     <itemizedlist>
         <title>Columns</title>
diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/headwordMarkers.xml b/dmlex-v1.0/specification/serializations/RDB/tables/headwordMarkers.xml
index 88a2e8bf..93289f95 100644
--- a/dmlex-v1.0/specification/serializations/RDB/tables/headwordMarkers.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/tables/headwordMarkers.xml
@@ -7,8 +7,8 @@
                          ]>
 <section id="rdb_headwordMarkers">
     <title>Database table: <literal>headwordMarkers</literal></title>
-    <para>Implements the <olink targetptr="annonation_headwordMarker">headwordMarker</olink> object type
-        from the Annotationm Module.</para>
+    <para>Implements the <olink targetptr="annotation_headwordMarker">headwordMarker</olink> object type
+        from the Annotation Module.</para>
 
     <itemizedlist>
         <title>Columns</title>
diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/placeholderMarkers.xml b/dmlex-v1.0/specification/serializations/RDB/tables/placeholderMarkers.xml
index 85437a00..636de67d 100644
--- a/dmlex-v1.0/specification/serializations/RDB/tables/placeholderMarkers.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/tables/placeholderMarkers.xml
@@ -7,8 +7,8 @@
                          ]>
 <section id="rdb_placeholderMarkers">
     <title>Database table: <literal>placeholderMarkers</literal></title>
-    <para>Implements the <olink targetptr="annonation_placeholderMarker">placeholderMarker</olink> object type
-        from the Annotationm Module.</para>
+    <para>Implements the <olink targetptr="annotation_placeholderMarker">placeholderMarker</olink> object type
+        from the Annotation Module.</para>
 
     <itemizedlist>
         <title>Columns</title>

From 01c2ad07464f0e7c5dc4ff205d7d7703ac012122 Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Wed, 14 Aug 2024 16:15:23 +0200
Subject: [PATCH 3/9] fixed typo (transcription is not a normalised string but
 an object)

---
 dmlex-v1.0/specification/core/objectTypes/pronunciation.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml b/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
index 58e03ee5..23f0526e 100644
--- a/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
@@ -36,8 +36,7 @@
         </listitem>
         <listitem>
           <para><literal><olink targetptr="core_transcription">transcription</olink></literal>
-            <glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.
-            Normalised string.</para>
+            <glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.</para>
         </listitem>
       </itemizedlist>
     </listitem>

From 0581f8f23eb5bc53ffc6ebece55c6c9351ce7b1f Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Wed, 14 Aug 2024 22:27:34 +0200
Subject: [PATCH 4/9] updated Acknowledgment list to include Vojtech Kovar

---
 dmlex-v1.0/specification/dmlex.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dmlex-v1.0/specification/dmlex.xml b/dmlex-v1.0/specification/dmlex.xml
index fffde50c..3f564391 100644
--- a/dmlex-v1.0/specification/dmlex.xml
+++ b/dmlex-v1.0/specification/dmlex.xml
@@ -978,7 +978,7 @@
         <para>Filip, David - Masaryk University (previously TCD, ADAPT Centre) </para>
       </listitem>
       <listitem>
-        <para>Jakubíček, Miloš - Lexical Computing </para>
+        <para>Jakubíček, Miloš - Lexical Computing, Masaryk University </para>
       </listitem>
       <listitem>
         <para>Kallas, Jelena - Institute of the Estonian Language</para>
@@ -995,6 +995,9 @@
       <listitem>
         <para>Krek, Simon - Jožef Stefan Institute </para>
       </listitem>
+      <listitem>
+        <para>Kovář, Vojtěch - Lexical Computing, Masaryk University </para>
+      </listitem>
       <listitem>
         <para>McCrae, John - University of Galway </para>
       </listitem>

From e08dd12e917609346e1e6a37d95ff8ff50b73f6b Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Wed, 14 Aug 2024 22:28:23 +0200
Subject: [PATCH 5/9] plain text model description file renamed

so it cannot be confused with the actual NVH schema
---
 dmlex-v1.0/specification/Makefile                               | 2 +-
 dmlex-v1.0/specification/dmlex.xml                              | 2 +-
 .../NVH/{dmlex.nvh => dmlex_model_description.nvh}              | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/{dmlex.nvh => dmlex_model_description.nvh} (100%)

diff --git a/dmlex-v1.0/specification/Makefile b/dmlex-v1.0/specification/Makefile
index ef4cda96..bcfd642d 100644
--- a/dmlex-v1.0/specification/Makefile
+++ b/dmlex-v1.0/specification/Makefile
@@ -27,7 +27,7 @@ dmlex_uml.svg: dmlex.dot
 dmlex.dot: dmlex.dot.m4 dmlex.dot.content
 	m4 $< > $@
 
-dmlex.dot.content: schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh nvh2dot.py
+dmlex.dot.content: schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.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
index 3f564391..cec13bc8 100644
--- a/dmlex-v1.0/specification/dmlex.xml
+++ b/dmlex-v1.0/specification/dmlex.xml
@@ -953,7 +953,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="schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+      <xi:include href="schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     </programlisting>
   </appendix>
 
diff --git a/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh b/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh
similarity index 100%
rename from dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh
rename to dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh

From abdebc8089d707e9623334e4c3aab0fc783b99ff Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Thu, 15 Aug 2024 15:01:54 +0200
Subject: [PATCH 6/9] fix implemenation -> implementation

---
 .../modules/values/objectTypes/inflectedFormTag.xml             | 2 +-
 .../specification/modules/values/objectTypes/labelTag.xml       | 2 +-
 .../modules/values/objectTypes/partOfSpeechTag.xml              | 2 +-
 .../modules/values/objectTypes/transcriptionSchemeTag.xml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
index 05bbd2ec..ccbc8359 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
@@ -41,7 +41,7 @@
         <glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
         constraints and recommendation on using this tag. This can be a human-readable description
         such as "for use with German nouns only" or a machine-readable instruction in any format
-        understandable to the DMLex implemenation, such as <code>partOfSpeech=noun AND
+        understandable to the DMLex implementation, such as <code>partOfSpeech=noun AND
           language=de</code>.</para>
     </listitem>
     <listitem>
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
index f0e900ec..9b2032c3 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
@@ -50,7 +50,7 @@
         <glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
         constraints and recommendation on using this tag. This can be a human-readable description
         such as "for use with German nouns only" or a machine-readable instruction in any format
-        understandable to the DMLex implemenation, such as <code>partOfSpeech=noun AND
+        understandable to the DMLex implementation, such as <code>partOfSpeech=noun AND
           language=de</code>.</para>
     </listitem>
     <listitem>
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
index 54b83221..f8a3ddf1 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
@@ -40,7 +40,7 @@
         <glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
         constraints and recommendation on using this tag. This can be a human-readable description
         such as "for use in German and Czech only" or a machine-readable instruction in any format
-        understandable to the DMLex implemenation, such as <code>language=de OR
+        understandable to the DMLex implementation, such as <code>language=de OR
         language=cs</code>.</para>
     </listitem>
     <listitem>
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
index 5b9cd9f6..e8585c71 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
@@ -38,7 +38,7 @@
         <glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
         constraints and recommendation on using this tag. This can be a human-readable description
         such as "for use in German and Czech only" or a machine-readable instruction in any format
-        understandable to the DMLex implemenation, such as <code>language=de OR
+        understandable to the DMLex implementation, such as <code>language=de OR
         language=cs</code>.</para>
     </listitem>
   </itemizedlist>

From d0505971bdf590904d6e77fbf580ff24ee5b2f30 Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Sun, 18 Aug 2024 22:38:35 +0200
Subject: [PATCH 7/9] added some NVH examples

---
 .../specification/core/objectTypes/entry.xml  | 13 ++++++++
 .../core/objectTypes/inflectedForm.xml        | 10 ++++++
 .../objectTypes/lexicographicResource.xml     | 11 +++++++
 .../core/objectTypes/partOfSpeech.xml         |  7 ++++
 .../specification/core/objectTypes/sense.xml  | 10 ++++++
 .../examples/examples/build_source.py         | 13 ++++++++
 .../examples/examples/source/0.nvh            | 13 ++++++++
 .../examples/examples/source/1.nvh            |  7 ++++
 .../examples/examples/source/10.nvh           |  6 ++++
 .../examples/examples/source/11.nvh           | 10 ++++++
 .../examples/examples/source/12.nvh           | 33 +++++++++++++++++++
 .../examples/examples/source/13.nvh           | 16 +++++++++
 .../examples/examples/source/14.nvh           | 25 ++++++++++++++
 .../examples/examples/source/2.nvh            |  4 +++
 .../examples/examples/source/3.nvh            |  3 ++
 .../examples/examples/source/4.nvh            |  4 +++
 .../examples/examples/source/5.nvh            | 17 ++++++++++
 .../examples/examples/source/6.nvh            |  8 +++++
 .../examples/examples/source/7.nvh            |  4 +++
 .../examples/examples/source/8.nvh            | 11 +++++++
 .../examples/examples/source/9.nvh            |  5 +++
 21 files changed, 230 insertions(+)
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/0.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/1.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/10.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/11.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/12.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/13.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/14.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/2.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/3.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/4.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/5.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/6.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/7.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/8.nvh
 create mode 100644 dmlex-v1.0/specification/examples/examples/source/9.nvh

diff --git a/dmlex-v1.0/specification/core/objectTypes/entry.xml b/dmlex-v1.0/specification/core/objectTypes/entry.xml
index 7cdbae03..6342e046 100644
--- a/dmlex-v1.0/specification/core/objectTypes/entry.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/entry.xml
@@ -157,4 +157,17 @@
     <graphic fileref="core/databaseDiagrams/entry.svg" contentwidth="16cm"/>
   </example>
 
+  <example>
+    <title>NVH</title>
+    <programlisting>
+entry: [headword]
+  homograph: ...
+  pos: ...
+  label: ...
+  pronunciation: ...
+  form: ...
+  sense: ...
+</programlisting>
+  </example>
+
 </section>
diff --git a/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml b/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
index c3bc7a76..f5e07725 100644
--- a/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
@@ -96,6 +96,16 @@
     <graphic fileref="core/databaseDiagrams/inflectedForm.svg" contentwidth="16cm"/>
   </example>
   
+  <example>
+    <title>NVH</title>
+    <programlisting>
+form: [text]
+  tag: ...
+  label: ...
+  pronunciation: ...
+</programlisting>
+  </example>
+
   <itemizedlist>
     <title>Comments</title>
     <listitem>
diff --git a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
index ce22a70f..bff6312a 100644
--- a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
@@ -111,4 +111,15 @@
     <graphic fileref="core/databaseDiagrams/lexicographicResource.svg" contentwidth="16cm"/>
   </example>
 
+  <example>
+    <title>NVH</title>
+    <programlisting>
+lexicographicResource: http://example.com/dictionary
+  title: An example dictionary
+  langCode: en
+  entry: ...
+  entry: ...
+</programlisting>
+  </example>
+
 </section>
diff --git a/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml b/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
index c39f0ce4..302c8d9e 100644
--- a/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
@@ -81,4 +81,11 @@
     <graphic fileref="core/databaseDiagrams/partOfSpeech.svg" contentwidth="16cm"/>
   </example>
 
+  <example>
+    <title>NVH</title>
+    <programlisting>
+pos: [tag]
+</programlisting>
+  </example>
+
 </section>
diff --git a/dmlex-v1.0/specification/core/objectTypes/sense.xml b/dmlex-v1.0/specification/core/objectTypes/sense.xml
index e8017f21..ec81cfcd 100644
--- a/dmlex-v1.0/specification/core/objectTypes/sense.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/sense.xml
@@ -100,6 +100,16 @@
     </programlisting>
   </example>
   
+  <example>
+    <title>NVH</title>
+    <programlisting>
+sense: [indicator]
+  definition: ...
+  label: ...
+  example: ...
+</programlisting>
+  </example>
+
   <example>
     <title>Relational database</title>
     <graphic fileref="core/databaseDiagrams/sense.svg" contentwidth="16cm"/>
diff --git a/dmlex-v1.0/specification/examples/examples/build_source.py b/dmlex-v1.0/specification/examples/examples/build_source.py
index 0eb97aad..af063b9b 100644
--- a/dmlex-v1.0/specification/examples/examples/build_source.py
+++ b/dmlex-v1.0/specification/examples/examples/build_source.py
@@ -46,3 +46,16 @@
                 outf.write(line.replace("<", "&lt;").replace(">", "&gt;"))
             outf.write("</programlisting>\n")
 
+for f in glob("source/*.nvh"):
+    with open(f) as inf:
+        with open(f + ".xml", "w") as outf:
+            outf.write("<!-- This example is automatically generated. DO NOT EDIT -->\n")
+            outf.write("<programlisting>\n")
+            for line in inf.readlines():
+                while len(line) > N:
+                    outf.write(line[:N].replace("<", "&lt;").replace(">", "&gt;"))
+                    outf.write("\n")
+                    line = line[N:]
+                outf.write(line.replace("<", "&lt;").replace(">", "&gt;"))
+            outf.write("</programlisting>\n")
+
diff --git a/dmlex-v1.0/specification/examples/examples/source/0.nvh b/dmlex-v1.0/specification/examples/examples/source/0.nvh
new file mode 100644
index 00000000..a32bfa3b
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/0.nvh
@@ -0,0 +1,13 @@
+lexicographicResource: http://example.com
+  langCode: en
+  entry: abandon
+    pos: verb
+    sense:
+      definition: to suddenly leave a place or a person
+      example: I'm sorry I abandoned you like that.
+      example: Abandon ship!
+        label: idiom
+    sense:
+      label: mostly-passive
+      definition: to stop supporting an idea
+      example: That theory has been abandoned.
diff --git a/dmlex-v1.0/specification/examples/examples/source/1.nvh b/dmlex-v1.0/specification/examples/examples/source/1.nvh
new file mode 100644
index 00000000..241dda4c
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/1.nvh
@@ -0,0 +1,7 @@
+entry: folúsghlantóir
+  pos: n-masc
+  form: folúsghlantóra
+    tag: sg-gen
+  form: folúsghlantóirí
+    tag: pl
+  sense: ...
diff --git a/dmlex-v1.0/specification/examples/examples/source/10.nvh b/dmlex-v1.0/specification/examples/examples/source/10.nvh
new file mode 100644
index 00000000..61930b3d
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/10.nvh
@@ -0,0 +1,6 @@
+lexicographicResource: http://example.com
+  title: My Irish-Multilingual Dictionary
+  langCode: ga
+  translationLanguage: en
+  translationLanguage: de
+  translationLanguage: cs
diff --git a/dmlex-v1.0/specification/examples/examples/source/11.nvh b/dmlex-v1.0/specification/examples/examples/source/11.nvh
new file mode 100644
index 00000000..1a204a64
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/11.nvh
@@ -0,0 +1,10 @@
+entry: fómhar
+  sense:
+    en_translation: autumn
+    en_translation: fall
+    de_translation: Herbst
+    cs_translation: podzim
+  sense:
+    en_translation: harvest
+    de_translation: Ernte
+    cs_translation: sklizeň
diff --git a/dmlex-v1.0/specification/examples/examples/source/12.nvh b/dmlex-v1.0/specification/examples/examples/source/12.nvh
new file mode 100644
index 00000000..f4637639
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/12.nvh
@@ -0,0 +1,33 @@
+lexicographicResource: http://example.com
+  langCode: en
+  entry: glasses
+    sense:
+	  definition: an optical seeing aid
+  entry: microscope
+    sense:
+      definition: equipment for looking at very small things
+  entry: lens
+    sense:
+      definition: curved glass that makes things seem bigger
+  relation: meronymy
+    member: example.com/entry/glasses~0~0/sense/0~an%20optical%20seeing%20aid
+	  role: whole
+    member: example.com/entry/lens~0~0/sense/0~curved%20glass%20that%20makes%20things%20seem%20bigger
+	  role: part
+  relation: meronymy
+    member: example.com/entry/microscope~0~0/sense/0~equipment%20for%20looking%20at%20very%20small%20things
+	  role: whole
+    member: example.com/entry/lens~0~0/sense/0~curved%20glass%20that%20makes%20things%20seem%20bigger
+	  role: part
+  relationType: meronomy
+    description: part-whole relationship
+    memberType: sense
+      role: whole
+      min: 1
+      max: 1
+      hint: navigate
+    memberType: sense
+      role: part
+      min: 1
+      max: 1
+      hint: navigate
diff --git a/dmlex-v1.0/specification/examples/examples/source/13.nvh b/dmlex-v1.0/specification/examples/examples/source/13.nvh
new file mode 100644
index 00000000..e194d919
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/13.nvh
@@ -0,0 +1,16 @@
+lexicographicResource: http://example.com
+  langCode: en
+  entry: buy
+    sense:
+      definition: get something by paying money for it
+  entry: sell
+    sense:
+      definition: exchange something for money
+  relation: antonyms
+    member: example.com/entry/buy~0~0/sense/0~get%20something%20by%20paying%20money%20for%20it
+    member: example.com/entry/sell~0~0/sense/0~exchange%20something%20for%20money
+  relationType: antonyms
+    memberType: sense
+	min: 2
+	max: 2
+	hint: navigate
diff --git a/dmlex-v1.0/specification/examples/examples/source/14.nvh b/dmlex-v1.0/specification/examples/examples/source/14.nvh
new file mode 100644
index 00000000..0777d712
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/14.nvh
@@ -0,0 +1,25 @@
+lexicographicResource: http://example.com
+  langCode: de
+  translationLanguage: en
+  entry: See
+    pos: n-fem
+    sense:
+	  headwordTranslation: sea
+  entry: Meer
+    pos: n-neut
+    sense:
+	 headwordTranslation: sea
+  entry: Ozean
+    pos: n-masc
+    sense
+      headwordTranslation: ocean
+  relation: synonyms
+    description: words that mean sea and ocean
+    member: example.com/entry/See~0~0/sense/0~0
+    member: example.com/entry/Meer~0~0/sense/0~0
+    member: example.com/entry/Ozean~0~0/sense/0~0
+  relationType: synonyms
+    description: synonyms and near synonyms
+    memberType: sense
+	min: 2
+	hint: navigate
diff --git a/dmlex-v1.0/specification/examples/examples/source/2.nvh b/dmlex-v1.0/specification/examples/examples/source/2.nvh
new file mode 100644
index 00000000..ffcfff3a
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/2.nvh
@@ -0,0 +1,4 @@
+entry: aardvark
+  pronunciation:
+    transcription: a:rdva:rk
+  sense: ...
diff --git a/dmlex-v1.0/specification/examples/examples/source/3.nvh b/dmlex-v1.0/specification/examples/examples/source/3.nvh
new file mode 100644
index 00000000..cc2d52f1
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/3.nvh
@@ -0,0 +1,3 @@
+entry: aardvark
+  pronunciation: aardvark.mp3
+  sense: ...
diff --git a/dmlex-v1.0/specification/examples/examples/source/4.nvh b/dmlex-v1.0/specification/examples/examples/source/4.nvh
new file mode 100644
index 00000000..08a926ef
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/4.nvh
@@ -0,0 +1,4 @@
+entry: aardvark
+  pronunciation: aardvark.mp3
+    transcription: a:rdva:rk
+  sense: ...
diff --git a/dmlex-v1.0/specification/examples/examples/source/5.nvh b/dmlex-v1.0/specification/examples/examples/source/5.nvh
new file mode 100644
index 00000000..28423ca3
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/5.nvh
@@ -0,0 +1,17 @@
+lexicographicResource: http://example.com
+  langCode: ga
+  entry: folúsghlantóir
+    pos: n-masc
+    form: folúsghlantóra
+	  tag: sg-gen
+    form: folúsghlantóirí
+	  tag: pl
+    sense: ...
+  posTag: n-masc
+    description: masculine noun
+  posTag: n-fem
+    description: feminine noun
+  formTag: sg-gen
+    description: singular genitive
+  formTag: pl
+    description: plural
diff --git a/dmlex-v1.0/specification/examples/examples/source/6.nvh b/dmlex-v1.0/specification/examples/examples/source/6.nvh
new file mode 100644
index 00000000..2e2ed5fa
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/6.nvh
@@ -0,0 +1,8 @@
+posTag: n-masc
+  description: masculine noun
+  sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#noun
+  sameAs: uri: http://www.lexinfo.net/ontology/3.0/lexinfo#masculine
+posTag: n-fem
+  description: feminine noun
+  sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#noun
+  sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#feminine
diff --git a/dmlex-v1.0/specification/examples/examples/source/7.nvh b/dmlex-v1.0/specification/examples/examples/source/7.nvh
new file mode 100644
index 00000000..49c210a5
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/7.nvh
@@ -0,0 +1,4 @@
+lexicographicResource: http://example.com
+  title: My German-English Dictionary
+  langCode: de
+  translationLanguage: en
diff --git a/dmlex-v1.0/specification/examples/examples/source/8.nvh b/dmlex-v1.0/specification/examples/examples/source/8.nvh
new file mode 100644
index 00000000..7b588149
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/8.nvh
@@ -0,0 +1,11 @@
+entry: doctor
+  sense: medical doctor
+    translation: Arzt
+      pos: n-masc
+    translation: Ärztin
+      pos: n-fem
+  sense: academic title
+    translation: Doktor
+      pos: n-masc
+    translation: Doktorin
+      pos: n-fem
diff --git a/dmlex-v1.0/specification/examples/examples/source/9.nvh b/dmlex-v1.0/specification/examples/examples/source/9.nvh
new file mode 100644
index 00000000..76dfa67d
--- /dev/null
+++ b/dmlex-v1.0/specification/examples/examples/source/9.nvh
@@ -0,0 +1,5 @@
+entry: Treppenwitz
+  pos: n-masc
+  sense:
+    explanation: belated realisation of what one could have said
+    translation: staircase wit

From 96899a034cec74b97c688f1fdf8836a5e74ee461 Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Sun, 18 Aug 2024 22:39:50 +0200
Subject: [PATCH 8/9] updated NVH serialization to match current model

---
 .../serializations/NVH/nodes/collocateMarker.xml |  4 ++--
 .../serializations/NVH/nodes/definition.xml      |  4 ++--
 .../serializations/NVH/nodes/entry.xml           | 10 +++++-----
 .../serializations/NVH/nodes/etymon.xml          |  2 +-
 .../serializations/NVH/nodes/etymonUnit.xml      |  9 +++------
 .../serializations/NVH/nodes/example.xml         | 11 ++++++-----
 .../NVH/nodes/exampleTranslation.xml             | 16 +++++-----------
 .../NVH/nodes/headwordExplanation.xml            | 15 +++------------
 .../serializations/NVH/nodes/headwordMarker.xml  |  4 ++--
 .../NVH/nodes/headwordTranslation.xml            | 15 +++++----------
 .../serializations/NVH/nodes/inflectedForm.xml   |  6 +++---
 .../NVH/nodes/inflectedFormTag.xml               |  4 ++--
 .../NVH/nodes/lexicographicResource.xml          |  8 ++++----
 .../serializations/NVH/nodes/member.xml          |  9 +++------
 .../serializations/NVH/nodes/partOfSpeech.xml    |  6 +++---
 .../serializations/NVH/nodes/partOfSpeechTag.xml |  4 ++--
 .../NVH/nodes/placeholderMarker.xml              |  4 ++--
 .../serializations/NVH/nodes/pronunciation.xml   |  7 +++----
 .../serializations/NVH/nodes/relation.xml        |  2 +-
 .../serializations/NVH/nodes/sense.xml           |  9 +++++----
 .../serializations/NVH/specification.xml         | 10 ++++++++--
 21 files changed, 70 insertions(+), 89 deletions(-)

diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
index 7f7ae0a0..99fb2c4d 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
@@ -5,8 +5,8 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_collocateMarker">
-    <title>NVH node: <literal>collocateMarker</literal></title>
+<section id="nvh_collocate">
+    <title>NVH node: <literal>collocate</literal></title>
     <para>Implements the <olink targetptr="annotation_collocateMarker">collocateMarker</olink> object type from the Annotation module.
         Contains the text which it marks up and optional child nodes.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
index 7f2a5e6a..47ea6fbb 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
@@ -26,10 +26,10 @@
     <itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>
-			<para><literal><olink targetptr="nvh_headwordMarker">headwordMarker</olink></literal> node <glossterm>optional</glossterm> (zero or more)</para>
+			<para><literal><olink targetptr="nvh_headword">headword</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
 		</listitem>
 		<listitem>
-			<para><literal><olink targetptr="nvh_collocateMarker">collocateMarker</olink></literal> node <glossterm>optional</glossterm> (zero or more)</para>
+			<para><literal><olink targetptr="nvh_collocate">collocate</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
 		</listitem>
     </itemizedlist>
     
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
index e4c172ca..c39c97a3 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
@@ -12,17 +12,17 @@
     <itemizedlist>
         <title>Value</title>
         <listitem>
-			<para><literal>headword</literal> <glossterm>required</glossterm> </para>
+			<para><glossterm>Required</glossterm>, implements the <literal>headword</literal> property.</para>
         </listitem>
     </itemizedlist>
     
     <itemizedlist>
         <title>Child nodes</title>
         <listitem>
-            <para><literal>homographNumber</literal> <glossterm>optional</glossterm> (zero or one)</para>
+            <para><literal>homograph</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_partOfSpeech">partOfSpeech</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_pos">pos</olink></literal> <glossterm>optional</glossterm> (zero or more). This implements the <literal><olink targetptr="core_partOfSpeech">partOfSpeech</olink></literal>property.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_label">label</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
@@ -31,7 +31,7 @@
             <para><literal><olink targetptr="nvh_pronunciation">pronunciation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_inflectedForm">inflectedForm</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_form">form</olink></literal> <glossterm>optional</glossterm> (zero or more). This implements the <literal><olink targetptr="core_inflectedForm">inflectedForm</olink></literal>property.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_sense">sense</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
@@ -48,7 +48,7 @@
     <itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>
-			<para><literal><olink targetptr="nvh_placeholderMarker">placeholderMarker</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+			<para><literal><olink targetptr="nvh_placeholder">placeholder</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
     </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
index 0b7d9686..7e5875c8 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
@@ -21,7 +21,7 @@
             <para><literal>note</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_etymonUnit">etymonUnit</olink></literal> <glossterm>required</glossterm> (one or more)</para>
+            <para><literal><olink targetptr="nvh_etymonUnit">[PREFIX]etymonUnit</olink></literal> <glossterm>required</glossterm> (one or more). The string [PREFIX] in the node name is replaced by the <literal>langCode</literal> property of this <literal>etymonUnit</literal> followed by the underscore character.</para>
         </listitem>
         <listitem>
             <para><literal>translation</literal> <glossterm>optional</glossterm> (zero or one)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
index b8c5d1e0..51a2412f 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
@@ -6,8 +6,8 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymonUnit">
-    <title>NVH node: <literal>etymonUnit</literal></title>
-    <para>Implements the <olink targetptr="etymology_etymonUnit">etymonUnit</olink> object type from the Etymology Module.</para>
+    <title>NVH nodes: <literal>[PREFIX]etymonUnit</literal></title>
+	<para>Implements the <olink targetptr="etymology_etymonUnit">etymonUnit</olink> object type from the Etymology Module. The string [PREFIX] in the node name is replaced by the <literal>langCode</literal> property of this <literal>etymonUnit</literal> followed by the underscore character. </para>
 
     <itemizedlist>
         <title>Value</title>
@@ -18,14 +18,11 @@
     
     <itemizedlist>
         <title>Child nodes</title>
-        <listitem>
-            <para><literal>langCode</literal> <glossterm>required</glossterm> (exactly one)</para>
-        </listitem>
         <listitem>
             <para><literal>reconstructed</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="etymology_partOfSpeech">partOfSpeech</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="etymology_partOfSpeech">pos</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
             <para><literal>translation</literal> <glossterm>optional</glossterm> (zero or one)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
index 7f961867..79149101 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
@@ -35,18 +35,19 @@
 	<itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>
-            <para><literal><olink targetptr="nvh_headwordMarker">headwordMarker</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_headword">headword</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
 		<listitem>
-            <para><literal><olink targetptr="nvh_collocateMarker">collocateMarker</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_collocate">collocate</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
     </itemizedlist>
     
     <itemizedlist>
         <title>Child nodes if implementing the Crosslingual Module</title>
         <listitem>
-			<para><literal><olink targetptr="nvh_exampleTranslation">exampleTranslation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+			<para><literal><olink targetptr="nvh_exampleTranslation">[PREFIX]exampleTranslation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
-    </itemizedlist>
-    
+</itemizedlist>
+
+     The string [PREFIX] in the node name <glossterm>may</glossterm> be an empty string if only one translation language exists in the lexicographic resource, otherwise it is replaced by the <literal>langCode</literal> property of the <literal><olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink></literal> followed by the underscore character. 
 </section>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
index 6c999a00..1f4b38f9 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
@@ -6,8 +6,8 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_exampleTranslation">
-    <title>NVH node: <literal>exampleTranslation</literal></title>
-    <para>Implements the <olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink> object type from the Crosslingual Module.</para>
+    <title>NVH nodes: <literal>[PREFIX]exampleTranslation</literal></title>
+    <para>Implements the <olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink> object type from the Crosslingual Module. The string [PREFIX] in the node name <glossterm>may</glossterm> be an empty string if only one translation language exists in the lexicographic resource, otherwise it is replaced by the <literal>langCode</literal> property of the <literal><olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink></literal> followed by the underscore character.</para>
 
     <itemizedlist>
         <title>Value</title>
@@ -19,13 +19,7 @@
     <itemizedlist>
         <title>Child nodes</title>
         <listitem>
-            <para><literal>langCode</literal> <glossterm>optional</glossterm> (zero or one)</para>
-        </listitem>
-        <listitem>
-            <para><literal>soundFile</literal>
-                <glossterm>optional</glossterm> (zero or one) if the ancestor <literal>lexicographicResource</literal>
-                contains exactly one <literal>translationLanguage</literal>,
-                <glossterm>required</glossterm> otherwise</para>
+            <para><literal>soundFile</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_label">label</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
@@ -35,10 +29,10 @@
     <itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>
-			<para><literal><olink targetptr="nvh_headwordMarker">headwordMarker</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+			<para><literal><olink targetptr="nvh_headword">headword</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
 		</listitem>
 		<listitem>
-            <para><literal><olink targetptr="nvh_collocateMarker">collocateMarker</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_collocate">collocate</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
     </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
index 9ed5e065..73ba65b3 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
@@ -6,8 +6,9 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_headwordExplanation">
-    <title>NVH node: <literal>headwordExplanation</literal></title>
-    <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink> object type from the Crosslingual Module.</para>
+    <title>NVH nodes: <literal>[PREFIX]explanation</literal></title>
+    <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink> object type from the Crosslingual Module. 	The string [PREFIX] in the node name <glossterm>may</glossterm> be an empty string if only one translation language exists in the lexicographic resource, otherwise it is replaced by the <literal>langCode</literal> property of the <literal><olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink></literal> followed by the underscore character.
+</para>
 
     <itemizedlist>
         <title>Value</title>
@@ -16,14 +17,4 @@
         </listitem>
     </itemizedlist>
 
-	<itemizedlist>
-        <title>Child nodes</title>
-        <listitem>
-				<para><literal>langCode</literal> <glossterm>optional</glossterm> (zero or one) if the ancestor <literal>lexicographicResource</literal>
-                contains exactly one <literal>translationLanguage</literal>,
-                <glossterm>required</glossterm> otherwise</para>
-        </listitem>
-    </itemizedlist>
-    
-    
 </section>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
index 4aa79b57..78c4b30b 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
@@ -5,8 +5,8 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_headwordMarker">
-    <title>NVH node: <literal>headwordMarker</literal></title>
+<section id="nvh_headword">
+    <title>NVH node: <literal>headword</literal></title>
     <para>Implements the <olink targetptr="annotation_headwordMarker">headwordMarker</olink> object type from the Annotation module.
 	Contains the text which it marks up.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
index a733e7f3..18aa0c59 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
@@ -6,8 +6,8 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_headwordTranslation">
-    <title>NVH node: <literal>headwordTranslation</literal></title>
-    <para>Implements the <olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink> object type from the Crosslingual Module.</para>
+    <title>NVH nodes: <literal>[PREFIX]translation</literal></title>
+    <para>Implements the <olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink> object type from the Crosslingual Module. The string [PREFIX] in the node name <glossterm>may</glossterm> be an empty string if only one translation language exists in the lexicographic resource, otherwise it is replaced by the <literal>langCode</literal> property of the <literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal> followed by the underscore character.</para>
 
     <itemizedlist>
         <title>Value</title>
@@ -19,12 +19,7 @@
     <itemizedlist>
         <title>Child nodes</title>
         <listitem>
-            <para><literal>langCode</literal> <glossterm>optional</glossterm> (zero or one) if the ancestor <literal>lexicographicResource</literal>
-                contains exactly one <literal>translationLanguage</literal>,
-                <glossterm>required</glossterm> otherwise</para>
-        </listitem>
-        <listitem>
-            <para><literal><olink targetptr="nvh_partOfSpeech">partOfSpeech</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_pos">pos</olink></literal> <glossterm>optional</glossterm> (zero or more). This implements the <literal><olink targetptr="core_partOfSpeech">partOfSpeech</olink></literal> property.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_label">label</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
@@ -33,14 +28,14 @@
             <para><literal><olink targetptr="nvh_pronunciation">pronunciation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_inflectedForm">inflectedForm</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+				<para><literal><olink targetptr="nvh_form">form</olink></literal> <glossterm>optional</glossterm> (zero or more). This implements the <literal><olink targetptr="core_inflectedForm">inflectedForm</olink></literal> property.</para>
         </listitem>
     </itemizedlist>
     
     <itemizedlist>
         <title>Child nodes if implementing the Annotation Module</title>
 		<listitem>
-			<para><literal><olink targetptr="nvh_placeholderMarker">placeholderMarker</olink></literal> <glossterm>optional</glossterm> </para>
+			<para><literal><olink targetptr="nvh_placeholder">placeholder</olink></literal> <glossterm>optional</glossterm> </para>
         </listitem>
     </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
index 08959242..39085a7d 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
@@ -5,14 +5,14 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_inflectedForm">
-    <title>NVH node: <literal>inflectedForm</literal></title>
+<section id="nvh_form">
+    <title>NVH node: <literal>form</literal></title>
     <para>Implements the <olink targetptr="core_inflectedForm">inflectedForm</olink> object type.</para>
 
     <itemizedlist>
         <title>Value</title>
         <listitem>
-            <para><literal>text</literal> <glossterm>required</glossterm> </para>
+            <para><glossterm>Required</glossterm>, implements the <literal>text</literal> property.</para>
         </listitem>
     </itemizedlist>
     
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
index 1ae9e284..75d6f1e5 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
@@ -5,8 +5,8 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_inflectedFormTag">
-    <title>NVH node: <literal>inflectedFormTag</literal></title>
+<section id="nvh_formTag">
+    <title>NVH node: <literal>formTag</literal></title>
     <para>Implements the <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
index 04cc8477..190c36b7 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
@@ -12,7 +12,7 @@
 	<itemizedlist>
         <title>Value</title>
         <listitem>
-            <para><literal>title</literal> <glossterm>optional</glossterm></para>
+            <para><glossterm>optional</glossterm>, implements the <literal>uri</literal> property.</para>
         </listitem>
     </itemizedlist>
 
@@ -22,7 +22,7 @@
             <para><literal><olink targetptr="nvh_entry">entry</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal>uri</literal> <glossterm>optional</glossterm> (zero or one)</para>
+            <para><literal>title</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
             <para><literal>langCode</literal> <glossterm>required</glossterm> (exactly one)</para>
@@ -42,7 +42,7 @@
             <para><literal><olink targetptr="nvh_definitionTypeTag">definitionTypeTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_inflectedFormTag">inflectedFormTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_formTag">formTag</olink></literal> <glossterm>optional</glossterm> (zero or more). Implements the <literal><olink targetptr="values_inflectedFormTag">inflectedFormTag</olink></literal> property.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_labelTag">labelTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
@@ -51,7 +51,7 @@
             <para><literal><olink targetptr="nvh_labelTypeTag">labelTypeTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_partOfSpeechTag">partOfSpeechTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_posTag">posTag</olink></literal> <glossterm>optional</glossterm> (zero or more). Implements the <literal><olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink></literal> property.</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_sourceIdentityTag">sourceIdentityTag</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
index ed54f626..d1554dd7 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
@@ -6,22 +6,19 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_member">
-    <title>NVH node: <literal>member</literal></title>
-    <para>Implements the <olink targetptr="linking_member">member</olink> object type from the Linking Module.</para>
+    <title>NVH nodes: <literal>[PREFIX]member</literal></title>
+    <para>Implements the <olink targetptr="linking_member">member</olink> object type from the Linking Module. The string [PREFIX] in the node name is an empty string if the <literal>role</literal> property of this <literal>member</literal> is not specified, otherwise it is replaced by that <literal>role</literal> property followed by the underscore character. All IRI-unsafe characters (outside the <literal>iunreserved</literal> class according to [<link linkend="bib_rfc3987">RFC 3987</link>]) in the <literal>role</literal> name are percent-encoded according to [<link linkend="bib_rfc3986">RFC 3986</link>].</para>
 
     <itemizedlist>
         <title>Value</title>
         <listitem>
             <para><literal>ref</literal>
-                <glossterm>required</glossterm>: the <code>id</code> of an <code>entry</code>, a <code>sense</code> or a <code>collocateMarker</code></para>
+                <glossterm>required</glossterm></para>
         </listitem>
 	</itemizedlist>
 
     <itemizedlist>
         <title>Child nodes</title>
-        <listitem>
-            <para><literal>role</literal> <glossterm>optional</glossterm> (zero or one)</para>
-        </listitem>
         <listitem>
             <para><literal>obverseListingOrder</literal>
                 <glossterm>optional</glossterm> (exactly one)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
index 4f279b46..ff88123f 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
@@ -5,14 +5,14 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_partOfSpeech">
-    <title>NVH node: <literal>partOfSpeech</literal></title>
+<section id="nvh_pos">
+    <title>NVH node: <literal>pos</literal></title>
     <para>Implements the <olink targetptr="core_partOfSpeech">partOfSpeech</olink> object type.</para>
 
     <itemizedlist>
         <title>Value</title>
         <listitem>
-            <para><literal>tag</literal> <glossterm>required</glossterm></para>
+            <para><glossterm>Required</glossterm>, implements the <literal>tag</literal> property.</para>
         </listitem>
     </itemizedlist>
     
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
index f4caf4da..189f3d54 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
@@ -5,8 +5,8 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_partOfSpeechTag">
-    <title>NVH node: <literal>partOfSpeechTag</literal></title>
+<section id="nvh_posTag">
+    <title>NVH node: <literal>posTag</literal></title>
     <para>Implements the <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
index 92eea876..09ea9a40 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
@@ -5,8 +5,8 @@
                          %xinclude;
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
-<section id="nvh_placeholderMarker">
-    <title>NVH node: <literal>placeholderMarker</literal></title>
+<section id="nvh_placeholder">
+    <title>NVH node: <literal>placeholder</literal></title>
     <para>Implements the <olink targetptr="annotation_placeholderMarker">placeholderMarker</olink> object type from the Annotation module.
         Contains the text which it marks up.</para>
     
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
index 1ce765ee..39920a14 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
@@ -7,12 +7,12 @@
                          ]>
 <section id="nvh_pronunciation">
     <title>NVH node: <literal>pronunciation</literal></title>
-    <para>Implements the <olink targetptr="core_pronunciation">pronunciation</olink> object type.</para>
+    <para>Implements the <olink targetptr="core_pronunciation">pronunciation</olink> object type under the <literal><olink targetptr="nvh_entry">entry</olink></literal> node.</para>
 
     <itemizedlist>
         <title>Value</title>
         <listitem>
-            <para><literal>soundFile</literal> <glossterm>required</glossterm> if <literal>transcription</literal> is present, <glossterm>optional</glossterm> otherwise</para>
+            <para><literal>soundFile</literal> <glossterm>optional</glossterm></para>
         </listitem>
     </itemizedlist>
     
@@ -20,8 +20,7 @@
         <title>Child nodes</title>
         <listitem>
             <para><literal><olink targetptr="nvh_transcription">transcription</olink></literal>
-                <glossterm>optional</glossterm> (zero or more) if <literal>soundFile</literal> is present,
-                <glossterm>required</glossterm> (one or more) otherwise</para>
+            <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
             <para><literal><olink targetptr="nvh_label">label</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
index 3759a4e0..4be0c562 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
@@ -22,7 +22,7 @@
             <para><literal>description</literal> <glossterm>optional</glossterm> (zero or one)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_member">member</olink></literal> <glossterm>required</glossterm> (two or more)</para>
+            <para><literal><olink targetptr="nvh_member">[PREFIX]member</olink></literal> <glossterm>required</glossterm> (two or more). The string [PREFIX] in the node name is an empty string if the <literal>role</literal> property of this <literal>member</literal> is not specified, otherwise it is replaced by that <literal>role</literal> property followed by the underscore character. All IRI-unsafe characters (outside the <literal>iunreserved</literal> class according to [<link linkend="bib_rfc3987">RFC 3987</link>]) in the <literal>role</literal> name are percent-encoded according to [<link linkend="bib_rfc3986">RFC 3986</link>].</para>
         </listitem>
     </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
index 1a9533e1..aeecfb49 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
@@ -12,7 +12,7 @@
     <itemizedlist>
         <title>Value</title>
         <listitem>
-            <para><literal>indicator</literal> <glossterm>optional</glossterm> (zero or one)</para>
+            <para><glossterm>optional</glossterm>, implements the <literal>indicator</literal> property </para>
         </listitem>
     </itemizedlist>
     
@@ -39,11 +39,12 @@
     <itemizedlist>
         <title>Child nodes if implementing the Crosslingual Module</title>
         <listitem>
-            <para><literal><olink targetptr="nvh_headwordExplanation">headwordExplanation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+            <para><literal><olink targetptr="nvh_headwordExplanation">[PREFIX]explanation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
         </listitem>
         <listitem>
-            <para><literal><olink targetptr="nvh_headwordTranslation">headwordTranslation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
-        </listitem>
+            <para><literal><olink targetptr="nvh_headwordTranslation">[PREFIX]translation</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
+		</listitem>
     </itemizedlist>
+	The string [PREFIX] in the node name <glossterm>may</glossterm> be an empty string if only one translation language exists in the lexicographic resource, otherwise it is replaced by the <literal>langCode</literal> property of the <literal><olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink></literal> or <literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal> object type, respectively, followed by the underscore character.
 
 </section>
diff --git a/dmlex-v1.0/specification/serializations/NVH/specification.xml b/dmlex-v1.0/specification/serializations/NVH/specification.xml
index d50e6b2f..c2a00e71 100644
--- a/dmlex-v1.0/specification/serializations/NVH/specification.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/specification.xml
@@ -24,10 +24,16 @@
     <para>The NVH serialization of DMLex shown in this document follows these principles:</para>
     <itemizedlist>
       <listitem>
-        <para>The value of the node is the text property of the object, if defined, otherwise it is one of the required object properties of maximum arity 1.</para>
+        <para>The <literal>listingOrder</literal> property is always implicit from ordering of lines in the NVH file and never serialized explicitly. Object types having only a literal property and <literal>listingOrder</literal> are considered as if they only had the literal property.</para>
       </listitem>
       <listitem>
-        <para>All other objects properties are implemented as NVH nodes.</para>
+        <para>The value of the node is the <literal>text</literal> property of the object, if defined, otherwise it is one of the (typically required) object properties of maximum arity 1.</para>
+      </listitem>
+      <listitem>
+        <para>All other object properties are implemented as NVH nodes. If the property contains a literal value, it is serialized as a node named as the property with the value being the literal value of the property.</para>
+      </listitem>
+      <listitem>
+        <para>Unless specified otherwise, property <literal>names</literal> refer to properties of the DMLex object that is being described.</para>
       </listitem>
 	</itemizedlist>
 	<para>See <ulink url="https://namevaluehierarchy.org">namevaluehierarchy.org</ulink> for details about the NVH file format and processing libraries.</para>

From 4cbf948bef8c39e8df6bcc27e3813985a93fba59 Mon Sep 17 00:00:00 2001
From: Milos Jakubicek <milos.jakubicek@sketchengine.eu>
Date: Sun, 18 Aug 2024 22:44:11 +0200
Subject: [PATCH 9/9] updated plain text model description to match current
 model

---
 .../NVH/dmlex_model_description.nvh           | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh b/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh
index 4b84e856..920a3ab9 100644
--- a/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh
+++ b/dmlex-v1.0/specification/schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh
@@ -9,7 +9,7 @@
 core@lexicographicResource:
     core@title: ?
     core@uri: ?
-    core@language:
+    core@langCode:
     core@entry: *
     xlingual@translationLanguage: +
     values@definitionTypeTag: *
@@ -37,8 +37,8 @@ core@partOfSpeech:
     core@tag:
     core@listingOrder:
 core@inflectedForm:
-    core@tag: ?
     core@text:
+    core@tag: ?
     core@label: *
     core@pronunciation: *
     core@listingOrder:
@@ -61,7 +61,7 @@ core@label:
     core@listingOrder:
 core@pronunciation:
     core@soundFile: ?
-    core@transcription: ?
+    core@transcription: *
     core@listingOrder:
     core@label: *
 core@transcription:
@@ -83,10 +83,10 @@ xlingual@translationLanguage:
     xlingual@listingOrder:
 xlingual@headwordExplanation:
     xlingual@text:
-    xlingual@language: *    
+    xlingual@langCode: ?
 xlingual@headwordTranslation:
     xlingual@text:
-    xlingual@language: *
+    xlingual@langCode: ?
     xlingual@listingOrder:
     xlingual@partOfSpeech: *
     xlingual@label: *
@@ -95,9 +95,9 @@ xlingual@headwordTranslation:
     annotation@placeholderMarker: *
 xlingual@exampleTranslation:
     xlingual@text:
-    xlingual@language: *
+    xlingual@langCode: ?
     xlingual@label: *
-    xlingual@soundFile: *
+    xlingual@soundFile: ?
     xlingual@listingOrder:
     annotation@headwordMarker: *
     annotation@collocateMarker: *
@@ -133,32 +133,40 @@ values@transcriptionSchemeTag:
     values@tag:
     values@description: ?
     values@for: ?
+values@sameAs:
+    values@uri:
 linking@relation:
     linking@type:
     linking@description: ?
     linking@member: 2+
 linking@member:
-    linking@memberID:
+    linking@ref:
     linking@role: ?
     linking@listingOrder:
-    linking@obverseListingOrder:
+    linking@obverseListingOrder: ?
 linking@relationType:
     linking@type:
     linking@description: ?
-    linking@scope: ?(any,sameEntry,sameResource)
+    linking@scopeRestriction: ?(any,sameEntry,sameResource)
     linking@memberType: *
     linking@sameAs: *
 linking@memberType:
-    linking@role:
+    linking@role: ?
     linking@description: ?
-    linking@memberType: (sense,entry,collocate)
+    linking@type: (sense,entry,collocate)
     linking@min: ?
     linking@max: ?
-    linking@action: (embed,navigate,none)
+    linking@hint: ?(embed,navigate,none)
     linking@sameAs: *
 annotation@placeholderMarker:
+    annotation@startIndex:
+    annotation@endIndex:
 annotation@headwordMarker:
+    annotation@startIndex:
+    annotation@endIndex:
 annotation@collocateMarker:
+    annotation@startIndex:
+    annotation@endIndex:
     annotation@lemma: ?
     annotation@label: *
 etymology@etymology:
@@ -173,7 +181,7 @@ etymology@etymon:
     etymology@translation: ?
     etymology@listingOrder:
 etymology@etymonUnit:
-    etymology@language:
+    etymology@langCode:
     etymology@text:
     etymology@reconstructed: ?
     etymology@partOfSpeech: *