metanorma-ietf 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f7c56e995bd19565266c00a76aa97a0e7a02e348d34f53d7d9288b63fb8663
-  data.tar.gz: 83866142dd9d484e04f7f34b7df0a2a405d1aee18063d0c5d87612e5b336920c
+  metadata.gz: 7a36096d484f0abebdb0aac35196a9f8975f7d5704851d3209d133e9901b1b82
+  data.tar.gz: 1fbef89a62eddc130fdf1c99367fae06c29369206f11bcbef9c24e1c1ab07c3d
 SHA512:
-  metadata.gz: 26bf8e60e859a2875c84c8ca90ad6f33e2100de0b381e51da5fb461a9cce3276e52b8a21d090d9639b9003ad2762aa69a3c5abd0154ecc489c56ab9e5660b240
-  data.tar.gz: '0891c85154fc7fdc7b53d66307fe7c9179336f45cabecd1c902f772db770e356b17027ac4d16b17fa2270dace7ff7767460788de5706c45febf7be292a96a1d0'
+  metadata.gz: 2ecdee7ac6dd34da6fe68e4613233b352b6eb1fa35ddec7a7f427b1dcce3bf09d8d5672f37efef8aac10f8e6cbf81c7d2f6466818db0a2fbae27676202c57dff
+  data.tar.gz: f914bccab27c70cbf81281aa0475896190e578bdd09a00072f8802d03903cca7b814bde12d214bfa01d43a95b218a9c1f13312877f6736dad9bf80f2c171253f

data/lib/asciidoctor/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">
@@ -1803,17 +1803,20 @@
         <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>
+      <optional>
+        <ref name="termusage"/>
+      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1830,41 +1833,200 @@
   </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="geographicArea"/>
+    </optional>
+    <choice>
+      <ref name="expression_designation"/>
+      <ref name="letter_symbol_designation"/>
+      <ref name="graphical_symbol_designation"/>
+    </choice>
+    <zeroOrMore>
+      <ref name="termsource"/>
+    </zeroOrMore>
+  </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>
+          <ref name="PureTextElement"/>
+        </zeroOrMore>
+      </element>
+      <optional>
+        <element name="abbreviationType">
+          <ref name="AbbreviationType"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="pronunciation">
+          <ref name="LocalizedString"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="grammarInfo">
+          <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>
+    <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="grammarvalue">
+        <text/>
+      </element>
+    </zeroOrMore>
+  </define>
+  <define name="GrammarGender">
+    <choice>
+      <value>masculine</value>
+      <value>feminine</value>
+      <value>neuter</value>
+      <value>common</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -1872,18 +2034,47 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termgrammar">
-    <element name="grammar">
+  <define name="termsubject">
+    <element name="subject">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
     </element>
   </define>
+  <define name="termusage">
+    <element name="usageinfo">
+      <oneOrMore>
+        <ref name="BasicBlock"/>
+      </oneOrMore>
+    </element>
+  </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="verbaldefinition">
+      <oneOrMore>
+        <ref name="paragraph"/>
+      </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="nonverbalrep">
+    <element name="nonverbalrepresentation">
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="table"/>
           <ref name="figure"/>
           <ref name="formula"/>
         </choice>

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 "verbaldefinition", "nonverbalrepresentation"
+        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/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.4.4".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -35,10 +35,9 @@ Gem::Specification.new do |spec|
   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 "metanorma-standoc", "~> 1.11.0"
   spec.add_dependency "open-uri"
 
   spec.add_development_dependency "byebug"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-25 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,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: open-uri
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and