metanorma-ietf 3.3.0 → 3.3.2

data/lib/metanorma/ietf/ietf.rng

@@ -30,6 +30,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="indent"/>
+      </optional>
       <zeroOrMore>
         <ref name="TextElement"/>
       </zeroOrMore>
@@ -47,6 +50,9 @@
             <ref name="Alignments"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="indent"/>
+        </optional>
         <zeroOrMore>
           <choice>
             <ref name="TextElement"/>
@@ -64,11 +70,21 @@
           <data type="ID"/>
         </attribute>
         <optional>
-          <attribute name="nobullet"/>
+          <attribute name="nobullet">
+            <data type="boolean"/>
+          </attribute>
         </optional>
         <optional>
           <attribute name="spacing"/>
         </optional>
+        <optional>
+          <attribute name="indent"/>
+        </optional>
+        <optional>
+          <attribute name="bare">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -101,6 +117,9 @@
         <optional>
           <attribute name="start"/>
         </optional>
+        <optional>
+          <attribute name="indent"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>

data/lib/metanorma/ietf/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.12 -->
+<!-- VERSION v1.3.0 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -146,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.3.0".freeze
+    VERSION = "3.3.2".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -19,7 +19,8 @@ journaltemplate: "{% if series_title and series_num %}<seriesInfo_name='{{ serie
 template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
   # date is cleaned up into RFC XML formatting afterwards
-  standard: "<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 i in authoritative_identifier %} <seriesInfo_value='{{ i | replace: ' ', ' ' | strip | split: ' ' | last | remove_first: 'I-D.'}}'_name='{%if i contains 'I-D.'%}Internet-Draft{% else %}{{ i | replace: ' ', ' ' | strip | split: ' ' | slice: -2 }}{%endif%}'/> {% endfor %} {% else %} <refcontent>{{authoritative_identifier | join: ', '}}</refcontent> {% endif %}"
+  # 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 %}"
   website: standard
   book: standard
   booklet: standard

data/lib/relaton/render/fields.rb

@@ -20,6 +20,14 @@ module Relaton
           date.nil? and return nil
           date_range(date)
         end
+
+        def compound_fields_format(hash)
+          ret = super
+          ret[:included]&.each do |h|
+            compound_fields_format(h)
+          end
+          ret
+        end
       end
     end
   end

data/lib/relaton/render/parse.rb

@@ -2,6 +2,11 @@ module Relaton
   module Render
     module Ietf
       class Parse < ::Relaton::Render::Parse
+        def initialize(options)
+          super
+          @fieldsklass = Relaton::Render::Ietf::Fields
+        end
+
         def simple_or_host_xml2hash(doc, host)
           ret = super
           ret.merge(home_standard: home_standard(doc, ret[:publisher_raw]),
@@ -24,7 +29,8 @@ module Relaton
 
         def series_xml2hash1(series, doc)
           ret = super
-          %w(BCP RFC I-D. Internet-Draft).include?(ret[:series_title]) and return {}
+          %w(BCP RFC I-D. Internet-Draft).include?(ret[:series_title]) and
+            return {}
           ret
         end
 
@@ -87,14 +93,49 @@ module Relaton
           super
         end
 
-        # add BCP number
         def authoritative_identifier(doc)
           ret = super
-          if bcp = doc.series.detect { |s| s.title.title.content == "BCP" }
-            ret.unshift("BCP #{bcp.number}")
+          bcp = doc.series.detect do |s|
+            %w(BCP STD).include?(s.title.title.content)
           end
+          bcp and ret.unshift("BCP #{bcp.number}")
           ret.reject { |x| /^(rfc-anchor|Internet-Draft)/.match? (x) }
         end
+
+        def simple_xml2hash(doc)
+          super.merge(stream: stream(doc))
+        end
+
+        def series(doc)
+          a = doc.series.reject { |s| s.type == "stream" }
+          a.empty? and return nil
+          a.detect { |s| s.type == "main" } ||
+            a.detect { |s| s.type.nil? } || a.first
+        end
+
+        def stream(doc)
+          a = doc.series.detect { |s| s.type == "stream" } or return nil
+          series_title(a, doc)
+        end
+
+        def extract(doc)
+          super.merge(included_xml2hash(doc))
+        end
+
+        def included_xml2hash(doc)
+          r = doc.relation.select { |x| x.type == "includes" }.map do |x|
+            parse_single_bibitem(x.bibitem)
+          end
+          r.empty? and return {}
+          { included: r }
+        end
+
+        def parse_single_bibitem(doc)
+          data = extract(doc)
+          # enhance_data(data, r.template_raw)
+          # data_liquid = @fieldsklass.new(renderer: self)
+          #  .compound_fields_format(data)
+        end
       end
     end
   end

data/metanorma-ietf.gemspec

@@ -37,9 +37,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.8.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.2"
   spec.add_dependency "relaton-render"
-  spec.add_dependency "vectory", "~> 0.6"
 
   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.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-19 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: 2.8.0
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vectory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +236,7 @@ files:
 - lib/isodoc/ietf/SVG-1.2-RFC.rng
 - lib/isodoc/ietf/blocks.rb
 - lib/isodoc/ietf/cleanup.rb
+- lib/isodoc/ietf/cleanup_blocks.rb
 - lib/isodoc/ietf/cleanup_inline.rb
 - lib/isodoc/ietf/footnotes.rb
 - lib/isodoc/ietf/front.rb