metanorma-ietf 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f82a2e2531457841566622014de866954e414a6fcdb4a21ca279ab21d4254e
-  data.tar.gz: ccfb59ff0df711e0994398124e61ad7d132a9142e53fb53b6feb75a5c8c3feac
+  metadata.gz: 6f8f95517eaa67fc95cbe0ebbf7f54833c4e1b3b2cd43926613a6564c6dbd5fa
+  data.tar.gz: 8497233d7a4e03d5f70ee53e7e3f6fdf91c2af6d4ded543537f11c8fa5167d33
 SHA512:
-  metadata.gz: a3cf1a3627c0dc5a7a380c9cf0c3504941d6e23bf8a23d6d7c2b3430b1ef27039fd9b37cfb40a383ce0ef3714dfa5462f8d70acd471debe474e90b14c6ebfd2d
-  data.tar.gz: 75321da1a28864666a818e95130e16156aa7ebf582a5d184106aa8ccb798ae50cf3d10cec0379ed3a3cb48e6b24cc495adef8d5400d19d9825f0b1579f8a93ce
+  metadata.gz: 4eadb338cb1289415cd8cfe9977386c57fc66e3e84ae77a88314ffffcf2da880540330f4d2d543cf5c724e0ae38f4fd5261b2a30a919ac3f6d700ce34e0fa557
+  data.tar.gz: bbeec104f704fd794a65444f2f9b3ab05dff67bf3fd721a64fb60277c25eee414555ac38bf500018d9c876444a5c7530522d027e53c95c8ee72141e3439bb8e6

data/Gemfile

@@ -4,10 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
-#gem "metanorma-cli"
+gemspec

data/lib/isodoc/ietf/cleanup.rb

@@ -23,6 +23,7 @@ module IsoDoc
       def biblio_cleanup(xmldoc)
         biblio_abstract_cleanup(xmldoc)
         biblio_date_cleanup(xmldoc)
+        biblio_refcontent_cleanup(xmldoc)
         annotation_cleanup(xmldoc)
       end
 
@@ -49,6 +50,15 @@ module IsoDoc
         end
       end
 
+      def biblio_refcontent_cleanup(xmldoc)
+        xmldoc.xpath("//refcontent").each do |a|
+          val = a.text.strip
+          if val.empty? then a.remove
+          else a.children = val
+          end
+        end
+      end
+
       def reparse_abstract(abstract)
         a1 = Nokogiri::XML(abstract.dup.to_xml
           .sub("<abstract>", "<abstract xmlns='http://www.example.com'>")).root
@@ -130,10 +140,10 @@ module IsoDoc
 
       def make_postamble(docxml)
         docxml.xpath("//figure").each do |f|
-          a = f&.at("./artwork | ./sourcecode") || next
-          name = f&.at("./name")&.remove
-          b = a&.xpath("./preceding-sibling::*")&.remove
-          c = a&.xpath("./following-sibling::*")&.remove
+          a = f.at("./artwork | ./sourcecode") || next
+          name = f.at("./name")&.remove
+          b = a.xpath("./preceding-sibling::*")&.remove
+          c = a.xpath("./following-sibling::*")&.remove
           a = a.remove
           name and f << name
           b.empty? or f << "<preamble>#{to_xml(b)}</preamble>"
@@ -211,7 +221,7 @@ module IsoDoc
 
       def dt_cleanup(docxml)
         docxml.xpath("//dt").each do |d|
-          d&.first_element_child&.name == "bookmark" and
+          d.first_element_child&.name == "bookmark" and
             d["anchor"] ||= d.first_element_child["anchor"]
           d.xpath(".//t").each do |t|
             d["anchor"] ||= t["anchor"]

data/lib/isodoc/ietf/references.rb

@@ -67,133 +67,6 @@ module IsoDoc
         bib1.namespace = nil
         ref << @bibrenderer.render(bib1.to_xml, embedded: true)
       end
-
-=begin
-
-      def nonstd_bibitem(list, bib, _ordinal, _bibliography)
-        uris = bib.xpath(ns("./uri"))
-        target = nil
-        uris&.each { |u| target = u.text if u["type"] == "src" }
-        list.reference **attr_code(target: target,
-                                   anchor: bib["id"]) do |r|
-          nonstd_bibitem_front(r, bib)
-          uris&.each do |u|
-            r.format nil, **attr_code(target: u.text, type: u["type"])
-          end
-          docidentifier_render(bib, r)
-        end
-      end
-
-      def docidentifier_render(bib, out)
-        docidentifiers = bib.xpath(ns("./docidentifier"))
-        id = render_identifier(bibitem_ref_code(bib))
-        !id[:sdo].nil? && id[:sdo] != "(NO ID)" and out.refcontent id[:sdo]
-        docidentifiers&.each do |u|
-          u["type"] == "DOI" and
-            out.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI[  ]/, ""),
-                                            name: "DOI")
-          %w(IETF RFC).include?(u["type"]) and docidentifier_ietf(u, out)
-        end
-      end
-
-      def docidentifier_ietf(ident, out)
-        if /^RFC[  ]/.match?(ident.text)
-          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^RFC[  ]0*/, ""),
-                                          name: "RFC")
-        elsif /^I-D\./.match?(ident.text)
-          out.seriesInfo nil, **attr_code(value: ident.text.sub(/^I-D\./, ""),
-                                          name: "Internet-Draft")
-        end
-      end
-
-      def nonstd_bibitem_front(ref, bib)
-        ref.front do |f|
-          relaton_to_title(bib, f)
-          relaton_to_author(bib, f)
-          relaton_to_date(bib, f)
-          relaton_to_keyword(bib, f)
-          relaton_to_abstract(bib, f)
-        end
-      end
-
-      def relaton_to_title(bib, node)
-        title = bib&.at(ns("./title")) || bib&.at(ns("./formattedref")) or
-          return
-        node.title do |t|
-          title.children.each { |n| parse(n, t) }
-        end
-      end
-
-      def relaton_to_author(bib, node)
-        auths = bib.xpath(ns("./contributor[xmlns:role/@type = 'author' or " \
-                             "xmlns:role/@type = 'editor']"))
-        auths.empty? and
-          auths = bib.xpath(ns("./contributor[xmlns:role/@type = " \
-                               "'publisher']"))
-        auths.each do |a|
-          role = a.at(ns("./role[@type = 'editor']")) ? "editor" : nil
-          (p = a&.at(ns("./person/name")) and
-            relaton_person_to_author(p, role, node)) or
-            relaton_org_to_author(a&.at(ns("./organization")), role, node)
-        end
-      end
-
-      def relaton_person_to_author(pers, role, node)
-        full = pers.at(ns("./completename"))&.text
-        surname = pers.at(ns("./surname"))&.text
-        initials = pers.xpath(ns("./initial"))&.map(&:text)&.join(" ") ||
-          pers.xpath(ns("./forename"))&.map { |i| i.text[0] }&.join(" ")
-        initials = nil if initials.empty?
-        node.author nil, **attr_code(
-          fullname: full,
-          asciiFullname: full&.transliterate,
-          role: role, surname: surname,
-          initials: initials,
-          asciiSurname: full ? surname&.transliterate : nil,
-          asciiInitials: full ? initials&.transliterate : nil
-        )
-      end
-
-      def relaton_org_to_author(org, _role, node)
-        name = org&.at(ns("./name"))&.text
-        abbrev = org&.at(ns("./abbreviation"))&.text
-        node.author do |_a|
-          node.organization name, **attr_code(ascii: name&.transliterate,
-                                              abbrev: abbrev)
-        end
-      end
-
-      def relaton_to_date(bib, node)
-        date = bib.at(ns("./date[@type = 'published']")) ||
-          bib.at(ns("./date[@type = 'issued']")) ||
-          bib.at(ns("./date[@type = 'circulated']"))
-        date or return
-        attr = date_attr(date.at(ns("./on | ./from"))&.text) or return
-        node.date **attr_code(attr)
-      end
-
-      def relaton_to_keyword(bib, node)
-        bib.xpath(ns("./keyword")).each do |k|
-          node.keyword do |keyword|
-            k.children.each { |n| parse(n, keyword) }
-          end
-        end
-      end
-
-      def relaton_to_abstract(bib, node)
-        bib.xpath(ns("./abstract")).each do |k|
-          node.abstract do |abstract|
-            if k.at(ns("./p"))
-              k.children.each { |n| parse(n, abstract) }
-            else
-              abstract.t do |t|
-                k.children.each { |n| parse(n, t) }
-              end
-            end
-          end
-        end
-      end
-=end
     end
   end
 end

data/lib/metanorma/ietf/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/ietf/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/metanorma/ietf/front.rb

@@ -9,6 +9,7 @@ module Metanorma
         personal_author(node, xml)
       end
 
+=begin
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || "IETF"
         csv_split(publishers)&.each do |p|
@@ -30,6 +31,11 @@ module Metanorma
           end
         end
       end
+=end
+
+def default_publisher
+  "IETF"
+end
 
       def org_abbrev
         { "Internet Engineering Task Force" => "IETF" }

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.6 -->
+<!-- VERSION v1.2.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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1054,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1092,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1394,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1617,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1668,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1765,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.2.3".freeze
+    VERSION = "3.2.5".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -8,18 +8,18 @@ extenttemplate:
   inbook: "{{ volume }} {{ page }}"
   misc: "{{ volume }} {{issue}} {{ page }}, {{ duration }}"
 nametemplate:
-    one: "{% if nonpersonal[0] %}<author><organization_ascii='{{nonpersonal[0] | dfhdsjfhsajdkfgkj }}'{% if nonpersonalabbrev[0] %}_abbrev='{{ nonpersonalabbrev[0]}}'{% endif %}>{{ nonpersonal[0] }}</organization></author>{% else %}{% if surname[0] %}<author_surname='{{surname[0]}}'_asciiSurname='{{surname[0] | ascii }}'_initials='{{initials[0] | join: ''}}'_asciiInitials='{{initials[0] | join: '' | ascii}}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% else %}{% if completename[0] %}<author_fullname='{{completename[0]}}'_asciiFullname='{{completename[0] | ascii }}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% endif %}{% endif %}{% endif %}"
+    one: "{% if nonpersonal[0] %}<author><organization_ascii='{{nonpersonal[0] | ascii }}'{% if nonpersonalabbrev[0] %}_abbrev='{{ nonpersonalabbrev[0]}}'{% endif %}>{{ nonpersonal[0] }}</organization></author>{% else %}{% if surname[0] %}<author_surname='{{surname[0]}}'_asciiSurname='{{surname[0] | ascii }}'_initials='{{initials[0] | join: ''}}'_asciiInitials='{{initials[0] | join: '' | ascii}}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% else %}{% if completename[0] %}<author_fullname='{{completename[0]}}'_asciiFullname='{{completename[0] | ascii }}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% endif %}{% endif %}{% endif %}"
     two: "{% if nonpersonal[0] %}<author><organization_ascii='{{nonpersonal[0] | ascii }}'_abbrev='{{ nonpersonalabbrev[0]}}'>{{ nonpersonal[0] }}</organization></author>{% else %}{% if surname[0] %}<author_surname='{{surname[0]}}'_asciiSurname='{{ surname[0] | ascii }}'_initials='{{initials[0] | join: ''}}'_asciiInitials='{{initials[0] | join: '' | ascii}}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% else %}{% if completename[0] %}<author_fullname='{{completename[0]}}'_asciiFullname='{{completename[0] | ascii }}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% endif %}{% endif %}{% endif  %} {% if nonpersonal[1] %}<author><organization_ascii='{{nonpersonal[1] | ascii }}'_abbrev='{{ nonpersonalabbrev[1]}}'>{{ nonpersonal[1] }}</organization></author>{% else %}{% if surname[0] %}<author_surname='{{surname[1]}}'_asciiSurname='{{ surname[1] | ascii }}'_initials='{{initials[1] | join: ''}}'_asciiInitials='{{initials[1] | join: '' | ascii}}'{%if role[1] %}_role='{{role[1]}}'{%endif%}/>{% else %}{% if completename[1] %}<author_fullname='{{completename[1]}}'_asciiFullname='{{completename[1] | ascii }}'{%if role[1] %}_role='{{role[1]}}'{%endif%}/>{% endif %}{%endif%}{% endif %}"
     more: "{% if nonpersonal[0] %}<author><organization_ascii='{{nonpersonal[0] | ascii }}'_abbrev='{{ nonpersonalabbrev[0]}}'>{{ nonpersonal[0] }}</organization></author>{% else %}{% if surname[0] %}<author_surname='{{surname[0]}}'_asciiSurname='{{ surname[0] | ascii }}'_initials='{{initials[0] | join: ''}}'_asciiInitials='{{initials[0] | join: '' | ascii}}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% else %}{% if completename[0] %}<author_fullname='{{completename[0]}}'_asciiFullname='{{completename[0] | ascii }}'{%if role[0] %}_role='{{role[0]}}'{%endif%}/>{% endif %}{% endif %}{%endif%} {% if nonpersonal[1] %}<author><organization_ascii='{{nonpersonal[1] | ascii }}'_abbrev='{{ nonpersonalabbrev[1]}}'>{{ nonpersonal[1] }}</organization></author>{% else %}{%if surname[1] %}<author_surname='{{surname[1]}}'_asciiSurname='{{ surname[1] | ascii }}'_initials='{{initials[1] | join: ''}}'_asciiInitials='{{initials[1] | join: '' | ascii}}'{%if role[1] %}_role='{{role[1]}}'{%endif%}/>{% else %}{% if completename[1] %}<author_fullname='{{completename[1]}}'_asciiFullname='{{completename[1] | ascii }}'{%if role[1] %}_role='{{role[1]}}'{%endif%}/>{% endif %}{% endif %}{% endif %}  {% if nonpersonal[2] or nonpersonalabbrev[2] %}<author><organization_ascii='{{nonpersonal[2] | ascii }}'_abbrev='{{ nonpersonalabbrev[2]}}'>{{ nonpersonal[2] }}</organization></author>{% else %}{% if surname[2] %}<author_surname='{{surname[2]}}'_asciiSurname='{{ surname[2] | ascii }}'_initials='{{initials[2] | join: ''}}'_asciiInitials='{{initials[2] | join: '' | ascii}}'{%if role[2] %}_role='{{role[2]}}'{%endif%}/>{% else %}{% if completename[2] %}<author_fullname='{{completename[2]}}'_asciiFullname='{{completename[2] | ascii }}'{%if role[2] %}_role='{{role[2]}}'{%endif%}/>{% endif %}{% endif %}{% endif %}"
 # disabled the following: they should be provided in inheriting calls
 # etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} <em>et al.</em>"
 # etal_count: 5
-seriestemplate: "{% if series_formatted %}{{ series_formatted }}{%else%}{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{series_num}}|({{series_partnumber}}){%endif%}"
-journaltemplate: "<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> ({{series_run}}) {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}"
+seriestemplate: "{% if series_title and series_num %}<seriesInfo_name='{{ series_title }}'_value='{{series_num}}'/>{% else %}{% if series_formatted %}<refcontent>{{ series_formatted }}</refcontent>{% else %}{% if series_title %}<refcontent> {{series_title}} {{ series_run }} ,_{{ series_org }} ,_{{ series_place }} ,_{{ series_dates }} </refcontent>{% endif %}{% endif %}{% endif %}"
+journaltemplate: "{% if series_title and series_num %}<seriesInfo_name='{{ series_title }}'_value='{{series_num}}'/>{% else %}{% if series_formatted %}<refcontent>{{ series_formatted }}</refcontent>{% else %}{% if series_title %}<refcontent> {{series_title}} {{ series_run }} ,_{{ series_org }} ,_{{ series_place }} ,_{{ series_dates }} </refcontent>{% endif %}{% endif %}{% endif %}"
 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 %} {%for d in doi %}<seriesInfo value='{{ d | replace: ' ', ' ' | remove_first: 'DOI' | strip }}' name='DOI'/>{% endfor %}  {%if authoritative_identifier[0]%}{%if home_standard %}<seriesInfo value='{{ authoritative_identifier[0] | remove_first: 'IETF' | remove_first: 'RFC' | remove_first: 'I-D.' | replace: ' ', ' ' | strip}}' name='{%if authoritative_identifier[0] contains 'RFC'%}RFC{%endif%}{%if authoritative_identifier[0] contains 'I-D.'%}Internet-Draft{%endif%}'/>{% else %}<refcontent>{{authoritative_identifier[0]}}</refcontent>{% endif %}{%endif%}"
+  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 %}"
   website: standard
   book: standard
   booklet: standard

data/lib/relaton/render/parse.rb

@@ -11,7 +11,7 @@ module Relaton
 
         def home_standard(_doc, pubs)
           pubs&.any? do |r|
-            ["Internet Engineering Task Force", "IETF"]
+            ["Internet Engineering Task Force", "IETF", "RFC Publisher"]
               .include?(r[:nonpersonal])
           end
         end
@@ -22,6 +22,12 @@ module Relaton
              authorizer)
         end
 
+        def series_xml2hash1(series, doc)
+          ret = super
+          %w(BCP RFC I-D. Internet-Draft).include?(ret[:series_title]) and return {}
+          ret
+        end
+
         def uris(doc)
           doc.link.map { |u| { content: u.content.to_s.strip, type: u.type } }
         end
@@ -80,6 +86,15 @@ module Relaton
           cr.empty? or return cr
           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}")
+          end
+          ret.reject { |x| /^(rfc-anchor|Internet-Draft)/.match? (x) }
+        end
       end
     end
   end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ 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.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.7.0"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-27 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.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement