grammars/basicdoc.rng in relaton-iho-1.10.2 vs grammars/basicdoc.rng in relaton-iho-1.11.0

@@ -171,14 +171,16 @@
       <optional>
         <attribute name="date">
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
       <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
+      <optional>
         <attribute name="to">
           <data type="IDREF"/>
         </attribute>
       </optional>
       <oneOrMore>
@@ -622,28 +624,39 @@
     <element name="em">
       <zeroOrMore>
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
@@ -820,11 +833,13 @@
     </attribute>
     <optional>
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
       <attribute name="target">
         <data type="anyURI"/>
@@ -833,11 +848,13 @@
         <ref name="ReferenceFormat"/>
       </attribute>
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
     <element name="xref">
       <attribute name="target">
@@ -847,10 +864,12 @@
         <ref name="ReferenceFormat"/>
       </attribute>
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">
     <element name="fn">
       <attribute name="reference"/>