metanorma-ietf 3.3.2 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14265a284f4144c71da7f1e427b520cc6d0e34fe888cb368d0f05423fbbf7958
-  data.tar.gz: b4a6341006304c7bc49b73f12486dc54bf4e7bddee10a87ec16eff99832db7eb
+  metadata.gz: 31d8e42be51ec47f80027b7e16b93b2991d082250b7a4e4b26adea124cdb9007
+  data.tar.gz: 248e9076ba1a755f1439bac879035e6ef917c4ec0f414b612c0ee2bb2465dcc9
 SHA512:
-  metadata.gz: 4f980c68587bf34737ffe6c3117ed76ba6fc4a0b0db662dd75bf93d36ab19b82d0b1599f0179970da8e20d55afc72ad793d3f0c768a90610a90c40682f4508af
-  data.tar.gz: 88b4193027bbba65871acc89ea0bff8fbf06271fc6dc0888ce5f218fbebed3c74797a7edc8f65aa2c8b3d7ae63c40b3639dc17556b22ccbd486fa7dac969734c
+  metadata.gz: aee2b7a6f408086016b8d6da78587a9e70aeff99e31c07da722e064987b5d6346ef61de5c2196e2d9cb24a2d39382f0c07e8b227662f37e32c73e9b1dbb2ee0a
+  data.tar.gz: 6fe3c4365fad2521b94a94f0f851b67313e647114353451ac9d2c40950185a1184cbc2f1c8c0d363521a3a812e1b3de6b798b4461fd5d3107fb0b9a0d6c240b2

data/lib/isodoc/ietf/section.rb

@@ -55,9 +55,9 @@ module IsoDoc
       def rfc_attributes(docxml)
         # t = Time.now.getutc
         obs = xpath_comma(docxml
-          .xpath(ns("//bibdata/relation[@type = 'obsoletes']/bibitem/docidentifier")))
+          .xpath(ns("//bibdata/relation[@type = 'obsoletes']/bibitem/docidentifier[not(@scope)]")))
         upd = xpath_comma(docxml
-          .xpath(ns("//bibdata/relation[@type = 'updates']/bibitem/docidentifier")))
+          .xpath(ns("//bibdata/relation[@type = 'updates']/bibitem/docidentifier[not(@scope)]")))
         {
           docName: @meta.get[:doctype] == "Internet Draft" ? @meta.get[:docnumber] : nil,
           number: @meta.get[:doctype].casecmp?("rfc") ? @meta.get[:docnumber] : nil,

data/lib/metanorma/ietf/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

data/lib/metanorma/ietf/validate.rb

@@ -26,7 +26,7 @@ module Metanorma
       def image_validate(doc)
         doc.xpath("//image").each do |i|
           i["mimetype"] == "image/svg+xml" and next
-          @log.add("MIME", i, "image #{i['src'][0, 40]} is not SVG!",
+          @log.add("Images", i, "image #{i['src'][0, 40]} is not SVG!",
                    severity: 1)
         end
       end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.3.2".freeze
+    VERSION = "3.3.4".freeze
   end
 end

data/lib/relaton/render/fields.rb

@@ -16,7 +16,7 @@ module Relaton
         end
 
         # do not format months
-        def dateformat(date, _hash)
+        def dateformat(date, _hash, _type)
           date.nil? and return nil
           date_range(date)
         end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.8.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement