metanorma-iso 2.7.10 → 2.8.0

data/lib/metanorma/iso/cleanup.rb

@@ -15,6 +15,12 @@ module Metanorma
         "//annex//fn | //references[@normative = 'false']//fn | " \
         "//clause[.//references[@normative = 'false']]//fn".freeze
 
+      NORM_REF =
+        "//bibliography/references[@normative = 'true'][not(@hidden)] | " \
+        "//bibliography/clause[.//references[@normative = 'true']] | "\
+        "//sections//references[@normative = 'true'][not(@hidden)]"
+          .freeze
+
       def other_footnote_renumber(xmldoc)
         seen = {}
         i = 0
@@ -36,9 +42,9 @@ module Metanorma
       end
 
       TERM_CLAUSE =
-        "//sections//terms | " \
-        "//sections//clause[descendant::terms][not(descendant::definitions)]"
-          .freeze
+        "//sections//terms[not(preceding-sibling::clause)] | " \
+        "//sections//clause[descendant::terms][not(descendant::definitions)][@type = 'terms'] | " \
+        "//sections/clause[not(@type = 'terms')][not(descendant::definitions)]//terms".freeze
 
       def sections_cleanup(xml)
         super
@@ -133,7 +139,7 @@ module Metanorma
         end
       end
 
-      def termdef_boilerplate_insert_location(xmldoc)
+      def termdef_boilerplate_insert_locationx(xmldoc)
         f = xmldoc.at(self.class::TERM_CLAUSE)
         root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
         !f || !root and return f || root

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.10".freeze
+    VERSION = "2.8.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
     || f.match(%r{Rakefile|bin/rspec})
   end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.9.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.10
+  version: 2.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -387,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="