basicdoc.rng in metanorma-vsd-0.5.10

- old
+ new

@@ -53,13 +53,10 @@
       <ref name="section-title"/>
     </optional>
     <zeroOrMore>
       <ref name="BasicBlock"/>
     </zeroOrMore>
-    <zeroOrMore>
-      <ref name="note"/>
-    </zeroOrMore>
   </define>
   <define name="references">
     <element name="references">
       <optional>
         <attribute name="id">
@@ -97,10 +94,14 @@
       <ref name="quote"/>
       <ref name="sourcecode"/>
       <ref name="example"/>
       <ref name="review"/>
       <ref name="pre"/>
+      <ref name="note"/>
+      <ref name="pagebreak"/>
+      <ref name="hr"/>
+      <ref name="bookmark"/>
     </choice>
   </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -339,11 +340,18 @@
     </element>
   </define>
   <define name="tname">
     <element name="name">
       <oneOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="stem"/>
+          <ref name="keyword"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
   <define name="thead">
     <element name="thead">
@@ -590,17 +598,23 @@
     </element>
   </define>
   <define name="em">
     <element name="em">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">