metanorma-generic 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50b039e644c1672d5e945c482602c872a21bceff11ac3f7d4d9d768639b81b1
-  data.tar.gz: 3fbcdb088cf39e43227dc48cc23874af81829e743d7a583e3408300f06dfbad8
+  metadata.gz: 02271ab979ae1b84b53ca3112e5e3cae9d98eceb5b575dd030f20a261b2ad734
+  data.tar.gz: '0893a275a0feb6027bb51f7b1437bc6317b9bc90027bac8e0ace8cfc2d55912d'
 SHA512:
-  metadata.gz: 11057878ee61b576be907979f6db2d66a30dea8b19b886e1aacce53d50b254bf989369b4f50d16cd1a16643412936b21d76d2f41b74e9e1cd0dd94316913615d
-  data.tar.gz: 5a7b58efe110889513dd6621fdd3bfc365b8eb2df02b91ca5ccad467dce4fd7ebb3a70b38e3257a2e3ed50e1a6e7fd9d1367efedc73450d5a8d0d53ec187c74b
+  metadata.gz: b0d2736096d9be12eed06c33b4c2ca9e8511aac8868e4036488e197fafa4bfd015bea9de1533da0e8ba7743aa5fb2690cf44ee5d7c3fbe14a647419817df73ec
+  data.tar.gz: e17f63256ce28036017aaee6ce37601ac595eaca68f7ae2917f46141e774c985ba88e33c95c175d4d111d491fe036f2049bd3da23ae7f61e29658e2c73c00a57

data/lib/isodoc/generic/metadata.rb

@@ -53,21 +53,15 @@ module IsoDoc
 
       def author(isoxml, _out)
         super
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
+        tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name"))
         set(:tc, tc.text) if tc
       end
 
       def stage_abbr(status)
-        return super unless configuration.stage_abbreviations
-
+        configuration.stage_abbreviations or return super
         Hash(configuration.stage_abbreviations).dig(status)
       end
 
-      def unpublished(status)
-        stages = configuration&.published_stages || ["published"]
-        !(Array(stages).map { |m| m.downcase }.include? status.downcase)
-      end
-
       def doctype(isoxml, _out)
         super
         b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) ||
@@ -77,10 +71,8 @@ module IsoDoc
 
       def xmlhash2hash(hash)
         ret = {}
-        return ret if hash.nil? || hash[:kind] != "element"
-
-        hash[:attr].nil? or
-          hash[:attr].each { |k, v| ret["#{hash[:name]}_#{k}"] = v }
+        hash.nil? || hash[:kind] != "element" and return ret
+        hash[:attr]&.each { |k, v| ret["#{hash[:name]}_#{k}"] = v }
         ret[hash[:name]] = hash[:kids] ? xmlhash2hash_kids(hash) : hash[:text]
         ret
       end

data/lib/metanorma/generic/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/generic/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/generic/converter.rb

@@ -121,7 +121,8 @@ module Metanorma
       def committee_validate(xmldoc)
         committees = Array(configuration&.committees) || return
         committees.empty? and return
-        xmldoc.xpath("//bibdata/ext/editorialgroup/committee").each do |c|
+        xmldoc.xpath("//bibdata/contributor[role/description = 'committee']/" \
+            "organization/subdivision/name").each do |c|
           committees.include? c.text or
             @log.add("Document Attributes", nil,
                      "#{c.text} is not a recognised committee")
@@ -182,6 +183,11 @@ module Metanorma
         f.is_a? Hash and f[@lang] and return baselocation(f[@lang])
         super
       end
+
+      def published?(status, _xmldoc)
+        stages = configuration&.published_stages || ["published"]
+        (Array(stages).map(&:downcase).include? status.downcase)
+      end
     end
   end
 end

data/lib/metanorma/generic/front.rb

@@ -21,18 +21,8 @@ module Metanorma
         Array(configuration.relations) || []
       end
 
-      def metadata_committee(node, xml)
-        node.attr("committee") or return
-        xml.editorialgroup do |a|
-          a.committee node.attr("committee"),
-                      **attr_code(type: node.attr("committee-type"))
-          i = 2
-          while node.attr("committee_#{i}")
-            a.committee node.attr("committee_#{i}"),
-                        **attr_code(type: node.attr("committee-type_#{i}"))
-            i += 1
-          end
-        end
+      def metadata_committee_types(_node)
+        Array(configuration.committee_types || "committee")
       end
 
       def metadata_status(node, xml)

data/lib/metanorma/generic/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>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "3.1.2".freeze
+    VERSION = "3.1.3".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -21,6 +21,7 @@ module Metanorma
         bibliography_titles
         boilerplate
         committees
+        committee_types
         document_namespace
         docid_template
         doctypes

data/metanorma.yml.example

@@ -42,6 +42,9 @@ metadata_extensions:
   - security
 published_stages:
   - published
+committee_types:
+  - Committee
+  - Workgroup
 committees:
   - TC 1
 relations:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc