sourcecode/body: metanorma/metanorma-standoc#966

metanorma · Feb 22, 2025 · dc9e7a0 · dc9e7a0
1 parent b681acb
commit dc9e7a0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/grammars/basicdoc-models b/grammars/basicdoc-models
diff --git a/grammars/isodoc.rnc b/grammars/isodoc.rnc
@@ -143,7 +143,7 @@ sourececodebody = element body {
       xref |
       ## Hyperlink of code segment to external bibliographic resource
       eref
-    )+,
+    )+
 }
 
 sections =

diff --git a/grammars/isodoc.rng b/grammars/isodoc.rng
@@ -244,23 +244,9 @@
           <a:documentation>The caption of the block</a:documentation>
         </ref>
       </optional>
-      <oneOrMore>
-        <choice>
-          <text>
-            <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-          </text>
-          <ref name="callout">
-            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-          </ref>
-          <ref name="xref">
-            <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
-          </ref>
-          <ref name="eref">
-            <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
-          </ref>
-        </choice>
-      </oneOrMore>
+      <ref name="sourecodebody">
+        <a:documentation>The sourcecode content</a:documentation>
+      </ref>
       <zeroOrMore>
         <ref name="annotation">
           <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -276,6 +262,26 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="sourececodebody">
+      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+      <element name="body">
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="callout">
+              <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+            </ref>
+            <ref name="xref">
+              <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
+            </ref>
+            <ref name="eref">
+              <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
+            </ref>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="sections">
       <element name="sections">
         <oneOrMore>
-Original file line number
+Diff line change
@@ Expand Up / @@ -143,7 +143,7 @@ sourececodebody = element body { @@
           xref |
           ## Hyperlink of code segment to external bibliographic resource
           eref
-        )+,
+        )+
     }
     sections =
@@ Expand Down @@