metanorma-ietf 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1c57c13cc70de322dae0d520d9643b939a5835975c49cfb64de8dbadad906b
-  data.tar.gz: 9c34b9675c03e4c35754fa1f3e2826d1f7837521e4d82e9e76c3f0876fbd7c40
+  metadata.gz: 64b7510c103e030759b4c5430edf1165dd55859f28a6914f091a8f028400ef95
+  data.tar.gz: '088ba7ce77c62226026e0fab41af28429a16623bc6379cc95d99f4bfa1a8fbe9'
 SHA512:
-  metadata.gz: 8c38a69f9cdac8106505836f5f95e76c5d03600fba62d2ba3a90021292c794d36ece9e6658a581697cb06c29aa8ebdb083e99d94cbb0155f43ae89787fac9d1f
-  data.tar.gz: 678ffc85d78c890e304475f9e0e387287399131e1259d7f034980840157dc488f2de0687291faf0b02de3c617098d7f0f0ed616e95f7fe28b77f95d50c4f2bfc
+  metadata.gz: c12d417a764debe8f8c4003e88730df92e34168c6fa85ecb322f94f63c7775c5c3d425faf2096b561edc7bd1598e95157a07bca6833acb26e2b7e5903b768ceb
+  data.tar.gz: 7117f344165e8150e0acd0fbc397cb73a2ec12e22763c4069d8d05e6f283df5622b998f7ed83eb067730f51e596ed8d9874ced2389e5a8f0d05da286f0bf82d4

data/lib/asciidoctor/ietf/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/isodoc/ietf/blocks.rb

@@ -73,8 +73,8 @@ module IsoDoc::Ietf
 
     def note_label(node)
       n = @xrefs.get[node["id"]]
-      return l10n("#{@note_lbl}: ") if n.nil? || n[:label].nil? || n[:label].empty?
-      l10n("#{@note_lbl} #{n[:label]}: ")
+      return l10n("#{@i18n.note}: ") if n.nil? || n[:label].nil? || n[:label].empty?
+      l10n("#{@i18n.note} #{n[:label]}: ")
     end
 
     def note_parse(node, out)
@@ -98,8 +98,8 @@ module IsoDoc::Ietf
     def example_label(node, div, name)
       n = @xrefs.get[node["id"]]
       div.t **attr_code(anchor: node["id"], keepWithNext: "true") do |p|
-        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
-          l10n("#{@example_lbl} #{n[:label]}")
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+          l10n("#{@i18n.example} #{n[:label]}")
         p << lbl
         name and !lbl.nil? and p << ": "
         name and name.children.each { |n| parse(n, p) }
@@ -139,7 +139,7 @@ module IsoDoc::Ietf
 
     def formula_where(dl, out)
       return unless dl
-      out.t { |p| p << @where_lbl }
+      out.t { |p| p << @i18n.where }
       parse(dl, out)
     end
 

data/lib/isodoc/ietf/reqt.rb

@@ -32,7 +32,7 @@ module IsoDoc::Ietf
     end
 
     def recommendation_parse(node, out)
-      recommendation_name(node, out, @recommendation_lbl)
+      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
@@ -40,7 +40,7 @@ module IsoDoc::Ietf
     end
 
     def requirement_parse(node, out)
-      recommendation_name(node, out, @requirement_lbl)
+      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
@@ -48,7 +48,7 @@ module IsoDoc::Ietf
     end
 
     def permission_parse(node, out)
-      recommendation_name(node, out, @permission_lbl)
+      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

data/lib/isodoc/ietf/rfc_convert.rb

@@ -27,12 +27,12 @@ module IsoDoc::Ietf
           set_pis(docxml, Nokogiri::XML(xml))
     end
 
-    def metadata_init(lang, script, labels)
-      @meta = Metadata.new(lang, script, labels)
+    def metadata_init(lang, script, i18n)
+      @meta = Metadata.new(lang, script, i18n)
     end
 
-    def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
+    def xref_init(lang, script, klass, i18n, options)
+        @xrefs = Xref.new(lang, script, klass, i18n, options)
       end
 
     def extract_delims(text)

data/lib/isodoc/ietf/section.rb

@@ -132,7 +132,7 @@ module IsoDoc::Ietf
       end
     end
 
-    def clause_parse_title(node, div, c1, out)
+    def clause_parse_title(node, div, c1, out, _heading_attrs = {})
       return unless c1
       div.name do |n|
         c1&.children&.each { |c2| parse(c2, n) }

data/lib/isodoc/ietf/terms.rb

@@ -13,7 +13,7 @@ module IsoDoc::Ietf
 
     def deprecated_term_parse(node, out)
       out.t do |p|
-        p << l10n("#{@deprecated_lbl}: ")
+        p << l10n("#{@i18n.deprecated}: ")
         node.children.each { |c| parse(c, p) }
       end
     end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-   VERSION = "2.1.3".freeze
+   VERSION = "2.2.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "mathml2asciimath"
 
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement