metanorma-ietf 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def69cf551c6c50fcb28fcdf04ab02e0d3d9cf83ba3dcd81114c41f71860599f
-  data.tar.gz: 5afc33bb93c93fbc86565d984562a3a61ed02b700e0a1e66a70f47289ef230c9
+  metadata.gz: e0bce55e3d73f441a77b94d2aa6f7f464e727b914dd8e8c6fa67dbf035122d63
+  data.tar.gz: 1eaa61e2a47f793b47653f76e8ff6a7fd53a8f7889a06b9e43e61132cb6b066d
 SHA512:
-  metadata.gz: 4a2c6f8d47d875c1fb896d1fffdc5d5f789c05a679ab474ae7dfbc52795b9df47eb4763164f08c2da964c0de53ad51f91233ea230a8bce9553a31986f19bf4cd
-  data.tar.gz: eb7fbd7913907b01e95f07bd2b28058b1d8c953f5f9b8b8a9c81a6c1638319fbb2ce8f593a3d83970b5ea748fbf34b7d0ba60b73ea5fa8f9c1a41e3076aec6ac
+  metadata.gz: c8f01b1753308bdb0d335a766fa4ed638a417a81433bb6f6b95a02518674d5eff55b3951db0717e748f7dc8dc3d0def3db27ddadb0f0a36105247f666747099b
+  data.tar.gz: af96278d659ea2949ad3aa2a435cdbe17017e171502fdea71cd5c332d13d7f7a2dade54361e8173aaf9b41e0614af7402fed6773d6f978e2388616f929108007

data/lib/asciidoctor/ietf/cleanup.rb

@@ -6,6 +6,8 @@ module Asciidoctor
         abstract_cleanup(xmldoc)
         super
         rfc_anchor_cleanup(xmldoc)
+        cref_cleanup(xmldoc)
+        xmldoc
       end
 
       def abstract_cleanup(xmldoc)
@@ -15,6 +17,21 @@ module Asciidoctor
         end
       end
 
+      def cref_cleanup(xmldoc)
+        xmldoc.xpath("//crefref").each do |r|
+          if c = xmldoc.at("//review[@id = '#{r.text}']")
+            r.replace(c.remove)
+          else
+            @log.add("Crossrefences", r,
+                     "No matching review for cref:[#{r.text}]")
+          end
+        end
+      end
+
+      BCP_KEYWORDS = ["MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+                      "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY",
+                      "OPTIONAL"].freeze
+
       def bcp14_cleanup(xmldoc)
         return unless @bcp_bold
 
@@ -26,12 +43,13 @@ module Asciidoctor
       end
 
       def rfc_anchor_cleanup(xmldoc)
-        map = {}
-        xmldoc.xpath("//bibitem[docidentifier/@type = 'rfc-anchor']").each do |b|
-          next if b.at("./ancestor::bibdata")
+        map = xmldoc.xpath("//bibitem[docidentifier/@type = 'rfc-anchor']")
+          .each_with_object({}) do |b, m|
+          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
+          id = b.at("./docidentifier[@type = 'rfc-anchor']").text
+          m[b["id"]] = id
+          b["id"] = id
         end
         xmldoc.xpath("//eref | //origin").each do |x|
           map[x["bibitemid"]] and x["bibitemid"] = map[x["bibitemid"]]

data/lib/asciidoctor/ietf/converter.rb

@@ -5,10 +5,15 @@ require_relative "./front"
 require_relative "./blocks"
 require_relative "./validate"
 require_relative "./cleanup"
+require_relative "./macros"
 
 module Asciidoctor
   module Ietf
     class Converter < ::Asciidoctor::Standoc::Converter
+      Asciidoctor::Extensions.register do
+        inline_macro Asciidoctor::Ietf::InlineCrefMacro
+      end
+
       XML_ROOT_TAG = "ietf-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/ietf".freeze
 
@@ -113,70 +118,7 @@ module Asciidoctor
         [t, rel]
       end
 
-      def cleanup(xmldoc)
-        bcp14_cleanup(xmldoc)
-        abstract_cleanup(xmldoc)
-        super
-        rfc_anchor_cleanup(xmldoc)
-      end
-
-      BCP_KEYWORDS = ["MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-                      "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", "OPTIONAL"].freeze
-
-      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 | ./ancestor::bibitem")
-
-          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(x)
-        super
-        x.delete("format")
-      end
-
-      def xref_cleanup(xmldoc)
-        super
-        xmldoc.xpath("//xref").each do |x|
-          x.delete("displayFormat")
-          x.delete("relative")
-        end
-      end
-
-      def norm_ref_preface(f)
-      end
+      def norm_ref_preface(sect); end
 
       def clause_parse(attrs, xml, node)
         attrs[:numbered] = node.attr("numbered")

data/lib/asciidoctor/ietf/ietf.rng

@@ -602,7 +602,10 @@
     </define>
   </include>
   <define name="TextElement" combine="choice">
-    <ref name="bcp14"/>
+    <choice>
+      <ref name="bcp14"/>
+      <ref name="review"/>
+    </choice>
   </define>
   <define name="bcp14">
     <element name="bcp14">

data/lib/asciidoctor/ietf/isodoc.rng

@@ -990,6 +990,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="linkmention">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="linkref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -1026,6 +1036,7 @@
       <ref name="svgmap"/>
       <ref name="inputform"/>
       <ref name="toc"/>
+      <ref name="passthrough"/>
     </choice>
   </define>
   <define name="toc">
@@ -1033,6 +1044,14 @@
       <ref name="ul"/>
     </element>
   </define>
+  <define name="passthrough">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -1700,7 +1719,9 @@
       <zeroOrMore>
         <ref name="termgrammar"/>
       </zeroOrMore>
-      <ref name="definition"/>
+      <oneOrMore>
+        <ref name="termdefinition"/>
+      </oneOrMore>
       <zeroOrMore>
         <ref name="termnote"/>
       </zeroOrMore>
@@ -1763,7 +1784,7 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="definition">
+  <define name="termdefinition">
     <element name="definition">
       <oneOrMore>
         <choice>
@@ -1772,6 +1793,9 @@
           <ref name="formula"/>
         </choice>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="termnote">

data/lib/asciidoctor/ietf/macros.rb

@@ -0,0 +1,17 @@
+require "asciidoctor/extensions"
+
+module Asciidoctor
+  module Ietf
+    class InlineCrefMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :cref
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<crefref>#{out}</crefref>}
+      end
+    end
+  end
+end

data/lib/isodoc/ietf/blocks.rb

@@ -64,11 +64,11 @@ module IsoDoc
                   spacing: node["spacing"])
       end
 
-      def dt_parse(dt, term)
-        if dt.elements.empty?
-          term << dt.text
+      def dt_parse(dterm, term)
+        if dterm.elements.empty?
+          term << dterm.text
         else
-          dt.children.each { |n| parse(n, term) }
+          dterm.children.each { |n| parse(n, term) }
         end
       end
 
@@ -108,7 +108,7 @@ module IsoDoc
                 end
           p << lbl
           name and !lbl.nil? and p << ": "
-          name and name.children.each { |n| parse(n, p) }
+          name&.children&.each { |e| parse(e, p) }
         end
       end
 
@@ -139,11 +139,11 @@ module IsoDoc
         @annotation = false
       end
 
-      def formula_where(dl, out)
-        return unless dl
+      def formula_where(dlist, out)
+        return unless dlist
 
         out.t { |p| p << @i18n.where }
-        parse(dl, out)
+        parse(dlist, out)
       end
 
       def formula_parse1(node, out)

data/lib/isodoc/ietf/cleanup.rb

@@ -7,14 +7,32 @@ module IsoDoc::Ietf
       footnote_cleanup(docxml)
       sourcecode_cleanup(docxml)
       annotation_cleanup(docxml)
+      li_cleanup(docxml)
       deflist_cleanup(docxml)
       bookmark_cleanup(docxml)
       aside_cleanup(docxml)
       front_cleanup(docxml)
+      u_cleanup(docxml)
       docxml
     end
 
-    # TODO: insert <u>
+    def u_cleanup(xmldoc)
+      xmldoc.traverse do |n|
+        next unless n.text?
+        next if %w(author organization street city region code country
+                   postalLine email seriesInfo title%).include? n.parent
+
+        n.replace(n.text.gsub(/[\u0080-\uffff]/, "<u>\\0</u>"))
+      end
+    end
+
+    def li_cleanup(xmldoc)
+      xmldoc.xpath("//li[t]").each do |li|
+        next unless li.elements.size == 1
+
+        li.children = li.elements[0].children
+      end
+    end
 
     def front_cleanup(xmldoc)
       xmldoc.xpath("//title").each { |s| s.children = s.text }

data/lib/isodoc/ietf/inline.rb

@@ -1,167 +1,170 @@
 require "mathml2asciimath"
 
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def em_parse(node, out)
-      out.em do |e|
-        node.children.each { |n| parse(n, e) }
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def em_parse(node, out)
+        out.em do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def sup_parse(node, out)
-      out.sup do |e|
-        node.children.each { |n| parse(n, e) }
+      def sup_parse(node, out)
+        out.sup do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def sub_parse(node, out)
-      out.sub do |e|
-        node.children.each { |n| parse(n, e) }
+      def sub_parse(node, out)
+        out.sub do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def tt_parse(node, out)
-      out.tt do |e|
-        node.children.each { |n| parse(n, e) }
+      def tt_parse(node, out)
+        out.tt do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def strong_parse(node, out)
-      out.strong do |e|
-        node.children.each { |n| parse(n, e) }
+      def strong_parse(node, out)
+        out.strong do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def bcp14_parse(node, out)
-      out.bcp14 do |e|
-        node.children.each { |n| parse(n, e) }
+      def bcp14_parse(node, out)
+        out.bcp14 do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def strike_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+      def strike_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def smallcap_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+      def smallcap_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def keyword_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+      def keyword_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def text_parse(node, out)
-      return if node.nil? || node.text.nil?
-      text = node.to_s
-      out << text
-    end
+      def text_parse(node, out)
+        return if node.nil? || node.text.nil?
 
-    def stem_parse(node, out)
-      stem = case node["type"]
-             when "MathML" then MathML2AsciiMath.m2a(node.children.to_xml)
-             else
-               HTMLEntities.new.encode(node.text)
-             end
-      out << "#{@openmathdelim} #{stem} #{@closemathdelim}"
-    end
+        text = node.to_s
+        out << text
+      end
 
-    def page_break(_out)
-    end
+      def stem_parse(node, out)
+        stem = case node["type"]
+               when "MathML" then MathML2AsciiMath.m2a(node.children.to_xml)
+               else HTMLEntities.new.encode(node.text)
+               end
+        out << "#{@openmathdelim} #{stem} #{@closemathdelim}"
+      end
 
-    def pagebreak_parse(_node, _out)
-    end
+      def page_break(_out); end
 
-    def br_parse(node, out)
-      if @sourcecode
+      def pagebreak_parse(_node, _out); end
+
+      def br_parse(_node, out)
         out.br
       end
-    end
 
-    def hr_parse(node, out)
-    end
+      def hr_parse(node, out); end
 
-    def link_parse(node, out)
-      out.eref **attr_code(target: node["target"]) do |l|
-        node.children.each { |n| parse(n, l) }
+      def link_parse(node, out)
+        out.eref **attr_code(target: node["target"]) do |l|
+          node.children.each { |n| parse(n, l) }
+        end
       end
-    end
 
-    def image_parse(node, out, caption)
-      attrs = { src: node["src"], title: node["title"],
-                align: node["align"], name: node["filename"],
-                anchor: node["id"], type: "svg",
-                alt: node["alt"] }
-      out.artwork **attr_code(attrs)
-      image_title_parse(out, caption)
-    end
+      def image_parse(node, out, caption)
+        attrs = { src: node["src"], title: node["title"],
+                  align: node["align"], name: node["filename"],
+                  anchor: node["id"], type: "svg",
+                  alt: node["alt"] }
+        out.artwork **attr_code(attrs)
+        image_title_parse(out, caption)
+      end
 
-    def image_title_parse(out, caption)
-      unless caption.nil?
-        out.t **{ align: "center", keepWithPrevious: "true" } do |p|
-          p << caption.to_s
+      def image_title_parse(out, caption)
+        unless caption.nil?
+          out.t **{ align: "center", keepWithPrevious: "true" } do |p|
+            p << caption.to_s
+          end
         end
       end
-    end
 
-    def xref_parse(node, out)
-      out.xref **attr_code(target: node["target"], format: node["format"],
-                           relative: node["relative"]) do |l|
-                             l << get_linkend(node)
-                           end
-    end
+      def xref_parse(node, out)
+        out.xref **attr_code(target: node["target"], format: node["format"],
+                             relative: node["relative"]) do |l|
+                               l << get_linkend(node)
+                             end
+      end
 
-    def get_linkend(node)
-      contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }.
-        select { |c| !c.text? || /\S/.match(c) }
-      !contents.empty? and
-        return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
-      ""
-    end
+      def get_linkend(node)
+        contents = node.children.reject do |c|
+                     %w{locality localityStack}.include? c.name
+                   end
+          .select { |c| !c.text? || /\S/.match(c) }
+        !contents.empty? and
+          return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+        ""
+      end
 
-    def eref_parse(node, out)
-      linkend = node.children.reject { |c| %w{locality localityStack}.include? c.name }
-      relative = node["relative"] ||
-        node.at(ns(".//locality[@type = 'anchor']/referenceFrom"))&.text || ""
-      section = eref_clause(node.xpath(ns("./locality | ./localityStack")), nil) || ""
-      section = "" if relative.empty?
-      out.relref **attr_code(target: node["bibitemid"], section: section,
-                             relative: relative,
-                             displayFormat: node["displayFormat"]) do |l|
-                               linkend.each { |n| parse(n, l) }
-                             end
-    end
+      def eref_parse(node, out)
+        linkend = node.children.reject do |c|
+          %w{locality localityStack}.include? c.name
+        end
+        relative = node["relative"] ||
+          node.at(ns(".//locality[@type = 'anchor']/referenceFrom"))&.text || ""
+        section = eref_clause(node.xpath(ns("./locality | ./localityStack")),
+                              nil) || ""
+        #section = "" unless relative.empty?
+        out.relref **attr_code(target: node["bibitemid"], section: section,
+                               relative: relative,
+                               displayFormat: node["displayFormat"]) do |l|
+                                 linkend.each { |n| parse(n, l) }
+                               end
+      end
 
-    def eref_clause(refs, target)
-      ret = []
-      ret1 = ""
-      refs.each do |l|
-        if l.name == "localityStack"
-          ret << ret1
-          ret1 = ""
-          ret << eref_clause1(l.elements, target)
-        else
-          ret1 += eref_clause1([l], target)
+      def eref_clause(refs, target)
+        ret = []
+        ret1 = ""
+        refs.each do |l|
+          if l.name == "localityStack"
+            ret << ret1
+            ret1 = ""
+            ret << eref_clause1(l.elements, target)
+          else ret1 += eref_clause1([l], target)
+          end
         end
+        ret << ret1
+        ret.reject { |c| c.nil? || c.empty? }.join("; ")
       end
-      ret << ret1
-      ret.reject { |c| c.nil? || c.empty? }.join("; ")
-    end
 
-    def eref_clause1(refs, target)
-      refs.each do |l|
-        next unless %w(clause section).include? l["type"]
-        return l&.at(ns("./referenceFrom"))&.text
+      def eref_clause1(refs, _target)
+        refs.each do |l|
+          next unless %w(clause section).include? l["type"]
+
+          return l&.at(ns("./referenceFrom"))&.text
+        end
+        ""
       end
-      return ""
-    end
 
-    def index_parse(node, out)
-      out.iref nil, **attr_code(item: node.at(ns("./primary")).text, primary: node["primary"],
-                                subitem: node&.at(ns("./secondary"))&.text)
-    end
+      def index_parse(node, out)
+        out.iref nil, **attr_code(item: node.at(ns("./primary")).text,
+                                  primary: node["primary"],
+                                  subitem: node&.at(ns("./secondary"))&.text)
+      end
 
-    def bookmark_parse(node, out)
-      out.bookmark nil, **attr_code(anchor: node["id"])
+      def bookmark_parse(node, out)
+        out.bookmark nil, **attr_code(anchor: node["id"])
+      end
     end
   end
 end

data/lib/isodoc/ietf/references.rb

@@ -55,15 +55,29 @@ module IsoDoc
           uris&.each do |u|
             r.format nil, **attr_code(target: u.text, type: u["type"])
           end
-          docidentifiers = bib.xpath(ns("./docidentifier"))
-          id = render_identifier(bibitem_ref_code(bib))
-          !id[1].nil? && id[1] != "(NO ID)" and r.refcontent id[1]
-          docidentifiers&.each do |u|
-            if %w(DOI IETF).include? u["type"]
-              r.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
-                                            name: u["type"])
-            end
-          end
+          docidentifier_render(bib, r)
+        end
+      end
+
+      def docidentifier_render(bib, out)
+        docidentifiers = bib.xpath(ns("./docidentifier"))
+        id = render_identifier(bibitem_ref_code(bib))
+        !id[1].nil? && id[1] != "(NO ID)" and out.refcontent id[1]
+        docidentifiers&.each do |u|
+          u["type"] == "DOI" and
+            out.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
+                                            name: "DOI")
+          u["type"] == "IETF" and docidentifier_ietf(u, out)
+        end
+      end
+
+      def docidentifier_ietf(ident, out)
+        if /^RFC /.match?(ident.text)
+          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^RFC 0*/, ""),
+                                          name: "RFC")
+        elsif /^I-D\./.match?(ident.text)
+          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^I-D\./, ""),
+                                          name: "Internet-Draft")
         end
       end
 

data/lib/isodoc/ietf/validation.rb

@@ -165,7 +165,7 @@ module IsoDoc
       def seriesInfo_check(xml)
         ret = []
         xml.root["ipr"] == "none" and return []
-        rfcinfo = xml.at("//seriesInfo[@name = 'RFC']")
+        rfcinfo = xml.at("//front//seriesInfo[@name = 'RFC']")
         rfcnumber = xml.root["number"]
         rfcinfo && rfcnumber && rfcnumber != rfcinfo["value"] and
           ret << "Mismatch between <rfc number='#{rfcnumber}'> "\

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.2".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,9 +37,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "isodoc", "~> 1.7.0"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "nokogiri", "~> 1.11.6"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
   spec.add_dependency "open-uri"
 
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.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: metanorma-ietf-data
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: open-uri
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +280,7 @@ files:
 - lib/asciidoctor/ietf/front.rb
 - lib/asciidoctor/ietf/ietf.rng
 - lib/asciidoctor/ietf/isodoc.rng
+- lib/asciidoctor/ietf/macros.rb
 - lib/asciidoctor/ietf/reqt.rng
 - lib/asciidoctor/ietf/validate.rb
 - lib/isodoc/ietf/SVG-1.2-RFC.rng