metanorma-ietf 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdae18146fd717cdc3e4edbc6aee7c51e286e93f4f04b08f247d0110c29644d5
-  data.tar.gz: 5990873706f6bab2c18005eba348edc987b54a7600c62889def4579c5f82b622
+  metadata.gz: 6c10eeb240c73eb23dc86cb68f2a74f8931b3e350f68ee763a23256a56795bae
+  data.tar.gz: ee6a1934c755a258adef52e1689eb462297fa34be3a8deb5923ed1da34b945b7
 SHA512:
-  metadata.gz: 8aed3ba6d2fe6b46f5907b71feefc20fe49bcc73c6a68244855eb730dae27c552347e4a3c3ec8f77d190f04f7e8f25560c5cd4d0b4ce00572dead34bdd7674c0
-  data.tar.gz: 854ab1d486f0689509468ec3f3342b38894e27b146abe258bb09d544e2dc8f9df65b1828b64d44589cab485ad09ad71b51859b164e0051599e0be6c6fea84b8c
+  metadata.gz: 89f9bc46f9a5d31116b36402279e8e41db7a23a012368d11acab85c9f87d6e71eb200a327a3f54b3e88e0df2efb997324462eea853996d9a46dc7e78861f09c6
+  data.tar.gz: fa040fe15ba9e856a3fdb5645c7d06773f288a2dd36414772e04f087ccb2acfc52dc13dfc2564025b7b4e9bc3ad0f8eba3b62c1d8a66fef699b186fd3d1e18fd

data/lib/isodoc/ietf/reqt.rb

@@ -1,81 +1,34 @@
 module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
-      def recommendation_labels(node)
-        [node.at(ns("./identifier")), 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}:"))
-        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
+      def recommendation_name(node, out)
+        out.t **{ keepWithNext: "true" } do |p|
+          node.children.each { |n| parse(n, p) }
         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 }
-            end
-          end
-        end
+      def recommendation_parse(node, out)
+        recommendation_parse1(node, out)
       end
 
-      def recommendation_parse(node, out)
-        recommendation_name(node, out, @i18n.recommendation)
-        recommendation_attributes(node, out)
+      def recommendation_parse1(node, out)
+        recommendation_name(node.at(ns("./name")), out)
         node.children.each do |n|
-          parse(n, out) unless %w(identifier title).include? n.name
+          parse(n, out) unless n.name == "name"
         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(identifier title).include? n.name
-        end
+        recommendation_parse1(node, out)
       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(identifier title).include? n.name
-        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
+        recommendation_parse1(node, out)
       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) }
+      def div_parse(node, out)
+        node.children.each do |n|
+          parse(n, out)
         end
       end
     end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -17,8 +17,7 @@ module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
       def convert1(docxml, _filename, _dir)
-        @xrefs.parse docxml
-        info docxml, nil
+        document_preprocess(docxml)
         ret = noko do |xml|
           xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
             make_link(html, docxml)
@@ -30,6 +29,20 @@ module IsoDoc
         set_pis(docxml, Nokogiri::XML(ret))
       end
 
+      def document_preprocess(docxml)
+        @isodoc.reqt_models = Metanorma::Requirements
+          .new({ default: "default", lang: @lang, script: @script,
+                 labels: @i18n.get })
+        info docxml, nil
+        @xrefs.parse docxml
+        @isodoc.xrefs = @xrefs
+        @isodoc.permission(docxml)
+        @isodoc.requirement(docxml)
+        @isodoc.recommendation(docxml)
+        @isodoc.requirement_render(docxml)
+        @xrefs.parse docxml
+      end
+
       def metadata_init(lang, script, i18n)
         @meta = Metadata.new(lang, script, i18n)
       end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.9".freeze
+    VERSION = "3.0.10".freeze
   end
 end

metadata

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