metanorma-ietf 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f207305bf9db4f24f830dca4e8b4eddc49ccc550704c65f091111225339a5b
-  data.tar.gz: fa78827c2391a0c0b4a2b788771da05bed92fae965f8b4a0a944b51a525a1fa2
+  metadata.gz: f7aa109dac18747b04bbbc7b429e16c79af695a2b04c0717cb302e330f813f39
+  data.tar.gz: e25ae275c7c5de72a5917c3cf00b74a73d35d9aa302f32f45c6fac954db93f99
 SHA512:
-  metadata.gz: dbb040f4b685c29ee35bccff130f061fdb5665542425ca18aeb366e09afdf39dd645edf0b8bbac2eaa4ffd88f09d27fa65578002d08f13ff52d084b5fe3b81ff
-  data.tar.gz: 0221363b8c7b38fb0ba2765ebfaec2312e2868a7c75c59508049bc0d8191e34a226cbb7ec229e066283d20ddb3aefcef69c776ef7095599619431955ecbdd6f7
+  metadata.gz: f839dcd5804af5ad1513a3be1cf7c5130c6a8cdec22ab2e23738d29d589715e78dca9824385d0a9e00a0e7770df72700975838c183b7eccc4d176eecd8b09a5e
+  data.tar.gz: 41745aeefd8fce750193618471488dbe2b1a2bbf2cafdfff70ff8b9cd9f59e04eef25ed06cdac7b6c6a12b406fdb5425014ad7e683fcbf8d31f40661030fc439

data/lib/isodoc/ietf/i18n-en.yaml

@@ -1,5 +1,5 @@
-term_def_boilerplate:
-no_terms_boilerplate:
-internal_terms_boilerplate:
-external_terms_boilerplate:
-internal_external_terms_boilerplate:
+term_def_boilerplate: ""
+no_terms_boilerplate: ""
+internal_terms_boilerplate: ""
+external_terms_boilerplate: ""
+internal_external_terms_boilerplate: ""

data/lib/isodoc/ietf/references.rb

@@ -7,10 +7,10 @@ module IsoDoc
         isoxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
           i.children = docid_prefix(i["type"], i.text)
         end
-        isoxml.xpath(ns("//bibliography/references | "\
-                        "//bibliography/clause[.//references] | "\
-                        "//annex/clause[.//references] | "\
-                        "//annex/references | "\
+        isoxml.xpath(ns("//bibliography/references | " \
+                        "//bibliography/clause[.//references] | " \
+                        "//annex/clause[.//references] | " \
+                        "//annex/references | " \
                         "//sections/clause[.//references]")).each do |f|
           bibliography1(f, out)
         end
@@ -64,15 +64,15 @@ module IsoDoc
         !id[:sdo].nil? && id[:sdo] != "(NO ID)" and out.refcontent id[:sdo]
         docidentifiers&.each do |u|
           u["type"] == "DOI" and
-            out.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
+            out.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI[  ]/, ""),
                                             name: "DOI")
           %w(IETF RFC).include?(u["type"]) and docidentifier_ietf(u, out)
         end
       end
 
       def docidentifier_ietf(ident, out)
-        if /^RFC /.match?(ident.text)
-          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^RFC 0*/, ""),
+        if /^RFC[  ]/.match?(ident.text)
+          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^RFC[  ]0*/, ""),
                                           name: "RFC")
         elsif /^I-D\./.match?(ident.text)
           out.seriesInfo nil, **attr_code(value: ident.text.sub(/^I-D\./, ""),
@@ -99,15 +99,15 @@ module IsoDoc
       end
 
       def relaton_to_author(bib, node)
-        auths = bib.xpath(ns("./contributor[xmlns:role/@type = 'author' or "\
+        auths = bib.xpath(ns("./contributor[xmlns:role/@type = 'author' or " \
                              "xmlns:role/@type = 'editor']"))
         auths.empty? and
-          auths = bib.xpath(ns("./contributor[xmlns:role/@type = "\
+          auths = bib.xpath(ns("./contributor[xmlns:role/@type = " \
                                "'publisher']"))
         auths.each do |a|
           role = a.at(ns("./role[@type = 'editor']")) ? "editor" : nil
-          p = a&.at(ns("./person/name")) and
-            relaton_person_to_author(p, role, node) or
+          (p = a&.at(ns("./person/name")) and
+            relaton_person_to_author(p, role, node)) or
             relaton_org_to_author(a&.at(ns("./organization")), role, node)
         end
       end
@@ -115,9 +115,7 @@ module IsoDoc
       def relaton_person_to_author(pers, role, node)
         full = pers&.at(ns("./completename"))&.text
         surname = pers&.at(ns("./surname"))&.text
-        initials = pers&.xpath(ns("./initial"))&.map do |i|
-                     i.text
-                   end&.join(" ") ||
+        initials = pers&.xpath(ns("./initial"))&.map(&:text)&.join(" ") ||
           pers&.xpath(ns("./forename"))&.map { |i| i.text[0] }&.join(" ")
         initials = nil if initials.empty?
         node.author nil, **attr_code(
@@ -143,9 +141,8 @@ module IsoDoc
         date = bib.at(ns("./date[@type = 'published']")) ||
           bib.at(ns("./date[@type = 'issued']")) ||
           bib.at(ns("./date[@type = 'circulated']"))
-        return unless date
-
-        attr = date_attr(date&.at(ns("./on | ./from"))&.text) || return
+        date or return
+        attr = date_attr(date.at(ns("./on | ./from"))&.text) or return
         node.date **attr_code(attr)
       end
 

data/lib/isodoc/ietf/table.rb

@@ -1,43 +1,45 @@
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def table_attrs(node)
-      attr_code(anchor: node["id"], align: node["align"])
-    end
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def table_attrs(node)
+        attr_code(anchor: node["id"], align: node["align"])
+      end
 
-    def table_parse(node, out)
-      @in_table = true
-      out.table **table_attrs(node) do |t|
-        table_title_parse(node, out)
-        thead_parse(node, t)
-        tbody_parse(node, t)
-        tfoot_parse(node, t)
+      def table_parse(node, out)
+        @in_table = true
+        out.table **table_attrs(node) do |t|
+          table_title_parse(node, out)
+          thead_parse(node, t)
+          tbody_parse(node, t)
+          tfoot_parse(node, t)
+        end
+        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./note")).each { |n| parse(n, out) }
+        @in_table = false
       end
-      (dl = node.at(ns("./dl"))) && parse(dl, out)
-      node.xpath(ns("./note")).each { |n| parse(n, out) }
-      @in_table = false
-    end
 
-    def table_title_parse(node, out)
-      name = node.at(ns("./name")) || return
-      out.name do |p|
-        name.children.each { |n| parse(n, p) }
+      def table_title_parse(node, out)
+        name = node.at(ns("./name")) || return
+        out.name do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def tr_parse(node, out, ord, totalrows, header)
-      out.tr do |r|
-        node.elements.each do |td|
-          attrs = make_tr_attr(td, ord, totalrows - 1, header)
-          r.send td.name, **attrs do |entry|
-            td.children.each { |n| parse(n, entry) }
+      def tr_parse(node, out, ord, totalrows, header)
+        out.tr do |r|
+          node.elements.each do |td|
+            attrs = make_tr_attr(td, ord, totalrows - 1, header)
+            r.send td.name, **attrs do |entry|
+              td.children.each { |n| parse(n, entry) }
+            end
           end
         end
       end
-    end
 
-    def make_tr_attr(td, row, totalrows, header)
-      attr_code(rowspan: td["rowspan"], colspan: td["colspan"],
-                align: td["align"] )
+      def make_tr_attr(cell, _row, _totalrows, _header)
+        attr_code(rowspan: cell["rowspan"], colspan: cell["colspan"],
+                  align: cell["align"])
+      end
     end
   end
 end

data/lib/metanorma/ietf/biblio.rng

@@ -1316,7 +1316,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/ietf/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -1570,7 +1580,7 @@
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>
@@ -2653,7 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
-      <value>modspec</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.1.0".freeze
+    VERSION = "3.1.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath