version bump

metanorma · Dec 21, 2023 · a2ba9de · a2ba9de
1 parent 8fc8471
commit a2ba9de
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 19 deletions.
diff --git a/lib/metanorma/cc/basicdoc.rng b/lib/metanorma/cc/basicdoc.rng
@@ -715,27 +715,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">

diff --git a/lib/metanorma/cc/biblio.rng b/lib/metanorma/cc/biblio.rng
@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

diff --git 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.2.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

diff --git a/lib/metanorma/cc/version.rb b/lib/metanorma/cc/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.3.4".freeze
+    VERSION = "2.3.5".freeze
   end
 end
diff --git a/spec/isodoc/base_spec.rb b/spec/isodoc/base_spec.rb
@@ -73,7 +73,9 @@
     expect(htmlencode(metadata(csdc.info(docxml, nil)).to_s
       .gsub(", :", ",\n:"))).to be_equivalent_to <<~OUTPUT
         {:accesseddate=>"XXX",
+        :adapteddate=>"XXX",
         :agency=>"CalConnect",
+        :announceddate=>"XXX",
         :authors=>["Fred Flintstone", "Barney Rubble"],
         :authors_affiliations=>{""=>["Fred Flintstone"], "Bedrock Inc."=>["Barney Rubble"]},
         :circulateddate=>"XXX",
@@ -102,6 +104,7 @@
         :revdate_monthyear=>"January 2000",
         :roles_authors_affiliations=>{"author"=>{"Bedrock Inc."=>["Barney Rubble"]}, "editor"=>{""=>["Fred Flintstone"]}},
         :script=>"Latn",
+        :stable_untildate=>"XXX",
         :stage=>"Working Draft",
         :stage_display=>"Working Draft",
         :stageabbr=>"WD",

diff --git a/spec/metanorma/base_spec.rb b/spec/metanorma/base_spec.rb
@@ -160,6 +160,10 @@
              <name>DOC TOC Heading Levels</name>
              <value>2</value>
            </presentation-metadata>
+           <presentation-metadata>
+             <name>PDF TOC Heading Levels</name>
+             <value>2</value>
+           </presentation-metadata>
          </metanorma-extension>
       #{BOILERPLATE.sub(/<legal-statement/, "#{BOILERPLATE_LICENSE}\n<legal-statement") \
         .sub(/#{Date.today.year} The Calendaring and Scheduling Consortium/, \
@@ -247,6 +251,10 @@
              <name>DOC TOC Heading Levels</name>
              <value>2</value>
            </presentation-metadata>
+           <presentation-metadata>
+             <name>PDF TOC Heading Levels</name>
+             <value>2</value>
+           </presentation-metadata>
          </metanorma-extension>
          #{BOILERPLATE}
         <sections/>
@@ -322,6 +330,10 @@
              <name>DOC TOC Heading Levels</name>
              <value>2</value>
            </presentation-metadata>
+           <presentation-metadata>
+             <name>PDF TOC Heading Levels</name>
+             <value>2</value>
+           </presentation-metadata>
          </metanorma-extension>
           #{BOILERPLATE.sub(/<legal-statement/, "#{BOILERPLATE_LICENSE}\n<legal-statement")}
         <sections/>

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -181,6 +181,10 @@ def boilerplate_read(file)
              <name>DOC TOC Heading Levels</name>
              <value>2</value>
            </presentation-metadata>
+           <presentation-metadata>
+             <name>PDF TOC Heading Levels</name>
+             <value>2</value>
+           </presentation-metadata>
          </metanorma-extension>
   #{BOILERPLATE}
 HDR