metanorma-ietf 3.3.9 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0fffd5668b2c2e63c87b719317dd6350c2c31ef1de14b6ddf36bdf0aa9458e6
-  data.tar.gz: 8c50f16816e6f1a7f7406e557e7aa8bcfaff0da1fb9d78b36b452d2484850d0d
+  metadata.gz: 002c1dbf3082b89ae330b047a9a044f6cea91437c49f1524b495c0c44117910e
+  data.tar.gz: 3cecbf7bcba03f86289b7edfbfa8c34b2645b739d7bd70785a0cac17b91650ba
 SHA512:
-  metadata.gz: 929f791db9271527d5a93783efb634b2d6baed93b287628550334422abc5f76ac486e0d214512d180ff22162bb10da7bf0bf15a703d05d968edcb572e7fcd9b6
-  data.tar.gz: 3296b7954e7d90756604d3e939a890a52e15275b6acc02e1d0f8912b314d76eca884c6475ff71b6d48119f4becad569cedd8075d01a6969809d89b21f5ec149e
+  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