metanorma-iso 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 280ddeefbca35755cc0324649f4f554fca30120dcb8d901740d0dbd7baa0e0f8
-  data.tar.gz: 81b5b54c4105074d822bced3f25d9a005c3f58c7ddeb47449184594605e57d47
+  metadata.gz: 9929b1cb4a3a27bc2d67e5cc35208ce6c0cde2edfcf610819b52431664a6d6e1
+  data.tar.gz: 1387bd4a7a70668aa172c398ef68e1ec7382742ae81d929e92925974be424526
 SHA512:
-  metadata.gz: 1fda52f6d5031ee446362525af0de04ec2551375007a1a76b0e9226b41ad4b41fa216d113f80a9ed317c140fcc5a5a44323c23801a8608fe6847213f24df7829
-  data.tar.gz: 15efc546555858005e2a4128244dce03bed7f93dc6aac9631e143e84269757f40ddc687be8c9b3c7322ebf112a5b96fee127252024a107a4aa096a351930dc31
+  metadata.gz: 39a5747db6618a81b7e0785edbf83c3e9bec40fdf11c7b51bf40eeb8f21e60a12acd50f6f1189eea94dd291b848174b83e354adeddc28d35b7c4bccbeb792f46
+  data.tar.gz: fc1a91e0703ecda60bf4e92b6528e5f6c1205675ad5b1b7daa20264154c4e0844c4ef53a141279b98e1bcad39e49eff22d481fffb6ff639889ce88989faea35e

data/lib/isodoc/iso/base_convert.rb

@@ -99,20 +99,8 @@ module IsoDoc
         end
       end
 
-      def table_parse(node, out)
-        @in_table = true
-        out.table(**table_attrs(node)) do |t|
-          table_title_parse(node, t)
-          table_parse_core(node, t)
-          table_parse_tail(node, t)
-        end
-        @in_table = false
-      end
-
       def table_title_parse(node, out)
-        name = node.at(ns("./fmt-name"))
-        summ = node["summary"]
-        meas = node.at(ns("./note[@type = 'units']"))
+        name, summ, meas = table_title_parse_prep(node)
         name || summ || meas or return
         out.caption do |p|
           children_parse(name, p)
@@ -123,14 +111,16 @@ module IsoDoc
         end
       end
 
-      def table_parse_tail(node, out)
-        (key = node.at(ns("./key"))) && parse(key, out)
-        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
-        node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
-          parse(n, out)
-        end
-        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
-          .each { |n| parse(n, out) }
+      def table_title_parse_prep(node)
+        name = node.at(ns("./fmt-name"))
+        summ = node["summary"]
+        meas = node.at(ns("./note[@type = 'units']"))
+        [name, summ, meas]
+      end
+
+      def table_parse_tail_elems
+        ["./key", "./fmt-source", "./note[not(@type = 'units')]",
+         "./fmt-footnote-container/fmt-fn-body"]
       end
 
       def figure_parse1(node, out)

data/lib/isodoc/iso/metadata.rb

@@ -5,7 +5,7 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, locale, i18n)
         super
-        DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = nil }
+        DATETYPES.each { |w| @metadata[:"#{w.gsub('-', '_')}date"] = nil }
         set(:obsoletes, nil)
         set(:obsoletes_part, nil)
       end
@@ -24,11 +24,12 @@ module IsoDoc
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         published = published_default(isoxml)
-        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/date[@type='updated']"))
         set(:revdate, revdate&.text)
         docstatus and docstatus1(isoxml, docstatus, published)
         docscheme = get[:"presentation_metadata_document-scheme"]
-        docscheme && !docscheme.empty? and set(:document_scheme, docscheme.first)
+        docscheme && !docscheme.empty? and set(:document_scheme,
+                                               docscheme.first)
       end
 
       def docstatus1(isoxml, docstatus, published)
@@ -39,7 +40,7 @@ module IsoDoc
             status_abbrev(docstatus["abbreviation"] || "??",
                           isoxml.at(ns("//bibdata/status/substage"))&.text,
                           isoxml.at(ns("//bibdata/status/iteration"))&.text,
-                          isoxml.at(ns("//bibdata/version/draft"))&.text,
+                          isoxml.at(ns("//bibdata/version"))&.text,
                           isoxml.at(ns("//bibdata/ext/doctype"))&.text))
         !published and set(:stageabbr, docstatus["abbreviation"])
       end
@@ -67,8 +68,8 @@ module IsoDoc
       end
 
       def title_part_prefix(xml, part, lang)
-        t = xml.at(ns("//bibdata/title[@language='#{lang}']"\
-          "[@type='title-#{part}-prefix']")) or return
+        t = xml.at(ns("//bibdata/title[@language='#{lang}']" \
+                      "[@type='title-#{part}-prefix']")) or return
         to_xml(t.children)
       end
 
@@ -97,7 +98,7 @@ module IsoDoc
       def title_parts(isoxml, lang)
         %w(intro main complementary part amd add).each_with_object({}) do |w, m|
           m[w.to_sym] = isoxml.at(ns("//bibdata/title[@type='title-#{w}' and " \
-                              "@language='#{lang}']"))
+                                     "@language='#{lang}']"))
         end
       end
 
@@ -164,7 +165,7 @@ module IsoDoc
       end
 
       COMMITTEE = "//bibdata/contributor[role/@type = 'author'] " \
-        "[role/description = 'committee']/organization".freeze
+                  "[role/description = 'committee']/organization".freeze
 
       def tc_base(xml, _grouptype)
         s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Technical committee']"))
@@ -208,8 +209,8 @@ module IsoDoc
 
       def secretariat(xml)
         sec = xml.at(ns("//bibdata/contributor[role/@type = 'author']" \
-          "[role/description = 'secretariat']/organization/subdivision" \
-          "[@type = 'Secretariat']/name"))
+                        "[role/description = 'secretariat']/organization/subdivision" \
+                        "[@type = 'Secretariat']/name"))
         set(:secretariat, sec.text) if sec
       end
 

data/lib/isodoc/iso/presentation_section.rb

@@ -20,8 +20,7 @@ module IsoDoc
         docxml.at(ns("//bibdata//contributor/role[description = 'committee']")) or
           ret += "<p>Editorial groups are missing.</p>"
         docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
-                     "or @type = 'created']")) ||
-          docxml.at(ns("//bibdata/version/revision-date")) or
+                     "or @type = 'created' or @type = 'updated']")) or
           ret += "<p>Document date is missing.</p>"
         ret
       end

data/lib/isodoc/iso/word_convert.rb

@@ -234,15 +234,6 @@ module IsoDoc
         @in_table = false
       end
 
-      def table_parse_tail(node, out)
-        (key = node.at(ns("./key"))) && parse(key, out)
-        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
-        node.xpath(ns("./note[not(@type = 'units')]"))
-          .each { |n| parse(n, out) }
-        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
-          .each { |n| parse(n, out) }
-      end
-
       def admonition_class(node)
         if node["type"] == "editorial" then "zzHelp"
         else super

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.4.1".freeze
+    VERSION = "3.4.2".freeze
   end
 end

data/lib/metanorma/requirements/requirements.rb

@@ -7,8 +7,10 @@ module Metanorma
       def create(type)
         case type
         when :modspec, :ogc
-          ::Metanorma::Requirements::Modspec::Iso.new(parent: self)
-        else ::Metanorma::Requirements::Default.new(parent: self)
+          ::Metanorma::Requirements::Modspec::Iso.new(parent: self,
+                                                      isodoc: @isodoc)
+        else ::Metanorma::Requirements::Default.new(parent: self,
+                                                    isodoc: @isodoc)
         end
       end
     end

data/metanorma-iso.gemspec

@@ -32,13 +32,13 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.4.2"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
   spec.add_development_dependency "benchmark"
-  spec.add_development_dependency "canon", "= 0.2.3"
+  spec.add_development_dependency "canon" #, "= 0.2.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement