metanorma-iso 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af8cccd4eb2c8c09f5e8e1714b3154106d37cbc60b470143dc1569885ddc5268
-  data.tar.gz: b9d3770934d56c2d25891663214631ab6fd72264ed9b17e1bb7729cf4302b89d
+  metadata.gz: 9929b1cb4a3a27bc2d67e5cc35208ce6c0cde2edfcf610819b52431664a6d6e1
+  data.tar.gz: 1387bd4a7a70668aa172c398ef68e1ec7382742ae81d929e92925974be424526
 SHA512:
-  metadata.gz: de6922a6e5923045702366f758294685bf1ebde75aab4a7abf78f9e7ab48c72478e8e733d21611ce84dd45ed9aaac61b6857b2c158dda910f650e237c3cfbf7c
-  data.tar.gz: 6a218b206ab889b35501881571a695d7d2fd3e623e76f356aaf98717aa46298986ca1aacdcb108f6675945db181abff80cab3e79a5e007c28837cd74b6a0a9cb
+  metadata.gz: 39a5747db6618a81b7e0785edbf83c3e9bec40fdf11c7b51bf40eeb8f21e60a12acd50f6f1189eea94dd291b848174b83e354adeddc28d35b7c4bccbeb792f46
+  data.tar.gz: fc1a91e0703ecda60bf4e92b6528e5f6c1205675ad5b1b7daa20264154c4e0844c4ef53a141279b98e1bcad39e49eff22d481fffb6ff639889ce88989faea35e

data/.rubocop.yml

@@ -1,7 +1,7 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 # local repo-specific modifications
 # ...

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/iso.amendment.xsl

@@ -2097,7 +2097,7 @@
 									<fo:table-row>
 										<fo:table-cell number-columns-spanned="2" border-right="{$COVER_PAGE_BORDER}" padding-right="4mm">
 
-											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
+											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm" id="{concat('__internal_layout__coverpage_p_title_', $num , '_', generate-id())}">
 												<!-- for role see coment https://github.com/pdf-association/extension-brotli/issues/5#issuecomment-3931742869 -->
 												<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 													<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="SKIP"> <!-- role="H1" -->

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -2097,7 +2097,7 @@
 									<fo:table-row>
 										<fo:table-cell number-columns-spanned="2" border-right="{$COVER_PAGE_BORDER}" padding-right="4mm">
 
-											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
+											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm" id="{concat('__internal_layout__coverpage_p_title_', $num , '_', generate-id())}">
 												<!-- for role see coment https://github.com/pdf-association/extension-brotli/issues/5#issuecomment-3931742869 -->
 												<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 													<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="SKIP"> <!-- role="H1" -->

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/cleanup_biblio.rb

@@ -30,26 +30,40 @@ module Metanorma
       end
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
+      ISO_NAME = "International Organization for Standardization".freeze
+      IEC_NAME = "International Electrotechnical Commission".freeze
 
       def pub_class(bib)
-        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization " \
-                           "for Standardization']")
-        return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International " \
-                           "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type]" \
-                           "[not(#{@conv.skip_docid} or @type = 'metanorma')]") ||
-          bib.at("./docidentifier[not(@type)]")
-
+        bib.at("#{PUBLISHER}[abbreviation = 'ISO']") ||
+          bib.at("#{PUBLISHER}[name = '#{ISO_NAME}']") and return 1
+        bib.at("#{PUBLISHER}[abbreviation = 'IEC']") ||
+          bib.at("#{PUBLISHER}[name = '#{IEC_NAME}']") and return 2
+        bib.at("./docidentifier[@type]" \
+               "[not(#{@conv.skip_docid} or @type = 'metanorma')]") ||
+          bib.at("./docidentifier[not(@type)]") and return 3
         4
       end
 
+      def second_pub_class(bib, first_pub)
+        case first_pub
+        when 1
+          n = bib.at("#{PUBLISHER}[not(abbreviation = 'ISO')]" \
+                     "[not(name = '#{ISO_NAME}')]")
+          n&.at("./abbreviation") || n&.at("./name") || ""
+        when 2
+          n = bib.at("#{PUBLISHER}[not(abbreviation = 'IEC')]" \
+                     "[not(name = '#{IEC_NAME}')]")
+          n&.at("./abbreviation") || n&.at("./name") || ""
+        else ""
+        end
+      end
+
       def sort_biblio(bib)
         bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
       end
 
       # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
+      # then second publisher
       # then standard class (docid class other than DOI &c)
       # then docnumber if present, numeric sort
       #      else alphanumeric metanorma id (abbreviation)
@@ -58,6 +72,7 @@ module Metanorma
       # then title
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
+        second_pubclass = second_pub_class(bib, pubclass)
         num = bib.at("./docnumber")&.text
         id = bib.at("./docidentifier[@primary = 'true']") ||
           bib.at("./docidentifier[not(#{@conv.skip_docid} or @type = 'metanorma')]")
@@ -67,7 +82,7 @@ module Metanorma
         type = id["type"] if id
         title = bib.at("./title[@type = 'main']")&.text ||
           bib.at("./title")&.text || bib&.at("./formattedref")&.text
-        "#{pubclass} :: #{type} :: " \
+        "#{pubclass} :: #{second_pubclass} :: #{type} :: " \
           "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
           "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
       end

data/lib/metanorma/iso/front.rb

@@ -100,6 +100,7 @@ module Metanorma
 
       def title(node, xml)
         %w(en ru fr).each do |lang|
+          node.attr("title-main-#{lang}") or next
           title1(node, xml, lang)
         end
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.4.0".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/lib/metanorma-iso.rb

@@ -12,7 +12,7 @@ require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
 require_relative "html2doc/lists"
 require "asciidoctor/extensions"
-require "metanorma"
+require "metanorma-core"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/iso"

data/metanorma-iso.gemspec

@@ -32,16 +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 "pubid-cen"
-  #spec.add_dependency "pubid-iec"
-  #spec.add_dependency "pubid-iso", "~> 0.7.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
   spec.add_development_dependency "benchmark"
-  spec.add_development_dependency "canon", "= 0.1.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.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-13 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.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement