metanorma-ietf 2.4.3 → 2.5.1

data/lib/isodoc/ietf/reqt.rb

@@ -1,79 +1,83 @@
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def recommendation_labels(node)
-      [node.at(ns("./label")), node.at(ns("./title")), 
-       @xrefs.anchor(node['id'], :label, false)]
-    end
-
-    def recommendation_name(node, out, type)
-      label, title, lbl = recommendation_labels(node)
-      out.t **{ keepWithNext: "true" }  do |b|
-        b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def recommendation_labels(node)
+        [node.at(ns("./label")), node.at(ns("./title")),
+         @xrefs.anchor(node["id"], :label, false)]
       end
-      if label || title
-        out.t **{ keepWithNext: "true" }  do |b|
-          label and label.children.each { |n| parse(n,b) }
-          b << "#{clausedelim} " if label && title
-          title and title.children.each { |n| parse(n,b) }
+
+      def recommendation_name(node, out, type)
+        label, title, lbl = recommendation_labels(node)
+        out.t **{ keepWithNext: "true" } do |b|
+          b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+        end
+        if label || title
+          out.t **{ keepWithNext: "true" }  do |b|
+            label and label.children.each { |n| parse(n, b) }
+            b << "#{clausedelim} " if label && title
+            title and title.children.each { |n| parse(n, b) }
+          end
         end
       end
-    end
 
-    def recommendation_attributes(node, out)
-      ret = recommendation_attributes1(node)
-      return if ret.empty?
-      out.ul do |p|
-        ret.each do |l|
-          p.li do |i|
-            i.em { |e| i << l }
+      def recommendation_attributes(node, out)
+        ret = recommendation_attributes1(node)
+        return if ret.empty?
+
+        out.ul do |p|
+          ret.each do |l|
+            p.li do |i|
+              i.em { |_e| i << l }
+            end
           end
         end
       end
-    end
 
-    def recommendation_parse(node, out)
-      recommendation_name(node, out, @i18n.recommendation)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def recommendation_parse(node, out)
+        recommendation_name(node, out, @i18n.recommendation)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def requirement_parse(node, out)
-      recommendation_name(node, out, @i18n.requirement)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def requirement_parse(node, out)
+        recommendation_name(node, out, @i18n.requirement)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def permission_parse(node, out)
-      recommendation_name(node, out, @i18n.permission)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def permission_parse(node, out)
+        recommendation_name(node, out, @i18n.permission)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def inline?(node)
-      return true if node.first_element_child.nil?
-      %w(em link eref xref strong tt sup sub strike keyword smallcap
-         br hr bookmark pagebreak stem origin term preferred admitted
-         deprecates domain termsource modification).include? node.first_element_child.name
-    end
+      def inline?(node)
+        return true if node.first_element_child.nil?
 
-    def requirement_component_parse(node, out)
-      return if node["exclude"] == "true"
-      out1 = out
-      if inline?(node)
-        out.t do |p|
-          p << "INHERIT: " if node.name == "inherit"
-          node.children.each { |n| parse(n, p) }
+        %w(em link eref xref strong tt sup sub strike keyword smallcap
+           br hr bookmark pagebreak stem origin term preferred admitted
+           deprecates domain termsource modification)
+          .include? node.first_element_child.name
+      end
+
+      def requirement_component_parse(node, out)
+        return if node["exclude"] == "true"
+
+        if inline?(node)
+          out.t do |p|
+            p << "INHERIT: " if node.name == "inherit"
+            node.children.each { |n| parse(n, p) }
+          end
+        else
+          node.children.each { |n| parse(n, out) }
         end
-      else
-        node.children.each { |n| parse(n, out) }
       end
     end
   end
 end
-

data/lib/isodoc/ietf/rfc_convert.rb

@@ -52,6 +52,8 @@ module IsoDoc::Ietf
       case node.name
       when "bcp14" then bcp14_parse(node, out)
       when "concept" then concept_parse(node, out)
+      when "verbal-definition", "non-verbal-representation"
+        node.elements.each { |n| parse(n, out) }
       else
         text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         out.t { |p| p << text }

data/lib/isodoc/ietf/terms.rb

@@ -1,63 +1,70 @@
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def definition_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def definition_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def modification_parse(node, out)
-      para = node.at(ns("./p"))
-      out << " -- "
-      para.children.each { |n| parse(n, out) }
-    end
+      def modification_parse(node, out)
+        para = node.at(ns("./p"))
+        out << " -- "
+        para.children.each { |n| parse(n, out) }
+      end
 
-    def deprecated_term_parse(node, out)
-      out.t do |p|
-        p << l10n("#{@i18n.deprecated}: ")
-        node.children.each { |c| parse(c, p) }
+      def deprecated_term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.t do |p|
+          p << l10n("#{@i18n.deprecated}: ")
+          name.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def admitted_term_parse(node, out)
-      out.t do |p|
-        node.children.each { |c| parse(c, p) }
+      def admitted_term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.t do |p|
+          name.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def term_parse(node, out)
-      out.name do |p|
-        node.children.each { |n| parse(n, p) }
+      def term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.name do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def termnote_parse(node, out)
-      note_parse(node, out)
-    end
+      def termnote_parse(node, out)
+        note_parse(node, out)
+      end
 
-    def termref_parse(node, out)
-      out.t do |p|
-        p << "SOURCE: "
-        node.children.each { |n| parse(n, p) }
+      def termref_parse(node, out)
+        out.t do |p|
+          p << "SOURCE: "
+          node.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def termdef_parse(node, out)
-      set_termdomain("")
-      clause_parse(node, out)
-    end
+      def termdef_parse(node, out)
+        set_termdomain("")
+        node.xpath(ns("./definition")).size > 1 and
+          IsoDoc::PresentationXMLConvert.new({}).multidef(node)
+        clause_parse(node, out)
+      end
 
-    def termdocsource_parse(_node, _out); end
+      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) }
+      def concept_parse(node, out)
+        if d = node.at(ns("./renderterm"))
+          out.em do |em|
+            d.children.each { |n| parse(n, em) }
+          end
+          out << " "
         end
-        out << " "
+        out << "[term defined in "
+        r = node.at(ns("./xref | ./eref | ./termref"))
+        parse(r, out)
+        out << "]"
       end
-      out << "[term defined in "
-      r = node.at(ns("./xref | ./eref | ./termref"))
-      parse(r, out)
-      out << "]"
     end
   end
 end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.4.3".freeze
+    VERSION = "2.5.1".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -35,13 +35,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc", "~> 1.7.0"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
-  spec.add_dependency "open-uri"
+  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
 
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -58,30 +44,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
-- !ruby/object:Gem::Dependency
-  name: open-uri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,6 +258,7 @@ files:
 - lib/isodoc/ietf/SVG-1.2-RFC.rng
 - lib/isodoc/ietf/blocks.rb
 - lib/isodoc/ietf/cleanup.rb
+- lib/isodoc/ietf/cleanup_inline.rb
 - lib/isodoc/ietf/footnotes.rb
 - lib/isodoc/ietf/front.rb
 - lib/isodoc/ietf/i18n-en.yaml
@@ -329,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and