csa.rng in metanorma-csa-2.4.8

- old
+ new
@@ -9,39 +9,35 @@
   <include href="relaton-csa.rng"/>
   <include href="isodoc.rng">
     <start>
       <ref name="csand-standard"/>
     </start>
-    <define name="figure">
-      <element name="figure">
-        <ref name="FigureAttributes"/>
-        <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <choice>
-          <oneOrMore>
-            <ref name="figure"/>
-          </oneOrMore>
-          <group>
-            <choice>
-              <zeroOrMore>
-                <ref name="TextElement"/>
-              </zeroOrMore>
-              <ref name="pre"/>
-            </choice>
+    <define name="FigureBody">
+      <optional>
+        <ref name="source"/>
+      </optional>
+      <optional>
+        <ref name="tname"/>
+      </optional>
+      <choice>
+        <oneOrMore>
+          <ref name="figure"/>
+        </oneOrMore>
+        <group>
+          <choice>
             <zeroOrMore>
-              <ref name="note"/>
+              <ref name="TextElement"/>
             </zeroOrMore>
-            <optional>
-              <ref name="dl"/>
-            </optional>
-          </group>
-        </choice>
-      </element>
+            <ref name="pre"/>
+          </choice>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+          <optional>
+            <ref name="dl"/>
+          </optional>
+        </group>
+      </choice>
     </define>
   </include>
   <define name="csand-standard">
     <element name="csa-standard">
       <ref name="Root-Attributes"/>