metanorma-ietf 3.6.5 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5758828f2f98a205b8195c990f58e1bf21bd90f8031df7d71a3757588952cc
-  data.tar.gz: f8dec2d352999ed8a0524c61a1850385987a03c7addd5648d1ff8886e4aae4c9
+  metadata.gz: 6a507adfdfc4defd2390ebf2f7fb144c2ff4fbebeaa728a5df4c786c2410f0a9
+  data.tar.gz: efb0bb23d05e4e647c3effbdf1f5555a7781ef453534bddc5f0109811e4676fb
 SHA512:
-  metadata.gz: ef4ca63eaaee7f005f29a8e318ed527a71fca533e6f8ede4da6ff4e1bb66331ded6bc90640ea133e061093ef7440f915753173563f9d7e606df85d7d6c37c1a6
-  data.tar.gz: 59e80f4b00c89ceb6b70364abea4e0b26d1f40a59bf0d222f283667da93674ce6bbd8f6b127e0e9b0852656809464ac2cd9b53065438a677f5045fb291ac6e57
+  metadata.gz: 8c2a5ebe1e425b5389a7ec27e2f00acbf35ff7cd771e3344a332ae887fed53e37adb737de71f944151569ba4657070835d59cf3708db2687e4baa2322761c96e
+  data.tar.gz: 2305e96e1affa68ad4d9dc2c6ceaf2fc747f24f25edaf071fce2a2cc78762ba411b29453cd1a80f494c02dd1cf48abe1ca654ee6fafcea6922a932a837100dd8

data/lib/isodoc/ietf/i18n-en.yaml

@@ -3,3 +3,5 @@ no_terms_boilerplate: ""
 internal_terms_boilerplate: ""
 external_terms_boilerplate: ""
 internal_external_terms_boilerplate: ""
+punct:
+  biblio-terminator: ""

data/lib/metanorma/ietf/biblio.rng

@@ -690,7 +690,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>
@@ -1296,17 +1296,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/cleanup.rb

@@ -13,7 +13,7 @@ module Metanorma
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup
         x.root.add_namespace(nil, xml_namespace)
-        #xml = Nokogiri::XML(x.to_xml)
+        # xml = Nokogiri::XML(x.to_xml)
         @isodoc ||= isodoc(@lang, @script, @locale)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
         @isodoc
@@ -41,8 +41,7 @@ module Metanorma
             c["to"] = id
             r.replace("<bookmark id='#{id}'/>")
           else
-            @log.add("Crossrefences", r,
-                     "No matching annotation for cref:[#{r.text}]", severity: 1)
+            @log.add("IETF_1", r, params: [r.text])
           end
         end
       end
@@ -103,7 +102,6 @@ module Metanorma
       def section_names_refs_cleanup(xml); end
 
       def note_cleanup(xmldoc); end
-
     end
   end
 end

data/lib/metanorma/ietf/converter.rb

@@ -161,6 +161,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
@@ -178,3 +182,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "./log"

data/lib/metanorma/ietf/front.rb

@@ -26,13 +26,16 @@ 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])
+            # s.title parts[0]
+            add_noko_elem(s, "number", parts[1..-1].join(" ")) if parts.size > 1
+            # s.number parts[1..-1].join(" ") if parts.size > 1
           end
       end
 
@@ -53,16 +56,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.4 -->
 
   <!--
     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/log.rb

@@ -0,0 +1,26 @@
+module Metanorma
+  module Ietf
+    class Converter
+      IETF_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "IETF_1": { category: "Crossrefences",
+                    error: "No matching annotation for cref:[%s]",
+                    severity: 1 },
+        "IETF_2": { category: "Document Attributes",
+                    error: "Editorial stream must have Informational status",
+                    severity: 2 },
+        "IETF_3": { category: "Images",
+                    error: "image %s is not SVG!",
+                    severity: 1 },
+        "IETF_4": { category: "Document Attributes",
+                    error: "IETF: unrecognised working group %s",
+                    severity: 1 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(IETF_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/ietf/validate.rb

@@ -19,15 +19,13 @@ module Metanorma
         stream = doc.at("//bibdata/series[@type = 'stream']/title")&.text
         status = doc.at("//bibdata/status/stage")&.text
         stream == "editorial" && status != "informational" and
-          @log.add("Document Attributes", nil,
-                   "Editorial stream must have Informational status")
+          @log.add("IETF_2", nil)
       end
 
       def image_validate(doc)
         doc.xpath("//image").each do |i|
           i["mimetype"] == "image/svg+xml" and next
-          @log.add("Images", i, "image #{i['src'][0, 40]} is not SVG!",
-                   severity: 1)
+          @log.add("IETF_3", i, params: [i["src"][0, 40]])
         end
       end
 
@@ -37,9 +35,7 @@ module Metanorma
           "organization/subdivision[@type = 'Workgroup']/name").each do |wg|
           wg_norm = wg.text.sub(/ (Working|Research) Group$/, "")
           @workgroups.include?(wg_norm) and next
-          @log.add("Document Attributes", nil,
-                   "IETF: unrecognised working group #{wg.text}",
-                   severity: 1)
+          @log.add("IETF_4", nil, params: [wg.text])
         end
       end
 

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.6.5".freeze
+    VERSION = "3.6.7".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -20,7 +20,7 @@ template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
   # date is cleaned up into RFC XML formatting afterwards
   # ref-included is cleaned up as referencegroup/reference in RFC XML afterwards
-  standard: "{% if stream %}<stream>{{stream}}</stream>{% endif %} <front> <title>{{ title }}</title> {{ creatornames }} <date_cleanme='true'>{{date}}</date> {% for k in keywords %}<keyword>{{k}}</keyword>{%endfor%} <abstract_cleanme='true'>{{abstract}}</abstract> </front> {{ series }} {%for d in doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' '  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' '  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{authoritative_identifier | join: ', '}}</refcontent> {% endif %} {% for i in included %}<ref-included target='{{ i.uris[0].content }}'> {% if i.stream %}<stream>{{i.stream}}</stream>{% endif %} <front> <title>{% if i.title %}{{ i.title}}{%else%}[TITLE]{%endif%}</title> {% if i.creatornames %}{{ i.creatornames }}{%else%}<author></author>{%endif%} <date_cleanme='true'>{{i.date}}</date> {% for k in i.keywords %}<keyword>{{k}}</keyword>{%endfor%} <abstract_cleanme='true'>{{i.abstract}}</abstract> </front> {{ series }} {%for d in i.doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI'  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in i.authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' |  replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' |  replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{i.authoritative_identifier | join: ', '}}</refcontent> {% endif %}</ref-included>{% endfor %}"
+  standard: "{% if stream %}<stream>{{stream}}</stream>{% endif %} <front> <title>{{ title }}</title> {{ creatornames }} <date_cleanme='true'>{{date}}</date> {% for k in keywords %}<keyword>{{k}}</keyword>{%endfor%} <abstract_cleanme='true'>{{abstract}}</abstract> </front> {%for d in doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' '  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' '  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{authoritative_identifier | join: ', '}}</refcontent> {% endif %} {% for i in included %}<ref-included target='{{ i.uris[0].content }}'> {% if i.stream %}<stream>{{i.stream}}</stream>{% endif %} <front> <title>{% if i.title %}{{ i.title}}{%else%}[TITLE]{%endif%}</title> {% if i.creatornames %}{{ i.creatornames }}{%else%}<author></author>{%endif%} <date_cleanme='true'>{{i.date}}</date> {% for k in i.keywords %}<keyword>{{k}}</keyword>{%endfor%} <abstract_cleanme='true'>{{i.abstract}}</abstract> </front> {{ series }} {%for d in i.doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI'  | replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in i.authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' |  replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' |  replace: '<esc> ': '<esc>' | replace: ' </esc>' : '</esc>' | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{i.authoritative_identifier | join: ', '}}</refcontent> {% endif %}</ref-included>{% endfor %}"
   website: standard
   book: standard
   booklet: standard

data/lib/relaton/render/fields.rb

@@ -2,7 +2,7 @@ module Relaton
   module Render
     module Ietf
       class Fields < ::Relaton::Render::Fields
-        def nameformat(names)
+        def nameformat(names, hash)
           names.nil? and return names
           parts = %i(surname initials given middle nonpersonal
                      nonpersonalabbrev completename)
@@ -12,7 +12,7 @@ module Relaton
               m[i] << n[i]
             end
           end
-          @r.nametemplate.render(names_out)
+          @r.nametemplate.render(names_out, hash)
         end
 
         # do not format months

data/metanorma-ietf.gemspec

@@ -37,13 +37,14 @@ 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", "~> 3.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.2.0"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "openssl"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-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: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +294,7 @@ files:
 - lib/metanorma/ietf/front.rb
 - lib/metanorma/ietf/ietf.rng
 - lib/metanorma/ietf/isodoc.rng
+- lib/metanorma/ietf/log.rb
 - lib/metanorma/ietf/macros.rb
 - lib/metanorma/ietf/processor.rb
 - lib/metanorma/ietf/relaton-ietf.rng