metanorma-ietf 2.4.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f7c56e995bd19565266c00a76aa97a0e7a02e348d34f53d7d9288b63fb8663
-  data.tar.gz: 83866142dd9d484e04f7f34b7df0a2a405d1aee18063d0c5d87612e5b336920c
+  metadata.gz: 6252e62c4528b954e8b212f8f4ecbd2743cf92ce0826851141e9bb5625a33b65
+  data.tar.gz: 54297c4b4d966720210747f55c42f67dbaf8154cb6c4638c7c8714aebf43d032
 SHA512:
-  metadata.gz: 26bf8e60e859a2875c84c8ca90ad6f33e2100de0b381e51da5fb461a9cce3276e52b8a21d090d9639b9003ad2762aa69a3c5abd0154ecc489c56ab9e5660b240
-  data.tar.gz: '0891c85154fc7fdc7b53d66307fe7c9179336f45cabecd1c902f772db770e356b17027ac4d16b17fa2270dace7ff7767460788de5706c45febf7be292a96a1d0'
+  metadata.gz: 3ba0e479fa11a65a1be98cdf6b18546fc4e633411e94ad8f23fc02492eb027018648abdef26ac81c4f5faed351c70d5871d3446017811c8621c33ba75a5899d8
+  data.tar.gz: 5381ff67f5acd1050032ee09a128e1e466fcae7624d8e3be8d1508ba401a158df4caadea2859f0cbb99ac46d32a41430f1d9f3c9ee145c0e8706cea799f307eb

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/references.rb

@@ -62,7 +62,7 @@ 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 /, ""),

data/lib/isodoc/ietf/reqt.rb

@@ -1,79 +1,83 @@
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def recommendation_labels(node)
-      [node.at(ns("./label")), node.at(ns("./title")), 
-       @xrefs.anchor(node['id'], :label, false)]
-    end
-
-    def recommendation_name(node, out, type)
-      label, title, lbl = recommendation_labels(node)
-      out.t **{ keepWithNext: "true" }  do |b|
-        b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def recommendation_labels(node)
+        [node.at(ns("./label")), node.at(ns("./title")),
+         @xrefs.anchor(node["id"], :label, false)]
       end
-      if label || title
-        out.t **{ keepWithNext: "true" }  do |b|
-          label and label.children.each { |n| parse(n,b) }
-          b << "#{clausedelim} " if label && title
-          title and title.children.each { |n| parse(n,b) }
+
+      def recommendation_name(node, out, type)
+        label, title, lbl = recommendation_labels(node)
+        out.t **{ keepWithNext: "true" } do |b|
+          b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+        end
+        if label || title
+          out.t **{ keepWithNext: "true" }  do |b|
+            label and label.children.each { |n| parse(n, b) }
+            b << "#{clausedelim} " if label && title
+            title and title.children.each { |n| parse(n, b) }
+          end
         end
       end
-    end
 
-    def recommendation_attributes(node, out)
-      ret = recommendation_attributes1(node)
-      return if ret.empty?
-      out.ul do |p|
-        ret.each do |l|
-          p.li do |i|
-            i.em { |e| i << l }
+      def recommendation_attributes(node, out)
+        ret = recommendation_attributes1(node)
+        return if ret.empty?
+
+        out.ul do |p|
+          ret.each do |l|
+            p.li do |i|
+              i.em { |_e| i << l }
+            end
           end
         end
       end
-    end
 
-    def recommendation_parse(node, out)
-      recommendation_name(node, out, @i18n.recommendation)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def recommendation_parse(node, out)
+        recommendation_name(node, out, @i18n.recommendation)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def requirement_parse(node, out)
-      recommendation_name(node, out, @i18n.requirement)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def requirement_parse(node, out)
+        recommendation_name(node, out, @i18n.requirement)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def permission_parse(node, out)
-      recommendation_name(node, out, @i18n.permission)
-      recommendation_attributes(node, out)
-      node.children.each do |n|
-        parse(n, out) unless %w(label title).include? n.name
+      def permission_parse(node, out)
+        recommendation_name(node, out, @i18n.permission)
+        recommendation_attributes(node, out)
+        node.children.each do |n|
+          parse(n, out) unless %w(label title).include? n.name
+        end
       end
-    end
 
-    def inline?(node)
-      return true if node.first_element_child.nil?
-      %w(em link eref xref strong tt sup sub strike keyword smallcap
-         br hr bookmark pagebreak stem origin term preferred admitted
-         deprecates domain termsource modification).include? node.first_element_child.name
-    end
+      def inline?(node)
+        return true if node.first_element_child.nil?
 
-    def requirement_component_parse(node, out)
-      return if node["exclude"] == "true"
-      out1 = out
-      if inline?(node)
-        out.t do |p|
-          p << "INHERIT: " if node.name == "inherit"
-          node.children.each { |n| parse(n, p) }
+        %w(em link eref xref strong tt sup sub strike keyword smallcap
+           br hr bookmark pagebreak stem origin term preferred admitted
+           deprecates domain termsource modification)
+          .include? node.first_element_child.name
+      end
+
+      def requirement_component_parse(node, out)
+        return if node["exclude"] == "true"
+
+        if inline?(node)
+          out.t do |p|
+            p << "INHERIT: " if node.name == "inherit"
+            node.children.each { |n| parse(n, p) }
+          end
+        else
+          node.children.each { |n| parse(n, out) }
         end
-      else
-        node.children.each { |n| parse(n, out) }
       end
     end
   end
 end
-

data/lib/isodoc/ietf/rfc_convert.rb

@@ -52,6 +52,8 @@ module IsoDoc::Ietf
       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 }

data/lib/isodoc/ietf/terms.rb

@@ -1,63 +1,70 @@
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def definition_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def definition_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def modification_parse(node, out)
-      para = node.at(ns("./p"))
-      out << " -- "
-      para.children.each { |n| parse(n, out) }
-    end
+      def modification_parse(node, out)
+        para = node.at(ns("./p"))
+        out << " -- "
+        para.children.each { |n| parse(n, out) }
+      end
 
-    def deprecated_term_parse(node, out)
-      out.t do |p|
-        p << l10n("#{@i18n.deprecated}: ")
-        node.children.each { |c| parse(c, p) }
+      def deprecated_term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.t do |p|
+          p << l10n("#{@i18n.deprecated}: ")
+          name.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def admitted_term_parse(node, out)
-      out.t do |p|
-        node.children.each { |c| parse(c, p) }
+      def admitted_term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.t do |p|
+          name.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def term_parse(node, out)
-      out.name do |p|
-        node.children.each { |n| parse(n, p) }
+      def term_parse(node, out)
+        name = node.at(ns(".//name"))
+        out.name do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def termnote_parse(node, out)
-      note_parse(node, out)
-    end
+      def termnote_parse(node, out)
+        note_parse(node, out)
+      end
 
-    def termref_parse(node, out)
-      out.t do |p|
-        p << "SOURCE: "
-        node.children.each { |n| parse(n, p) }
+      def termref_parse(node, out)
+        out.t do |p|
+          p << "SOURCE: "
+          node.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def termdef_parse(node, out)
-      set_termdomain("")
-      clause_parse(node, out)
-    end
+      def termdef_parse(node, out)
+        set_termdomain("")
+        node.xpath(ns("./definition")).size > 1 and
+          IsoDoc::PresentationXMLConvert.new({}).multidef(node)
+        clause_parse(node, out)
+      end
 
-    def termdocsource_parse(_node, _out); end
+      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) }
+      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 << " "
+        out << "[term defined in "
+        r = node.at(ns("./xref | ./eref | ./termref"))
+        parse(r, out)
+        out << "]"
       end
-      out << "[term defined in "
-      r = node.at(ns("./xref | ./eref | ./termref"))
-      parse(r, out)
-      out << "]"
     end
   end
 end

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']"\
+                        "[@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'][@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/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <!-- include "biblio.rnc" { } -->
   <include href="basicdoc.rng">
@@ -32,6 +32,19 @@
         <ref name="DocumentType"/>
       </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>
@@ -58,7 +71,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -690,6 +703,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1680,6 +1694,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1737,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -1796,6 +1812,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>
@@ -1803,17 +1833,17 @@
         <ref name="admitted"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="related"/>
+        <ref name="deprecates"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="deprecates"/>
+        <ref name="related"/>
       </zeroOrMore>
       <optional>
         <ref name="termdomain"/>
       </optional>
-      <zeroOrMore>
-        <ref name="termgrammar"/>
-      </zeroOrMore>
+      <optional>
+        <ref name="termsubject"/>
+      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1830,41 +1860,236 @@
   </define>
   <define name="preferred">
     <element name="preferred">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="admitted">
     <element name="admitted">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="related">
     <element name="related">
+      <attribute name="type">
+        <ref name="RelatedTermType"/>
+      </attribute>
+      <element name="preferred">
+        <ref name="Designation"/>
+      </element>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
+  <define name="RelatedTermType">
+    <choice>
+      <value>deprecates</value>
+      <value>supersedes</value>
+      <value>narrower</value>
+      <value>broader</value>
+      <value>equivalent</value>
+      <value>compare</value>
+      <value>contrast</value>
+      <value>see</value>
+    </choice>
+  </define>
+  <define name="deprecates">
+    <element name="deprecates">
+      <ref name="Designation"/>
+    </element>
+  </define>
+  <define name="Designation">
+    <optional>
+      <attribute name="absent">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="geographic-area"/>
+    </optional>
+    <choice>
+      <ref name="expression_designation"/>
+      <ref name="letter_symbol_designation"/>
+      <ref name="graphical_symbol_designation"/>
+    </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="termsource"/>
+    </zeroOrMore>
+  </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="letter_symbol_designation">
+    <element name="letter-symbol">
       <optional>
-        <attribute name="type">
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <oneOrMore>
           <choice>
-            <value>compare</value>
-            <value>contrast</value>
-            <value>see</value>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
           </choice>
+        </oneOrMore>
+      </element>
+    </element>
+  </define>
+  <define name="graphical_symbol_designation">
+    <element name="graphical-symbol">
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
         </attribute>
       </optional>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="figure"/>
     </element>
   </define>
-  <define name="deprecates">
-    <element name="deprecates">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+  <define name="expression_designation">
+    <element name="expression">
+      <optional>
+        <attribute name="language">
+          <a:documentation>ISO-639</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="script">
+          <a:documentation>ISO-15924</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="type">
+          <ref name="ExpressionDesignationType"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+      <optional>
+        <element name="abbreviation-type">
+          <ref name="AbbreviationType"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="pronunciation">
+          <ref name="LocalizedString"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="grammar">
+          <ref name="Grammar"/>
+        </element>
+      </optional>
     </element>
   </define>
+  <define name="ExpressionDesignationType">
+    <choice>
+      <value>prefix</value>
+      <value>suffix</value>
+      <value>abbreviation</value>
+      <value>full</value>
+    </choice>
+  </define>
+  <define name="AbbreviationType">
+    <choice>
+      <value>truncation</value>
+      <value>acronym</value>
+      <value>initialism</value>
+    </choice>
+  </define>
+  <define name="Grammar">
+    <zeroOrMore>
+      <element name="gender">
+        <ref name="GrammarGender"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
+    <optional>
+      <element name="isPreposition">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isParticiple">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdjective">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isVerb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdverb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isNoun">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <element name="grammar-value">
+        <text/>
+      </element>
+    </zeroOrMore>
+  </define>
+  <define name="GrammarGender">
+    <choice>
+      <value>masculine</value>
+      <value>feminine</value>
+      <value>neuter</value>
+      <value>common</value>
+    </choice>
+  </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -1872,8 +2097,8 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termgrammar">
-    <element name="grammar">
+  <define name="termsubject">
+    <element name="subject">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1881,9 +2106,39 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <choice>
+        <ref name="verbaldefinition"/>
+        <ref name="nonverbalrep"/>
+        <group>
+          <ref name="verbaldefinition"/>
+          <ref name="nonverbalrep"/>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
+          <ref name="dl"/>
+          <ref name="ol"/>
+          <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="nonverbalrep">
+    <element name="non-verbal-representation">
+      <oneOrMore>
+        <choice>
+          <ref name="table"/>
           <ref name="figure"/>
           <ref name="formula"/>
         </choice>
@@ -1972,6 +2227,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>
@@ -2289,4 +2550,17 @@
       </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>
 </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.4.4".freeze
+    VERSION = "3.0.0".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,20 +28,18 @@ 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) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc", "~> 1.7.0"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
-  spec.add_dependency "open-uri"
+  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
 
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -58,30 +44,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.0.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: open-uri
-  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'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,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
@@ -305,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
@@ -330,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+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