metanorma-ietf 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b00b4e459d8ef6b3506ed7a090af700868e804787c10fab7dca88476fab221d
-  data.tar.gz: a5fcfda2549643625dc8c88a21361da23f4e2b6074be97f5261c71f607fa5057
+  metadata.gz: b48379093e4f20d35fddb174f623ff1e926c2ae65b6e473df2476d7cfd203b0b
+  data.tar.gz: 640976bed48e7c8b9c4ac56533059a240a93c8bc814473456b8034dc1ffdb777
 SHA512:
-  metadata.gz: 5d67b66aa2f1daf672ddd422d347f5e84296c5d3f56da70aefa7a33ee96f9fc09fbebfda95103082c0b3297f6bf6302ce8147394b20d89bfbbbdf55170ced303
-  data.tar.gz: 9946801435350a61f4590947ae3aba50d12becf4ee29724c659abc33a670c8b2bff6a9ecd803b97f3eec7136e584faf29aa605df13b269457aa5b5d13f29eba8
+  metadata.gz: e27578363727679af9e4c75865bf7a82caa39050fbd0e6f76c15e38ca6a24af2c492d8e127b376048d6ae2e65d3924ff6e583fcc0fe2eed9a41b2ae0b82d5fc3
+  data.tar.gz: 74c40963d020da82e6e9c7c05b8d723f3724d4dd69c293bfd1d0a5251733f077a975f10cbe440561cfb6d9443fb2c78ce92a8792d67835c8c182168d098bca13

data/lib/isodoc/ietf/blocks.rb

@@ -179,6 +179,15 @@ module IsoDoc
         end
       end
 
+      def admonition_name(node, type)
+        name = node&.at(ns("./name")) and return name
+        name = Nokogiri::XML::Node.new("name", node.document)
+        return unless type && @i18n.admonition[type]
+
+        name << @i18n.admonition[type]&.upcase
+        name
+      end
+
       def admonition_name_parse(_node, div, name)
         div.t **{ keepWithNext: "true" } do |p|
           name.children.each { |n| parse(n, p) }

data/lib/isodoc/ietf/init.rb

@@ -5,7 +5,7 @@ module IsoDoc
   module Ietf
     module Init
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)

data/lib/metanorma/ietf/biblio.rng

@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>

data/lib/metanorma/ietf/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -851,6 +888,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1225,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1252,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.5".freeze
+    VERSION = "3.0.6".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.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.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.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement