colophon: metanorma/metanorma-bsi#241

metanorma · Feb 19, 2023 · bf5189c · bf5189c
1 parent e694b98
commit bf5189c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/grammars/basicdoc-models b/grammars/basicdoc-models
diff --git a/grammars/bsi.rnc b/grammars/bsi.rnc
@@ -86,6 +86,6 @@ bsi-standard =
   element bsi-standard {
 attribute version { text },
   attribute type { "semantic" | "presentation" },
-    bibdata, termdocsource*, misccontainer?, boilerplate?, preface, sections+, annex*, bibliography, indexsect*
+    bibdata, termdocsource*, misccontainer?, boilerplate?, preface, sections+, annex*, bibliography, indexsect*, colophon?
   }
 
diff --git a/grammars/bsi.rng b/grammars/bsi.rng
@@ -287,6 +287,9 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
 </grammar>
diff --git a/grammars/isodoc.rnc b/grammars/isodoc.rnc
@@ -468,14 +468,17 @@ standard-document =
 element standard-document {
   attribute version { text },
   attribute type { "semantic" | "presentation" },
-  bibdata, misccontainer?, boilerplate?, preface?, sections, annex*, bibliography?, indexsect*
+  bibdata, misccontainer?, boilerplate?, preface?, sections, annex*, bibliography?, indexsect*, colophon?
 }
 
 misccontainer = element metanorma-extension { AnyElement+ }
 
 preface =
   element preface { ( content | abstract | foreword | introduction | acknowledgements)+ }
 
+colophon =
+  element colophon { content+ }
+
 foreword =
   element foreword { Content-Section }
 

diff --git a/grammars/isodoc.rng b/grammars/isodoc.rng
@@ -1578,6 +1578,9 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1600,6 +1603,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="colophon">
+    <element name="colophon">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Content-Section"/>

diff --git a/grammars/relaton-models b/grammars/relaton-models
+1 −1		grammars/basicdoc.rnc
+0 −1		grammars/basicdoc.rng
+1 −1		grammars/relaton-models
+ −		images/MultiParagraphs.png
+0 −5		models/multiparagraphs/AdmonitionType.lutaml