From 97dbcf212df11f1a343f882107d2d5489b42c994 Mon Sep 17 00:00:00 2001
From: Nick Nicholas <opoudjis@gmail.com>
Date: Mon, 22 Apr 2024 20:30:39 +1000
Subject: [PATCH] version bump

---
 lib/metanorma/cc/biblio.rng |  45 ++++++-----
 lib/metanorma/cc/isodoc.rng | 153 +++++++++---------------------------
 lib/metanorma/cc/version.rb |   2 +-
 3 files changed, 60 insertions(+), 140 deletions(-)

diff --git a/lib/metanorma/cc/biblio.rng b/lib/metanorma/cc/biblio.rng
index e76ec4e8..03ed1509 100644
--- a/lib/metanorma/cc/biblio.rng
+++ b/lib/metanorma/cc/biblio.rng
@@ -95,7 +95,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString1">
+  <define name="LocalizedStringAttrs">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -106,6 +106,10 @@
     <optional>
       <attribute name="script"/>
     </optional>
+  </define>
+  <define name="LocalizedString1">
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <text/>
   </define>
   <define name="LocalizedString">
@@ -142,16 +146,8 @@
     <ref name="LocalizedStringOrXsAny"/>
   </define>
   <define name="LocalizedStringOrXsAny1">
-    <optional>
-      <!-- multiple languages and scripts possible: comma delimit them if so -->
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="locale"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <oneOrMore>
       <choice>
         <text/>
@@ -208,6 +204,7 @@
   </define>
   <define name="roledescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -335,6 +332,7 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -948,6 +946,7 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <ref name="LocalizedStringAttrs"/>
     <zeroOrMore>
       <ref name="TextElement"/>
     </zeroOrMore>
@@ -1041,15 +1040,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="locale"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1277,6 +1268,7 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1284,9 +1276,15 @@
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedStringAttrs"/>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlock"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement"/>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="copyright">
@@ -1391,6 +1389,7 @@
       </attribute>
       <optional>
         <element name="description">
+          <ref name="LocalizedStringAttrs"/>
           <oneOrMore>
             <ref name="TextElement"/>
           </oneOrMore>
diff --git a/lib/metanorma/cc/isodoc.rng b/lib/metanorma/cc/isodoc.rng
index 24fd0d10..4d6cab6d 100644
--- a/lib/metanorma/cc/isodoc.rng
+++ b/lib/metanorma/cc/isodoc.rng
@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.0 -->
+<!-- VERSION v1.3.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1346,38 +1346,41 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="Section-Attributes">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
+    <optional>
+      <attribute name="obligation">
+        <choice>
+          <value>normative</value>
+          <value>informative</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="reference-clause">
     <element name="clause">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -1566,36 +1569,7 @@
     </element>
   </define>
   <define name="Content-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1617,39 +1591,10 @@
     </element>
   </define>
   <define name="Clause-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1730,34 +1675,10 @@
   </define>
   <define name="terms">
     <element name="terms">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <attribute name="type"/>
       </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
diff --git a/lib/metanorma/cc/version.rb b/lib/metanorma/cc/version.rb
index 99992537..aa00c8b5 100644
--- a/lib/metanorma/cc/version.rb
+++ b/lib/metanorma/cc/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.4.6".freeze
+    VERSION = "2.4.7".freeze
   end
 end