metanorma-ietf 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158e5eef3f87d8f6ce1242339d819343ea8b8ab744f522eafb9c7f16e20f6c55
-  data.tar.gz: '089428469df3542fa94fcb535aa54d0a899b74b3aea35567239f5a24b4525366'
+  metadata.gz: 9a0a93b0a29195d775f23e2ba37414870b8e708a006bba0498b3113aebe787c9
+  data.tar.gz: 53a29d58e5c0c601c29de23d0515d43e690458b8b848f67cacf5064403c3b834
 SHA512:
-  metadata.gz: 33db0a9a909d0253f3b91fed431e7194c53abab8ae396cea3a6944bcc56d1f2fbade0c79444d7b5d87deeab75a8e33ed1771e574a21fbf77884d9052a3b69a30
-  data.tar.gz: 9217f91cfb840cafb5dcdda4520dfcf378634d568960a02580760fd182f0d7f4f47f23b90b143aeff3209135fc62e3c782eb5d6383b39932149666cbbdc3d7c9
+  metadata.gz: e89e41ec81886905668543d6f24ad31ef6ea9cf0a38551f56f1fa3e8007bb6068421b221d0d835951054894146d218b47ae0fe9d1cc1a621f7df6f85a7442e3d
+  data.tar.gz: 11d9d25373f48d7fb3197e5107168c64b8230d519f1e45b410dec5403aab6158f81c8f0e34c2553aff7fa1f32f5974d7a8d7a77a6e5233fb0ef65aa1a300a2c6

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
 

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/asciidoctor/ietf/cleanup.rb

@@ -0,0 +1,81 @@
+module Asciidoctor
+  module Ietf
+    class Converter < ::Asciidoctor::Standoc::Converter
+      def cleanup(xmldoc)
+        bcp14_cleanup(xmldoc)
+        abstract_cleanup(xmldoc)
+        super
+        rfc_anchor_cleanup(xmldoc)
+      end
+
+      def abstract_cleanup(xmldoc)
+        xmldoc.xpath("//abstract[not(text())]").each do |x|
+          x.remove
+          warn "Empty abstract section removed"
+        end
+      end
+
+      def bcp14_cleanup(xmldoc)
+        return unless @bcp_bold
+
+        xmldoc.xpath("//strong").each do |s|
+          next unless BCP_KEYWORDS.include?(s.text)
+
+          s.name = "bcp14"
+        end
+      end
+
+      def rfc_anchor_cleanup(xmldoc)
+        map = {}
+        xmldoc.xpath("//bibitem[docidentifier/@type = 'rfc-anchor']").each do |b|
+          next if b.at("./ancestor::bibdata")
+
+          map[b["id"]] = b.at("./docidentifier[@type = 'rfc-anchor']").text
+          b["id"] = b.at("./docidentifier[@type = 'rfc-anchor']").text
+        end
+        xmldoc.xpath("//eref | //origin").each do |x|
+          map[x["bibitemid"]] and x["bibitemid"] = map[x["bibitemid"]]
+        end
+        xmldoc
+      end
+
+      def smartquotes_cleanup(xmldoc)
+        xmldoc.traverse do |n|
+          next unless n.text?
+
+          n.replace(HTMLEntities.new.encode(
+                      n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'")
+                      .gsub(/\u201c|\u201d|\u201e|\u201f/, '"'), :basic
+                    ))
+        end
+        xmldoc
+      end
+
+      def xref_to_eref(xref)
+        super
+        xref.delete("format")
+      end
+
+      def xref_cleanup(xmldoc)
+        super
+        xmldoc.xpath("//xref").each do |x|
+          x.delete("displayFormat")
+          x.delete("relative")
+        end
+      end
+
+      def quotesource_cleanup(xmldoc)
+        xmldoc.xpath("//quote/source | //terms/source").each do |x|
+          if x["target"]&.match?(URI::DEFAULT_PARSER.make_regexp)
+            x["uri"] = x["target"]
+            x.delete("target")
+          else
+            xref_to_eref(x)
+          end
+        end
+      end
+
+      def section_names_refs_cleanup(xml); end
+    end
+  end
+end

data/lib/asciidoctor/ietf/converter.rb

@@ -4,6 +4,7 @@ require "isodoc/ietf/rfc_convert"
 require_relative "./front"
 require_relative "./blocks"
 require_relative "./validate"
+require_relative "./cleanup"
 
 module Asciidoctor
   module Ietf
@@ -22,13 +23,13 @@ module Asciidoctor
         @draft = node.attributes.has_key?("draft")
         @workgroups = cache_workgroup(node)
         @bcp_bold = !node.attr?("no-rfc-bold-bcp14")
-        @xinclude = node.attr?("use-xinclude") 
+        @xinclude = node.attr?("use-xinclude")
         super
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        rfc_converter(node).convert(@filename + ".xml")
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        rfc_converter(node).convert("#{@filename}.xml")
       end
 
       def doctype(node)
@@ -63,12 +64,12 @@ module Asciidoctor
         f, c = xref_text(node)
         f1, c = eref_text(node) if f.nil?
         t, rel = xref_rel(node)
+        attrs = { target: t, type: "inline", displayFormat: f1, format: f,
+                  relative: rel }
         noko do |xml|
-          xml.xref **attr_code(target: t, type: "inline",
-                               displayFormat: f1, format: f,
-                               relative: rel ) do |x|
-                                 x << c
-                               end
+          xml.xref **attr_code(attrs) do |x|
+            x << c
+          end
         end.join
       end
 
@@ -140,7 +141,8 @@ module Asciidoctor
       def rfc_anchor_cleanup(xmldoc)
         map = {}
         xmldoc.xpath("//bibitem[docidentifier/@type = 'rfc-anchor']").each do |b|
-          next if b.at("./ancestor::bibdata")
+          next if b.at("./ancestor::bibdata | ./ancestor::bibitem")
+
           map[b["id"]] = b.at("./docidentifier[@type = 'rfc-anchor']").text
           b["id"] = b.at("./docidentifier[@type = 'rfc-anchor']").text
         end
@@ -194,34 +196,24 @@ module Asciidoctor
         clause_parse(attrs, xml, node)
       end
 
-      def quotesource_cleanup(xmldoc)
-        xmldoc.xpath("//quote/source | //terms/source").each do |x|
-          if x["target"] =~ URI::DEFAULT_PARSER.make_regexp
-            x["uri"] = x["target"]
-            x.delete("target")
-          else
-            xref_to_eref(x)
-          end
-        end
-      end
-
       def inline_indexterm(node)
         noko do |xml|
           node.type == :visible and xml << node.text.sub(/^primary:(?=\S)/, "")
           terms = (node.attr("terms") || [node.text]).map { |x| xml_encode(x) }
-          if /^primary:\S/.match(terms[0])
+          if /^primary:\S/.match?(terms[0])
             terms[0].sub!(/^primary:/, "")
             has_primary = true
           end
-          xml.index **attr_code(primary: has_primary) do |i|
-            i.primary { |x| x << terms[0] }
-            a = terms.dig(1) and i.secondary { |x| x << a }
-            a = terms.dig(2) and i.tertiary { |x| x << a }
-          end
+          inline_indexterm1(has_primary, terms, xml)
         end.join
       end
 
-      def section_names_refs_cleanup(x)
+      def inline_indexterm1(has_primary, terms, xml)
+        xml.index **attr_code(primary: has_primary) do |i|
+          i.primary { |x| x << terms[0] }
+          a = terms[1] and i.secondary { |x| x << a }
+          a = terms[2] and i.tertiary { |x| x << a }
+        end
       end
 
       def html_extract_attributes(node)

data/lib/asciidoctor/ietf/front.rb

@@ -119,7 +119,7 @@ module Asciidoctor
           strict: node.attr("strict"),
           compact: node.attr("compact"),
           subcompact: node.attr("subcompact"),
-          toc: node.attr("toc-include") == "false" ? "no" : "yes",
+          tocinclude: node.attr("toc-include") == "false" ? "no" : "yes",
           tocdepth: node.attr("toc-depth"),
           symrefs: node.attr("sym-refs"),
           sortrefs: node.attr("sort-refs"),

data/lib/asciidoctor/ietf/ietf.rng

@@ -842,7 +842,7 @@
         </element>
       </optional>
       <optional>
-        <element name="toc">
+        <element name="tocinclude">
           <text/>
         </element>
       </optional>

data/lib/asciidoctor/ietf/isodoc.rng

@@ -204,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -899,7 +911,7 @@
   </include>
   <!-- end overrides -->
   <define name="docsubtype">
-    <element name="docsubtype">
+    <element name="subdoctype">
       <ref name="DocumentSubtype"/>
     </element>
   </define>
@@ -955,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -972,8 +1011,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -981,6 +1026,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1212,6 +1260,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1473,26 +1527,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/asciidoctor/ietf/validate.rb

@@ -1,4 +1,4 @@
-require "open-uri"
+require "metanorma/ietf/data/workgroups"
 
 module Asciidoctor
   module Ietf
@@ -34,59 +34,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "ietf.rng"))
       end
 
-      def wgcache_name
-        "#{Dir.home}/.metanorma-ietf-workgroup-cache.json"
-      end
-
-      def open_wg_cache(node)
-        node.attr("flush-caches") == "true" and
-          FileUtils.rm wgcache_name, force: true
-        wg = []
-        if Pathname.new(wgcache_name).file?
-          begin
-            File.open(wgcache_name, "r") { |f| wg = JSON.parse(f.read) }
-          rescue Exception => e
-            warn "Cache #{wgcache_name} is invalid, drop it"
-          end
-        end
-        [wg, wgcache_name]
-      end
-
-      def cache_workgroup_ietf(wg, _b)
-        warn "Reading workgroups from https://tools.ietf.org/wg/..."
-        URI.open("https://tools.ietf.org/wg/") do |f|
-          f.each_line do |l|
-            l.scan(%r{<td width="50%" style='padding: 0 1ex'>([^<]+)</td>}) do |w|
-              wg << w[0].gsub(/\s+$/, "").gsub(/ Working Group$/, "")
-            end
-          end
-        end
-        wg
-      end
-
-      def cache_workgroup_irtf(wg, _b)
-        warn "Reading workgroups from https://irtf.org/groups..."
-        URI.open("https://irtf.org/groups", ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |f|
-          f.each_line do |l|
-            l.scan(%r{<a title="([^"]+) Research Group"[^>]+>([^<]+)<}) do |w|
-              wg << w[0].gsub(/\s+$/, "")
-              wg << w[1].gsub(/\s+$/, "") # abbrev
-            end
-          end
-        end
-        wg
-      end
-
-      def cache_workgroup(node)
-        wg, wgcache_name = open_wg_cache(node)
-        if wg.empty?
-          File.open(wgcache_name, "w") do |b|
-            wg = cache_workgroup_ietf(wg, b)
-            wg = cache_workgroup_irtf(wg, b)
-            b << wg.to_json
-          end
-        end
-        wg
+      def cache_workgroup(_node)
+        Metanorma::Ietf::Data::WORKGROUPS
       end
     end
   end

data/lib/isodoc/ietf/cleanup.rb

@@ -48,6 +48,17 @@ module IsoDoc::Ietf
       figure_postamble(docxml)
       figure_unnest(docxml)
       figure_footnote_cleanup(docxml)
+      figure_data_uri(docxml)
+    end
+
+    def figure_data_uri(docxml)
+      docxml.xpath("//artwork").each do |a|
+        next unless %r{^data:image/svg\+xml;base64}.match?(a["src"])
+
+        f = Metanorma::Utils::save_dataimage(a["src"])
+        a.delete("src")
+        a.children = File.read(f).sub(%r{<\?.+\?>}, "")
+      end
     end
 
     def figure_unnest(docxml)
@@ -133,7 +144,7 @@ module IsoDoc::Ietf
         docxml << "<back/>" and endnotes = docxml.at("//back")
       end
       endnotes << "<section><name>Endnotes</name></section>"
-      endnotes = docxml.at("//back/section[last()]")
+      docxml.at("//back/section[last()]")
     end
 
     def image_cleanup(docxml)
@@ -153,13 +164,13 @@ module IsoDoc::Ietf
         s.children = s.children.to_xml.gsub(%r{<br/>\n}, "\n")
           .gsub(%r{\s+(<t[ >])}, "\\1").gsub(%r{</t>\s+}, "</t>")
         sourcecode_remove_markup(s)
-        text = HTMLEntities.new.decode(s.children.to_xml.sub(/\A\n+/, ""))
-        s.children = "<![CDATA[#{text}]]>"
+        s.children = "<![CDATA[#{HTMLEntities.new.decode(s
+        .children.to_xml.sub(/\A\n+/, ''))}]]>"
       end
     end
 
-    def sourcecode_remove_markup(s)
-      s.traverse do |n|
+    def sourcecode_remove_markup(node)
+      node.traverse do |n|
         next if n.text?
         next if %w(name callout annotation note sourcecode).include? n.name
 

data/lib/isodoc/ietf/references.rb

@@ -3,6 +3,9 @@ module IsoDoc::Ietf
     # TODO displayreference will be implemented as combination of autofetch and user-provided citations
 
     def bibliography(isoxml, out)
+      isoxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = docid_prefix(i["type"], i.text)
+      end
       isoxml.xpath(ns("//bibliography/references | "\
                       "//bibliography/clause[.//references] | "\
                       "//annex/clause[.//references] | "\
@@ -31,22 +34,21 @@ module IsoDoc::Ietf
       i = 0
       f.xpath(ns("./bibitem | ./note")).each do |b|
         next if implicit_reference(b)
+
         i += 1 if b.name == "bibitem"
         if b.name == "note" then note_parse(b, div)
-        elsif(is_ietf(b)) then ietf_bibitem_entry(div, b, i)
+        elsif is_ietf(b) then ietf_bibitem_entry(div, b, i)
         else
           nonstd_bibitem(div, b, i, biblio)
         end
       end
     end
 
-    def nonstd_bibitem(list, b, ordinal, bibliography)
+    def nonstd_bibitem(list, b, _ordinal, _bibliography)
       uris = b.xpath(ns("./uri"))
       target = nil
       uris&.each do |u|
-        if u["type"] == "src" then
-          target = u.text
-        end
+        target = u.text if u["type"] == "src"
       end
       list.reference **attr_code(target: target,
                                  anchor: b["id"]) do |r|
@@ -66,7 +68,8 @@ module IsoDoc::Ietf
           r.refcontent id[1]
         docidentifiers&.each do |u|
           if %w(DOI IETF).include? u["type"]
-            r.seriesInfo nil, **attr_code(value: u.text, name: u["type"])
+            r.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
+                                          name: u["type"])
           end
         end
       end
@@ -86,7 +89,7 @@ module IsoDoc::Ietf
                                           "'publisher']"))
       auths.each do |a|
         role = a.at(ns("./role[@type = 'editor']")) ? "editor" : nil
-        p = a&.at(ns("./person/name")) and 
+        p = a&.at(ns("./person/name")) and
           relaton_person_to_author(p, role, f) or
           relaton_org_to_author(a&.at(ns("./organization")), role, f)
       end
@@ -99,17 +102,17 @@ module IsoDoc::Ietf
         p&.xpath(ns("./forename"))&.map { |i| i.text[0] }&.join(" ")
       initials = nil if initials.empty?
       f.author nil,
-        **attr_code(fullname: fullname, asciiFullname: fullname&.transliterate,
-                    role: role, surname: surname, initials: initials,
-                    asciiSurname: fullname ? surname&.transliterate : nil,
-                    asciiInitials: fullname ? initials&.transliterate : nil)
+               **attr_code(fullname: fullname, asciiFullname: fullname&.transliterate,
+                           role: role, surname: surname, initials: initials,
+                           asciiSurname: fullname ? surname&.transliterate : nil,
+                           asciiInitials: fullname ? initials&.transliterate : nil)
     end
 
-    def relaton_org_to_author(o, role, f)
+    def relaton_org_to_author(o, _role, f)
       name = o&.at(ns("./name"))&.text
       abbrev = o&.at(ns("./abbreviation"))&.text
-      f.author do |a|
-        f.organization name, **attr_code(ascii: name&.transliterate, 
+      f.author do |_a|
+        f.organization name, **attr_code(ascii: name&.transliterate,
                                          abbrev: abbrev)
       end
     end
@@ -119,6 +122,7 @@ module IsoDoc::Ietf
         b.at(ns("./date[@type = 'issued']")) ||
         b.at(ns("./date[@type = 'circulated']"))
       return unless date
+
       attr = date_attr(date&.at(ns("./on | ./from"))&.text) || return
       f.date **attr_code(attr)
     end
@@ -145,13 +149,14 @@ module IsoDoc::Ietf
       end
     end
 
-    def ietf_bibitem_entry(div, b, i)
+    def ietf_bibitem_entry(div, b, _i)
       url = b&.at(ns("./uri[@type = 'xml']"))&.text
       div << "<xi:include href='#{url}'/>"
     end
 
     def is_ietf(b)
       return false if !@xinclude
+
       url = b.at(ns("./uri[@type = 'xml']")) or return false
       /xml2rfc\.tools\.ietf\.org/.match(url)
     end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -15,7 +15,7 @@ require_relative "./init"
 
 module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
-    def convert1(docxml, filename, dir)
+    def convert1(docxml, _filename, _dir)
       @xrefs.parse docxml
       info docxml, nil
       xml = noko do |xml|
@@ -51,6 +51,7 @@ module IsoDoc::Ietf
     def error_parse(node, out)
       case node.name
       when "bcp14" then bcp14_parse(node, out)
+      when "concept" then concept_parse(node, out)
       else
         text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         out.t { |p| p << text }
@@ -59,6 +60,7 @@ module IsoDoc::Ietf
 
     def omit_docid_prefix(prefix)
       return true if prefix == "IETF"
+
       super
     end
 
@@ -67,9 +69,9 @@ module IsoDoc::Ietf
     end
 
     def postprocess(result, filename, _dir)
-      result = from_xhtml(cleanup(to_xhtml(textcleanup(result)))).
-        sub(/<!DOCTYPE[^>]+>\n/, "").
-        sub(/(<rfc[^<]+? )lang="[^"]+"/, "\\1")
+      result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+        .sub(/<!DOCTYPE[^>]+>\n/, "")
+        .sub(/(<rfc[^<]+? )lang="[^"]+"/, "\\1")
       File.open(filename, "w:UTF-8") { |f| f.write(result) }
       schema_validate(filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/ietf/section.rb

@@ -33,7 +33,7 @@ module IsoDoc::Ietf
         strict: node&.at(ns("//pi/strict"))&.text || "yes",
         compact: node&.at(ns("//pi/compact"))&.text || "yes",
         subcompact: node&.at(ns("//pi/subcompact"))&.text || "no",
-        toc: node&.at(ns("//pi/toc-include"))&.text,
+        toc: node&.at(ns("//pi/tocinclude"))&.text,
         tocdepth: node&.at(ns("//pi/toc-depth"))&.text || "4",
         symrefs: node&.at(ns("//pi/sym-refs"))&.text || "yes",
         sortrefs: node&.at(ns("//pi/sort-refs"))&.text || "yes",

data/lib/isodoc/ietf/terms.rb

@@ -1,6 +1,5 @@
 module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
-
     def definition_parse(node, out)
       node.children.each { |n| parse(n, out) }
     end
@@ -46,7 +45,19 @@ module IsoDoc::Ietf
       clause_parse(node, out)
     end
 
-    def termdocsource_parse(_node, _out)
+    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 << " "
+      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.3.3".freeze
+    VERSION = "2.4.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -33,11 +33,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.7.0"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "metanorma-ietf-data"
   spec.add_dependency "nokogiri", "~> 1.11.6"
   spec.add_dependency "open-uri"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-ietf-data
+  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'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +289,7 @@ files:
 - lib/asciidoctor/ietf/basicdoc.rng
 - lib/asciidoctor/ietf/biblio.rng
 - lib/asciidoctor/ietf/blocks.rb
+- lib/asciidoctor/ietf/cleanup.rb
 - lib/asciidoctor/ietf/converter.rb
 - lib/asciidoctor/ietf/front.rb
 - lib/asciidoctor/ietf/ietf.rng
@@ -320,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="