From a479977b3f3abed14328e36af1d0cd80b397ca6c Mon Sep 17 00:00:00 2001
From: Cyprian Laskowski <cyp@trojina.si>
Date: Wed, 19 Feb 2020 17:27:48 +0100
Subject: [PATCH] IssueID #1102: moved types to inventory

---
 resources/schema/bilingual_dictionaries.xsd | 32 -------------------
 resources/schema/inventory.xsd              | 34 ++++++++++++++++++++-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/resources/schema/bilingual_dictionaries.xsd b/resources/schema/bilingual_dictionaries.xsd
index 4152258..641651d 100644
--- a/resources/schema/bilingual_dictionaries.xsd
+++ b/resources/schema/bilingual_dictionaries.xsd
@@ -5,38 +5,6 @@
               schemaLocation="http://www.w3.org/2001/xml.xsd" />
   <xsd:include schemaLocation="inventory.xsd"/>
 
-  <xsd:complexType name="translationContainerType">
-    <xsd:sequence>
-      <xsd:element name="labelList" type="labelListType" minOccurs="0"/>
-      <xsd:element name="translation" type="translationType"/>
-      <xsd:element name="explanation" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="cluster" type="xsd:int" use="optional"/>
-    <xsd:attribute name="source" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="translationContainerListType">
-    <xsd:sequence>
-      <xsd:element name="translationContainer" type="translationContainerType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="exampleContainerType">
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="corpusExample" type="corpusExampleType"/>
-        <xsd:element name="multiwordExample" type="multipleLexemeExampleType"/>
-      </xsd:choice>
-      <xsd:element name="translationContainer" type="translationContainerType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="exampleContainerListType">
-    <xsd:sequence>
-      <xsd:element name="exampleContainer" type="exampleContainerType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
   <xsd:element name="dictionary">
     <xsd:complexType>
       <xsd:sequence>
diff --git a/resources/schema/inventory.xsd b/resources/schema/inventory.xsd
index 60fdcb5..e13f984 100644
--- a/resources/schema/inventory.xsd
+++ b/resources/schema/inventory.xsd
@@ -42,7 +42,7 @@
     </xsd:simpleContent>
   </xsd:complexType>
 
-    <xsd:complexType name="homonymyFeatureType">
+  <xsd:complexType name="homonymyFeatureType">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
         <xsd:attribute name="name" type="xsd:string" use="required"/>
@@ -232,4 +232,36 @@
     <xsd:attribute name="cluster" type="xsd:int"/>
   </xsd:complexType>
 
+  <xsd:complexType name="translationContainerType">
+    <xsd:sequence>
+      <xsd:element name="labelList" type="labelListType" minOccurs="0"/>
+      <xsd:element name="translation" type="translationType"/>
+      <xsd:element name="explanation" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="cluster" type="xsd:int" use="optional"/>
+    <xsd:attribute name="source" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="translationContainerListType">
+    <xsd:sequence>
+      <xsd:element name="translationContainer" type="translationContainerType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:complexType name="exampleContainerType">
+    <xsd:sequence>
+      <xsd:choice>
+        <xsd:element name="corpusExample" type="corpusExampleType"/>
+        <xsd:element name="multiwordExample" type="multipleLexemeExampleType"/>
+      </xsd:choice>
+      <xsd:element name="translationContainer" type="translationContainerType" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="exampleContainerListType">
+    <xsd:sequence>
+      <xsd:element name="exampleContainer" type="exampleContainerType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
 </xsd:schema>