From d3267e95fcf1b7ec53c62764a0d61db630825dc3 Mon Sep 17 00:00:00 2001
From: Leonard Smith <lenrsmith@gmail.com>
Date: Wed, 1 Sep 2021 16:06:53 -0500
Subject: [PATCH] Updated the XSD Schema

---
 Checked/wa_ulb.xsd | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/Checked/wa_ulb.xsd b/Checked/wa_ulb.xsd
index 0a2247f7..182e0aa7 100644
--- a/Checked/wa_ulb.xsd
+++ b/Checked/wa_ulb.xsd
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:element name="xml" type="xmlType"/>
+  <xs:complexType name="usfmType">
+    <xs:simpleContent>
+      <xs:extension base="xs:string" />
+    </xs:simpleContent>
+  </xs:complexType>
   <xs:complexType name="wType">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -20,39 +25,45 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
+  <xs:complexType name="phraseWordsType" mixed="true">
+    <xs:all>
+      <xs:element name="usfm" type="usfmType"  minOccurs="0" />
+    </xs:all>
+  </xs:complexType>
   <xs:complexType name="phraseType" mixed="true">
     <xs:sequence>
-      <xs:element type="wType" name="w" maxOccurs="unbounded" minOccurs="0"/>
-      <xs:element name="phraseWords" minOccurs="0" type="xs:string" />
+      <xs:element type="wType" name="w" maxOccurs="unbounded" minOccurs="1"/>
+      <xs:element name="phraseWords" minOccurs="1" type="phraseWordsType" />
     </xs:sequence>
+    <xs:attribute type="xs:string" name="sub" use="optional"/>
   </xs:complexType>
-  <xs:complexType name="verseType">
-    <xs:choice maxOccurs="unbounded" minOccurs="0">
+  <xs:group name="verseHeaderGroup">
+    <xs:sequence>
       <xs:element type="xs:string" name="Greek"/>
       <xs:element type="xs:string" name="preText"/>
       <xs:element name="ULB">
         <xs:complexType mixed="true">
           <xs:sequence>
-            <xs:element name="usfm" maxOccurs="unbounded" minOccurs="0">
-              <xs:simpleType>
-                <xs:restriction base="xs:string">
-                </xs:restriction>
-              </xs:simpleType>
-            </xs:element>
+            <xs:element type="usfmType" name="usfm" maxOccurs="unbounded" minOccurs="0" />
           </xs:sequence>
         </xs:complexType>
       </xs:element>
       <xs:element type="xs:string" name="residue"/>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="wordsGroup">
+    <xs:choice>
       <xs:element type="wType" name="w"/>
       <xs:element type="phraseType" name="phrase"/>
-      <xs:element name="usfm">
-        <xs:complexType>
-          <xs:simpleContent>
-            <xs:extension base="xs:string" />
-          </xs:simpleContent>
-        </xs:complexType>
-      </xs:element>
+      <xs:element type="usfmType" name="usfm"/>
+      <xs:element type="xs:string" name="comment"/>
     </xs:choice>
+  </xs:group>
+  <xs:complexType name="verseType">
+    <xs:sequence>
+      <xs:group ref="verseHeaderGroup" minOccurs="1"/>
+      <xs:group ref="wordsGroup" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
     <xs:attribute type="xs:string" name="name" use="optional"/>
   </xs:complexType>
   <xs:complexType name="chapterType">