metanorma-ietf 3.3.10 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2c9fa6b75fa9f59989e179010230e67343367105c8243802ea4737048af37e
-  data.tar.gz: 8c483e33478e424fa4f0023fdd6c1bb286f7d3411f738f8787f47e21b667e7a5
+  metadata.gz: 002c1dbf3082b89ae330b047a9a044f6cea91437c49f1524b495c0c44117910e
+  data.tar.gz: 3cecbf7bcba03f86289b7edfbfa8c34b2645b739d7bd70785a0cac17b91650ba
 SHA512:
-  metadata.gz: 921af978d14ac5079cfc8bbf3d438992ba97c609f40540988bf725cf4f6a81f2523db4dd50688cf822b3bdabe1b4368c652e3c2622b990e1a402a38269baa346
-  data.tar.gz: 14bee8fdffd3d971f777392d6d3dd3d4ef54c9927a476acaa28fd9b3bd9421094467666f025028bca09bceee9b4074028ba3874f7353fb9676035beebb7ff161
+  metadata.gz: 6c1193cb258edcae562cbfe66023db98a438c4ad70a1dc8f1f0c71577cdf6d335fed24ed39e223f190098168fd3c3147d6d6bbebc60352473b9341da78cca621
+  data.tar.gz: b944d99efa37b7616c35d624753da963a344f534c822baa0acacd3f1365c14a1b70e8dd1308e9dff89225008bfd99e8d6077e13a99c30ff6cd1ead676f5d3cf4

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/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/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.0 -->
 <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">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.3.10".freeze
+    VERSION = "3.4.0".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.0"
   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.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement