metanorma-ietf 3.3.0 → 3.3.2

data/lib/isodoc/ietf/front.rb

@@ -1,247 +1,248 @@
 require "sterile"
 
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def make_front(out, isoxml)
-      info(isoxml, out)
-      out.front do |front|
-        title isoxml, front
-        seriesinfo isoxml, front
-        author isoxml, front
-        date isoxml, front
-        area isoxml, front
-        workgroup isoxml, front
-        keyword isoxml, front
-        abstract isoxml, front
-        note isoxml, front
-        boilerplate isoxml, front
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def make_front(out, isoxml)
+        info(isoxml, out)
+        out.front do |front|
+          title isoxml, front
+          seriesinfo isoxml, front
+          author isoxml, front
+          date isoxml, front
+          area isoxml, front
+          workgroup isoxml, front
+          keyword isoxml, front
+          abstract isoxml, front
+          note isoxml, front
+          boilerplate isoxml, front
+        end
       end
-    end
 
-    def info(isoxml, out)
-      @meta.areas isoxml, out
-      super
-    end
+      def info(isoxml, out)
+        @meta.areas isoxml, out
+        super
+      end
 
-    def output_if_translit(text)
-      return nil if text.nil?
+      def output_if_translit(text)
+        text.nil? and return nil
+        text.transliterate == text ? nil : text.transliterate
+      end
 
-      text.transliterate == text ? nil : text.transliterate
-    end
+      def title(_isoxml, front)
+        title = @meta.get[:doctitle] or return
+        front.title title, **attr_code(abbrev: @meta.get[:docabbrev],
+                                       ascii: @meta.get[:docascii] ||
+                                       output_if_translit(title))
+      end
 
-    def title(_isoxml, front)
-      title = @meta.get[:doctitle] or return
-      front.title title, **attr_code(abbrev: @meta.get[:docabbrev],
-                                     ascii: (@meta.get[:docascii] ||
-                                     output_if_translit(title)))
-    end
+      def seriesinfo(isoxml, front)
+        rfc_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Rfc"
+        id_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Internet Draft"
+      end
 
-    def seriesinfo(isoxml, front)
-      rfc_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Rfc"
-      id_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Internet Draft"
-    end
+      def seriesinfo_attr(isoxml)
+        attr_code(value: @meta.get[:docnumber] || "",
+                  asciiValue: output_if_translit(@meta.get[:docnumber]),
+                  status: @meta.get[:stage],
+                  stream: isoxml&.at(ns("//bibdata/series[@type = 'stream']/" \
+                                        "title"))&.text)
+      end
 
-    def seriesinfo_attr(isoxml)
-      attr_code(value: @meta.get[:docnumber] || "",
-                asciiValue: output_if_translit(@meta.get[:docnumber]),
-                status: @meta.get[:stage],
-                stream: isoxml&.at(ns("//bibdata/series[@type = 'stream']/" \
-                                      "title"))&.text)
-    end
+      def rfc_seriesinfo(isoxml, front)
+        front.seriesInfo **seriesinfo_attr(isoxml).merge({ name: "RFC",
+                                                           asciiName: "RFC" })
+        i = isoxml&.at(ns("//bibdata/series[@type = 'intended']")) and
+          front.seriesInfo nil,
+                           **attr_code(name: "",
+                                       status: i&.at(ns("./title"))&.text,
+                                       value: i&.at(ns("./number"))&.text || "")
+      end
 
-    def rfc_seriesinfo(isoxml, front)
-      front.seriesInfo **seriesinfo_attr(isoxml).merge({ name: "RFC",
-                                                         asciiName: "RFC" })
-      i = isoxml&.at(ns("//bibdata/series[@type = 'intended']")) and
+      def id_seriesinfo(isoxml, front)
         front.seriesInfo nil,
-                         **attr_code(name: "",
-                                     status: i&.at(ns("./title"))&.text,
-                                     value: i&.at(ns("./number"))&.text || "")
-    end
-
-    def id_seriesinfo(isoxml, front)
-      front.seriesInfo nil,
-                       **seriesinfo_attr(isoxml)
-                         .merge({ name: "Internet-Draft",
-                                  asciiName: "Internet-Draft" })
-      i = isoxml&.at(ns("//bibdata/series[@type = 'intended']/title"))&.text and
-        front.seriesInfo **attr_code(name: "", value: "", status: i)
-    end
-
-    def author(isoxml, front)
-      isoxml.xpath(("//xmlns:bibdata/xmlns:contributor[xmlns:role/@type = " \
-        "'author' or xmlns:role/@type = 'editor']")).each do |c|
-        role = c.at(ns("./role/@type")).text == "editor" ? "editor" : nil
-        (c.at("./organization") and org_author(c, role, front)) or
-          person_author(c, role, front)
+                         **seriesinfo_attr(isoxml)
+                           .merge({ name: "Internet-Draft",
+                                    asciiName: "Internet-Draft" })
+        i = isoxml&.at(ns("//bibdata/series[@type = 'intended']/title"))&.text and
+          front.seriesInfo **attr_code(name: "", value: "", status: i)
       end
-    end
 
-    def person_author_attrs(contrib, role)
-      return {} if contrib.nil?
+      def author(isoxml, front)
+        isoxml.xpath("//xmlns:bibdata/xmlns:contributor[xmlns:role/@type = " \
+          "'author' or xmlns:role/@type = 'editor']").each do |c|
+          role = c.at(ns("./role/@type")).text == "editor" ? "editor" : nil
+          (c.at("./organization") and org_author(c, role, front)) or
+            person_author(c, role, front)
+        end
+      end
 
-      full = contrib&.at(ns("./completename"))&.text
-      init = contrib&.at(ns("./initial"))&.text ||
-        contrib&.xpath(ns("./forename"))&.map { |n| n.text[0] }&.join(".")
-      init = nil if init.empty?
-      ret = attr_code(role: role, fullname: full, initials: init,
-                      surname: contrib&.at(ns("./surname"))&.text)
-      pers_author_attrs1(ret, full, init, contrib)
-    end
+      def person_author_attrs(contrib, role)
+        contrib.nil? and return {}
+        full = contrib.at(ns("./completename"))&.text
+        init = contrib.at(ns("./initial"))&.text ||
+          contrib.xpath(ns("./forename"))&.map { |n| n.text[0] }&.join(".")
+        init = nil if init.empty?
+        ret = attr_code(role: role, fullname: full, initials: init,
+                        surname: contrib.at(ns("./surname"))&.text)
+        pers_author_attrs1(ret, full, init, contrib)
+      end
 
-    def pers_author_attrs1(ret, full, init, contrib)
-      full and ret.merge!(
-        attr_code(
-          asciiFullname: output_if_translit(full),
-          asciiInitials: output_if_translit(init),
-          asciiSurname: output_if_translit(contrib&.at(ns("./surname"))),
-        ),
-      )
-      ret
-    end
+      def pers_author_attrs1(ret, full, init, contrib)
+        full and ret.merge!(
+          attr_code(
+            asciiFullname: output_if_translit(full),
+            asciiInitials: output_if_translit(init),
+            asciiSurname: output_if_translit(contrib&.at(ns("./surname"))),
+          ),
+        )
+        ret
+      end
 
-    def person_author(contrib, role, front)
-      attrs = person_author_attrs(contrib.at(ns("./person/name")), role)
-      front.author **attrs do |a|
-        org = contrib.at(ns("./person/affiliation/organization")) and
-          organization(org, a, contrib.document.at(ns("//showOnFrontPage")))
-        address(contrib.xpath(ns(".//address")),
-                contrib.at(ns(".//phone[not(@type = 'fax')]")),
-                contrib.at(ns(".//phone[@type = 'fax']")),
-                contrib.xpath(ns(".//email")), contrib.xpath(ns(".//uri")), a)
+      def person_author(contrib, role, front)
+        attrs = person_author_attrs(contrib.at(ns("./person/name")), role)
+        front.author **attrs do |a|
+          org = contrib.at(ns("./person/affiliation/organization")) and
+            organization(org, a, contrib.document.at(ns("//showOnFrontPage")))
+          address(contrib.xpath(ns(".//address")),
+                  contrib.at(ns(".//phone[not(@type = 'fax')]")),
+                  contrib.at(ns(".//phone[@type = 'fax']")),
+                  contrib.xpath(ns(".//email")), contrib.at(ns(".//uri")), a)
+        end
       end
-    end
 
-    def org_author(contrib, role, front)
-      front.author **attr_code(role: role) do |a|
-        organization(contrib.at(ns("./organization")), a,
-                     contrib.document.at(ns("//showOnFrontPage")))
-        address(contrib.at(ns(".//address")),
-                contrib.at(ns(".//phone[not(@type = 'fax')]")),
-                contrib.at(ns(".//phone[@type = 'fax']")),
-                contrib.at(ns(".//email")), contrib.at(ns(".//uri")), a)
+      def org_author(contrib, role, front)
+        front.author **attr_code(role: role) do |a|
+          organization(contrib.at(ns("./organization")), a,
+                       contrib.document.at(ns("//showOnFrontPage")))
+          address(contrib.at(ns(".//address")),
+                  contrib.at(ns(".//phone[not(@type = 'fax')]")),
+                  contrib.at(ns(".//phone[@type = 'fax']")),
+                  contrib.xpath(ns(".//email")), contrib.at(ns(".//uri")), a)
+        end
       end
-    end
 
-    def organization(org, out, show)
-      name = org.at(ns("./name"))&.text
-      out.organization name, **attr_code(
-        showOnFrontPage: show&.text, ascii: output_if_translit(name),
-        asciiAbbrev: output_if_translit(org.at(ns("./abbreviation"))),
-        abbrev: org.at(ns("./abbreviation"))
-      )
-    end
+      def organization(org, out, show)
+        name = org.at(ns("./name"))&.text
+        out.organization name, **attr_code(
+          showOnFrontPage: show&.text, ascii: output_if_translit(name),
+          asciiAbbrev: output_if_translit(org.at(ns("./abbreviation"))),
+          abbrev: org.at(ns("./abbreviation"))
+        )
+      end
 
-    def address(addr, phone, fax, email, uri, out)
-      return unless addr || phone || fax || email || uri
+      def address(addr, phone, fax, email, uri, out)
+        return unless addr || phone || fax || email || uri
 
-      out.address do |a|
-        addr and postal(addr, a)
-        phone and a.phone phone.text
-        fax and a.facsimile fax.text
-        email and email(email, a)
-        uri and a.uri uri.text
+        out.address do |a|
+          addr and postal(addr, a)
+          phone and a.phone phone.text
+          fax and a.facsimile fax.text
+          email.each { |e| email(e, a) }
+          uri and a.uri uri.text
+        end
       end
-    end
 
-    def postal(addr, out)
-      out.postal do |p|
-        if line = addr.at(ns("./formattedAddress"))
-          line.xpath(ns(".//br")).each { |br| br.replace("\n") }
-          line.text.split("\n").each do |l|
-            p.postalLine l, **attr_code(ascii: l.transliterate)
+      def postal(addr, out)
+        out.postal do |p|
+          if line = addr.at(ns("./formattedAddress"))
+            line.xpath(ns(".//br")).each { |br| br.replace("\n") }
+            line.text.split("\n").each do |l|
+              p.postalLine l, **attr_code(ascii: l.transliterate)
+            end
+          else
+            postal_detailed(addr, p)
           end
-        else
-          postal_detailed(addr, p)
         end
       end
-    end
 
-    def postal_detailed(addr, out)
-      addr.xpath(ns("./street")).each do |s|
-        out.street s.text, **attr_code(ascii: s.text.transliterate)
-      end
-      s = addr.at(ns("./city")) and
-        out.city s.text, **attr_code(ascii: s.text.transliterate)
-      s = addr.at(ns("./state")) and
-        out.region s.text, **attr_code(ascii: s.text.transliterate)
-      s = addr.at(ns("./country")) and
-        out.country s.text, **attr_code(ascii: s.text.transliterate)
-      s = addr.at(ns("./postcode")) and
-        out.code s.text, **attr_code(ascii: s.text.transliterate)
-    end
+      def postal_detailed(addr, out)
+        addr.xpath(ns("./street")).each do |s|
+          out.street s.text, **attr_code(ascii: s.text.transliterate)
+        end
+        s = addr.at(ns("./city")) and
+          out.city s.text, **attr_code(ascii: s.text.transliterate)
+        s = addr.at(ns("./state")) and
+          out.region s.text, **attr_code(ascii: s.text.transliterate)
+        s = addr.at(ns("./country")) and
+          out.country s.text, **attr_code(ascii: s.text.transliterate)
+        s = addr.at(ns("./postcode")) and
+          out.code s.text, **attr_code(ascii: s.text.transliterate)
+      end
 
-    def email(email, out)
-      ascii = email.text.transliterate
-      out.email email.text,
-                **attr_code(ascii: ascii == email.text ? nil : ascii)
-    end
+      def email(email, out)
+        ascii = email.text.transliterate
+        out.email email.text,
+                  **attr_code(ascii: ascii == email.text ? nil : ascii)
+      end
 
-    def date(_isoxml, front)
-      date = @meta.get[:publisheddate] || @meta.get[:circulateddate] || return
-      date = date.gsub(/T.*$/, "")
-      attr = date_attr(date) || return
-      front.date **attr_code(attr)
-    end
+      def date(_isoxml, front)
+        date = @meta.get[:publisheddate] || @meta.get[:circulateddate] || return
+        date = date.gsub(/T.*$/, "")
+        attr = date_attr(date) || return
+        front.date **attr_code(attr)
+      end
 
-    def date_attr(date)
-      return nil if date.nil?
-
-      if date.length == 4 && date =~ /^\d\d\d\d$/ then { year: date }
-      elsif /^\d\d\d\d-?\d\d$/.match?(date)
-        m = /^(?<year>\d\d\d\d)-(?<month>\d\d)$/.match date
-        { month: Date::MONTHNAMES[(m[:month]).to_i], year: m[:year] }
-      else
-        begin
-          d = Date.iso8601 date
-          { day: d.day.to_s.gsub(/^0/, ""), year: d.year,
-            month: Date::MONTHNAMES[d.month] }
-        rescue StandardError
-          nil
+      def date_attr(date)
+        date.nil? and return nil
+        if date.length == 4 && date =~ /^\d\d\d\d$/ then { year: date }
+        elsif /^\d\d\d\d-?\d\d$/.match?(date)
+          m = /^(?<year>\d\d\d\d)-(?<month>\d\d)$/.match date
+          { month: Date::MONTHNAMES[(m[:month]).to_i], year: m[:year] }
+        else
+          begin
+            d = Date.iso8601 date
+            { day: d.day.to_s.gsub(/^0/, ""), year: d.year,
+              month: Date::MONTHNAMES[d.month] }
+          rescue StandardError
+            nil
+          end
         end
       end
-    end
 
-    def area(_isoxml, front)
-      @meta.get[:areas].each do |w|
-        front.area w
+      def area(_isoxml, front)
+        @meta.get[:areas].each do |w|
+          front.area w
+        end
       end
-    end
 
-    def workgroup(_isoxml, front)
-      @meta.get[:wg].each do |w|
-        front.workgroup w
+      def workgroup(_isoxml, front)
+        @meta.get[:wg].each do |w|
+          front.workgroup w
+        end
       end
-    end
 
-    def keyword(_isoxml, front)
-      @meta.get[:keywords].each do |kw|
-        front.keyword kw
+      def keyword(_isoxml, front)
+        @meta.get[:keywords].each do |kw|
+          front.keyword kw
+        end
       end
-    end
 
-    def abstract(isoxml, front)
-      a = isoxml.at(ns("//preface/abstract | //preface/foreword")) || return
-      front.abstract **attr_code(anchor: a["id"]) do |abs|
-        a.children.reject { |c1| %w(title note).include? c1.name }.each do |c1|
-          parse(c1, abs)
+      def abstract(isoxml, front)
+        a = isoxml.at(ns("//preface/abstract | //preface/foreword")) || return
+        front.abstract **attr_code(anchor: a["id"]) do |abs|
+          a.children.reject do |c1|
+            %w(title note).include? c1.name
+          end.each do |c1|
+            parse(c1, abs)
+          end
         end
       end
-    end
 
-    def note(isoxml, front)
-      a = isoxml.at(ns("//preface/abstract/note | //preface/foreword/note")) or
-        return
-      front.note **attr_code(removeInRFC: a["removeInRFC"]) do |n|
-        title = a.at(ns("./name")) and n.name do |t|
-          title.children.each { |tt| parse(tt, t) }
-        end
-        a.children.reject { |c1| c1.name == "name" }.each do |c1|
-          parse(c1, n)
+      def note(isoxml, front)
+        a = isoxml.at(ns("//preface/abstract/note | //preface/foreword/note")) or
+          return
+        front.note **attr_code(removeInRFC: a["removeInRFC"]) do |n|
+          title = a.at(ns("./name")) and n.name do |t|
+            title.children.each { |tt| parse(tt, t) }
+          end
+          a.children.reject { |c1| c1.name == "name" }.each do |c1|
+            parse(c1, n)
+          end
         end
       end
-    end
 
-    def boilerplate(isoxml, front); end
+      def boilerplate(isoxml, front); end
+    end
   end
 end

data/lib/isodoc/ietf/inline.rb

@@ -76,7 +76,8 @@ module IsoDoc
       def hr_parse(node, out); end
 
       def link_parse(node, out)
-        out.eref **attr_code(target: node["target"]) do |l|
+        out.eref **attr_code(target: node["target"],
+                             brackets: node["style"]) do |l|
           node.children.each { |n| parse(n, l) }
         end
       end
@@ -133,12 +134,12 @@ module IsoDoc
           %w{locality localityStack}.include? c.name
         end
         # section = "" unless relative.empty?
-        out.relref **attr_code(target: node["bibitemid"],
-                               section: eref_section(node),
-                               relative: eref_relative(node),
-                               displayFormat: node["displayFormat"]) do |l|
-                                 linkend.each { |n| parse(n, l) }
-                               end
+        out.xref **attr_code(target: node["bibitemid"],
+                             section: eref_section(node),
+                             relative: eref_relative(node),
+                             sectionFormat: node["displayFormat"]) do |l|
+          linkend.each { |n| parse(n, l) }
+        end
       end
 
       def eref_relative(node)

data/lib/isodoc/ietf/references.rb

@@ -54,7 +54,7 @@ module IsoDoc
       def ietf_bibitem(list, bib, _ordinal)
         uris = bib.xpath(ns("./uri"))
         target = nil
-        uris&.each { |u| target = u.text if u["type"] == "src" }
+        uris&.each { |u| target = u.text if %w(src HTML).include?(u["type"]) }
         list.reference **attr_code(target: target,
                                    anchor: bib["id"]) do |r|
                                      bibitem_render(r, bib)

data/lib/isodoc/ietf/section.rb

@@ -3,41 +3,41 @@ module IsoDoc
     class RfcConvert < ::IsoDoc::Convert
       def common_rfc_pis(node)
         rfc_pis = {
-          artworkdelimiter: node&.at(ns("//pi/artworkdelimiter"))&.text,
-          artworklines: node&.at(ns("//pi/artworklines"))&.text,
-          authorship: node&.at(ns("//pi/authorship"))&.text,
-          autobreaks: node&.at(ns("//pi/autobreaks"))&.text,
-          background: node&.at(ns("//pi/background"))&.text,
-          colonspace: node&.at(ns("//pi/colonspace"))&.text,
-          comments: node&.at(ns("//pi/comments"))&.text,
-          docmapping: node&.at(ns("//pi/docmapping"))&.text,
-          editing: node&.at(ns("//pi/editing"))&.text,
-          emoticonic: node&.at(ns("//pi/emoticonic"))&.text,
-          footer: node&.at(ns("//pi/footer"))&.text,
-          header: node&.at(ns("//pi/header"))&.text,
-          inline: node&.at(ns("//pi/inline"))&.text,
-          iprnotified: node&.at(ns("//pi/iprnotified"))&.text,
-          linkmailto: node&.at(ns("//pi/linkmailto"))&.text,
-          linefile: node&.at(ns("//pi/linefile"))&.text,
-          notedraftinprogress: node&.at(ns("//pi/notedraftinprogress"))&.text,
-          private: node&.at(ns("//pi/private"))&.text,
-          refparent: node&.at(ns("//pi/refparent"))&.text,
-          rfcedstyle: node&.at(ns("//pi/rfcedstyle"))&.text,
-          slides: node&.at(ns("//pi/slides"))&.text,
-          "text-list-symbols": node&.at(ns("//pi/text-list-symbols"))&.text,
-          tocappendix: node&.at(ns("//pi/tocappendix"))&.text,
-          tocindent: node&.at(ns("//pi/tocindent"))&.text,
-          tocnarrow: node&.at(ns("//pi/tocnarrow"))&.text,
-          tocompact: node&.at(ns("//pi/tocompact"))&.text,
-          topblock: node&.at(ns("//pi/topblock"))&.text,
-          useobject: node&.at(ns("//pi/useobject"))&.text,
-          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/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",
+          artworkdelimiter: node.at(ns("//pi/artworkdelimiter"))&.text,
+          artworklines: node.at(ns("//pi/artworklines"))&.text,
+          authorship: node.at(ns("//pi/authorship"))&.text,
+          autobreaks: node.at(ns("//pi/autobreaks"))&.text,
+          background: node.at(ns("//pi/background"))&.text,
+          colonspace: node.at(ns("//pi/colonspace"))&.text,
+          comments: node.at(ns("//pi/comments"))&.text,
+          docmapping: node.at(ns("//pi/docmapping"))&.text,
+          editing: node.at(ns("//pi/editing"))&.text,
+          emoticonic: node.at(ns("//pi/emoticonic"))&.text,
+          footer: node.at(ns("//pi/footer"))&.text,
+          header: node.at(ns("//pi/header"))&.text,
+          inline: node.at(ns("//pi/inline"))&.text,
+          iprnotified: node.at(ns("//pi/iprnotified"))&.text,
+          linkmailto: node.at(ns("//pi/linkmailto"))&.text,
+          linefile: node.at(ns("//pi/linefile"))&.text,
+          notedraftinprogress: node.at(ns("//pi/notedraftinprogress"))&.text,
+          private: node.at(ns("//pi/private"))&.text,
+          refparent: node.at(ns("//pi/refparent"))&.text,
+          rfcedstyle: node.at(ns("//pi/rfcedstyle"))&.text,
+          slides: node.at(ns("//pi/slides"))&.text,
+          "text-list-symbols": node.at(ns("//pi/text-list-symbols"))&.text,
+          tocappendix: node.at(ns("//pi/tocappendix"))&.text,
+          tocindent: node.at(ns("//pi/tocindent"))&.text,
+          tocnarrow: node.at(ns("//pi/tocnarrow"))&.text,
+          tocompact: node.at(ns("//pi/tocompact"))&.text,
+          topblock: node.at(ns("//pi/topblock"))&.text,
+          useobject: node.at(ns("//pi/useobject"))&.text,
+          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/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",
         }
         attr_code(rfc_pis)
       end
@@ -62,22 +62,22 @@ module IsoDoc
           docName: @meta.get[:doctype] == "Internet Draft" ? @meta.get[:docnumber] : nil,
           number: @meta.get[:doctype].casecmp?("rfc") ? @meta.get[:docnumber] : nil,
           category: series2category(
-            docxml&.at(ns("//bibdata/series[@type = 'intended']/title"))&.text,
+            docxml.at(ns("//bibdata/series[@type = 'intended']/title"))&.text,
           ),
-          ipr: docxml&.at(ns("//bibdata/ext/ipr"))&.text,
-          consensus: docxml&.at(ns("//bibdata/ext/consensus"))&.text,
+          ipr: docxml.at(ns("//bibdata/ext/ipr"))&.text,
+          consensus: docxml.at(ns("//bibdata/ext/consensus"))&.text,
           obsoletes: obs,
           updates: upd,
-          indexInclude: docxml&.at(ns("//bibdata/ext/indexInclude"))&.text,
-          iprExtract: docxml&.at(ns("//bibdata/ext/iprExtract"))&.text,
-          sortRefs: docxml&.at(ns("//bibdata/ext/sortRefs"))&.text,
-          symRefs: docxml&.at(ns("//bibdata/ext/symRefs"))&.text,
-          tocInclude: docxml&.at(ns("//bibdata/ext/tocInclude"))&.text,
-          tocDepth: docxml&.at(ns("//bibdata/ext/tocDepth"))&.text,
-          submissionType: docxml&.at(ns(
-            "//bibdata/series[@type = 'stream']/title",
-          ))&.text || "IETF",
-          "xml:lang": docxml&.at(ns("//bibdata/language"))&.text,
+          indexInclude: docxml.at(ns("//bibdata/ext/indexInclude"))&.text,
+          iprExtract: docxml.at(ns("//bibdata/ext/iprExtract"))&.text,
+          sortRefs: docxml.at(ns("//bibdata/ext/sortRefs"))&.text,
+          symRefs: docxml.at(ns("//bibdata/ext/symRefs"))&.text,
+          tocInclude: docxml.at(ns("//bibdata/ext/tocInclude"))&.text,
+          tocDepth: docxml.at(ns("//bibdata/ext/tocDepth"))&.text,
+          submissionType: docxml.at(ns(
+                                      "//bibdata/series[@type = 'stream']/title",
+                                    ))&.text || "IETF",
+          "xml:lang": docxml.at(ns("//bibdata/language"))&.text,
           version: "3",
           "xmlns:xi": "http://www.w3.org/2001/XInclude",
         }

data/lib/metanorma/ietf/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/metanorma/ietf/blocks.rb

@@ -6,12 +6,15 @@ module Metanorma
                   node.attr("keep-with-next"),
                   "keep-with-previous": node.attr("keepWithPrevious") ||
                  node.attr("keep-with-previous"),
+                  indent: node.attr("indent"),
                   id: ::Metanorma::Utils::anchor_or_uuid(node))
       end
 
       def ul_attrs(node)
         attr_code(id: ::Metanorma::Utils::anchor_or_uuid(node),
-                  nobullet: node.attr("nobullet"),
+                  nobullet: node.attr("nobullet") || node.attr("empty"),
+                  indent: node.attr("indent"),
+                  bare: node.attr("bare"),
                   spacing: node.attr("spacing"))
       end
 
@@ -20,6 +23,7 @@ module Metanorma
                   type: node.attr("format") || olist_style(node.style),
                   group: node.attr("group"),
                   spacing: node.attr("spacing"),
+                  indent: node.attr("indent"),
                   start: node.attr("start"))
       end