metanorma-ietf 3.3.10 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2c9fa6b75fa9f59989e179010230e67343367105c8243802ea4737048af37e
-  data.tar.gz: 8c483e33478e424fa4f0023fdd6c1bb286f7d3411f738f8787f47e21b667e7a5
+  metadata.gz: 83a0728840ef2d5d5a7ace72f4bc2dfff97a85b6213e73511e15fd303313440f
+  data.tar.gz: 600e41fd0c3559f1b53ed072e6dc54905c049c3a41655ca2355af9451d0573d3
 SHA512:
-  metadata.gz: 921af978d14ac5079cfc8bbf3d438992ba97c609f40540988bf725cf4f6a81f2523db4dd50688cf822b3bdabe1b4368c652e3c2622b990e1a402a38269baa346
-  data.tar.gz: 14bee8fdffd3d971f777392d6d3dd3d4ef54c9927a476acaa28fd9b3bd9421094467666f025028bca09bceee9b4074028ba3874f7353fb9676035beebb7ff161
+  metadata.gz: 92d3d375108c3d6f441c9070a9c1bd454d8471f92b3fb6fddaaeff9c4f8f15b2fc06cdd46c907ff9fbf2d619632a9551c8d75dac8ad2866fb0994f79841edde7
+  data.tar.gz: f6740373061b304cbda897852a632686eb7675394d179d6ee05ad9bca4b0d1031b0cb45e0a371f5a41490e820b63079dedca33e318ae94d5ede1ca2ea34259d5

data/lib/isodoc/ietf/blocks.rb

@@ -77,6 +77,15 @@ module IsoDoc
         end
       end
 
+      def dl_parse1(dlist, dterm, ddef)
+        dlist.dt **attr_code(anchor: dterm["id"]) do |term|
+          dt_parse(dterm, term)
+        end
+        dlist.dd **attr_code(anchor: ddef["id"]) do |listitem|
+          ddef.children.each { |n| parse(n, listitem) }
+        end
+      end
+
       def note_label(node)
         n = @xrefs.get[node["id"]]
         n.nil? || n[:label].nil? || n[:label].empty? and
@@ -166,9 +175,11 @@ module IsoDoc
       def formula_parse1(node, out)
         out.t **attr_code(anchor: node["id"]) do |p|
           parse(node.at(ns("./stem")), p)
-          lbl = @xrefs.anchor(node["id"], :label, false)
-          lbl.nil? or
-            p << "    (#{lbl})"
+          if lbl = @xrefs.anchor(node["id"], :label, false)
+            lbl.gsub!(%r{</?span[^>]*>}, "")
+            /^\(.+?\)$/.match?(lbl) or lbl = "(#{lbl})"
+            p << "    #{lbl}"
+          end
         end
       end
 

data/lib/isodoc/ietf/cleanup_inline.rb

@@ -3,11 +3,11 @@ module IsoDoc
     class RfcConvert < ::IsoDoc::Convert
       def u_cleanup(xmldoc)
         xmldoc.traverse do |n|
-          next unless n.text?
-          next unless %w(t blockquote li dd preamble td th annotation)
-            .include? n.parent.name
-
-          n.replace(n.text.gsub(/[\u0080-\uffff]/, "<u>\\0</u>"))
+          n.text? or next
+          %w(t blockquote li dd preamble td th annotation)
+            .include? n.parent.name or next
+          n.replace(@c.encode(n.text, :basic).gsub(/[\u0080-\uffff]/,
+                                                   "<u>\\0</u>"))
         end
       end
 

data/lib/isodoc/ietf/inline.rb

@@ -138,7 +138,8 @@ module IsoDoc
                              section: eref_section(node),
                              relative: eref_relative(node),
                              sectionFormat: node["displayFormat"]) do |l|
-          linkend.each { |n| parse(n, l) }
+          linkend.map(&:text).join.strip.empty? or
+            linkend.each { |n| parse(n, l) }
         end
       end
 
@@ -148,10 +149,11 @@ module IsoDoc
       end
 
       def eref_section(node)
-        @isodoc.eref_localities(
+        ret = @isodoc.eref_localities(
           node.xpath(ns("./locality | ./localityStack")), nil, node
-        )&.sub(/^,/, "")&.sub(/^\s*(Sections?|Clauses?)/, "")&.strip
-          &.sub(/,$/, "") || ""
+        ) or return ""
+        ret.gsub(%r{</?span[^>]*>}, "").sub(/^,/, "")
+          .sub(/^\s*(Sections?|Clauses?)/, "").strip.sub(/,$/, "")
       end
 
       def origin_parse(node, out)
@@ -171,6 +173,10 @@ module IsoDoc
       def bookmark_parse(node, out)
         out.bookmark nil, **attr_code(anchor: node["id"])
       end
+
+      def span_parse(node, out)
+        children_parse(node, out)
+      end
     end
   end
 end

data/lib/isodoc/ietf/references.rb

@@ -23,6 +23,10 @@ module IsoDoc
                                                i18nhash: @i18n.get)
       end
 
+      def implicit_reference(bib)
+        bib["hidden"] == "true"
+      end
+
       def bibliography1(node, out)
         out.references **attr_code(anchor: node["id"]) do |div|
           title = node.at(ns("./title")) and div.name do |name|

data/lib/isodoc/ietf/reqt.rb

@@ -12,9 +12,9 @@ module IsoDoc
       end
 
       def recommendation_parse1(node, out)
-        recommendation_name(node.at(ns("./name")), out)
+        recommendation_name(node.at(ns("./fmt-name")), out)
         node.children.each do |n|
-          parse(n, out) unless n.name == "name"
+          parse(n, out) unless n.name == "fmt-name"
         end
       end
 

data/lib/isodoc/ietf/terms.rb

@@ -1,6 +1,10 @@
 module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
+      def set_termdomain(termdomain)
+        @termdomain = termdomain
+      end
+
       def definition_parse(node, out)
         node.children.each { |n| parse(n, out) }
       end
@@ -27,6 +31,10 @@ module IsoDoc
       end
 
       def term_parse(node, out)
+        if domain = node.at(ns("./domain"))
+          set_termdomain(domain.text)
+          domain["hidden"] = "true"
+        end
         name = node.at(ns(".//name"))
         out.name do |p|
           name.children.each { |n| parse(n, p) }
@@ -38,7 +46,12 @@ module IsoDoc
       end
 
       def termdef_parse(node, out)
-        set_termdomain("")
+        if domain = node.at(ns("./domain"))
+          set_termdomain(domain.text)
+          domain["hidden"] = "true"
+        else
+          set_termdomain("")
+        end
         node.xpath(ns("./definition")).size > 1 and
           @isodoc.multidef(node)
         clause_parse(node, out)
@@ -47,15 +60,25 @@ module IsoDoc
       def termdocsource_parse(_node, _out); end
 
       def concept_parse(node, out)
-        if d = node.at(ns("./renderterm"))
-          out.em do |em|
-            d.children.each { |n| parse(n, em) }
-          end
-          out << " "
+        ref = node.at(ns("./xref | ./eref | ./termref"))
+        render = node.at(ns("./renderterm"))
+        !ref && !render and return node.children.each { |n| parse(n, out) }
+        !render or concept_render(render, ref, out)
+        ref or return
+        concept_ref(ref, out)
+      end
+
+      def concept_render(render, ref, out)
+        out.em do |em|
+          render.children.each { |n| parse(n, em) }
         end
+        ref and out << " "
+      end
+
+      def concept_ref(ref, out)
+        ref or return
         out << "[term defined in "
-        r = node.at(ns("./xref | ./eref | ./termref"))
-        parse(r, out)
+        parse(ref, out)
         out << "]"
       end
 

data/lib/isodoc/ietf/xref.rb

@@ -7,12 +7,11 @@ module IsoDoc
         docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
           c = IsoDoc::XrefGen::Counter.new
           notes = t.xpath(ns("./termnote"))
-          notes.each do |n|
-            next if n["id"].nil? || n["id"].empty?
-
+          notes.noblank.each do |n|
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] =
-              anchor_struct(idx, n, @labels["note_xref"], "note", false)
+              anchor_struct(idx, n, @labels["note_xref"], "note",
+                            { container: true })
           end
         end
       end

data/lib/metanorma/ietf/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/ietf/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.1 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.3.10".freeze
+    VERSION = "3.4.2".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.2"
   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.10
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-12-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.9.3
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement