metanorma-ietf 2.5.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d4894fa5f829d7b49228514a64317990ec1747c1f3f327545a919b714aa054
-  data.tar.gz: 7058f5103647d0917da435023afef57236c803413e59b6dab3382e5ab8a84d0f
+  metadata.gz: 51d0713bcfae4cec3a50c1c840c445df4b12d0b7c8b31ae75eae87ef5dde0a67
+  data.tar.gz: 62ca2ad04f15976d681a621d399bb463cf339d496b98a8111cf4ec8ef9792c8a
 SHA512:
-  metadata.gz: cd64d4822df68c4df3338ac56abe2159991ed4065c8eacfb5eb1474a1900410ab732a186883486492538538b8344d60fb2b9090008c673fcae1ac1120c1c3e18
-  data.tar.gz: 73051c3782f02ae2d4ad8f2592f534eb3d2f1abd34620c1bc15c3d8034d51ad1aac2e3d552d11c489ea0f81b940844ea7198d0b598d9a9f1a4a30a4dd2b304b2
+  metadata.gz: dfb117a7bae17c2ad66302424b97672dc35bbc4b710af759c4e191c9a01dfa4d30326324786760cc5437b845e7941472fd524dc8b6ee9b85cb94f8ef29424dd4
+  data.tar.gz: a4ecb6cc11f97bde100cb8c9a8870379ddd732fcf638abf6b928502b056c95e80ed82c044a65998f5b1e871bf2a9b6dc21d3ac58a4c388168ea97e09191ffac5

data/.github/workflows/rake.yml

@@ -8,75 +8,9 @@ on:
     tags: [ v* ]
   pull_request:
 
+
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-
-    steps:
-      - uses: actions/checkout@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - uses: actions/setup-python@v1
-        with:
-          python-version: '3.6'
-
-      - name: set PIP_DOWNLOAD_CACHE
-        shell: python
-        run: |
-          import os
-          import platform
-          from os.path import expanduser
-
-          home = expanduser("~")
-          cache_path = {
-            "Linux": f"{home}/.cache/pip",
-            "Darwin": f"{home}Library/Caches/pip",
-            "Windows": f"{home}\\AppData\\Local\\pip\\Cache"
-          }[platform.system()]
-
-          os.system(f"echo PIP_DOWNLOAD_CACHE={cache_path} >> {os.environ['GITHUB_ENV']}")
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.PIP_DOWNLOAD_CACHE }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: ${{ runner.os }}-pip-
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.cache/xml2rfc
-          key: xml2rfc
-          restore-keys: xml2rfc
-
-      - if: matrix.os == 'macos-latest'
-        run: brew install libmagic
-
-      - if: matrix.os == 'windows-latest'
-        run: pip install python-magic-bin
-
-      - run: pip install xml2rfc
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+    uses: metanorma/metanorma-build-scripts/.github/workflows/xml2rfc-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -18,3 +18,8 @@
 **/.byebug_history
 
 .rubocop-https--*
+
+/Gemfile.devel
+/Gemfile.lock
+/test.err
+/test.rfc.xml.err

data/lib/isodoc/ietf/inline.rb

@@ -107,10 +107,10 @@ module IsoDoc
       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) }
+        no_loc_contents = node.children.reject do |c|
+          %w{locality localityStack location}.include? c.name
+        end
+        contents = no_loc_contents.select { |c| !c.text? || /\S/.match(c) }
         !contents.empty? and
           return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
         ""
@@ -122,9 +122,10 @@ module IsoDoc
         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?
+        section = @isodoc.eref_localities(
+          node.xpath(ns("./locality | ./localityStack")), nil, node
+        )&.sub(/^,/, "")&.sub(/^\s*(Section|Clause)/, "")&.strip&.sub(/,$/, "") || ""
+        # section = "" unless relative.empty?
         out.relref **attr_code(target: node["bibitemid"], section: section,
                                relative: relative,
                                displayFormat: node["displayFormat"]) do |l|
@@ -132,30 +133,6 @@ module IsoDoc
                                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)
-          end
-        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
-        end
-        ""
-      end
-
       def index_parse(node, out)
         out.iref nil, **attr_code(item: node.at(ns("./primary")).text,
                                   primary: node["primary"],

data/lib/isodoc/ietf/references.rb

@@ -62,12 +62,12 @@ module IsoDoc
       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]
+        !id[:sdo].nil? && id[:sdo] != "(NO ID)" and out.refcontent id[:sdo]
         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)
+          %w(IETF RFC).include?(u["type"]) and docidentifier_ietf(u, out)
         end
       end
 

data/lib/isodoc/ietf/rfc_convert.rb

@@ -13,85 +13,89 @@ require_relative "./validation"
 require_relative "./xref"
 require_relative "./init"
 
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def convert1(docxml, _filename, _dir)
-      @xrefs.parse docxml
-      info docxml, nil
-      xml = noko do |xml|
-        xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
-          make_link(html, docxml)
-          make_front(html, docxml)
-          make_middle(html, docxml)
-          make_back(html, docxml)
-        end
-      end.join("\n").sub(/<!DOCTYPE[^>]+>\n/, "")
-      set_pis(docxml, Nokogiri::XML(xml))
-    end
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def convert1(docxml, _filename, _dir)
+        @xrefs.parse docxml
+        info docxml, nil
+        ret = noko do |xml|
+          xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
+            make_link(html, docxml)
+            make_front(html, docxml)
+            make_middle(html, docxml)
+            make_back(html, docxml)
+          end
+        end.join("\n").sub(/<!DOCTYPE[^>]+>\n/, "")
+        set_pis(docxml, Nokogiri::XML(ret))
+      end
 
-    def metadata_init(lang, script, i18n)
-      @meta = Metadata.new(lang, script, i18n)
-    end
+      def metadata_init(lang, script, i18n)
+        @meta = Metadata.new(lang, script, i18n)
+      end
 
-    def xref_init(lang, script, klass, i18n, options)
-      @xrefs = Xref.new(lang, script, klass, i18n, options)
-    end
+      def xref_init(lang, script, klass, i18n, options)
+        @xrefs = Xref.new(lang, script, klass, i18n, options)
+      end
 
-    def extract_delims(text)
-      @openmathdelim = "$$"
-      @closemathdelim = "$$"
-      while %r{#{Regexp.escape(@openmathdelim)}}m.match(text) ||
-          %r{#{Regexp.escape(@closemathdelim)}}m.match(text)
-        @openmathdelim += "$"
-        @closemathdelim += "$"
+      def extract_delims(text)
+        @openmathdelim = "$$"
+        @closemathdelim = "$$"
+        while %r{#{Regexp.escape(@openmathdelim)}}m.match(text) ||
+            %r{#{Regexp.escape(@closemathdelim)}}m.match(text)
+          @openmathdelim += "$"
+          @closemathdelim += "$"
+        end
+        [@openmathdelim, @closemathdelim]
       end
-      [@openmathdelim, @closemathdelim]
-    end
 
-    def error_parse(node, out)
-      case node.name
-      when "bcp14" then bcp14_parse(node, out)
-      when "concept" then concept_parse(node, out)
-      when "verbal-definition", "non-verbal-representation"
-        node.elements.each { |n| parse(n, out) }
-      else
-        text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-        out.t { |p| p << text }
+      def error_parse(node, out)
+        case node.name
+        when "bcp14" then bcp14_parse(node, out)
+        when "concept" then concept_parse(node, out)
+        when "verbal-definition", "non-verbal-representation"
+          node.elements.each { |n| parse(n, out) }
+        else
+          text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+          out.t { |p| p << text }
+        end
       end
-    end
 
-    def omit_docid_prefix(prefix)
-      return true if prefix == "IETF"
+      def omit_docid_prefix(prefix)
+        return true if %w(IETF RFC).include?(prefix)
 
-      super
-    end
+        super
+      end
 
-    def textcleanup(docxml)
-      passthrough_cleanup(docxml)
-    end
+      def textcleanup(docxml)
+        passthrough_cleanup(docxml)
+      end
 
-    def postprocess(result, filename, _dir)
-      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 }
-      content_validate(to_xhtml(result), filename)
-    end
+      def postprocess(result, filename, _dir)
+        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 }
+        content_validate(to_xhtml(result), filename)
+      end
 
-    def init_file(filename, debug)
-      filename = filename.sub(/\.rfc\.xml$/, ".rfc")
-      super
-    end
+      def init_file(filename, debug)
+        filename = filename.sub(/\.rfc\.xml$/, ".rfc")
+        super
+      end
 
-    def initialize(options)
-      super
-      @xinclude = options[:use_xinclude] == "true"
-      @format = :rfc
-      @suffix = "rfc.xml"
-    end
+      def initialize(options)
+        super
+        @xinclude = options[:use_xinclude] == "true"
+        @format = :rfc
+        @suffix = "rfc.xml"
+        @isodoc = IsoDoc::PresentationXMLConvert.new({})
+        @isodoc.i18n_init("en", "Latn")
+      end
 
-    include ::IsoDoc::Ietf::Init
+      include ::IsoDoc::Ietf::Init
+    end
   end
 end

data/lib/isodoc/ietf/terms.rb

@@ -47,7 +47,7 @@ module IsoDoc
       def termdef_parse(node, out)
         set_termdomain("")
         node.xpath(ns("./definition")).size > 1 and
-          IsoDoc::PresentationXMLConvert.new({}).multidef(node)
+          @isodoc.multidef(node)
         clause_parse(node, out)
       end
 

data/lib/isodoc/ietf/xref.rb

@@ -9,6 +9,7 @@ module IsoDoc
           notes = t.xpath(ns(".//termnote"))
           notes.each do |n|
             next if n["id"].nil? || n["id"].empty?
+
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] =
               anchor_struct(idx, n, @labels["note_xref"], "note", false)

data/lib/{asciidoctor → metanorma}/ietf/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/{asciidoctor → metanorma}/ietf/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/{asciidoctor → metanorma}/ietf/blocks.rb

@@ -1,6 +1,6 @@
-module Asciidoctor
+module Metanorma
   module Ietf
-    class Converter < ::Asciidoctor::Standoc::Converter
+    class Converter < ::Metanorma::Standoc::Converter
       def para_attrs(node)
         attr_code( "keep-with-next": node.attr("keepWithNext") ||
                   node.attr("keep-with-next"),

data/lib/{asciidoctor → metanorma}/ietf/cleanup.rb

@@ -1,6 +1,6 @@
-module Asciidoctor
+module Metanorma
   module Ietf
-    class Converter < ::Asciidoctor::Standoc::Converter
+    class Converter < ::Metanorma::Standoc::Converter
       def cleanup(xmldoc)
         bcp14_cleanup(xmldoc)
         abstract_cleanup(xmldoc)
@@ -42,19 +42,19 @@ module Asciidoctor
         end
       end
 
-      def rfc_anchor_cleanup(xmldoc)
-        map = xmldoc.xpath("//bibitem[docidentifier/@type = 'rfc-anchor']")
-          .each_with_object({}) do |b, m|
+      def rfc_anchor_cleanup(xml)
+        map = xml.xpath("//bibitem[docidentifier[@type = 'IETF' or @type = 'RFC']"\
+                        "[@scope = 'anchor']]").each_with_object({}) do |b, m|
           next if b.at("./ancestor::bibdata | ./ancestor::bibitem")
 
-          id = b.at("./docidentifier[@type = 'rfc-anchor']").text
+          id = b.at("./docidentifier[@type = 'IETF' or @type = 'RFC'][@scope = 'anchor']").text
           m[b["id"]] = id
           b["id"] = id
         end
-        xmldoc.xpath("//eref | //origin").each do |x|
+        xml.xpath("//eref | //origin").each do |x|
           map[x["bibitemid"]] and x["bibitemid"] = map[x["bibitemid"]]
         end
-        xmldoc
+        xml
       end
 
       def smartquotes_cleanup(xmldoc)

data/lib/{asciidoctor → metanorma}/ietf/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor"
-require "asciidoctor/standoc/converter"
+require "metanorma/standoc/converter"
 require "isodoc/ietf/rfc_convert"
 require_relative "./front"
 require_relative "./blocks"
@@ -7,11 +7,11 @@ require_relative "./validate"
 require_relative "./cleanup"
 require_relative "./macros"
 
-module Asciidoctor
+module Metanorma
   module Ietf
-    class Converter < ::Asciidoctor::Standoc::Converter
+    class Converter < ::Metanorma::Standoc::Converter
       Asciidoctor::Extensions.register do
-        inline_macro Asciidoctor::Ietf::InlineCrefMacro
+        inline_macro Metanorma::Ietf::InlineCrefMacro
       end
 
       XML_ROOT_TAG = "ietf-standard".freeze

data/lib/{asciidoctor → metanorma}/ietf/front.rb

@@ -1,6 +1,6 @@
-module Asciidoctor
+module Metanorma
   module Ietf
-    class Converter < ::Asciidoctor::Standoc::Converter
+    class Converter < ::Metanorma::Standoc::Converter
       def relaton_relations
         %w(included-in described-by derived-from instance obsoletes updates)
       end

data/lib/{asciidoctor → metanorma}/ietf/ietf.rng

@@ -345,7 +345,7 @@
         <optional>
           <attribute name="format"/>
         </optional>
-        <text/>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">

data/lib/{asciidoctor → metanorma}/ietf/isodoc.rng

@@ -32,6 +32,56 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -102,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -138,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -690,6 +774,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1013,6 +1098,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1027,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1680,6 +1795,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1838,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -1796,6 +1913,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1959,7 +2090,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1973,7 +2108,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -2182,7 +2317,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2516,4 +2662,43 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/{asciidoctor → metanorma}/ietf/macros.rb

@@ -1,6 +1,6 @@
 require "asciidoctor/extensions"
 
-module Asciidoctor
+module Metanorma
   module Ietf
     class InlineCrefMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl

data/lib/{asciidoctor → metanorma}/ietf/validate.rb

@@ -1,8 +1,8 @@
 require "metanorma/ietf/data/workgroups"
 
-module Asciidoctor
+module Metanorma
   module Ietf
-    class Converter < ::Asciidoctor::Standoc::Converter
+    class Converter < ::Metanorma::Standoc::Converter
       def content_validate(doc)
         super
         image_validate(doc)

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.5.1".freeze
+    VERSION = "3.0.3".freeze
   end
 end

data/lib/metanorma-ietf.rb

@@ -2,7 +2,7 @@ require "asciidoctor" unless defined? Asciidoctor::Converter
 require "metanorma"
 
 require_relative "metanorma/ietf"
-require_relative "asciidoctor/ietf/converter"
+require_relative "metanorma/ietf/converter"
 require_relative "isodoc/ietf/rfc_convert"
 
 Metanorma::Registry.instance.register(Metanorma::Ietf::Processor)

data/metanorma-ietf.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(bin|test|spec|features)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -235,26 +235,9 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
-- bin/asciidoctor-rfc2
-- bin/asciidoctor-rfc2.bat
-- bin/asciidoctor-rfc3
-- bin/console
-- bin/rspec
-- bin/setup
 - docs/installation.md
 - docs/navigation.md
 - docs/overview.md
-- 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
-- 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
 - lib/isodoc/ietf/blocks.rb
 - lib/isodoc/ietf/cleanup.rb
@@ -277,7 +260,18 @@ files:
 - lib/isodoc/ietf/xref.rb
 - lib/metanorma-ietf.rb
 - lib/metanorma/ietf.rb
+- lib/metanorma/ietf/basicdoc.rng
+- lib/metanorma/ietf/biblio.rng
+- lib/metanorma/ietf/blocks.rb
+- lib/metanorma/ietf/cleanup.rb
+- lib/metanorma/ietf/converter.rb
+- lib/metanorma/ietf/front.rb
+- lib/metanorma/ietf/ietf.rng
+- lib/metanorma/ietf/isodoc.rng
+- lib/metanorma/ietf/macros.rb
 - lib/metanorma/ietf/processor.rb
+- lib/metanorma/ietf/reqt.rng
+- lib/metanorma/ietf/validate.rb
 - lib/metanorma/ietf/version.rb
 - metanorma-ietf.gemspec
 - rfc2629-other.ent
@@ -302,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and

data/bin/asciidoctor-rfc2

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "metanorma-ietf"
-require "asciidoctor/cli"
-
-options = Asciidoctor::Cli::Options.new backend: "rfc2", header_footer: true
-# FIXME This is a really bizarre API. Please make me simpler.
-
-exit 0 if options.parse!(ARGV) == 0
-
-invoker = Asciidoctor::Cli::Invoker.new options
-GC.start
-invoker.invoke!
-exit invoker.code

data/bin/asciidoctor-rfc2.bat

@@ -1,2 +0,0 @@
-@echo off
-ruby %~dp0\asciidoctor-rfc2 %*

data/bin/asciidoctor-rfc3

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "metanorma-ietf"
-require "asciidoctor/cli"
-
-options = Asciidoctor::Cli::Options.new backend: "rfc3", header_footer: true
-# FIXME This is a really bizarre API. Please make me simpler.
-
-exit 0 if options.parse!(ARGV) == 0
-
-invoker = Asciidoctor::Cli::Invoker.new options
-GC.start
-invoker.invoke!
-exit invoker.code

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "metanorma-ietf"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/rspec

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here