metanorma-ietf 3.6.6 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd5d53757c7142ccf379c7ffb83ecc79874c544593de69a9b1421a00e90cc3f
-  data.tar.gz: ce343131a888ca5c1b617abfea081e2bee46c2f6c2162bd99331e0ce05add13e
+  metadata.gz: 17bcabceaa3266e27009fca291f497dbda0bac6f31d48e9cb4aeb51653721682
+  data.tar.gz: 29a033f30aebf8a6c9b5127178617e2049696067746014d482145190309ff3ee
 SHA512:
-  metadata.gz: 3440d8db12dda0936d60ded38bbe47c72fb76ffbbc5aac8ee914b0bb03f3808f93078bba4aeb69edf4133d7b4d6e2561419b9b1e8eaedeb2ce803f0817db1c73
-  data.tar.gz: 74564e708027fd31b303cf215d6a5a98c25e4e8ed40bf58e207805d9a7a49ac6a882f483fbae3db4fdc92c973c5db22deb133b3ecfb0380d471b9d32954d1485
+  metadata.gz: f897268efa4c788332b8cd18f4d63c67094263bf1030028f01124209ddbf21778ffc1a3cb8bf82a70e550cd5ddbab216ff10a64316385c6eee7771185a986472
+  data.tar.gz: 4babd7a444518b0a712d06265c23040da702ff4d707d2f1dea4d2af90913e61bdff952d44405e0761dc0c9b2b263c8336d467b093b053a1e8850a07992a2db89

data/lib/isodoc/ietf/references.rb

@@ -19,8 +19,9 @@ module IsoDoc
           i.children = docid_prefix(i["type"], i.text)
         end
         @bibrenderer =
-          ::Relaton::Render::Ietf::General.new(language: @lang,
-                                               i18nhash: @i18n.get)
+          ::Relaton::Render::Ietf::General
+            .new(language: @lang, i18nhash: @i18n.get,
+                 config: @relatonrenderconfig)
       end
 
       def implicit_reference(bib)

data/lib/isodoc/ietf/section.rb

@@ -138,8 +138,7 @@ module IsoDoc
       end
 
       def clause_parse_title(_node, div, clause, _out, _heading_attrs = {})
-        return unless clause
-
+        clause or return
         div.name do |n|
           clause&.children&.each { |c2| parse(c2, n) }
         end

data/lib/metanorma/ietf/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/ietf/converter.rb

@@ -137,7 +137,11 @@ module Metanorma
         super
       end
 
-      def introduction_parse(attrs, xml, node)
+      #def introduction_parse(attrs, xml, node)
+        #clause_parse(attrs, xml, node)
+      #end
+
+      def acknowledgements_parse(attrs, xml, node)
         clause_parse(attrs, xml, node)
       end
 
@@ -161,6 +165,10 @@ module Metanorma
         end
       end
 
+      def default_svg_conform_profile
+        :svg_1_2_rfc
+      end
+
       def html_extract_attributes(node)
         super.merge(usexinclude: node.attr("use-xinclude"))
       end

data/lib/metanorma/ietf/front.rb

@@ -26,16 +26,23 @@ module Metanorma
 
       def metadata_series(node, xml)
         xml.series **{ type: "stream" } do |s|
-          s.title (node.attr("submission-type") || "IETF")
+          add_noko_elem(s, "title", node.attr("submission-type") || "IETF")
+          # s.title (node.attr("submission-type") || "IETF")
         end
         a = node.attr("intended-series") and
           xml.series **{ type: "intended" } do |s|
             parts = a.split(/ /)
-            s.title parts[0]
-            s.number parts[1..-1].join(" ") if parts.size > 1
+            add_noko_elem(s, "title", parts[0])
+            add_noko_elem(s, "number", parts[1..-1].join(" ")) if parts.size > 1
           end
       end
 
+      def title_fallback(node, xml)
+        xml.parent.at("./title[not(normalize-space(.)='')]" \
+          "[not(@type = 'abbrev' or @type = 'ascii')]") and return
+        add_title_xml(xml, node.attr("doctitle"), @lang, "main")
+      end
+
       def title_other(node, xml)
         a = node.attr("abbrev") and
           add_title_xml(xml, a, "en", "abbrev")
@@ -53,16 +60,20 @@ module Metanorma
       def metadata_ext(node, xml)
         super
         x = node.attr("area") and x.split(/,\s*/).each do |a|
-          xml.area a
+          add_noko_elem(xml, "area", a)
+          # xml.area a
         end
-        xml.ipr (node.attr("ipr") || "trust200902")
+        add_noko_elem(xml, "ipr", node.attr("ipr") || "trust200902")
+        # xml.ipr (node.attr("ipr") || "trust200902")
         x = node.attr("consensus") and xml.consensus (x != "false")
         x = node.attr("index-include") and xml.indexInclude (x != "false")
-        x = node.attr("ipr-extract") and xml.iprExtract x
+        add_noko_elem(xml, "iprExtract", node.attr("ipr-extract"))
+        # x = node.attr("ipr-extract") and xml.iprExtract x
         x = node.attr("sort-refs") and xml.sortRefs (x != "false")
         x = node.attr("sym-refs") and xml.symRefs (x != "false")
         x = node.attr("toc-include") and xml.tocInclude (x != "false")
-        x = node.attr("toc-depth") and xml.tocDepth x
+        add_noko_elem(xml, "tocDepth", node.attr("toc-depth"))
+        # x = node.attr("toc-depth") and xml.tocDepth x
         x = node.attr("show-on-front-page") and xml.showOnFrontPage (x != "false")
         xml.pi { |pi| set_pi(node, pi) }
       end

data/lib/metanorma/ietf/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.1.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.6.6".freeze
+    VERSION = "3.6.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.6.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data