metanorma-ietf 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f6ac422dac62904d909f6993446eb129be1d8c7e4de293efff0a00d7a214f6
-  data.tar.gz: 2e143432805fa1d7cd1cb206b7c7145b957771819ad222674583380923576104
+  metadata.gz: 1f0e7013a9c1c4dc1e68120b61238fbd30241630349e0c9b8f84b73c4b51eb59
+  data.tar.gz: eb27229d92af97141eaaaa446cd86bf70b28a06c9f35ef6da8e2535e696e6d11
 SHA512:
-  metadata.gz: 990260a7fbc5f14ee4df3d5b354fc2f4e5cf7f5e2ab5192350cf2fec94da5bef65a506726eda678faf76f54381e0344d9f9d4ebdafe9557379193c15c23caa2d
-  data.tar.gz: f95f99fc706252db1900bd701a13d6f95903db3340b764e67728a88e4549efd4b80222769ea88c04852b8eda19732a306f76591bd6bb308c71f5550545b78949
+  metadata.gz: 3a59ffbbadc531aed8203951b6727c0eb9c9218e8826ceceb9578e9ab4b79775eaaa096fca3ee96bfcbfa3101e24384201c041b5a5769911d8f609cc76a15c74
+  data.tar.gz: 02146517cb6d24b14565e24424fcc191a8d64eae2dc985be127d9897474871b368c88844cf4b0e6c8a6b386ed0d73617ba4bef2a58854319dd3cf5db07fe4618

data/README.adoc

@@ -6,7 +6,7 @@
 
 image:https://img.shields.io/gem/v/metanorma-ietf.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ietf"]
 image:https://github.com/metanorma/metanorma-ietf/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-ietf/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma-ietf/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ietf"]
+// image:https://codeclimate.com/github/metanorma/metanorma-ietf/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ietf"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ietf.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ietf/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-ietf/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ietf/releases"]
 

data/lib/isodoc/ietf/cleanup.rb

@@ -17,15 +17,27 @@ module IsoDoc
         front_cleanup(docxml)
         u_cleanup(docxml)
         biblio_cleanup(docxml) # feeds aside
+        abstract_cleanup(docxml) # bleeds aside
         aside_cleanup(docxml)
         docxml
       end
 
+      def abstract_cleanup(docxml)
+        docxml.xpath("//abstract").each do |a|
+          a.xpath(".//eref | .//xref").each do |node|
+            crossref_remove_markup_elem(node)
+          end
+          a.xpath(".//aside | ./title | .//table")
+            .each(&:remove)
+        end
+      end
+
       def biblio_cleanup(xmldoc)
         biblio_referencegroup_cleanup(xmldoc)
         biblio_abstract_cleanup(xmldoc)
         biblio_date_cleanup(xmldoc)
         biblio_refcontent_cleanup(xmldoc)
+        biblio_format_cleanup(xmldoc)
         annotation_cleanup(xmldoc)
       end
 
@@ -72,6 +84,12 @@ module IsoDoc
         end
       end
 
+      def biblio_format_cleanup(xmldoc)
+        xmldoc.xpath("//reference[format]").each do |r|
+          r.xpath("./format").each(&:remove)
+        end
+      end
+
       def reparse_abstract(abstract)
         a1 = Nokogiri::XML(abstract.dup.to_xml
           .sub("<abstract>", "<abstract xmlns='http://www.example.com'>")).root

data/lib/isodoc/ietf/cleanup_blocks.rb

@@ -109,20 +109,28 @@ module IsoDoc
       def sourcecode_remove_markup(node)
         node.traverse do |n|
           n.text? and next
-          %w(name callout callout-annotation note sourcecode).include? n.name and next
+          %w(name callout callout-annotation note
+             sourcecode).include? n.name and next
           sourcecode_remove_markup_elem(n)
         end
       end
 
-      def sourcecode_remove_markup_elem(node)
+      def crossref_remove_markup_elem(node)
         case node.name
-        when "br" then node.replace("\n")
-        when "t" then node.replace("\n\n#{node.children}")
         when "eref"
           node.replace(node.children.empty? ? node["target"] : node.children)
         when "xref"
           node.children.empty? ? sourcecode_xref(node) : node.replace(node.children)
           # when "relref" then n.replace(n.children.empty? ? n["target"] : n.children)
+        end
+      end
+
+      def sourcecode_remove_markup_elem(node)
+        case node.name
+        when "br" then node.replace("\n")
+        when "t" then node.replace("\n\n#{node.children}")
+        when "eref", "xref"
+          crossref_remove_markup_elem(node)
         else node.replace(node.children)
         end
       end

data/lib/isodoc/ietf/front.rb

@@ -177,7 +177,8 @@ module IsoDoc
       end
 
       def date(_isoxml, front)
-        date = @meta.get[:publisheddate] || @meta.get[:circulateddate] || return
+        date = @meta.get[:publisheddate] || @meta.get[:circulateddate] ||
+          Date.today.to_s
         date = date.gsub(/T.*$/, "")
         attr = date_attr(date) || return
         front.date **attr_code(attr)
@@ -220,12 +221,8 @@ module IsoDoc
 
       def abstract(isoxml, front)
         a = isoxml.at(ns("//preface/abstract | //preface/foreword")) || return
-        front.abstract **attr_code(anchor: a["id"]) do |abs|
-          a.children.reject do |c1|
-            %w(title note).include? c1.name
-          end.each do |c1|
-            parse(c1, abs)
-          end
+        front.abstract do |abs|
+          children_parse(a, abs)
         end
       end
 
@@ -239,6 +236,7 @@ module IsoDoc
           a.children.reject { |c1| c1.name == "name" }.each do |c1|
             parse(c1, n)
           end
+          a.remove
         end
       end
 

data/lib/isodoc/ietf/metadata.rb

@@ -49,6 +49,12 @@ module IsoDoc
         super
         set(:doctype, "RFC") if get[:doctype].nil?
       end
+
+      def initialize(lang, script, locale, i18n, fonts_options = {})
+        super
+        @metadata[:publisheddate] = nil
+        @metadata[:circulateddate] = nil
+      end
     end
   end
 end

data/lib/metanorma/ietf/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

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.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.6.0".freeze
+    VERSION = "3.6.1".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> {% for u in uris %}<format_target='{{u.content}}'_type='{%if u.type%}{{u.type}}{%else%}HTML{%endif%}'/>{% endfor %} {{ series }} {%for d in doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | strip }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' | strip | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' | strip | 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> {% for u in i.uris %}<format_target='{{u.content}}'_type='{%if u.type%}{{u.type}}{%else%}HTML{%endif%}'/>{% endfor %} {{ series }} {%for d in i.doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | strip }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in i.authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' | strip | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' | strip | 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> {{ series }} {%for d in doi %}<seriesInfo_value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | strip }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' | strip | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' | strip | 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' | strip }}'_name='DOI'/>{% endfor %}  {% if home_standard %}{% for j in i.authoritative_identifier %} <seriesInfo_value='{{ j | replace: ' ', ' ' | strip | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if j contains 'I-D.'%}Internet-Draft{% else %}{{ j | replace: ' ', ' ' | strip | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{i.authoritative_identifier | join: ', '}}</refcontent> {% endif %}</ref-included>{% endfor %}"
   website: standard
   book: standard
   booklet: standard

data/metanorma-ietf.gemspec

@@ -51,5 +51,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="