version bump

metanorma · Nov 11, 2024 · 3f1826c · 3f1826c
1 parent 6d6f9d4
commit 3f1826c
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 200 deletions.
diff --git a/Gemfile.devel b/Gemfile.devel
diff --git a/lib/metanorma/jis/biblio.rng b/lib/metanorma/jis/biblio.rng
@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

diff --git a/lib/metanorma/jis/isodoc.rng b/lib/metanorma/jis/isodoc.rng
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

diff --git a/lib/metanorma/jis/version.rb b/lib/metanorma/jis/version.rb
@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.3.7".freeze
+    VERSION = "0.4.0".freeze
   end
 end
 
diff --git a/metanorma-jis.gemspec b/metanorma-jis.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 2.8.0"
+  spec.add_dependency "metanorma-iso", "~> 2.9.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"

diff --git a/spec/vcr_cassettes/isobib_123_dated.yml b/spec/vcr_cassettes/isobib_123_dated.yml
diff --git a/spec/vcr_cassettes/isobib_123_mix_dated.yml b/spec/vcr_cassettes/isobib_123_mix_dated.yml
diff --git a/spec/vcr_cassettes/isobib_123_undated.yml b/spec/vcr_cassettes/isobib_123_undated.yml