SF-3629 Add link support to the USX schema

Author: pmachapman

src/SIL.XForge.Scripture/usx-sf.rnc

@@ -134,7 +134,7 @@ Para =
             },
         attribute vid { xsd:string { pattern = "[A-Z1-4]{3} ?[a-z0-9\-,:]*" } }?,
         attribute status { text }?,
-        (Reference | Note | Char | Milestone | Figure | Verse | Break | Unmatched | text)+
+        (Reference | Note | Link | Char | Milestone | Figure | Verse | Break | Unmatched | text)+
     }
 Para.para.style.enum = (
       "restore" # Comment about when text was restored
@@ -430,7 +430,7 @@ ListChar.char.style.enum = (
 
 char.link =
     attribute link-href { xsd:string
-        { pattern = "(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?)|(#[^\s]+)" } }?, # The resource being linked to as a URI
+        { pattern = "(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?[ ]*)|(#[^\s]+)" } }?, # The resource being linked to as a URI
     attribute link-title { xsd:string }?, # Plain text describing the remote resource such as might be shown in a tooltip
     attribute link-id { xsd:string { pattern = "[\w_\-\.:]+" } }? # Unique identifier for this location in the text
 
@@ -483,15 +483,15 @@ Note =
         attribute style { "f" | "fe" | "ef" | "x" | "ex" },
         attribute caller { text },
         (attribute category { text })?,
-        (NoteChar | Unmatched | text )+
+        (NoteChar | Link | Unmatched | text )+
     }
 
 NoteChar =
     element char {
         attribute style { FootnoteChar.char.style.enum | CrossReferenceChar.char.style.enum },
         char.link?,
         char.closed?,
-        (Char | Reference | Unmatched | text)+
+        (Char | Link | Reference | Unmatched | text)+
     }
 FootnoteChar.char.style.enum = (
       "fr" # The origin reference for the footnote
@@ -544,6 +544,13 @@ Reference =
         text?
     }
 
+Link =
+    element link {
+        attribute style { CrossReferenceChar.char.style.enum },
+        char.link?,
+        text?
+    }
+
 Break =
     element optbreak { empty }
 

src/SIL.XForge.Scripture/usx-sf.xsd

@@ -143,6 +143,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="ref"/>
         <xs:element ref="note"/>
+        <xs:element ref="link"/>
         <xs:group ref="Char"/>
         <xs:element ref="ms"/>
         <xs:element ref="figure"/>
@@ -563,7 +564,7 @@
     <xs:attribute name="link-href">
       <xs:simpleType>
         <xs:restriction base="xs:string">
-          <xs:pattern value="(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?)|(#[^\s]+)"/>
+          <xs:pattern value="(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?[ ]*)|(#[^\s]+)"/>
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
@@ -726,6 +727,7 @@
     <xs:complexType mixed="true">
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:group ref="NoteChar"/>
+        <xs:element ref="link"/>
         <xs:element ref="unmatched"/>
       </xs:choice>
       <xs:attribute name="style" use="required">
@@ -749,6 +751,7 @@
         <xs:complexType mixed="true">
           <xs:choice minOccurs="0" maxOccurs="unbounded">
             <xs:group ref="Char"/>
+            <xs:element ref="link"/>
             <xs:element ref="ref"/>
             <xs:element ref="unmatched"/>
           </xs:choice>
@@ -820,6 +823,12 @@
       </xs:attribute>
     </xs:complexType>
   </xs:element>
+  <xs:element name="link">
+    <xs:complexType mixed="true">
+      <xs:attribute name="style" use="required" type="CrossReferenceChar.char.style.enum"/>
+      <xs:attributeGroup ref="char.link"/>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="optbreak">
     <xs:complexType/>
   </xs:element>

tools/Roundtrip/usx-sf.xsd

@@ -143,6 +143,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="ref"/>
         <xs:element ref="note"/>
+        <xs:element ref="link"/>
         <xs:group ref="Char"/>
         <xs:element ref="ms"/>
         <xs:element ref="figure"/>
@@ -563,7 +564,7 @@
     <xs:attribute name="link-href">
       <xs:simpleType>
         <xs:restriction base="xs:string">
-          <xs:pattern value="(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?)|(#[^\s]+)"/>
+          <xs:pattern value="(.*///?(.*/?)+)|((prj:[A-Za-z\-0-9]{3,8} )?[A-Z1-4]{3} \d+:\d+(\-\d+)?[ ]*)|(#[^\s]+)"/>
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
@@ -726,6 +727,7 @@
     <xs:complexType mixed="true">
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:group ref="NoteChar"/>
+        <xs:element ref="link"/>
         <xs:element ref="unmatched"/>
       </xs:choice>
       <xs:attribute name="style" use="required">
@@ -749,6 +751,7 @@
         <xs:complexType mixed="true">
           <xs:choice minOccurs="0" maxOccurs="unbounded">
             <xs:group ref="Char"/>
+            <xs:element ref="link"/>
             <xs:element ref="ref"/>
             <xs:element ref="unmatched"/>
           </xs:choice>
@@ -820,6 +823,12 @@
       </xs:attribute>
     </xs:complexType>
   </xs:element>
+  <xs:element name="link">
+    <xs:complexType mixed="true">
+      <xs:attribute name="style" use="required" type="CrossReferenceChar.char.style.enum"/>
+      <xs:attributeGroup ref="char.link"/>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="optbreak">
     <xs:complexType/>
   </xs:element>