metanorma-ietf 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0e7013a9c1c4dc1e68120b61238fbd30241630349e0c9b8f84b73c4b51eb59
-  data.tar.gz: eb27229d92af97141eaaaa446cd86bf70b28a06c9f35ef6da8e2535e696e6d11
+  metadata.gz: 8f6e4443d3285113f0feed7ef1361e5d4b66658596fedf93dac1202fbb726c7e
+  data.tar.gz: 3c789caaf85f315377767b52a2f473dc91869f6b180b5dd72d0924bbed7fd777
 SHA512:
-  metadata.gz: 3a59ffbbadc531aed8203951b6727c0eb9c9218e8826ceceb9578e9ab4b79775eaaa096fca3ee96bfcbfa3101e24384201c041b5a5769911d8f609cc76a15c74
-  data.tar.gz: 02146517cb6d24b14565e24424fcc191a8d64eae2dc985be127d9897474871b368c88844cf4b0e6c8a6b386ed0d73617ba4bef2a58854319dd3cf5db07fe4618
+  metadata.gz: 327449e74a50a023b69472a9e25bd8dd9b6b796ea13b8f97f555bee6d88c4f28a937600bdd7f3628acbff6ae8a56bb8dc17638ec6699dcf20f219da7a142d9f9
+  data.tar.gz: c1edfb038d079c034ce052f0b747dd3182c5361c5718904ad3083074016ae4c0eef3df2d9d9a56fe0d08a125448e090f540703a2ae830b3b9d2ceaad459f71e5

data/lib/metanorma/ietf/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/ietf/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/ietf/front.rb

@@ -7,12 +7,19 @@ module Metanorma
 
       def metadata_author(node, xml)
         personal_author(node, xml)
+        committee_contributors(node, xml, default_publisher, {})
       end
 
+      def org_author(node, xml); end
+
       def default_publisher
         "IETF"
       end
 
+      def metadata_committee_types(_node)
+        %w(workgroup)
+      end
+
       def org_abbrev
         { "Internet Engineering Task Force" => "IETF" }
       end
@@ -109,10 +116,10 @@ module Metanorma
         pi_code(rfc_pis, pi)
       end
 
-      def pi_code(rfc_pis, pi)
+      def pi_code(rfc_pis, processing_instruction)
         rfc_pis.each_pair do |k, v|
           v.nil? and next
-          pi.send k.to_s, v
+          processing_instruction.send k.to_s, v
         end
       end
     end

data/lib/metanorma/ietf/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.2 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -871,6 +883,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>
@@ -2233,6 +2251,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/ietf/relaton-ietf.rng

@@ -1,13 +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">
   <include href="biblio-standoc.rng">
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <zeroOrMore>
-          <ref name="committee"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="DocumentType">
       <choice>
         <value>rfc</value>
@@ -78,11 +71,6 @@ listed on &lt;http://www.ietf.org/iesg/area.html</a:documentation>
       </ref>
     </optional>
   </define>
-  <define name="committee">
-    <element name="committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
   <define name="area">
     <element name="area">
       <choice>

data/lib/metanorma/ietf/validate.rb

@@ -33,7 +33,8 @@ module Metanorma
 
       def workgroup_validate(doc)
         @workgroups.empty? and return
-        doc.xpath("//bibdata/ext/editorialgroup/workgroup").each do |wg|
+        doc.xpath("//bibdata/contributor[role/description = 'committee']/" \
+          "organization/subdivision[@type = 'Workgroup']/name").each do |wg|
           wg_norm = wg.text.sub(/ (Working|Research) Group$/, "")
           @workgroups.include?(wg_norm) and next
           @log.add("Document Attributes", nil,

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.6.1".freeze
+    VERSION = "3.6.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data