metanorma-ietf 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71679f9a6d5e530d891b8c56b4353846fd3be9fff356e2aeb9efee7ab21b5b68
-  data.tar.gz: 801f308896032b32cc194292ab0c44b9b624ce616e1155b5957bc83fa9bbb217
+  metadata.gz: bdae18146fd717cdc3e4edbc6aee7c51e286e93f4f04b08f247d0110c29644d5
+  data.tar.gz: 5990873706f6bab2c18005eba348edc987b54a7600c62889def4579c5f82b622
 SHA512:
-  metadata.gz: c406406aa3a034082595dcea77a43ddf55e55a7463033180216d3820b31449182af81e9c1dede1cc99ee944c27ad33359a7feb0df9170793e186af157cbaa640
-  data.tar.gz: 2439758d94f9966ced0e48a5970ec68e6083afc9f308832cc2529d86b555d84595f86b64569a233ebe8b3487ca98f59bfa0b76842b538b6dfafc1cebeaab12c9
+  metadata.gz: 8aed3ba6d2fe6b46f5907b71feefc20fe49bcc73c6a68244855eb730dae27c552347e4a3c3ec8f77d190f04f7e8f25560c5cd4d0b4ce00572dead34bdd7674c0
+  data.tar.gz: 854ab1d486f0689509468ec3f3342b38894e27b146abe258bb09d544e2dc8f9df65b1828b64d44589cab485ad09ad71b51859b164e0051599e0be6c6fea84b8c

data/lib/isodoc/ietf/reqt.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
       def recommendation_labels(node)
-        [node.at(ns("./label")), node.at(ns("./title")),
+        [node.at(ns("./identifier")), node.at(ns("./title")),
          @xrefs.anchor(node["id"], :label, false)]
       end
 
@@ -37,7 +37,7 @@ module IsoDoc
         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
+          parse(n, out) unless %w(identifier title).include? n.name
         end
       end
 
@@ -45,7 +45,7 @@ module IsoDoc
         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
+          parse(n, out) unless %w(identifier title).include? n.name
         end
       end
 
@@ -53,7 +53,7 @@ module IsoDoc
         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
+          parse(n, out) unless %w(identifier title).include? n.name
         end
       end
 

data/lib/metanorma/ietf/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -1269,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2488,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/metanorma/ietf/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.8".freeze
+    VERSION = "3.0.9".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.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: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement