metanorma-ietf 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0caa70c59e0b00b7eaf785a68d24b0ec9368c4c0c45c1dee96ef973b0d8c0150
-  data.tar.gz: fcc948fcdb7b9e4b05596b741659052789c595deaf65798a517929bc30173faf
+  metadata.gz: 44f82a2e2531457841566622014de866954e414a6fcdb4a21ca279ab21d4254e
+  data.tar.gz: ccfb59ff0df711e0994398124e61ad7d132a9142e53fb53b6feb75a5c8c3feac
 SHA512:
-  metadata.gz: 4699fae2fcb874453ca24a16295b72efe450f03dbb16f002884002b7b324f0f5bf03c843f0424a1a8395914d3db9d031f37b2ffb221d0fa2317e0a63c487b0cc
-  data.tar.gz: ba585e9aa3859230b9bf0ff1f574a33ded9268620e40c4438495c8b5a1731b0f8a89e2628b9e1d8a942b9a6d25bcecaba8e0557fc0ea943bebd5eed2c6265280
+  metadata.gz: a3cf1a3627c0dc5a7a380c9cf0c3504941d6e23bf8a23d6d7c2b3430b1ef27039fd9b37cfb40a383ce0ef3714dfa5462f8d70acd471debe474e90b14c6ebfd2d
+  data.tar.gz: 75321da1a28864666a818e95130e16156aa7ebf582a5d184106aa8ccb798ae50cf3d10cec0379ed3a3cb48e6b24cc495adef8d5400d19d9825f0b1579f8a93ce

data/lib/isodoc/ietf/cleanup.rb

@@ -9,17 +9,54 @@ module IsoDoc
         table_cleanup(docxml)
         footnote_cleanup(docxml)
         sourcecode_cleanup(docxml)
-        annotation_cleanup(docxml)
         li_cleanup(docxml)
         deflist_cleanup(docxml)
         bookmark_cleanup(docxml)
         cref_cleanup(docxml)
-        aside_cleanup(docxml)
         front_cleanup(docxml)
         u_cleanup(docxml)
+        biblio_cleanup(docxml) # feeds aside
+        aside_cleanup(docxml)
         docxml
       end
 
+      def biblio_cleanup(xmldoc)
+        biblio_abstract_cleanup(xmldoc)
+        biblio_date_cleanup(xmldoc)
+        annotation_cleanup(xmldoc)
+      end
+
+      def biblio_date_cleanup(xmldoc)
+        xmldoc.xpath("//date[@cleanme]").each do |a|
+          a.delete("cleanme")
+          d = @c.decode(a.text).gsub(/–/, "-").sub(/-\d\d\d\d.*$/, "")
+          if attrs = date_attr(d)
+            attrs.each do |k, v|
+              a[k] = v
+            end
+            a.children.remove
+          else a.remove end
+        end
+      end
+
+      def biblio_abstract_cleanup(xmldoc)
+        xmldoc.xpath("//abstract[@cleanme]").each do |a|
+          a.delete("cleanme")
+          ret = reparse_abstract(a)
+          a.children = if a.at("./p") then ret
+                       else "<t>#{ret}</t>"
+                       end
+        end
+      end
+
+      def reparse_abstract(abstract)
+        a1 = Nokogiri::XML(abstract.dup.to_xml
+          .sub("<abstract>", "<abstract xmlns='http://www.example.com'>")).root
+        noko do |xml|
+          a1.children.each { |n| parse(n, xml) }
+        end.join
+      end
+
       def li_cleanup(xmldoc)
         xmldoc.xpath("//li[t]").each do |li|
           next unless li.elements.size == 1
@@ -151,18 +188,22 @@ module IsoDoc
 
       def annotation_cleanup(docxml)
         docxml.xpath("//reference").each do |r|
-          next unless r&.next_element&.name == "aside"
-
-          aside = r.next_element
-          aside.name = "annotation"
-          aside.traverse do |n|
-            n.name == "t" and n.replace(n.children)
+          while r.next_element&.name == "aside"
+            annotation_cleanup1(r)
           end
-          r << aside
         end
         docxml.xpath("//references/aside").each(&:remove)
       end
 
+      def annotation_cleanup1(ref)
+        aside = ref.next_element
+        aside.name = "annotation"
+        aside.traverse do |n|
+          n.name == "t" and n.replace(n.children)
+        end
+        ref << aside
+      end
+
       def deflist_cleanup(docxml)
         dt_cleanup(docxml)
         dd_cleanup(docxml)

data/lib/isodoc/ietf/metadata.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def relaton_relations
-        %w(included-in described-by derived-from instance)
+        %w(included-in described-by derived-from instance-of)
         # = item describedby convertedfrom alternate
       end
 

data/lib/isodoc/ietf/references.rb

@@ -1,11 +1,11 @@
+require_relative "../../relaton/render/general"
+
 module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
-      def bibliography(isoxml, out)
-        isoxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
-          i.children = docid_prefix(i["type"], i.text)
-        end
-        isoxml.xpath(ns("//bibliography/references | " \
+      def bibliography(docxml, out)
+        bibliography_prep(docxml)
+        docxml.xpath(ns("//bibliography/references | " \
                         "//bibliography/clause[.//references] | " \
                         "//annex/clause[.//references] | " \
                         "//annex/references | " \
@@ -14,6 +14,15 @@ module IsoDoc
         end
       end
 
+      def bibliography_prep(docxml)
+        docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+          i.children = docid_prefix(i["type"], i.text)
+        end
+        @bibrenderer =
+          ::Relaton::Render::Ietf::General.new(language: @lang,
+                                               i18nhash: @i18n.get)
+      end
+
       def bibliography1(node, out)
         out.references **attr_code(anchor: node["id"]) do |div|
           title = node.at(ns("./title")) and div.name do |name|
@@ -29,7 +38,7 @@ module IsoDoc
         end
       end
 
-      def biblio_list(node, div, biblio)
+      def biblio_list(node, div, _biblio)
         i = 0
         node.xpath(ns("./bibitem | ./note")).each do |b|
           next if implicit_reference(b)
@@ -37,11 +46,30 @@ module IsoDoc
           i += 1 if b.name == "bibitem"
           if b.name == "note" then note_parse(b, div)
           else
-            nonstd_bibitem(div, b, i, biblio)
+            ietf_bibitem(div, b, i)
           end
         end
       end
 
+      def ietf_bibitem(list, bib, _ordinal)
+        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|
+                                     bibitem_render(r, bib)
+                                   end
+      end
+
+      def bibitem_render(ref, bib)
+        bib1 = bib.clone
+        @isodoc.prep_for_rendering(bib1)
+        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
@@ -165,6 +193,7 @@ module IsoDoc
           end
         end
       end
+=end
     end
   end
 end

data/lib/isodoc/ietf/section.rb

@@ -105,7 +105,7 @@ module IsoDoc
         links = isoxml
           .xpath(ns("//bibdata/relation[@type = 'includedIn' or " \
                     "@type = 'describedBy' or @type = 'derivedFrom' or " \
-                    "@type = 'instance']")) || return
+                    "@type = 'instanceOf']")) || return
         links.each do |l|
           out.link href: l&.at(ns("./bibitem/docidentifier"))&.text,
                    rel: rel2iana(l["type"])
@@ -117,7 +117,7 @@ module IsoDoc
         when "includedIn" then "item"
         when "describedBy" then "describedby"
         when "derivedFrom" then "convertedfrom"
-        when "instance" then "alternate"
+        when "instanceOf" then "alternate"
         else
           "alternate"
         end

data/lib/isodoc/ietf/validation.rb

@@ -16,6 +16,7 @@ module IsoDoc
       end
 
       def content_validate(xml, filename)
+        #return
         err = []
         err += numbered_sections_check(xml)
         err += toc_sections_check(xml)

data/lib/metanorma/ietf/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/lib/metanorma/ietf/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/ietf/cleanup.rb

@@ -29,7 +29,7 @@ module Metanorma
 
       BCP_KEYWORDS = ["MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
                       "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY",
-                      "OPTIONAL"].freeze
+                      "NOT RECOMMENDED", "OPTIONAL"].freeze
 
       def bcp14_cleanup(xmldoc)
         return unless @bcp_bold

data/lib/metanorma/ietf/front.rb

@@ -2,7 +2,7 @@ module Metanorma
   module Ietf
     class Converter < ::Metanorma::Standoc::Converter
       def relaton_relations
-        %w(included-in described-by derived-from instance obsoletes updates)
+        %w(included-in described-by derived-from instance-of obsoletes updates)
       end
 
       def metadata_author(node, xml)

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.4 -->
+<!-- VERSION v1.2.6 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1004,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1047,6 +1064,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1079,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1147,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1159,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/ietf/processor.rb

@@ -58,6 +58,7 @@ module Metanorma
       end
 
       def output(isodoc_node, inname, outname, format, options = {})
+        options_preprocess(options)
         case format
         when :rfc
           outname ||= inname.sub(/\.xml$/, ".rfc.xml")

data/lib/metanorma/ietf/version.rb

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

data/lib/relaton/render/config.yml

@@ -0,0 +1,59 @@
+extenttemplate:
+  book: "{{ volume }} {{ page }}"
+  booklet: book
+  proceedings: book
+  journal: book
+  standard: book
+  techreport: book
+  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 %}"
+    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}}"
+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%}"
+  website: standard
+  book: standard
+  booklet: standard
+  manual: standard
+  techreport: standard
+  proceedings: standard
+  inbook: standard
+  inproceedings: standard
+  incollection: standard
+  journal: standard
+  article: standard
+  software: standard
+  electronic resource:  standard
+  dataset: standard
+  webresource: standard
+  unpublished: standard
+  presentation: standard
+  thesis: standard
+  misc:  standard
+  # following are # unsupported types:
+  map: misc
+  audiovisual: misc
+  film: misc
+  video: misc
+  broadcast: misc
+  graphic_work: misc
+  music: misc
+  performance: misc
+  patent: misc
+  archival: misc
+  social_media: misc
+  alert: misc
+  message: misc
+  conversation: misc
+  internal: misc
+
+

data/lib/relaton/render/fields.rb

@@ -0,0 +1,26 @@
+module Relaton
+  module Render
+    module Ietf
+      class Fields < ::Relaton::Render::Fields
+        def nameformat(names)
+          names.nil? and return names
+          parts = %i(surname initials given middle nonpersonal
+                     nonpersonalabbrev completename)
+          names_out = names.each_with_object({}) do |n, m|
+            parts.each do |i|
+              m[i] ||= []
+              m[i] << n[i]
+            end
+          end
+          @r.nametemplate.render(names_out)
+        end
+
+        # do not format months
+        def dateformat(date, _hash)
+          date.nil? and return nil
+          date_range(date)
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/general.rb

@@ -0,0 +1,23 @@
+require "relaton-render"
+require_relative "parse"
+require_relative "template"
+require_relative "fields"
+
+module Relaton
+  module Render
+    module Ietf
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+
+        def klass_initialize(_options)
+          super
+          @parseklass = Relaton::Render::Ietf::Parse
+          @nametemplateklass = Relaton::Render::Ietf::Template::Name
+          @fieldsklass = Relaton::Render::Ietf::Fields
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/parse.rb

@@ -0,0 +1,86 @@
+module Relaton
+  module Render
+    module Ietf
+      class Parse < ::Relaton::Render::Parse
+        def simple_or_host_xml2hash(doc, host)
+          ret = super
+          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw]),
+                    uris: uris(doc), keywords: keywords(doc),
+                    abstract: abstract(doc))
+        end
+
+        def home_standard(_doc, pubs)
+          pubs&.any? do |r|
+            ["Internet Engineering Task Force", "IETF"]
+              .include?(r[:nonpersonal])
+          end
+        end
+
+        # allow publisher for standards
+        def creatornames_roles_allowed
+          %w(author performer adapter translator editor publisher distributor
+             authorizer)
+        end
+
+        def uris(doc)
+          doc.link.map { |u| { content: u.content.to_s.strip, type: u.type } }
+        end
+
+        def keywords(doc)
+          doc.keyword.map { |u| content(u) }
+        end
+
+        def abstract(doc)
+          doc.abstract.join
+        end
+
+        def extractname(contributor)
+          org = contributor.entity if contributor.entity
+            .is_a?(RelatonBib::Organization)
+          person = contributor.entity if contributor.entity
+            .is_a?(RelatonBib::Person)
+          if org
+            return { nonpersonal: extract_orgname(org),
+                     nonpersonalabbrev: extract_orgabbrev(org) }
+          end
+          return extract_personname(person) if person
+
+          nil
+        end
+
+        def extract_orgabbrev(org)
+          content(org.abbreviation)
+        end
+
+        def extract_personname(person)
+          surname = person.name.surname
+          completename = person.name.completename
+          given, middle, initials = given_and_middle_name(person)
+          { surname: content(surname),
+            completename: content(completename),
+            given: given,
+            middle: middle,
+            initials: initials }.compact
+        end
+
+        # not just year-only
+        def date(doc, host)
+          ret = date1(doc.date)
+          host and ret ||= date1(host.date)
+          datepick(ret)
+        end
+
+        # return authors and editors together
+        def creatornames1(doc)
+          return [] if doc.nil?
+
+          add1 = pick_contributor(doc, "author") || []
+          add2 = pick_contributor(doc, "editor") || []
+          cr = add1 + add2
+          cr.empty? or return cr
+          super
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/template.rb

@@ -0,0 +1,29 @@
+require "sterile"
+
+module Relaton
+  module Render
+    module Template
+      module Ascii
+        def ascii(ret)
+          ret.transliterate
+        end
+      end
+    end
+  end
+end
+
+module Relaton
+  module Render
+    module Ietf
+      module Template
+        class Name < ::Relaton::Render::Template::Name
+          def customise_liquid
+            super
+            ::Liquid::Template
+              .register_filter(::Relaton::Render::Template::Ascii)
+          end
+        end
+      end
+    end
+  end
+end

data/metanorma-ietf.gemspec

@@ -37,7 +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.5.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
+  spec.add_dependency "relaton-render"
 
   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.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: relaton-render
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +270,11 @@ files:
 - lib/metanorma/ietf/reqt.rng
 - lib/metanorma/ietf/validate.rb
 - lib/metanorma/ietf/version.rb
+- lib/relaton/render/config.yml
+- lib/relaton/render/fields.rb
+- lib/relaton/render/general.rb
+- lib/relaton/render/parse.rb
+- lib/relaton/render/template.rb
 - metanorma-ietf.gemspec
 - rfc2629-other.ent
 - rfc2629-xhtml.ent