metanorma-iso 3.1.1 → 3.1.2

data/lib/isodoc/iso/metadata.rb

@@ -23,7 +23,7 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
-        set(:unpublished, false)
+        published_default(isoxml)
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
         docstatus and docstatus1(isoxml, docstatus)
@@ -73,7 +73,7 @@ module IsoDoc
 
       def part_title(part, titlenums, lang)
         part or return ""
-        suffix = part.children.to_xml
+        suffix = to_xml(part.children)
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
           p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
@@ -102,11 +102,11 @@ module IsoDoc
       end
 
       def compose_title(tparts, tnums, lang)
-        t = tparts[:main].nil? ? "" :  tparts[:main].children.to_xml
+        t = tparts[:main].nil? ? "" :  to_xml(tparts[:main].children)
         tparts[:intro] and
-          t = "#{tparts[:intro].children.to_xml} — #{t}"
+          t = "#{to_xml(tparts[:intro].children)} — #{t}"
         tparts[:complementary] and
-          t = "#{t} — #{tparts[:complementary].children.to_xml}"
+          t = "#{t} — #{to_xml(tparts[:complementary].children)}"
         if tparts[:part]
           suffix = part_title(tparts[:part], tnums, lang)
           t = "#{t} — #{suffix}"
@@ -138,19 +138,19 @@ module IsoDoc
         # intro, main, complementary, part, amd = title_parts(isoxml, lang)
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-        set(:doctitlemain, tp[:main] ? tp[:main].children.to_xml : "")
+        set(:doctitlemain, tp[:main] ? to_xml(tp[:main].children) : "")
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
+        tp[:intro] and set(:doctitleintro, to_xml(tp[:intro].children))
         tp[:complementary] and
-          set(:doctitlecomplementary, tp[:complementary].children.to_xml)
+          set(:doctitlecomplementary, to_xml(tp[:complementary].children))
         set(:doctitlepartlabel, part_prefix(tn, lang))
-        set(:doctitlepart, tp[:part].children.to_xml) if tp[:part]
+        set(:doctitlepart, to_xml(tp[:part].children)) if tp[:part]
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:doctitleamd, tp[:amd].children.to_xml) if tp[:amd]
+        set(:doctitleamd, to_xml(tp[:amd].children)) if tp[:amd]
         set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
         set(:doctitleaddlabel, add_prefix(tn, lang)) if tn[:add]
-        set(:doctitleadd, tp[:add].children.to_xml) if tp[:add]
+        set(:doctitleadd, to_xml(tp[:add].children)) if tp[:add]
       end
 
       def subtitle(isoxml, _out)
@@ -158,18 +158,18 @@ module IsoDoc
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
 
-        set(:docsubtitlemain, tp[:main] ? tp[:main].children.to_xml : "")
+        set(:docsubtitlemain, tp[:main] ? to_xml(tp[:main].children) : "")
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
+        tp[:intro] and set(:docsubtitleintro, to_xml(tp[:intro].children))
         tp[:complementary] and
-          set(:docsubtitlecomplementary, tp[:complementary].children.to_xml)
+          set(:docsubtitlecomplementary, to_xml(tp[:complementary].children))
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
-        tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
+        tp[:part] and set(:docsubtitlepart, to_xml(tp[:part].children))
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:docsubtitleamd, tp[:amd].children.to_xml) if tp[:amd]
+        set(:docsubtitleamd, to_xml(tp[:amd].children)) if tp[:amd]
         set(:docsubtitleaddlabel, add_prefix(tn, lang)) if tn[:add]
-        set(:docsubtitleadd, tp[:add].children.to_xml) if tp[:add]
+        set(:docsubtitleadd, to_xml(tp[:add].children)) if tp[:add]
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
@@ -225,10 +225,17 @@ module IsoDoc
       end
 
       def editorialgroup(xml)
-        a = xml.at(ns("//bibdata/ext/editorialgroup/@identifier")) and
-          set(:editorialgroup, a.text)
-        a = xml.at(ns("//bibdata/ext/approvalgroup/@identifier")) and
-          set(:approvalgroup, a.text)
+        xpath = <<~XPATH
+          //contributor[role/@type = 'author'][role/description = 'Technical committee']/organization/subdivision/identifier[@type = 'full']
+        XPATH
+        a = xml.xpath(ns(xpath))
+        a.empty? or set(:editorialgroup,
+                        connectives_strip(@i18n.boolean_conj(a.map(&:text),
+                                                             "and")))
+        a = xml.xpath(ns(xpath.sub("author", "authorizer")))
+        a.empty? or set(:approvalgroup,
+                        connectives_strip(@i18n.boolean_conj(a.map(&:text),
+                                                             "and")))
       end
 
       def secretariat(xml)

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -37,6 +37,8 @@ module IsoDoc
                            bib.at(ns("./ext/doctype")))
         hash_translate(bib, @i18n.get["substage_dict"],
                        "./status/substage", nil, @lang)
+        hash_translate(bib, @i18n.get["contributor_role_desc_dict"],
+                       "./contributor/role/description", nil, @lang)
         edition_translate(bib)
       end
 

data/lib/metanorma/iso/basicdoc.rng

@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/iso/front_contributor.rb

@@ -1,17 +1,14 @@
 module Metanorma
   module Iso
     class Converter < Standoc::Converter
-      # def home_agency
-      # "ISO"
-      # end
-
       def default_publisher
         "ISO"
       end
 
       def org_abbrev
         { "International Organization for Standardization" => "ISO",
-          "International Electrotechnical Commission" => "IEC" }
+          "International Electrotechnical Commission" => "IEC",
+          "International Organization for Standardization, International Electrotechnical Commission" => "ISO/IEC" }
       end
 
       def metadata_author(node, xml)
@@ -22,23 +19,59 @@ module Metanorma
       end
 
       def org_organization(node, xml, org)
-        org[:committee] and
-          contrib_committee_build(xml, org[:agency], org) or
-          super
+        if org[:committee]
+          contrib_committee_build(xml, org[:agency], org)
+        else super
+        end
       end
 
       def committee_contributors(node, xml, approval, agency)
-        metadata_approval_committee_types(approval ? node : nil).each do |v|
-          node.attr("#{v}-number") or next
+        t = metadata_approval_committee_types(approval ? node : nil)
+        v = t.first
+        if node.attr("#{v}-number")
           node.attr(v) or node.set_attr(v, "")
-          o = { source: [v], role: approval ? "authorizer" : "author",
-                default_org: false, committee: true, agency:,
-                desc: v.sub(/^approval-/, "").tr("-", " ").capitalize }
+          o = committee_contrib_org_prep(node, v, approval, agency)
+          o[:groups] = t
+          o[:approval] = approval
           org_contributor(node, xml, o)
         end
         approval or committee_contributors_approval(node, xml, agency)
       end
 
+      def committee_contrib_org_prep(node, type, approval, agency)
+        agency_arr, agency_abbrev =
+          committee_org_prep_agency(node, type, agency, [], [])
+        { source: [type], role: approval ? "authorizer" : "author",
+          default_org: false, committee: true, agency: agency_arr,
+          agency_abbrev:,
+          desc: type.sub(/^approval-/, "").tr("-", " ").capitalize }.compact
+      end
+
+      def committee_org_prep_agency(node, type, agency, agency_arr, agency_abbr)
+        i = 1
+        suffix = ""
+        while node.attr("#{type}-number#{suffix}") ||
+            node.attr("#{type}#{suffix}")
+          agency_arr << (node.attr("#{type}-agency#{suffix}") || agency)
+          agency_abbr << node.attr("#{type}-agency-abbr#{suffix}")
+          i += 1
+          suffix = "_#{i}"
+        end
+        [agency_arr, agency_abbr]
+      end
+
+      def org_attrs_complex_parse(node, opts, source)
+        i = 1
+        suffix = ""
+        ret = []
+        while node.attr("#{source}-number#{suffix}") || node.attr("#{source}#{suffix}")
+          ret << extract_org_attrs_complex(node, opts, source, suffix)
+          i += 1
+          suffix = "_#{i}"
+        end
+        ret
+      end
+
       def committee_contributors_approval(node, xml, agency)
         o = { name: agency, role: "authorizer", default_org: false,
               desc: "Agency", committee: false }
@@ -52,13 +85,42 @@ module Metanorma
       end
 
       def contrib_committee_build(xml, agency, committee)
-        name = org_abbrev.invert[agency] and agency = name
+        if name = org_abbrev.invert[agency]
+          committee[:agency_abbrev] = agency
+          agency = name
+        end
         xml.name agency
-        xml.subdivision do |o|
-            o.name committee[:name]
-            committee[:abbr] and o.abbreviation committee[:abbr]
-            committee[:ident] and o.identifier committee[:ident]
+        s = committee
+        loop do
+          contrib_committee_subdiv(xml, s)
+          s = s[:subdiv] or break
         end
+        abbr = committee[:agency_abbrev] and xml.abbreviation abbr
+        full_committee_id(xml.parent)
+      end
+
+      def contrib_committee_subdiv(xml, committee)
+        contributors_committees_filter_empty?(committee) and return
+        xml.subdivision **attr_code(type: committee[:desc]) do |o|
+          o.name committee[:name]
+          # s = committee[:subdiv] and contrib_committee_subdiv(o, s)
+          committee[:abbr] and o.abbreviation committee[:abbr]
+          committee[:ident] and o.identifier committee[:ident]
+        end
+      end
+
+      def full_committee_id(contrib)
+        ret = full_committee_agency_id(contrib)
+        ids = contrib.xpath("./subdivision").map { |x| x.at("./identifier")&.text }
+        ins = contrib.at("./subdivision/identifier") and
+          ins.next = "<identifier type='full'>#{ret}#{ids.join('/')}</identifier>"
+      end
+
+      def full_committee_agency_id(contrib)
+        agency = contrib.at("./abbreviation")&.text
+        ret = agency == default_publisher ? "" : "#{agency} "
+        /^\s+/.match?(ret) and ret = ""
+        ret
       end
 
       COMMITTEE_ABBREVS =
@@ -66,16 +128,58 @@ module Metanorma
           "workgroup" => "WG" }.freeze
 
       def committee_abbrev(type, number, level)
+        number.nil? || number.empty? and return
         type ||= COMMITTEE_ABBREVS[level.sub(/^approval-/, "")]
         type == "Other" and type = ""
         "#{type} #{number}".strip
       end
 
       def org_attrs_parse(node, opts)
-        super&.map do |x|
-          x.merge(agency: opts[:agency], abbr: opts[:abbr],
+        opts_orig = opts.dup
+        ret = []
+        ret << super&.map&.with_index do |x, i|
+          x.merge(agency: opts.dig(:agency, i),
+                  agency_abbrev: opts.dig(:agency_abbrev, i), abbr: opts[:abbr],
                   committee: opts[:committee], default_org: opts[:default_org])
         end
+        opts_orig[:groups]&.each_with_index do |g, i|
+          i.zero? and next
+          contributors_committees_pad_multiples(ret, node, g)
+          opts = committee_contrib_org_prep(node, g, opts_orig[:approval], nil)
+          ret << super
+        end
+        #ret = contributors_committees_filter_empty(ret)
+        #ret.first
+        ret = contributors_committees_nest1(ret)
+      end
+
+      # ensure there is subcommittee, workgroup -number_2, -number_3 etc
+      # to parse mutlple tech committees
+      def contributors_committees_pad_multiples(committees, node, group)
+        committees.each_with_index do |_r, j|
+          suffix = j.zero? ? "" : "_#{j + 1}"
+          node.attr("#{group}#{suffix}") or
+            node.set_attr("#{group}#{suffix}", "")
+          node.attr("#{group}-number#{suffix}") or
+            node.set_attr("#{group}-number#{suffix}", "")
+        end
+      end
+
+      def contributors_committees_filter_empty?(committee)
+            committee[:name].empty? &&
+              (committee[:ident].nil? || %w(WG TC SC).include?(committee[:ident]))
+      end
+
+      def contributors_committees_nest1(committees)
+        committees.empty? and return committees
+        committees = committees.reverse
+        committees.each_with_index do |m, i|
+          i.zero? and next
+          m.each_with_index do |m1, j|
+            m1[:subdiv] = committees[i - 1][j]
+          end
+        end
+        committees[-1]
       end
 
       def metadata_publisher(node, xml)
@@ -93,7 +197,10 @@ module Metanorma
       def metadata_editorial_committee(node, xml)
         xml.editorialgroup do |a|
           %w(technical-committee subcommittee workgroup).each do |v|
-            node.attr("#{v}-number") and committee_component(v, node, a)
+            val = node.attr("#{v}-number")
+            val && !val.empty? and committee_component(v, node, a)
+            a.parent.xpath("./#{v.gsub('-', '_')}[not(node())][not(@number)]")
+              .each(&:remove)
           end
           node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
         end
@@ -106,6 +213,8 @@ module Metanorma
             &.split(%r{[/,;]}))
           types.each do |v|
             node.attr("#{v}-number") and committee_component(v, node, a)
+            a.parent.xpath("./#{v.gsub('-', '_')}[not(node())][not(@number)]")
+              .each(&:remove)
           end
         end
       end
@@ -124,6 +233,21 @@ module Metanorma
           xml.agency v
         end
       end
+
+      def committee_component(compname, node, out)
+        i = 1
+        suffix = ""
+        while node.attr(compname + suffix)
+          num = node.attr("#{compname}-number#{suffix}")
+                          name = node.attr(compname + suffix)
+                          (!num.nil? && !num.empty?) || (!name.nil? && !name.empty?) and
+          out.send compname.gsub(/-/, "_"), name,
+            **attr_code(number: num,
+                               type: node.attr("#{compname}-type#{suffix}"))
+          i += 1
+          suffix = "_#{i}"
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/isodoc.rng

@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.1.1".freeze
+    VERSION = "3.1.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -50,5 +50,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="