metanorma-iso 3.1.2 → 3.1.3

data/lib/isodoc/iso/metadata.rb

@@ -23,32 +23,26 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
-        published_default(isoxml)
+        published = published_default(isoxml)
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
-        docstatus and docstatus1(isoxml, docstatus)
+        docstatus and docstatus1(isoxml, docstatus, published)
         docscheme = isoxml.at(ns("//presentation-metadata[name" \
           "[text() = 'document-scheme']]/value"))
         docscheme and set(:document_scheme, docscheme.text)
       end
 
-      def docstatus1(isoxml, docstatus)
+      def docstatus1(isoxml, docstatus, published)
         set(:stage, docstatus.text)
         set(:stage_int, docstatus.text.to_i)
         set(:substage_int, isoxml.at(ns("//bibdata/status/substage"))&.text)
-        set(:unpublished, unpublished(docstatus.text))
         set(:statusabbr,
             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/ext/doctype"))&.text))
-        unpublished(docstatus.text) and
-          set(:stageabbr, docstatus["abbreviation"])
-      end
-
-      def unpublished(status)
-        status.to_i.positive? && status.to_i < 60
+        !published and set(:stageabbr, docstatus["abbreviation"])
       end
 
       def docid(isoxml, _out)
@@ -187,13 +181,13 @@ module IsoDoc
         set(:tc, tcid)
       end
 
+      COMMITTEE = "//bibdata/contributor[role/@type = 'author'] " \
+        "[role/description = 'committee']/organization".freeze
+
       def tc_base(xml, grouptype)
-        tc_num = xml.at(ns("//bibdata/ext/#{grouptype}/" \
-                           "technical-committee/@number")) or return nil
-        tc_type = xml.at(ns("//bibdata/ext/#{grouptype}/technical-committee/" \
-                            "@type"))&.text || "TC"
-        tc_type == "Other" and tc_type = ""
-        "#{tc_type} #{tc_num.text}".strip
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Technical committee']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def sc(xml)
@@ -202,12 +196,9 @@ module IsoDoc
       end
 
       def sc_base(xml, grouptype)
-        sc_num = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
-                           "@number")) or return nil
-        sc_type = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
-                            "@type"))&.text || "SC"
-        sc_type == "Other" and sc_type = ""
-        "#{sc_type} #{sc_num.text}"
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Subcommittee']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def wg(xml)
@@ -216,18 +207,13 @@ module IsoDoc
       end
 
       def wg_base(xml, grouptype)
-        wg_num = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
-                           "@number")) or return
-        wg_type = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
-                            "@type"))&.text || "WG"
-        wg_type == "Other" and wg_type = ""
-        "#{wg_type} #{wg_num.text}"
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Workgroup']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def editorialgroup(xml)
-        xpath = <<~XPATH
-          //contributor[role/@type = 'author'][role/description = 'Technical committee']/organization/subdivision/identifier[@type = 'full']
-        XPATH
+        xpath = "#{COMMITTEE}/subdivision/identifier[@type = 'full']"
         a = xml.xpath(ns(xpath))
         a.empty? or set(:editorialgroup,
                         connectives_strip(@i18n.boolean_conj(a.map(&:text),
@@ -239,7 +225,9 @@ module IsoDoc
       end
 
       def secretariat(xml)
-        sec = xml.at(ns("//bibdata/ext/editorialgroup/secretariat"))
+        sec = xml.at(ns("//bibdata/contributor[role/@type = 'author']" \
+          "[role/description = 'secretariat']/organization/subdivision" \
+          "[@type = 'Secretariat']/name"))
         set(:secretariat, sec.text) if sec
       end
 

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -1,35 +1,6 @@
 module IsoDoc
   module Iso
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def bibdata(docxml)
-        super
-        editorialgroup_identifier(docxml)
-      end
-
-      def editorialgroup_identifier(docxml)
-        %w(editorialgroup approvalgroup).each do |v|
-          docxml.xpath(ns("//bibdata/ext/#{v}")).each do |a|
-            editorialgroup_identifier1(a)
-          end
-        end
-      end
-
-      def editorialgroup_identifier1(group)
-        agency = group.xpath(ns("./agency"))&.map(&:text)
-        ret = %w(technical-committee subcommittee workgroup)
-          .each_with_object([]) do |v, m|
-          m << editorialgroup_identifier2(group, v)
-        end
-        group["identifier"] = (agency + ret.compact).join("/")
-      end
-
-      def editorialgroup_identifier2(group, level)
-        a = group.at(ns("./#{level}")) or return nil
-        type = a["type"]
-        type&.casecmp("other")&.zero? and type = ""
-        "#{type} #{a['number']}".strip
-      end
-
       def bibdata_i18n(bib)
         hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype",
                        "//presentation-metadata/doctype-alias", @lang)

data/lib/isodoc/iso/presentation_section.rb

@@ -15,9 +15,9 @@ module IsoDoc
 
       def warning_for_missing_metadata_create(docxml)
         ret = ""
-        docxml.at(ns("//bibdata/ext//secretariat")) or
+        docxml.at(ns("//bibdata//contributor/role[description = 'secretariat']")) or
           ret += "<p>Secretariat is missing.</p>"
-        docxml.at(ns("//bibdata/ext//editorialgroup")) or
+        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']")) ||

data/lib/metanorma/iso/biblio-standoc.rng

@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>

data/lib/metanorma/iso/biblio.rng

@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>

data/lib/metanorma/iso/cleanup.rb

@@ -100,30 +100,6 @@ module Metanorma
         super
       end
 
-      def bibdata_cleanup(xmldoc)
-        super
-        approval_groups_rename(xmldoc)
-        editorial_groups_agency(xmldoc)
-        editorial_group_types(xmldoc)
-      end
-
-      def approval_groups_rename(xmldoc)
-        %w(technical-committee subcommittee workgroup).each do |v|
-          xmldoc.xpath("//bibdata//approval-#{v}").each { |a| a.name = v }
-        end
-      end
-
-      def editorial_groups_agency(xmldoc)
-        pubs = extract_publishers(xmldoc)
-        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
-          pubs.reverse_each do |p|
-            if e.children.empty? then e << "<agency>#{p}</agency>"
-            else e.children.first.previous = "<agency>#{p}</agency>"
-            end
-          end
-        end
-      end
-
       def extract_publishers(xmldoc)
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/" \
                      "organization").each_with_object([]) do |p, m|
@@ -132,25 +108,34 @@ module Metanorma
         end
       end
 
+      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
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
+
+      def published?(status, _xmldoc)
+        status.to_i.positive? && status.to_i >= 60
+      end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        editorial_group_types(xmldoc)
+      end
+
       DEFAULT_EDGROUP_TYPE = { "technical-committee": "TC",
                                subcommittee: "SC", workgroup: "WG" }.freeze
 
       def editorial_group_types(xmldoc)
         %w(technical-committee subcommittee workgroup).each do |v|
-          xmldoc.xpath("//bibdata//#{v} | //bibdata//approval-#{v}").each do |g|
-            g["type"] and next
-            g["type"] = DEFAULT_EDGROUP_TYPE[v.to_sym]
+          v1 = v.sub("-", " ").capitalize
+          xmldoc.xpath("//bibdata//subdivision[@type = '#{v1}']").each do |g|
+            g["subtype"] ||= DEFAULT_EDGROUP_TYPE[v.to_sym]
           end
         end
       end
-
-      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
-        f.at("./preceding-sibling::clause") and return root
-        f
-      end
     end
   end
 end

data/lib/metanorma/iso/front_contributor.rb

@@ -15,7 +15,9 @@ module Metanorma
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
                           default: default_publisher })
-        committee_contributors(node, xml, false, default_publisher)
+        committee_contributors(node, xml, default_publisher,
+                               { approval: false })
+        secretariat_contributor(node, xml, default_publisher)
       end
 
       def org_organization(node, xml, org)
@@ -25,33 +27,40 @@ module Metanorma
         end
       end
 
-      def committee_contributors(node, xml, approval, agency)
-        t = metadata_approval_committee_types(approval ? node : nil)
+      def secretariat_contributor(node, xml, agency)
+        node.attr("secretariat") or return
+        o = committee_contrib_org_prep(node, "secretariat", agency, {})
+        o[:desc] = "secretariat"
+        org_contributor(node, xml, o)
+      end
+
+      def committee_contributors(node, xml, agency, opt)
+        t = metadata_approval_committee_types(opt[:approval] ? node : nil)
         v = t.first
-        if node.attr("#{v}-number")
+        if committee_number_or_name?(node, v, "")
           node.attr(v) or node.set_attr(v, "")
-          o = committee_contrib_org_prep(node, v, approval, agency)
+          o = committee_contrib_org_prep(node, v, agency, opt)
           o[:groups] = t
-          o[:approval] = approval
+          o[:approval] = opt[:approval]
           org_contributor(node, xml, o)
         end
-        approval or committee_contributors_approval(node, xml, agency)
+        opt[:approval] or committee_contributors_approval(node, xml, agency)
       end
 
-      def committee_contrib_org_prep(node, type, approval, agency)
+      def committee_contrib_org_prep(node, type, agency, opt)
         agency_arr, agency_abbrev =
           committee_org_prep_agency(node, type, agency, [], [])
-        { source: [type], role: approval ? "authorizer" : "author",
+        { source: [type], role: opt[:approval] ? "authorizer" : "author",
           default_org: false, committee: true, agency: agency_arr,
-          agency_abbrev:,
-          desc: type.sub(/^approval-/, "").tr("-", " ").capitalize }.compact
+          agency_abbrev:, desc: "committee",
+          subdivtype: 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}")
+        while committee_number_or_name?(node, type, suffix)
           agency_arr << (node.attr("#{type}-agency#{suffix}") || agency)
           agency_abbr << node.attr("#{type}-agency-abbr#{suffix}")
           i += 1
@@ -60,163 +69,37 @@ module Metanorma
         [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 }
         org_contributor(node, xml, o)
       end
 
-      def extract_org_attrs_complex(node, opts, source, suffix)
-        n = node.attr("#{source}-number#{suffix}")
-        t = committee_abbrev(node.attr("#{source}-type#{suffix}"), n, source)
-        super.merge(ident: t).compact
-      end
-
-      def contrib_committee_build(xml, agency, committee)
-        if name = org_abbrev.invert[agency]
-          committee[:agency_abbrev] = agency
-          agency = name
-        end
-        xml.name agency
-        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 =
+      def committee_abbrevs
         { "technical-committee" => "TC", "subcommittee" => "SC",
-          "workgroup" => "WG" }.freeze
+          "workgroup" => "WG" }
+      end
 
-      def committee_abbrev(type, number, level)
+      def committee_ident(type, number, level)
         number.nil? || number.empty? and return
-        type ||= COMMITTEE_ABBREVS[level.sub(/^approval-/, "")]
+        type ||= committee_abbrevs[level.sub(/^approval-/, "")]
         type == "Other" and type = ""
         "#{type} #{number}".strip
       end
 
-      def org_attrs_parse(node, opts)
-        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]
+        committee[:name].empty? &&
+          (committee[:ident].nil? || %w(WG TC
+                                        SC).include?(committee[:ident]))
       end
 
       def metadata_publisher(node, xml)
         super
         # approvals
-        committee_contributors(node, xml, true,
-                               node.attr("approval-agency") || default_publisher)
-      end
-
-      def metadata_committee(node, xml)
-        metadata_editorial_committee(node, xml)
-        metadata_approval_committee(node, xml)
-      end
-
-      def metadata_editorial_committee(node, xml)
-        xml.editorialgroup do |a|
-          %w(technical-committee subcommittee workgroup).each do |v|
-            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
-      end
-
-      def metadata_approval_committee(node, xml)
-        types = metadata_approval_committee_types(node)
-        xml.approvalgroup do |a|
-          metadata_approval_agency(a, node.attr("approval-agency")
-            &.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
+        committee_contributors(
+          node, xml,
+          node.attr("approval-agency") || default_publisher, { approval: true }
+        )
       end
 
       def metadata_approval_committee_types(node)
@@ -226,28 +109,6 @@ module Metanorma
                      approval-workgroup)
         types
       end
-
-      def metadata_approval_agency(xml, list)
-        list = [default_publisher] if list.nil? || list.empty?
-        list.each do |v|
-          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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.0 -->
+<!-- VERSION v2.1.1 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -2233,6 +2233,11 @@ used in document amendments</a:documentation>
       <ref name="RequiredId"/>
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Semantic classification of note</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>