metanorma-ietf 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ba51cb30f9a763118cd067b90a81ae8425ad6943c9c270daf87ba3d043de92
-  data.tar.gz: a54742db1f6423d43d44dfc4388539ffb9da6e709c5d8b7f16954d2a0536eba8
+  metadata.gz: 390603e9e2284f8f9d4a296e2b2477145d68db6860bf89518bf12a38eaec4de6
+  data.tar.gz: ecb70e48ac54f68e4b486aafdc0af99792834dcedc781e94da78b88a75ddb0cd
 SHA512:
-  metadata.gz: c2a0a4d158e1c8cf8ecacc4eec7f27e17033f14782c6ba5c8aac1be90da247d475ebce115499957ae8641546af02cc76e27cc2b3b4bc5a9c06de9782a68e385f
-  data.tar.gz: 3f2a5457aba6280d50be9f63d5555b33d04da66f098edb7af4dd150e345df380de7c16de43252c4180c65637ebe7d3da42f1f9ae427a698da43df3ae3cefc232
+  metadata.gz: 90f627b63a727c2a022db91718237058c8309b892bd39cbc5991685a8daa6362639503caf8cc06fd60eabcb0bb3b36a671fbd9d018e00e7fe41f11261b4f4fea
+  data.tar.gz: e6178e44010dbbddf74aa1b4120a3be44e1c24dc076577a70751a58e88cb7ebfa0b0cc9bf3a1b666776c7afb2b883516e00edc93099a14f7ac966039cfc0698e

data/lib/isodoc/ietf/inline.rb

@@ -37,6 +37,10 @@ module IsoDoc
         end
       end
 
+      def display_text_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
+
       def strike_parse(node, out)
         node.children.each { |n| parse(n, out) }
       end
@@ -56,7 +60,7 @@ module IsoDoc
         out << text
       end
 
-      def stem_parse(node, out)
+      def semx_stem_parse(node, out)
         stem = case node["type"]
                when "MathML"
                  a = node.at(ns("./asciimath"))&.remove
@@ -78,7 +82,7 @@ module IsoDoc
 
       def hr_parse(node, out); end
 
-      def link_parse(node, out)
+      def semx_link_parse(node, out)
         out.eref **attr_code(target: node["target"],
                              brackets: node["style"]) do |l|
           node.children.each { |n| parse(n, l) }
@@ -115,7 +119,7 @@ module IsoDoc
         end
       end
 
-      def xref_parse(node, out)
+      def semx_xref_parse(node, out)
         out.xref **attr_code(target: node["target"], format: node["format"],
                              relative: node["relative"]) do |l|
                                l << get_linkend(node)
@@ -127,12 +131,13 @@ module IsoDoc
           %w{locality localityStack location}.include? c.name
         end
         contents = no_loc_contents.select { |c| !c.text? || /\S/.match(c) }
+          .map { |x| x.name == "display-text" ? x.children : x }.flatten
         !contents.empty? and
           return to_xml(Nokogiri::XML::NodeSet.new(node.document, contents))
         ""
       end
 
-      def eref_parse(node, out)
+      def semx_eref_parse(node, out)
         linkend = node.children.reject do |c|
           %w{locality localityStack}.include? c.name
         end
@@ -159,11 +164,11 @@ module IsoDoc
           .sub(/^\s*(Sections?|Clauses?)/, "").strip.sub(/,$/, "")
       end
 
-      def origin_parse(node, out)
+      def semx_origin_parse(node, out)
         if t = node.at(ns("./termref"))
           termrefelem_parse(t, out)
         else
-          eref_parse(node, out)
+          semx_eref_parse(node, out)
         end
       end
 

data/lib/isodoc/ietf/reqt.rb

@@ -14,7 +14,7 @@ module IsoDoc
       def recommendation_parse1(node, out)
         recommendation_name(node.at(ns("./fmt-name")), out)
         node.children.each do |n|
-          parse(n, out) unless n.name == "fmt-name"
+          parse(n, out) if %w(name fmt-provision).include?(n.name)
         end
       end
 

data/lib/isodoc/ietf/rfc_convert.rb

@@ -66,7 +66,8 @@ module IsoDoc
         case node.name
         when "bcp14" then bcp14_parse(node, out)
         when "concept" then concept_parse(node, out)
-        when "verbal-definition", "non-verbal-representation"
+        when "display-text" then display_text_parse(node, out)
+        when "verbal-definition", "non-verbal-representation", "fmt-provision"
           node.elements.each { |n| parse(n, out) }
         else
           text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")

data/lib/metanorma/ietf/biblio.rng

@@ -947,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>

data/lib/metanorma/ietf/ietf.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns='https://www.metanorma.org/ns/ietf' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
     VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
@@ -8,9 +8,6 @@
   -->
   <include href="relaton-ietf.rng"/>
   <include href="isodoc.rng">
-    <start>
-      <ref name="ietf-standard"/>
-    </start>
     <define name="ParagraphAttrs">
       <optional>
         <attribute name="align">
@@ -382,7 +379,34 @@
         </optional>
       </element>
     </define>
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <ref name="preface"/>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <ref name="bibliography"/>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
+  <!-- end overrides -->
   <define name="TextElement" combine="choice">
     <choice>
       <ref name="bcp14"/>
@@ -438,30 +462,4 @@
     </optional>
     <text/>
   </define>
-  <define name="ietf-standard">
-    <element name="ietf-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/ietf/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <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 href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.4.4".freeze
+    VERSION = "3.5.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.10.2"
+  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement